新服：二测玩家测试服

game-server/app.ts

@@ -47,7 +47,7 @@ filePath.CONFIG_DIR = '/config';
 const adminfilePath = _pinus.DEFAULT_ADMIN_PATH;
 adminfilePath.ADMIN_FILENAME = 'adminUser';
 adminfilePath.ADMIN_USER = 'config/adminUser';
-const ALL_ENVS = 'stable|development|alpha|dev|isbn|monitor|monitor2|distribute|sq1';
+const ALL_ENVS = 'stable|development|alpha|dev|isbn|monitor|monitor2|distribute|sq1|sq3';
 /**
  *  替换全局Promise
  *  自动解析sourcemap

game-server/app/servers/connector/handler/entryHandler.ts

@@ -20,7 +20,7 @@ import Counter from '../../../db/Counter';
 import { getExpByLv } from '../../../pubUtils/data';
 import { reportCreateRoleEventToTa, reportTAEvent, reportTAUserSet } from '../../../services/sdkService';
 import { saveLoginAndOutLog } from '../../../pubUtils/logUtil';
-import { sendMessageToAllWithSuc } from '../../../services/pushService';
+import { sendMessageToAllWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService';
 import { getIpLocation } from '../../../services/roleService';
 
 export default function (app: Application) {
@@ -249,6 +249,8 @@ export class EntryHandler {
         // });
         session.on('closed', this.onGmUserLeave.bind(this));
 
+        sendMessageToUserWithSuc(user.username, 'onGMENTER', {}, self.app.get('serverId'))
+
         // put user into channel
         return resResult(STATUS.SUCCESS, {
             env: this.app.get('env')

game-server/app/servers/gm/handler/gmServerHandler.ts

@@ -48,6 +48,7 @@ export class GmHandler {
 
         console.log('*******', params);
         let curRegion = await RegionModel.findRegionByEnv(params.env);
+        console.log('******* curRegion', curRegion);
         if(!curRegion) return resResult(STATUS.WRONG_PARMS);
 
         let { latestServer = 0 } = curRegion;

game-server/app/services/pvpService.ts

@@ -15,7 +15,6 @@ import { HeroModel, HeroType } from '../db/Hero';
 import { AttributeCal } from '../domain/roleField/attribute';
 import { PvpEnemies, PvpHeroInfo, PvpOtherHeroes } from '../domain/dbGeneral';
 import { DicWarJson } from '../pubUtils/dictionary/DicWarJson';
-import { findWhere, findIndex } from 'underscore';
 import { pinus } from 'pinus';
 import { PvpHistoryOppModel, PvpHistoryOppType, PvpOppCreateParam } from '../db/PvpHistoryOpp';
 import { Rank } from './rankService';

game-server/config/database.ts

@@ -54,4 +54,10 @@ module.exports = {
         'redis': 'r-8vb7l1s8ne4vm6v6x6.redis.zhangbei.rds.aliyuncs.com',
         'redispw': 'PANl3Vr2eozkq4N2'
     },
+    'sq3': {
+        'mongo': 'mongodb://dbop:zyzSQ2022@dds-8vb9e0b130444f341.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9e0b130444f342.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-510195956',
+        'gmmongo': 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742',
+        'redis': 'r-8vbq8kgkeqd4bbegwk.redis.zhangbei.rds.aliyuncs.com',
+        'redispw': 'bB^Ow3l@RMRSTtJU'
+    },
 };

game-server/config/master.ts

@@ -56,7 +56,7 @@ module.exports = {
     },
     'sq3': {
         'id': 'master-server-1',
-        'host': '172.16.4.108',
+        'host': '172.16.4.106',
         'port': 3005
     }
 };

game-server/config/servers.ts

@@ -331,28 +331,37 @@ module.exports = {
     },
     'sq3': {
         'connector': [
-            { 'id': 'connector-server-4', 'port': 4053, 'clientHost': 'sq1-game2-sgzzyz.yev242.com', 'host': '172.16.4.106', 'clientPort': 3053, 'frontend': true },
+            { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'sq3-game1-sgzzyz.yev242.com', 'host': '172.16.4.106', 'clientPort': 3050, 'frontend': true },
-            { 'id': 'connector-server-5', 'port': 4054, 'clientHost': 'sq1-game2-sgzzyz.yev242.com', 'host': '172.16.4.106', 'clientPort': 3054, 'frontend': true },
+            { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'sq3-game1-sgzzyz.yev242.com', 'host': '172.16.4.106', 'clientPort': 3051, 'frontend': true },
-        ],
+            { 'id': 'connector-server-gm', 'port': 4099, 'clientHost': 'sq3-game1-sgzzyz.yev242.com', 'host': '172.16.4.106', 'clientPort': 3099, 'frontend': true, 'isGM': true },
-        'role': [
-            { 'id': 'role-server-4', 'host': '172.16.4.106', 'port': 6063 },
-            { 'id': 'role-server-5', 'host': '172.16.4.106', 'port': 6065 },
-            { 'id': 'role-server-6', 'host': '172.16.4.106', 'port': 6066 },
         ],
         'chat': [
-            { 'id': 'chat-server-2', 'host': '172.16.4.106', 'port': 6069 },
+            { 'id': 'chat-server-1', 'host': '172.16.4.106', 'port': 6050 },
+        ],
+        'role': [
+            { 'id': 'role-server-1', 'host': '172.16.4.106', 'port': 6053 },
+            { 'id': 'role-server-2', 'host': '172.16.4.106', 'port': 6061 },
         ],
         'battle': [
-            { 'id': 'battle-server-3', 'host': '172.16.4.106', 'port': 6070 },
+            { 'id': 'battle-server-1', 'host': '172.16.4.106', 'port': 6054 },
-            { 'id': 'battle-server-4', 'host': '172.16.4.106', 'port': 6072 },
+            { 'id': 'battle-server-2', 'host': '172.16.4.106', 'port': 6067 },
+        ],
+        'gm': [
+            { 'id': 'gm-server-1', 'host': '172.16.4.106', 'port': 6055 }
+        ],
+        'systimer': [
+            { 'id': 'systimer-server-1', 'host': '172.16.4.106', 'port': 6056 }
         ],
         'guild': [
-            { 'id': 'guild-server-3', 'host': '172.16.4.106', 'port': 6071 },
+            { 'id': 'guild-server-1', 'host': '172.16.4.106', 'port': 6057 },
-            { 'id': 'guild-server-4', 'host': '172.16.4.106', 'port': 6073 },
+            { 'id': 'guild-server-2', 'host': '172.16.4.106', 'port': 6058 }
-            { 'id': 'guild-server-5', 'host': '172.16.4.106', 'port': 6074 },
+        ],
+        'activity': [
+            { 'id': 'activity-server-1', 'host': '172.16.4.106', 'port': 6059 },
+            { 'id': 'activity-server-2', 'host': '172.16.4.106', 'port': 6068 },
         ],
         'order': [
-            { 'id': 'order-server-2', 'host': '172.16.4.106', 'port': 6064 },
+            { 'id': 'order-server-1', 'host': '172.16.4.106', 'port': 6060 },
-        ],
+        ]
     },
 };

game-server/config/sq3/log4js.ts

@@ -0,0 +1,177 @@
+module.exports = {
+    'appenders': {
+        'console': {
+            'type': 'console'
+        },
+        'con-log': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/con-log-${opts:serverId}.log',
+            'pattern': 'connector',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'rpc-log': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/rpc-log-${opts:serverId}.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'forward-log': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/forward-log-${opts:serverId}.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'rpc-debug': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/rpc-debug-${opts:serverId}.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'crash-log': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/crash.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'admin-log': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/admin.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'pinus': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/pinus-${opts:serverId}.log',
+            'maxLogSize': 1073741824,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 20
+        },
+        'pinus-admin': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/pinus-admin.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'pinus-rpc': {
+            'type': 'file',
+            'filename': '/zyz_logs/log4js/pinus-rpc-${opts:serverId}.log',
+            'maxLogSize': 104857600,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'app': {
+            'type': 'file',
+            'filename': '/zyz_logs/sls/app.log',
+            'maxLogSize': 1073741824,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 20
+        },
+        'error': {
+            'type': 'file',
+            'filename': '/zyz_logs/sls/error.log',
+            'maxLogSize': 1073741824,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        },
+        'ta': {
+            'type': 'file',
+            'filename': '/zyz_logs/ta/log',
+            'pattern': 'yyyy-MM-dd-hh',
+            'alwaysIncludePattern': true,
+            'layout': {
+                'type': 'pattern',
+                'pattern': '%m',
+            },
+            'backups': 240,
+        }
+    },
+
+    'categories': {
+        'default': {
+            'appenders': ['console', 'pinus'],
+            'level': 'debug'
+        },
+        'con-log': {
+            'appenders': ['con-log'],
+            'level': 'debug'
+        },
+        'rpc-log': {
+            'appenders': ['rpc-log'],
+            'level': 'debug'
+        },
+        'forward-log': {
+            'appenders': ['forward-log'],
+            'level': 'debug'
+        },
+        'rpc-debug': {
+            'appenders': ['rpc-debug'],
+            'level': 'debug'
+        },
+        'crash-log': {
+            'appenders': ['crash-log'],
+            'level': 'debug'
+        },
+        'admin-log': {
+            'appenders': ['admin-log'],
+            'level': 'debug'
+        },
+        'pinus-admin': {
+            'appenders': ['pinus-admin'],
+            'level': 'debug'
+        },
+        'pinus-rpc': {
+            'appenders': ['pinus-rpc'],
+            'level': 'debug'
+        },
+        'pinus': {
+            'appenders': ['pinus'],
+            'level': 'debug'
+        },
+        'info': {
+            'appenders': ['console', 'app'],
+            'level': 'debug'
+        },
+        'err': {
+            'appenders': ['console', 'error'],
+            'level': 'debug'
+        },
+        'ta': {
+            'appenders': ['console', 'ta'],
+            'level': 'info'
+        }
+
+    },
+    'replaceConsole': true,
+    'lineDebug': false,
+    'errorStack': true
+};

gm-server/config/config.default.ts

@@ -83,6 +83,7 @@ export default (appInfo: EggAppInfo) => {
     { env: 'isbn', name: "办好福", domain: 'http://zyz_isbn_gm.trgame.cn' },
     // 37测试服组
     { env: 'sq1', name: "37测试1服", domain: 'http://gm-sgzzyz.yev242.com' },
+    { env: 'sq3', name: "渠道二测", domain: 'http://sq3-web-sgzzyz.yev242.com' },
   ];
   config.regions = regions;
   

gm-server/config/config.sq3.ts

@@ -0,0 +1,46 @@
+import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
+import defaultConfig from './config.default';
+
+export default (appInfo: EggAppInfo) => {
+  const config = {} as PowerPartial<EggAppConfig>;
+
+  // add your special config in here  
+  
+  config.mongoose = {
+    url: 'mongodb://dbop:zyzSQ2022@dds-8vb9e0b130444f341.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9e0b130444f342.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-510195956', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.gmmongoose = {
+    url: 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.redis = {
+    url: 'r-8vbq8kgkeqd4bbegwk.redis.zhangbei.rds.aliyuncs.com', // 内网
+    pw: 'bB^Ow3l@RMRSTtJU'
+  };
+
+
+  config.customLogger = {
+    linkLogger: {
+      file: '/zyz_logs/gm-server/link-log.log',
+      formatter(meta) {
+        return `[${meta.level}] [${meta.date}] ${meta.message}`;
+      },
+    },
+  };
+
+  config.logrotator = {
+    filesRotateBySize: [
+      '/zyz_logs/gm-server/link-log.log',
+    ],
+    maxFileSize: 1024,
+  };
+
+  // the return config will combines to EggAppConfig
+  return {
+    ...defaultConfig(appInfo),
+    ...config,
+  };
+};

pushdocker.sh

@@ -37,7 +37,7 @@ elif [ ${1} == 'sq2' ] ; then
 elif [ ${1} == 'sq3' ] ; then
   destUrl="root@sq3:/root/zyz/"
   port=3737
-  env='sq1'
+  env='sq3'
 else
   echo "需要一个参数指明服务器"
   exit 1;

shared/domain/backEndField/params.ts

@@ -200,7 +200,8 @@ export class CreateServerParam {
     }
 
     checkParams() {
-        if(!this.env || !this.openTime  || !this.stopRegisterTime || !isArray(this.activityGroupId) || this.activityGroupId.length <= 0 ) {
+        console.log('##### createNew', this.env, this.openTime, this.stopRegisterTime, this.hasOpenMail, this.hasCircleMail)
+        if(!this.env || !this.openTime  || !this.stopRegisterTime ) {
             return false
         }
         if(this.hasOpenMail && !this.openMail) return false;

web-server/config/config.sq3.ts

@@ -0,0 +1,48 @@
+import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
+import defaultConfig from './config.default';
+
+export default (appInfo: EggAppInfo) => {
+  const config = {} as PowerPartial<EggAppConfig>;
+
+  config.mongoose = {
+    url: 'mongodb://dbop:zyzSQ2022@dds-8vb9e0b130444f341.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9e0b130444f342.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-510195956', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+  config.gmmongoose = {
+    url: 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+  config.redis = {
+    url: 'r-8vbq8kgkeqd4bbegwk.redis.zhangbei.rds.aliyuncs.com', // 内网
+    pw: 'bB^Ow3l@RMRSTtJU'
+  };
+
+  config.xtransit = {
+    server: 'ws://172.16.4.107:9092',
+    appId: 2,
+    appSecret: '19f8d6272fbba17294513610ba67f21b'
+  };
+
+  config.customLogger = {
+    linkLogger: {
+      file: '/zyz_logs/web-server/link-log.log',
+      formatter(meta) {
+        return `[${meta.level}] [${meta.date}] ${meta.message}`;
+      },
+    },
+  };
+
+  config.logrotator = {
+    filesRotateBySize: [
+      '/zyz_logs/web-server/link-log.log',
+    ],
+    maxFileSize: 1024,
+  };
+
+
+  // the return config will combines to EggAppConfig
+  return {
+    ...defaultConfig(appInfo),
+    ...config
+  };
+};