登录：更新服务器列表

web-server/app/controller/game.ts

@@ -2,6 +2,7 @@ import { STATUS } from '@consts';
 import { GameModel } from '@db/Game';
 import { Controller } from 'egg';
 import { RoleModel } from '@db/Role';
+import { ServerParamWithRole, GroupParam } from '../domain/gameField/serverlist';
 
 export default class GameController extends Controller {
 
@@ -9,26 +10,26 @@ export default class GameController extends Controller {
         const { ctx } = this;
         let { serverType, auth, uid } = ctx;
 
-        let serverList = [];
-        let loginServerList = [];
+        let serverList = new Array<GroupParam>();
+        let loginServerList = new Array<ServerParamWithRole>();
 
         let allServers = await GameModel.getServerList();
         let roles = await RoleModel.findAllByUid(uid);
-        console.log(roles.length)
 
         for(let server of allServers) {
             if(auth === 1 || (!auth && server.serverType == serverType)) {
-                serverList.push(server);
+                server['serverStr'] = `S${server.id}`;
+                let curGroup = serverList.find(cur => cur.groupId == server.groupId);
+                if(!curGroup) {
+                    curGroup = new GroupParam(server);
+                    serverList.push(curGroup);
+                }
+                curGroup.pushServer(server);
+
                 let role = roles.find(role => role.serverId == server.id);
                 if(!!role) {
-                    let roleInfo = {
-                        roleId: role.roleId,
-                        roleName: role.roleName,
-                        headHid: role.headHid,
-                        sHid: role.sHid,
-                        lv: role.lv
-                    };
-                    loginServerList.push({...server, ...roleInfo});
+                    let curLoginInfo = new ServerParamWithRole(role, server);
+                    loginServerList.push(curLoginInfo);
                 }
             }
         }