From 1479c66f146c2b40f6e4e7f9c96143fafe382c22 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 5 Mar 2021 18:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/domain/gameField/serverlist.ts | 6 ++++--
 web-server/app/controller/game.ts     | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/shared/domain/gameField/serverlist.ts b/shared/domain/gameField/serverlist.ts
index d04127358..230d39f57 100644
--- a/shared/domain/gameField/serverlist.ts
+++ b/shared/domain/gameField/serverlist.ts
@@ -27,13 +27,13 @@ export class ServerParam {
 export class GroupParam {
     groupId: number;        // 大区号
     groupName: string;      // 大区名
-    serverStr: string;      // 大区内小区编号 S1-S10
+    groupStr: string;      // 大区内小区编号 S1-S10
     servers: ServerParam[];      // 区
 
     constructor(server: ServerInfo) {
         this.groupId = server.groupId;
         this.groupName = server.groupName;
-        this.serverStr = `S${server.id}-S${server.id + 9}`;
+        this.groupStr = `S${server.id}-S${server.id + 9}`;
         this.servers = new Array<ServerParam>();
     }
 
@@ -52,6 +52,7 @@ export class ServerParamWithRole extends ServerParam {
     headHid: number;         // 头像
     sHid: number;            // 形象
     lv: number;              // 等级
+    updatedAt: Date;
 
     constructor(role: RoleType, server: ServerInfo) {
         super(server);
@@ -63,5 +64,6 @@ export class ServerParamWithRole extends ServerParam {
         this.headHid = role.headHid;
         this.sHid = role.sHid;
         this.lv = role.lv;
+        this.updatedAt = role.updatedAt;
     } 
 }
\ No newline at end of file
diff --git a/web-server/app/controller/game.ts b/web-server/app/controller/game.ts
index 317b4f02d..445f3d6c6 100644
--- a/web-server/app/controller/game.ts
+++ b/web-server/app/controller/game.ts
@@ -17,6 +17,9 @@ export default class GameController extends Controller {
         let allServers = await GameModel.getServerList();
         let roles = await RoleModel.findAllByUid(uid);
 
+        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}`;
@@ -35,6 +38,8 @@ export default class GameController extends Controller {
             }
         }
 
+        loginServerList.sort((a, b) => { return b.updatedAt.getTime() - a.updatedAt.getTime()});
+
         if (serverList && serverList.length > 0) {
             ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, { serverList, loginServerList });
         } else {