✨ feat(服务器): 更新维护逻辑

web-server/app/controller/game.ts

@@ -87,7 +87,7 @@ export default class GameController extends Controller {
         try {
             const { ctx } = this;
             let { uid } = ctx;
-            const { pid, gid } = ctx.request.body;
+            const { pid, gid, version } = ctx.request.body;
             let serverList = new Array<GroupParam>();
             let loginServerList = new Array<ServerParamWithRole>();
 
@@ -104,6 +104,7 @@ export default class GameController extends Controller {
             // let env = isReview? curRegion.reviewEnv: ctx.app.config.realEnv;
 
             let allServers = await ServerlistModel.findByEnv(ctx.app.config.realEnv, false);
+            let hasRole = await RoleModel.checkHasRole(uid, curRegion.latestServerUniqId);
 
             if(pid && gid) {
                 const pkg = await PackageModel.getPackageByGidPid(gid, pid);
@@ -114,16 +115,17 @@ export default class GameController extends Controller {
 
             let roles = await RoleModel.findAllByUid(uid, true, true);
             for (let server of allServers) {
+                let status = ctx.service.utils.getServerStatus(server, version, hasRole)
                 let curGroup = serverList.find(cur => cur.groupId == server.groupId);
                 if (!curGroup) {
                     curGroup = new GroupParam(server);
                     serverList.push(curGroup);
                 }
-                curGroup.pushServer(server);
+                curGroup.pushServer(server, status);
 
                 let role = roles.find(role => role.serverId == server.id);
                 if (!!role) {
-                    let curLoginInfo = new ServerParamWithRole(role, server);
+                    let curLoginInfo = new ServerParamWithRole(role, server, status);
                     loginServerList.push(curLoginInfo);
                 }
             }

web-server/app/middleware/checkMainten.ts

@@ -2,10 +2,11 @@ import { STATUS } from '@consts';
 import { ServerlistModel } from '@db/Serverlist';
 import { nowSeconds } from 'app/pubUtils/timeUtil';
 import { checkWhiteList } from 'app/pubUtils/sysUtil';
+import { RoleModel } from '@db/Role';
 
 module.exports = () => {
     return async function checkMainten(ctx, next) {
-        const { serverId } = ctx.request.body;
+        const { serverId, version } = ctx.request.body;
         if (serverId) {
             let server = await ServerlistModel.findByServerId(serverId);
             if (server && server.maintenance && server.maintenance.isOpen && server.maintenance.startTime < nowSeconds() && server.maintenance.endTime > nowSeconds()) {
@@ -13,8 +14,19 @@ module.exports = () => {
                 if (isWhiteList) {
                     return await next();
                 } else {
-                    ctx.body = ctx.service.utils.resResult(STATUS.SERVER_MAINTENANCE);
-                    return;
+                    const versionFlag = ctx.service.utils.compareVersion(version, server.maintenance.version||'0.0.0');
+                    if(versionFlag >= 0) { // 新版本号
+                        let hasRole = await RoleModel.checkHasRole(ctx.uid, server.latestServerUniqId); // 是否是老玩家
+                        if(!hasRole) {
+                            return await next();
+                        } else {
+                            ctx.body = ctx.service.utils.resResult(STATUS.SERVER_MAINTENANCE);
+                            return;
+                        }
+                    } else {
+                        ctx.body = ctx.service.utils.resResult(STATUS.SERVER_MAINTENANCE);
+                        return;
+                    }
                 }
             } else if(server && server.openTime > nowSeconds()) {
                 let isWhiteList = await checkWhiteList(ctx.app.config.realEnv, ctx.clientIp, ctx.uid);

web-server/app/service/Sdk.ts

@@ -348,7 +348,7 @@ export default class Sdk extends Service {
         let regions = await RegionModel.getAllRegion();
         let data = servers.map(server => {
             let statue = 0;
-            switch(server.status) {
+            switch(server.serverStatus) {
                 case SERVER_STATUS.MAINTENANCE:
                     statue = 0; break;
                 case SERVER_STATUS.WILL_OPEN:

web-server/app/service/Utils.ts

@@ -2,8 +2,10 @@ import { Service } from 'egg';
 import { resResult as pubResult } from '../pubUtils/util';
 import { gameData } from 'app/pubUtils/data';
 import { RedisClient } from 'redis';
-import { REDIS_KEY } from '@consts';
+import { REDIS_KEY, SERVER_STATUS } from '@consts';
 import { getRedisSubChannel } from 'app/pubUtils/sdkUtil';
+import { ServerlistType } from '@db/Serverlist';
+import { nowSeconds } from 'app/pubUtils/timeUtil';
 const csprng = require('csprng');
 /**
  * Utils Service
@@ -133,4 +135,24 @@ export default class Utils extends Service {
         return 0;
     }
   };
+
+  public getServerStatus(server: ServerlistType, version: string, hasRole: boolean) {
+    let now = nowSeconds();
+    if (now < server.openTime) {
+      return SERVER_STATUS.WILL_OPEN;
+    } else if (server.maintenance && server.maintenance.isOpen && server.maintenance.startTime < now && server.maintenance.endTime > now) {
+      const versionFlag = this.ctx.service.utils.compareVersion(version, server.maintenance.version||'0.0.0');
+      if(versionFlag >= 0) { // 新版本号
+          if(!hasRole && server.id == server.latestServerUniqId) { // 新玩家
+              return server.serverStatus;
+          } else {
+              return SERVER_STATUS.MAINTENANCE;
+          }
+      } else {
+          return SERVER_STATUS.MAINTENANCE;
+      }
+    } else {
+      return server.serverStatus; // 未开服
+    }
+  }
 }