cgserver 6.9.475 → 7.1.568

package/README.md

@@ -1,3 +1,6 @@
+7.0.568
+1、serverconfig的命名变化
+2、IServerConfig去掉webserver配置
 6.6.5
 1、mongomanager可单独初始化
 6.6.5

package/dist/lib/Config/{ServerConfig.js → IServerConfig.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerConfig = exports.GServerCfg = void 0;
+exports.IServerConfig = exports.GServerCfg = void 0;
 const FrameworkConfig_1 = require("./FrameworkConfig");
 exports.GServerCfg = null;
-class ServerConfig extends FrameworkConfig_1.FrameworkConfig {
+class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     port = -1;
     _server_name = "";
-    webserver = null;
     get serverName() {
         return this._server_name;
     }
@@ -24,4 +23,4 @@ class ServerConfig extends FrameworkConfig_1.FrameworkConfig {
         return ret;
     }
 }
-exports.ServerConfig = ServerConfig;
+exports.IServerConfig = IServerConfig;

package/dist/lib/Database/MSSqlManager.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMSSqlMgr = exports.MssqlReturn = void 0;
 const mssql = require("mssql");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const DBCache_1 = require("./Decorator/DBCache");
 class MssqlReturn {
     error = null;
@@ -24,12 +24,12 @@ class MSSqlManager {
     }
     async init() {
         if (this._pool
-            || !ServerConfig_1.GServerCfg.db.mssql
-            || !ServerConfig_1.GServerCfg.db.mssql.open) {
+            || !IServerConfig_1.GServerCfg.db.mssql
+            || !IServerConfig_1.GServerCfg.db.mssql.open) {
             return;
         }
-        this._pool = await mssql.connect(ServerConfig_1.GServerCfg.db.mssql);
-        console.log("mssql config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mssql));
+        this._pool = await mssql.connect(IServerConfig_1.GServerCfg.db.mssql);
+        console.log("mssql config=" + JSON.stringify(IServerConfig_1.GServerCfg.db.mssql));
         //这个的初始化位置不能变，必须位于cbs前，pool后
         await DBCache_1.GDBCache.init();
         for (let i = 0; i < this._init_cbs.length; ++i) {

package/dist/lib/Database/MysqlBaseService.js

@@ -5,7 +5,7 @@ const Property_1 = require("./Decorator/Property");
 const MysqlManager_1 = require("./MysqlManager");
 const Log_1 = require("../Logic/Log");
 const DBCache_1 = require("./Decorator/DBCache");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 class BaseModel {
 }
 exports.BaseModel = BaseModel;
@@ -42,7 +42,7 @@ class MysqlBaseService {
             throw new Error("数据表的类必须要具有Table装饰器");
         }
         this._table = "`" + table.table + "`";
-        if (!ServerConfig_1.GServerCfg.db.mysql.auto) {
+        if (!IServerConfig_1.GServerCfg.db.mysql.auto) {
             //未开启自动创建数据表
             return;
         }

package/dist/lib/Database/MysqlManager.js

@@ -47,22 +47,22 @@ class MysqlManager {
     async init() {
         return new Promise(async (resolve) => {
             if (this._pool
-                || !ServerConfig_1.GServerCfg.db.mysql
-                || !ServerConfig_1.GServerCfg.db.mysql.open) {
+                || !IServerConfig_1.GServerCfg.db.mysql
+                || !IServerConfig_1.GServerCfg.db.mysql.open) {
                 resolve(null);
                 return;
             }
             this._pool = mysql.createPool({
                 connectionLimit: 100,
-                host: ServerConfig_1.GServerCfg.db.mysql.host,
-                port: ServerConfig_1.GServerCfg.db.mysql.port,
-                user: ServerConfig_1.GServerCfg.db.mysql.user,
-                password: ServerConfig_1.GServerCfg.db.mysql.password,
-                database: ServerConfig_1.GServerCfg.db.mysql.database,
+                host: IServerConfig_1.GServerCfg.db.mysql.host,
+                port: IServerConfig_1.GServerCfg.db.mysql.port,
+                user: IServerConfig_1.GServerCfg.db.mysql.user,
+                password: IServerConfig_1.GServerCfg.db.mysql.password,
+                database: IServerConfig_1.GServerCfg.db.mysql.database,
                 supportBigNumbers: true,
                 charset: "utf8mb4"
             });
-            console.log("mysql config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mysql));
+            console.log("mysql config=" + JSON.stringify(IServerConfig_1.GServerCfg.db.mysql));
             //这个的初始化位置不能变，必须位于cbs前，pool后
             await DBCache_1.GDBCache.init();
             resolve(null);
@@ -177,4 +177,4 @@ class MysqlManager {
 exports.GMysqlMgr = new MysqlManager();
 //该import必须放在GMysqlMgr实例化之后，否则version基类找不到GMysqlMgr
 const DBCache_1 = require("./Decorator/DBCache");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");

package/dist/lib/Service/MongoCacheService.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMongoCacheSer = exports.MongoCacheModel = void 0;
+const cgserver_1 = require("../cgserver");
 const MongoBaseService_1 = require("../Database/MongoBaseService");
 const MongoManager_1 = require("../Database/MongoManager");
 //暂时就用这个了，反正没啥用户
@@ -14,14 +15,28 @@ exports.GMongoCacheSer = null;
 class MongoCacheService extends MongoBaseService_1.MongoBaseService {
     constructor() {
         super("cache", MongoCacheModel);
-        this.createIndex({ "expireAt": 1 }, { expireAfterSeconds: 0 });
+        cgserver_1.GCgServer.addListener("start", () => {
+            this.createIndex({ key: 1 });
+            this.createIndex({ "expireAt": 1 }, { expireAfterSeconds: 0 });
+        });
     }
     async getData(key) {
-        let cm = await exports.GMongoCacheSer.get(null, { key: key });
+        let cm = await this.get(null, { key: key });
         if (!cm) {
             return null;
         }
         return cm.data;
     }
+    async addData(key, data, expireAt = Date.now() + 365 * 24 * 60 * 60 * 1000) {
+        let mcm = new MongoCacheModel();
+        mcm.key = key;
+        mcm.data = data;
+        mcm.expireAt = expireAt;
+        let rs = await this.updateOne(mcm, { key: mcm.key }, true);
+        if (rs.rs.upsertedCount <= 0) {
+            return null;
+        }
+        return mcm;
+    }
 }
 exports.GMongoCacheSer = new MongoCacheService();

package/dist/lib/SocketServer/IClientWebSocket.js

@@ -2,74 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IClientWebSocket = void 0;
 const IWebSocket_1 = require("./IWebSocket");
-const ws = require("websocket");
 const Log_1 = require("../Logic/Log");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 /**
- * 客户端使用的websocket
- * 用它去主动连接服务器
- * 默认自动重连
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
  */
 class IClientWebSocket extends IWebSocket_1.IWebSocket {
-    _host = "";
-    /**
-     * 连接的服务器地址
-     */
-    get host() {
-        return this._host;
+    _server = null;
+    get server() {
+        return this._server;
     }
-    _port = -1;
-    /**
-     * 连接的服务器端口
-     */
-    get port() {
-        return this._port;
-    }
-    _need_close = false;
-    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         super(protoType, protoPath);
-    }
-    connect(domain, port) {
-        this._host = domain || this._host;
-        this._port = port || this._port;
-        this._connect();
-    }
-    _connect() {
-        let url = "ws://" + this._host + ":" + this._port + "/";
-        Log_1.GLog.info("Trying to connect to server : " + url);
-        let _ws = new ws.client();
-        _ws.on("connect", super.onConnect.bind(this));
-        _ws.on("connectFailed", this.onClose.bind(this));
-        _ws.connect(url, null, null, { cookie: "client=" + this._tipKey });
-    }
-    onOpen(e) {
-        super.onOpen(e);
-        Log_1.GLog.info("success to connect to " + this._host + ":" + this._port);
+        this._server = server;
+        this._tipKey = this._server.name;
     }
     onClose(reasonCode, description) {
         super.onClose(reasonCode, description);
-        if (!this._need_close) {
-            setTimeout(() => {
-                if (!this._need_close) {
-                    this.connect(this._host, this._port);
-                }
-            }, 1000);
-            return true;
-        }
-        else {
-            return false;
-        }
+        this._server.removeServerWebSocketBySocketId(this._socket_id);
     }
-    close() {
-        this._need_close = true;
-        super.close();
+    broadCast(data) {
+        if (!data) {
+            Log_1.GLog.info("Send Message warning:null data!");
+            return;
+        }
+        Log_1.GLog.info("broadCast:----------------------------------");
+        Log_1.GLog.info(data);
+        let msg = this._protoFilter.encode(data);
+        this._server.broadCast(msg);
     }
     _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgRes");
+        let msg = super._onDecode(message, "msgReq");
         return msg;
     }
     _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgReq");
+        let msg = super._onEncode(data, "msgRes");
         return msg;
     }
 }

package/dist/lib/SocketServer/IRpcClientWebSocket.js

@@ -46,7 +46,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
         });
     }
     receive_other_all(msg) {
-        if (msg.__rpcid) {
+        if (msg.__return) {
             EventTool_1.GEventTool.emit(msg.__rpcid, msg);
             return;
         }

package/dist/lib/SocketServer/IRpcServerWebSocket.js

@@ -46,7 +46,7 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
         });
     }
     receive_other_all(msg) {
-        if (msg.__return) {
+        if (msg.__rpcid) {
             EventTool_1.GEventTool.emit(msg.__rpcid, msg);
             return;
         }

package/dist/lib/SocketServer/IServerWebSocket.js

@@ -2,43 +2,73 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IServerWebSocket = void 0;
 const IWebSocket_1 = require("./IWebSocket");
+const ws = require("websocket");
 const Log_1 = require("../Logic/Log");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 /**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
+ * 连接到服务器的websocket
+ * 默认自动重连
  */
 class IServerWebSocket extends IWebSocket_1.IWebSocket {
-    _server = null;
-    get server() {
-        return this._server;
+    _host = "";
+    /**
+     * 连接的服务器地址
+     */
+    get host() {
+        return this._host;
     }
-    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+    _port = -1;
+    /**
+     * 连接的服务器端口
+     */
+    get port() {
+        return this._port;
+    }
+    _need_close = false;
+    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         super(protoType, protoPath);
-        this._server = server;
-        this._tipKey = this._server.name;
+    }
+    connect(domain, port) {
+        this._host = domain || this._host;
+        this._port = port || this._port;
+        this._connect();
+    }
+    _connect() {
+        let url = "ws://" + this._host + ":" + this._port + "/";
+        Log_1.GLog.info("Trying to connect to server : " + url);
+        let _ws = new ws.client();
+        _ws.on("connect", super.onConnect.bind(this));
+        _ws.on("connectFailed", this.onClose.bind(this));
+        _ws.connect(url, null, null, { cookie: "client=" + this._tipKey });
+    }
+    onOpen(e) {
+        super.onOpen(e);
+        Log_1.GLog.info("success to connect to " + this._host + ":" + this._port);
     }
     onClose(reasonCode, description) {
         super.onClose(reasonCode, description);
-        this._server.removeServerWebSocketBySocketId(this._socket_id);
-    }
-    broadCast(data) {
-        let serverWS = this._server.serverWebSocket;
-        if (!data) {
-            Log_1.GLog.info("Send Message warning:null data!");
-            return;
+        if (!this._need_close) {
+            setTimeout(() => {
+                if (!this._need_close) {
+                    this.connect(this._host, this._port);
+                }
+            }, 1000);
+            return true;
+        }
+        else {
+            return false;
         }
-        Log_1.GLog.info("broadCast:----------------------------------");
-        Log_1.GLog.info(data);
-        let msg = this._protoFilter.encode(data);
-        serverWS.broadcast(msg);
+    }
+    close() {
+        this._need_close = true;
+        super.close();
     }
     _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgReq");
+        let msg = super._onDecode(message, "msgRes");
         return msg;
     }
     _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgRes");
+        let msg = super._onEncode(data, "msgReq");
         return msg;
     }
 }

package/dist/lib/SocketServer/ISocketServer.js

@@ -11,41 +11,31 @@ const https = require("https");
 const MongoManager_1 = require("../Database/MongoManager");
 const MSSqlManager_1 = require("../Database/MSSqlManager");
 const EventTool_1 = require("../Logic/EventTool");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const cgserver_1 = require("../cgserver");
 class ISocketServer {
+    _cfg = null;
+    //方便提示
+    get cfg() {
+        return this._cfg;
+    }
     //服务器已被关闭
     _is_closed = false;
     get isClosed() {
         return this._is_closed;
     }
-    _code = -1; //服务器唯一编码
-    get code() {
-        return this._code;
-    }
-    set code(value) {
-        this._code = value;
-    }
-    _name = "";
     get name() {
-        return this._name;
-    }
-    get fullServerName() {
-        return this._name + "@" + this._code;
+        return this._cfg.serverName;
     }
     //监听websocket
-    _web_socket = null;
-    get serverWebSocket() {
-        return this._web_socket;
+    _listening_websocket = null;
+    get listeningWebSocket() {
+        return this._listening_websocket;
     }
     //来自于用户的链接
     _ws_clients = {};
-    _listen_port = 0;
     get listenPort() {
-        return this._listen_port;
-    }
-    set listenPort(value) {
-        this._listen_port = value;
+        return this._cfg.port;
     }
     /**
      * websocket can accepted protocol
@@ -62,8 +52,8 @@ class ISocketServer {
         }
         this._name_vs_class[name] = cls;
     }
-    constructor(server_name) {
-        this._name = server_name;
+    constructor(cfg) {
+        this._cfg = cfg;
     }
     removeServerWebSocketBySocketId(socketId) {
         this._ws_clients[socketId] = null;
@@ -73,22 +63,20 @@ class ISocketServer {
         cgserver_1.GCgServer.addSocketServer(this);
         await MSSqlManager_1.GMSSqlMgr.init();
         await MysqlManager_1.GMysqlMgr.init();
-        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db?.redis);
-        await MongoManager_1.GMongoMgr.init(ServerConfig_1.GServerCfg.db?.mongo);
-        let code = await RedisManager_1.GRedisMgr.incr("server_code");
-        this._code = code;
+        await RedisManager_1.GRedisMgr.init(IServerConfig_1.GServerCfg.db?.redis);
+        await MongoManager_1.GMongoMgr.init(IServerConfig_1.GServerCfg.db?.mongo);
         this.initWebSocket();
     }
     stop() {
         this._is_closed = true;
-        this._web_socket.closeAllConnections();
+        this._listening_websocket.closeAllConnections();
     }
     /*
         把所有的客户端链接保存起来
         方便统计，广播等
     */
-    addClient(client_server) {
-        this._ws_clients[client_server.socketId] = client_server;
+    addClient(ws_client) {
+        this._ws_clients[ws_client.socketId] = ws_client;
     }
     isOriginAllowed(origin) {
         return true;
@@ -115,8 +103,8 @@ class ISocketServer {
                 response.end();
             });
         }
-        server.listen(this._listen_port, this.onListenning.bind(this));
-        this._web_socket = new ws.server({
+        server.listen(this._cfg.port, this.onListenning.bind(this));
+        this._listening_websocket = new ws.server({
             httpServer: server,
             // You should not use autoAcceptConnections for production 
             // applications, as it defeats all standard cross-origin protection 
@@ -125,14 +113,14 @@ class ISocketServer {
             // to accept it. 
             autoAcceptConnections: false
         });
-        this._web_socket.on('request', this.onRequest.bind(this));
-        this._web_socket.on('close', this.onClose.bind(this));
+        this._listening_websocket.on('request', this.onRequest.bind(this));
+        this._listening_websocket.on('close', this.onClose.bind(this));
     }
     onClose(connection, reason, desc) {
     }
     onListenning() {
         EventTool_1.GEventTool.emit("socket_server_init_done");
-        let info = (new Date()) + "  Server " + this.fullServerName + " is listening on port " + this._listen_port;
+        let info = (new Date()) + "  Server " + this.name + " is listening on port " + this._cfg.port;
         Log_1.GLog.info(info);
         console.log(info);
     }
@@ -190,5 +178,25 @@ class ISocketServer {
         }
         return server_name;
     }
+    /**
+     * 广播消息
+     * @param msg
+     */
+    broadCast(msg) {
+        for (var key in this._ws_clients) {
+            let ws = this._ws_clients[key];
+            ws.send(msg);
+        }
+    }
+    /**
+     * 获取任意客户端连接
+     * @returns
+     */
+    getAnyWebSocket() {
+        for (var key in this._ws_clients) {
+            return this._ws_clients[key];
+        }
+        return null;
+    }
 }
 exports.ISocketServer = ISocketServer;

package/dist/lib/SocketServer/IWebSocket.js

@@ -6,7 +6,7 @@ const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 const Core_1 = require("../Core/Core");
 const _ = require("underscore");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
 class BaseMsg {
     cmd;
@@ -62,7 +62,7 @@ class IWebSocket {
         return false;
     }
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        this._debug_msg = ServerConfig_1.GServerCfg.debug_msg;
+        this._debug_msg = IServerConfig_1.GServerCfg.debug_msg;
         this._socket_id = parseInt(_.uniqueId());
         this._protoType = protoType;
         this._protoPath = protoPath;

package/dist/lib/ThirdParty/AlipayTool.js

@@ -7,7 +7,7 @@ const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
 const fs = require("fs");
 const form_1 = require("alipay-sdk/lib/form");
 const Log_1 = require("../Logic/Log");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 class AlipayResult {
     alipay_trade_app_pay_response = {
         code: "10000",
@@ -71,26 +71,26 @@ class AlipayTool {
         notify_url: ""
     };
     init() {
-        if (!ServerConfig_1.GServerCfg.third_cfg.alipay
-            || !ServerConfig_1.GServerCfg.third_cfg.alipay.open) {
+        if (!IServerConfig_1.GServerCfg.third_cfg.alipay
+            || !IServerConfig_1.GServerCfg.third_cfg.alipay.open) {
             return false;
         }
         let suffix = "";
-        if (ServerConfig_1.GServerCfg.third_cfg.alipay.dev) {
+        if (IServerConfig_1.GServerCfg.third_cfg.alipay.dev) {
             suffix = "_dev";
         }
         this._cfg = {
-            app_id: ServerConfig_1.GServerCfg.third_cfg.alipay["app_id" + suffix],
-            app_key: ServerConfig_1.GServerCfg.third_cfg.alipay["app_key" + suffix],
-            gateway: ServerConfig_1.GServerCfg.third_cfg.alipay["gateway" + suffix],
+            app_id: IServerConfig_1.GServerCfg.third_cfg.alipay["app_id" + suffix],
+            app_key: IServerConfig_1.GServerCfg.third_cfg.alipay["app_key" + suffix],
+            gateway: IServerConfig_1.GServerCfg.third_cfg.alipay["gateway" + suffix],
             //RSA1 RSA2
-            signType: ServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
+            signType: IServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
             /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: ServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
-            alipay_root_cert_sn: ServerConfig_1.GServerCfg.third_cfg.alipay["alipay_root_cert_sn" + suffix],
-            alipay_cert_sn: ServerConfig_1.GServerCfg.third_cfg.alipay["alipay_cert_sn" + suffix],
-            app_cert_sn: ServerConfig_1.GServerCfg.third_cfg.alipay["app_cert_sn" + suffix],
-            notify_url: ServerConfig_1.GServerCfg.third_cfg.alipay["notify_url" + suffix]
+            keyType: IServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
+            alipay_root_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["alipay_root_cert_sn" + suffix],
+            alipay_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["alipay_cert_sn" + suffix],
+            app_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["app_cert_sn" + suffix],
+            notify_url: IServerConfig_1.GServerCfg.third_cfg.alipay["notify_url" + suffix]
         };
         if (this._cfg.alipay_cert_sn) {
             this._aliPay = new AliPayUtil_1.AliPayUtil(this._cfg.alipay_cert_sn, this._cfg.app_key);

package/dist/lib/ThirdParty/Alisms.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GSmsTool = void 0;
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const Log_1 = require("./../Logic/Log");
 let SMSClient = require("@alicloud/sms-sdk");
 exports.GSmsTool = null;
@@ -13,7 +13,7 @@ class SMSTool {
             return true;
         }
         this._is_init = true;
-        this._sms_client = new SMSClient({ accessKeyId: ServerConfig_1.GServerCfg.third_cfg.aliSms.accessKeyId, secretAccessKey: ServerConfig_1.GServerCfg.third_cfg.aliSms.secretAccessKey });
+        this._sms_client = new SMSClient({ accessKeyId: IServerConfig_1.GServerCfg.third_cfg.aliSms.accessKeyId, secretAccessKey: IServerConfig_1.GServerCfg.third_cfg.aliSms.secretAccessKey });
     }
     /**
      * 发送短信验证码
@@ -25,8 +25,8 @@ class SMSTool {
         return new Promise((resolve, reject) => {
             this._sms_client.sendSMS({
                 PhoneNumbers: phone,
-                SignName: ServerConfig_1.GServerCfg.third_cfg.aliSms.signName,
-                TemplateCode: ServerConfig_1.GServerCfg.third_cfg.aliSms.templateCode,
+                SignName: IServerConfig_1.GServerCfg.third_cfg.aliSms.signName,
+                TemplateCode: IServerConfig_1.GServerCfg.third_cfg.aliSms.templateCode,
                 TemplateParam: JSON.stringify({ code: code })
             }).then((res) => {
                 if (res.Code == "OK") {

package/dist/lib/ThirdParty/AppleTool.js

@@ -6,7 +6,7 @@ const HttpTool_1 = require("./../Logic/HttpTool");
 const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
 const fs = require("fs");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 //developer.apple.com/documentation/appstorereceipts/responsebody
 class ReceiptInfo {
     cancellation_date = "";
@@ -187,7 +187,7 @@ class AppleTool {
     }
     signature(nickname, create_time, appBundleID, productIdentifier, offerIdentifier) {
         let keyIdentifier = "";
-        for (var k in ServerConfig_1.GServerCfg.third_cfg.apple.keyIds) {
+        for (var k in IServerConfig_1.GServerCfg.third_cfg.apple.keyIds) {
             keyIdentifier = k;
             break;
         }
@@ -200,7 +200,7 @@ class AppleTool {
             nonce.toLowerCase() + '\u2063' +
             create_time;
         // Get the PEM-formatted private key string associated with the Key ID.
-        const path = ServerConfig_1.GServerCfg.third_cfg.apple.keyIds[keyIdentifier];
+        const path = IServerConfig_1.GServerCfg.third_cfg.apple.keyIds[keyIdentifier];
         const keyString = fs.readFileSync(path).toString();
         // Create an Elliptic Curve Digital Signature Algorithm (ECDSA) object using the private key.
         const key = new ec_key_1.default(keyString, 'pem');

package/dist/lib/ThirdParty/CgMq.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CgMq = exports.CgMqConfig = exports.CgMqRetMsg = void 0;
 const Core_1 = require("../Core/Core");
 const Log_1 = require("../Logic/Log");
-const IRpcClientWebSocket_1 = require("../SocketServer/IRpcClientWebSocket");
+const IRpcServerWebSocket_1 = require("../SocketServer/IRpcServerWebSocket");
 const IRpc_1 = require("../SocketServer/IRpc");
 //接受到的消息无需basemsg部分
 class CgMqMsg extends IRpc_1.RpcBaseMsg {
@@ -27,7 +27,7 @@ class CgMqRetMsg extends CgMqMsg {
     count = 0;
 }
 exports.CgMqRetMsg = CgMqRetMsg;
-class CgMqServerWebsocket extends IRpcClientWebSocket_1.IRpcClientWebSocket {
+class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
     _cgmq = null;
     /**
      * 自己的身份