登录优化：gate可变为短链接

game-server/app/servers/gate/handler/gateHandler.ts

@@ -1,5 +1,5 @@
 import { STATUS } from './../../../consts/statusCode';
-import { dispatch } from '../../../util/dispatcher';
+import { dispatch } from '../../../pubUtils/dispatcher';
 import { Application, BackendSession, HandlerService, } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 

game-server/app/services/comBattleService.ts

@@ -25,7 +25,7 @@ import { getRewardByBlueprtId, gameData, getBossHpByBlueprtId } from '../pubUtil
 import { getFriendPointObject } from '../pubUtils/itemUtils';
 import { DicWar } from '../pubUtils/dictionary/DicWar';
 import { getZeroPointD } from '../pubUtils/timeUtil';
-import { dispatch } from '../util/dispatcher';
+import { dispatch } from '../pubUtils/dispatcher';
 
 /**
  * 在给定的品质列表中随机返回一定数量的藏宝图Id

game-server/app/services/redisService.ts

@@ -3,7 +3,7 @@ import * as Redis from 'redis';
 import {REDIS_KEY} from '../consts'
 import { GameModel } from "../db/Game";
 import { promisifyAll } from 'bluebird';
-import { pinus } from 'pinus';
+import { pinus, ServerInfo } from 'pinus';
 import { GuildRankParam, GuildLeader, RankParam, LineupParam } from '../domain/rank';
 import { comBtlRanges } from '../pubUtils/data';
 import { setRankRedisFromDb } from './rankService';
@@ -446,3 +446,22 @@ export function redisClient() {
 }
 
 /**************** 数据库表end */
+
+
+/*************** 将connector服插入redis *******/
+
+export async function setConnectors(servers: ServerInfo[]) {
+    for(let server of servers) {
+        if(server.serverType == 'connector') {
+            let { serverType, clientHost, clientPort, id } = server;
+            await redisClient().hsetAsync(REDIS_KEY.SYS_SERVER, server.id, JSON.stringify({ serverType, clientHost, clientPort, id }));
+        }
+    }
+}
+
+export async function removeConnectors(servers: string[]) {
+    for(let server of servers) {
+        let hasServer = await redisClient().hgetAsync(REDIS_KEY.SYS_SERVER, server);
+        if(!!hasServer) await redisClient().hdelAsync(REDIS_KEY.SYS_SERVER, server);
+    }
+}

game-server/app/services/timeTaskService.ts

@@ -18,7 +18,7 @@ import { sendMailByContent } from './mailService';
 import { getGuildActivityByDic, sendEndMsgToAll, autoDeclare, sendGuildActivityStatus } from './guildActivityService';
 import { sendUngotDividendJob, startGuildAuction, startWorldAuction, stopAuction } from './auctionService';
 import { DicGuildActivity } from '../pubUtils/dictionary/DicGuildActivity';
-import { dispatch } from '../util/dispatcher';
+import { dispatch } from '../pubUtils/dispatcher';
 import { Rank } from './rankService';
 import { checkTask } from './taskService';
 import { everydayRefresh } from './connectorService';

game-server/app/util/dispatcher.ts

@@ -1,44 +0,0 @@
-import * as crc from 'crc';
-import { ServerInfo } from 'pinus';
-
-
-
-let roleRoute = new Map<string, Map<string, string>>()
-
-export function dispatch(uid: string, connectors: ServerInfo[], serverType: string = '') {
-    //测试代码
-    // if (serverType == 'activity') {
-    //     if (uid == 'SPDtGqx9Gw') {
-    //         if (connectors.length > 1) {
-    //             connectors = connectors.filter(obj => { return obj.id != 'activity-server-1' })
-    //         }
-    //     } else {
-    //         connectors = connectors.filter(obj => { return obj.id == 'activity-server-1' })
-    //     }
-    // }
-
-    if (serverType) {
-        let roleRouteData = roleRoute.get(uid);
-        let serverId = '';
-        if (roleRouteData) {
-            serverId = roleRouteData.get(serverType);
-            if (serverId) {
-                let index = connectors.findIndex(obj => { return obj.id === serverId });
-                if (index != -1) {
-                    // console.log('aaaaaaaaa 1', roleRouteData)
-                    return connectors[index];
-                }
-            }
-        }
-        let index = Math.abs(crc.crc32(uid)) % connectors.length;
-        if (!roleRouteData) {
-            roleRouteData = new Map<string, string>()
-        }
-        roleRouteData.set(serverType, connectors[index].id);
-        roleRoute.set(uid, roleRouteData)
-        // console.log('aaaaaaaaa 2', roleRouteData)
-        return connectors[index];
-    }
-    let index = Math.abs(crc.crc32(uid)) % connectors.length;
-    return connectors[index];
-}

game-server/app/util/routeUtil.ts

@@ -1,5 +1,5 @@
 
-import { dispatch } from './dispatcher';
+import { dispatch } from '../pubUtils/dispatcher';
 import { Session, Application } from 'pinus';
 
 export function chat(session: Session, msg: any, app: Application, cb: (err: Error, serverId?: string) => void) {