测试：添加测试用的 token 查询接口，不再写死 token

game-server/app/servers/connector/handler/entryHandler.ts

@@ -188,4 +188,21 @@ export class EntryHandler {
         // put user into channel
         return resResult(STATUS.SUCCESS);
     }
+
+    /**
+     * ! 仅用于测试
+     * @description 测试接口，用于查询和返回 token
+     * @param {{ tel: string, magicWord: string }} msg 要查询的手机号；需要验证的密码
+     * @param {FrontendSession} session
+     * @returns
+     * @memberof EntryHandler
+     */
+    async debugQueryToken(msg: { tel: string, magicWord: string }, session: FrontendSession) {
+        const { tel, magicWord } = msg;
+        if (magicWord !== 'zyz666server518') {
+            return resResult(STATUS.TOKEN_ERR);
+        }
+        const token = await UserModel.findTokenByTel(tel);
+        return resResult(STATUS.SUCCESS, { token });
+    }
 }

game-server/test/app.test.ts

@@ -11,6 +11,7 @@ describe('test zyz login', function() {
         //   });
       // });
   var pinusClient;
+  const loginParms = {serverId: 1};
 
   beforeEach(function(done) {
     pinusClient = new PinusWSClient();
@@ -50,11 +51,16 @@ describe('test zyz login', function() {
 
   it('登录测试', function(done) {
     expect(1).equal(1);
-    pinusClient.request('connector.entryHandler.enter', {token:'3dc788mrgqshmu8dawocuiftf4lpkjo8sah6p023rin7396n6o', serverId: 1} , (ret) => {
+    pinusClient.request('connector.entryHandler.debugQueryToken', {tel: '13911134885', magicWord: 'zyz666server518'}, (res) => {
-      // 消息回调
+      expect(res).to.be.an('object');
-      expect(ret).to.be.an('object');
+      expect(res.data).to.be.an('object');
-      expect(ret.code).equal(0);
+      expect(res.data.token).to.be.an('string');
-      done();
+      pinusClient.request('connector.entryHandler.enter', {...loginParms, ...res.data}, (ret) => {
+        expect(ret).to.be.an('object');
+        expect(ret.code).equal(0);
+        // 消息回调
+        done();
+      });
     });
   });
 });

game-server/test/comBattle.test.ts

@@ -13,7 +13,7 @@ describe('寻宝创建队伍', function() {
   var pinusClient;
   var roleInfo;
 
-  const loginParms = {token:'3dc788mrgqshmu8dawocuiftf4lpkjo8sah6p023rin7396n6o', serverId: 1};
+  const loginParms = {serverId: 1};
   const createTeamParms = {blueprtId: 33001, pub: true, ceLimit: 0};
   const searchTeamParms = {qualityArr: [1, 2, 3, 4, 5]};
 
@@ -47,12 +47,17 @@ describe('寻宝创建队伍', function() {
         console.log('gate连接成功');
         // console.log('gate连接成功', data);
         // done();
-        pinusClient.request('connector.entryHandler.enter', loginParms, (ret) => {
+        pinusClient.request('connector.entryHandler.debugQueryToken', {tel: '13911134885', magicWord: 'zyz666server518'}, (res) => {
-          // 消息回调
+          expect(res).to.be.an('object');
-          console.log('connector返回');
+          expect(res.data).to.be.an('object');
-          // console.log('connector返回', JSON.stringify(ret));
+          expect(res.data.token).to.be.an('string');
-          roleInfo = ret.role;
+          pinusClient.request('connector.entryHandler.enter', {...loginParms, ...res.data}, (ret) => {
-          done();
+            // 消息回调
+            console.log('connector返回');
+            // console.log('connector返回', JSON.stringify(ret));
+            roleInfo = ret.role;
+            done();
+          });
         });
     });
   });

game-server/test/guild.test.ts

@@ -13,6 +13,7 @@ describe('军团测试', function() {
   var pinusClient;
   var roleInfo;
   let guildList;
+  const loginParms = {serverId: 1};
 
   beforeEach(function(done) {
     pinusClient = new PinusWSClient();
@@ -44,12 +45,17 @@ describe('军团测试', function() {
         console.log('gate连接成功');
         // console.log('gate连接成功', data);
         // done();
-        pinusClient.request('connector.entryHandler.enter', {token:'3dc788mrgqshmu8dawocuiftf4lpkjo8sah6p023rin7396n6o', serverId: 1} , (ret) => {
+        pinusClient.request('connector.entryHandler.debugQueryToken', {tel: '13911134885', magicWord: 'zyz666server518'}, (res) => {
-          // 消息回调
+          expect(res).to.be.an('object');
-          console.log('connector返回');
+          expect(res.data).to.be.an('object');
-          // console.log('connector返回', JSON.stringify(ret));
+          expect(res.data.token).to.be.an('string');
-          roleInfo = ret.role;
+          pinusClient.request('connector.entryHandler.enter', {...loginParms, ...res.data}, (ret) => {
-          done();
+            // 消息回调
+            console.log('connector返回');
+            // console.log('connector返回', JSON.stringify(ret));
+            roleInfo = ret.role;
+            done();
+          });
         });
     });
   });

shared/db/User.ts

@@ -87,6 +87,11 @@ export default class User extends BaseModel {
     return user;
   }
 
+  public static async findTokenByTel(tel: string, lean = true) {
+    const { token } = await UserModel.findOne({ tel }).select('token').lean(lean);
+    return token;
+  }
+
   public static async findUserByTel(tel: string, lean = true) {
     const user: UserType = await UserModel.findOne({ tel }).select('uid tel').lean(lean);
     return user;