Merge branch 'feature/login'

Conflicts:
	game-server/app/servers/role/handler/heroHandler.ts
	game-server/app/services/redisService.ts
	shared/consts/index.ts
	shared/resource/jsons/dic_zyz_gk_main.json

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

@@ -55,7 +55,7 @@ export class EntryHandler {
             await self.app.rpc.connector.connectorRemote.remoteLogin.toServer(connect.sid, role.roleId);
         }
         let serverName =  this.app.getServerId();
-        await roleLogin(role.roleId, user.userCode, serverName); // 保存在线用户
+        await roleLogin(role.roleId, user.userCode, serverName, user.pkgName); // 保存在线用户
         await session.abind(role.roleId);
         session.set('uid', role.roleId);
         session.set('roleId', role.roleId);