feature:

修改账号接口返回结构
修改部分账号接口逻辑

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

@@ -1,9 +1,11 @@
+import { STATUS } from './../../../consts/statusCode';
 import { EquipModel } from './../../../db/Equip';
 import { RoleModel } from './../../../db/Role';
 import { UserModel } from '../../../db/User';
 import { Application, Session } from 'pinus';
 import {FrontendSession} from 'pinus';
 import { HeroModel } from './../../../db/Hero';
+import { resResult } from '../../../pubUtils/util';
 
 export default function (app: Application) {
     return new EntryHandler(app);
@@ -19,42 +21,28 @@ export class EntryHandler {
      * @param  {Object}   msg     request message
      * @param  {Object}   session current session object
      */
-    async enter(msg: { rid: string, username: string, token: string, serverId: number }, session: FrontendSession) {
+    async enter(msg: { token: string, serverId: number }, session: FrontendSession) {
         let self = this;
-        let rid = msg.rid;
         let serverId = msg.serverId;
-        let uid = msg.username + '*' + rid;
         let sessionService = self.app.get('sessionService');
 
         let user = await UserModel.findUserByToken(msg.token);
         if (!user) {
             console.log('user token not found');
-            return {
-                code: 500,
-                error: true,
-                data: 'user token not found'
-            };
+            return resResult(STATUS.TOKEN_ERR);
         }
 
         let role = await RoleModel.findByUid(user.uid, serverId);
         if (!role) {
-            return {
-                code: 201,
-                error: true,
-                data: '用户还未创建角色',
-            }
+            return resResult(STATUS.ROLE_NOT_FOUND);
         }
         // duplicate log in
         if (!!sessionService.getByUid(role.roleId)) {
-            console.log('uid not found');
-            return {
-                code: 500,
-                error: true
-            };
+            console.log('duplicate log in', role.roleId);
+            return resResult(STATUS.DUP_LOGIN);
         }
 
         await session.abind(role.roleId);
-        session.set('rid', rid);
         session.set('uid', role.roleId);
         session.set('roleId', role.roleId);
         session.set('roleName', role.roleName);
@@ -64,11 +52,11 @@ export class EntryHandler {
         session.push('roleId', () => {});
         session.push('roleName', () => {});
         session.push('eventStatus', () => {});
-        session.push('rid', function (err) {
-            if (err) {
-                console.error('set rid for session service failed! error is : %j', err.stack);
-            }
-        });
+        // session.push('rid', function (err) {
+        //     if (err) {
+        //         console.error('set rid for session service failed! error is : %j', err.stack);
+        //     }
+        // });
         session.on('closed', this.onUserLeave.bind(this));
 
         let channelService = self.app.get('channelService');
@@ -79,16 +67,12 @@ export class EntryHandler {
 
         // put user into channel
         await self.app.rpc.battle.eventBattleRemote.add.route(session)(role.roleId, self.app.get('serverId'), true);
-        let users = await self.app.rpc.chat.chatRemote.add.route(session)(role.roleId, self.app.get('serverId'), rid, true);
+        // let users = await self.app.rpc.chat.chatRemote.add.route(session)(role.roleId, self.app.get('serverId'), rid, true);
         let heros = await HeroModel.findByRole(role.roleId);
         let equips = await EquipModel.findbyRole(role.roleId);
         role['heros'] = heros;
         role['equips'] = equips;
-        return {
-            status: 200,
-            users: users,
-            role
-        };
+        return resResult(STATUS.SUCCESS, { role });
     }
 
     /**