🐎 ci(配置): ios提审服

game-server/config/database.ts

@@ -91,5 +91,11 @@ module.exports = {
         'redispw': 'hWCJ$HDajm9SN&&Z',
         'redisLock': 'r-8vbjy2v5jepcsozyum.redis.zhangbei.rds.aliyuncs.com',
         'redisLockpw': 'hWCJ$HDajm9SN&&Z'
-    }
+    },
+    'yjzios': { // 公测ios审核服
+        'mongo': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-j6c3bd7dc950fad41.mongodb.rds.aliyuncs.com:3717,dds-j6c3bd7dc950fad42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-67758677',
+        'gmmongo': 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241580-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242705-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243998-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244698-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/admin?readPreference=secondary&replicaSet=mgset-515829436',
+        'redis': 'r-j6cnm99s202onoig1v.redis.rds.aliyuncs.com',
+        'redispw': 'hWCJ$HDajm9SN&&Z'
+    },
 };

game-server/config/master.ts

@@ -124,4 +124,9 @@ module.exports = {
         'host': '172.16.4.140',
         'port': 3005
     },
+    'yjzios': {
+        'id': 'master-server-1',
+        'host': '172.31.237.140',
+        'port': 3005
+    },
 };

game-server/config/servers.ts

@@ -1,4 +1,4 @@
-const { zy1, zy2, zy3, zy4, zy5 } = require("./yjz_zy");
+const { zy1, zy2, zy3, zy4, zy5, yjzios } = require("./yjz_zy");
 
 module.exports = {
     'development': {
@@ -632,4 +632,5 @@ module.exports = {
     'zy3': zy3,
     'zy4': zy4,
     'zy5': zy5,
+    'yjzios': yjzios,
 };

game-server/config/yjz_zy.ts

@@ -226,3 +226,37 @@ export const zy5 = {
         { 'id': 'order-server-10', 'host': '172.16.4.141', 'port': 6062 },
     ]
 };
+
+// ios提审
+export const yjzios = {
+    'connector': [
+        { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'yjz-ios-review-game.fdd73.com', 'host': '172.31.237.140', 'clientPort': 3050, 'frontend': true },
+    ],
+    'chat': [
+        { 'id': 'chat-server-1', 'host': '172.31.237.140', 'port': 6050 },
+    ],
+    'role': [
+        { 'id': 'role-server-1', 'host': '172.31.237.140', 'port': 6053 }
+    ],
+    'battle': [
+        { 'id': 'battle-server-1', 'host': '172.31.237.140', 'port': 6054 }
+    ],
+    'gate': [
+        { 'id': 'gate-server-1', 'host': '172.31.237.140', 'clientHost': 'pinus_test.trgame.cn', 'clientPort': 3014, 'frontend': true }
+    ],
+    'gm': [
+        { 'id': 'gm-server-1', 'host': '172.31.237.140', 'port': 6055 }
+    ],
+    'systimer': [
+        { 'id': 'systimer-server-1', 'host': '172.31.237.140', 'port': 6056 }
+    ],
+    'guild': [
+        { 'id': 'guild-server-1', 'host': '172.31.237.140', 'port': 6061, "args": " --inspect=9239" },
+    ],
+    'activity': [
+        { 'id': 'activity-server-1', 'host': '172.31.237.140', 'port': 6059, "args": " --inspect=9241" },
+    ],
+    'order': [
+        { 'id': 'order-server-1', 'host': '172.31.237.140', 'port': 6060, "args": " --inspect=9242" },
+    ]
+};

game-server/config/yjzios/log4js.ts

@@ -0,0 +1,190 @@
+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,
+        },
+        'item': {
+            'type': 'file',
+            'filename': '/zyz_logs/item/log',
+            'maxLogSize': 1073741824,
+            'layout': {
+                'type': 'basic'
+            },
+            'backups': 5
+        }
+    },
+
+    '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'
+        },
+        'item': {
+            'appenders': ['console', 'item'],
+            'level': 'info'
+        }
+
+    },
+    'replaceConsole': true,
+    'lineDebug': false,
+    'errorStack': true
+};

gm-server/config/config.yjzios.ts

@@ -0,0 +1,51 @@
+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://yjzDbOp:yjz2023ZyDB@dds-j6c3bd7dc950fad41.mongodb.rds.aliyuncs.com:3717,dds-j6c3bd7dc950fad42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-67758677', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.gmmongoose = {
+    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.redis = {
+    url: 'r-j6cnm99s202onoig1v.redis.rds.aliyuncs.com', // 内网
+    pw: 'hWCJ$HDajm9SN&&Z'
+  };
+
+  config.xtransit = {
+    server: 'ws://172.16.4.147:9092',
+    appId: 3,
+    appSecret: 'bc33c837395b6dc272fd67f4cf38ef77'
+  };
+
+  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,
+  };
+};

gm-server/config/config.zy1.ts

@@ -12,7 +12,7 @@ export default (appInfo: EggAppInfo) => {
   };
 
   config.gmmongoose = {
-    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
+    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241580-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242705-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243998-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244698-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/admin?readPreference=secondary&replicaSet=mgset-515829436', // 内网
     options: { useNewUrlParser: true, useUnifiedTopology: true },
   };
 

pushdocker.sh

@@ -121,6 +121,10 @@ elif [ ${1} == 'zygm2' ] ; then
   destUrl="root@yjz-gm-2:/root/zyz/"
   port=22
   env='zy1'
+elif [ ${1} == 'yjzios' ] ; then
+  destUrl="root@yjz-ios-review:/root/zyz/"
+  port=22
+  env='yjzios'
 else
   echo "需要一个参数指明服务器"
   exit 1;

web-server/config/config.yjzios.ts

@@ -0,0 +1,51 @@
+import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
+import defaultConfig from './config.default';
+
+export default (appInfo: EggAppInfo) => {
+  const config = {} as PowerPartial<EggAppConfig>;
+  config.middleware = [ 'parmsDecode', 'getIp', 'proxy' ];
+
+  config.mongoose = {
+    url: 'mongodb://yjzDbOp:yjz2023ZyDB@dds-j6c3bd7dc950fad41.mongodb.rds.aliyuncs.com:3717,dds-j6c3bd7dc950fad42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-67758677', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.gmmongoose = {
+    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
+    options: { useNewUrlParser: true, useUnifiedTopology: true },
+  };
+
+  config.redis = {
+    url: 'r-j6cnm99s202onoig1v.redis.rds.aliyuncs.com', // 内网
+    pw: 'hWCJ$HDajm9SN&&Z'
+  };
+
+  config.xtransit = {
+    server: 'ws://172.16.4.147:9092',
+    appId: 2,
+    appSecret: '700e3bc3e55236f31ea52780041ac039'
+  };
+
+  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 * 1024 * 1024,
+  };
+
+
+  // the return config will combines to EggAppConfig
+  return {
+    ...defaultConfig(appInfo),
+    ...config
+  };
+};

web-server/config/config.zy1.ts

@@ -11,7 +11,7 @@ export default (appInfo: EggAppInfo) => {
   };
 
   config.gmmongoose = {
-    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
+    url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241580-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242705-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243998-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244698-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/admin?readPreference=secondary&replicaSet=mgset-515829436', // 内网
     options: { useNewUrlParser: true, useUnifiedTopology: true },
   };