服务器：修改服务器列表

web-server/app/controller/game.ts

@@ -5,6 +5,7 @@ import { RoleModel } from '@db/Role';
 import { NoticeModel } from '@db/Notice';
 import { ServerParamWithRole, GroupParam } from '../domain/gameField/serverlist';
 import { reloadResources } from 'app/pubUtils/data';
+import { ServerlistModel } from '@db/Serverlist';
 
 export default class GameController extends Controller {
 
@@ -15,27 +16,20 @@ export default class GameController extends Controller {
         let serverList = new Array<GroupParam>();
         let loginServerList = new Array<ServerParamWithRole>();
 
-        let allServers = await GameModel.getServerList();
+        let allServers = await ServerlistModel.findByServerType(auth == 1? null: serverType);
         let roles = await RoleModel.findAllByUid(uid, true, true);
-
-        allServers.sort((a, b) => {
-            return b.id - a.id;
-        });
         for(let server of allServers) {
-            if(auth === 1 || (!auth && server.serverType == serverType)) {
-                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 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 curLoginInfo = new ServerParamWithRole(role, server);
-                    loginServerList.push(curLoginInfo);
-                }
+            let role = roles.find(role => role.serverId == server.id);
+            if(!!role) {
+                let curLoginInfo = new ServerParamWithRole(role, server);
+                loginServerList.push(curLoginInfo);
             }
         }
 

web-server/app/middleware/tokenParser.ts

@@ -15,7 +15,7 @@ module.exports = () => {
       return;
     }
     ctx.uid = user.uid;
-    ctx.serverType = user.serverType;
+    ctx.serverType = ctx.request.body.serverType||user.serverType;
     ctx.auth = user.auth;
     ctx.userCode = user.userCode;
     ctx.pkgName = user.pkgName;