cgserver 6.9.474 → 7.0.567

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/MongoBaseService.js

@@ -31,8 +31,8 @@ class MongoBaseService {
         let rs = await MongoManager_1.GMongoMgr.findOne(this._table, null, { id: id });
         return rs.one;
     }
-    async get(proterty, where, sort) {
-        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, proterty, where, sort);
+    async get(proterty, where) {
+        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, proterty, where);
         return rs.one;
     }
     async countDocuments(where, options) {

package/dist/lib/Database/MongoManager.js

@@ -136,7 +136,7 @@ class MongoManager {
      * 获取单条消息
      * @param collection
      */
-    async findOne(collection, property = {}, where = {}, sort) {
+    async findOne(collection, property = {}, where = {}) {
         this._convertWhere(where);
         let rs = { errcode: null, one: null };
         if (!this._mongo) {

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/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;
     /**
      * 自己的身份

package/dist/lib/ThirdParty/EmailTool.js

@@ -2,23 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GEmailTool = void 0;
 const nodeMailer = require("nodemailer");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const Log_1 = require("../Logic/Log");
 exports.GEmailTool = null;
 class EmailTool {
     send(to, subject, html) {
         return new Promise((resolve, reject) => {
             let transport = nodeMailer.createTransport({
-                host: ServerConfig_1.GServerCfg.third_cfg.email.host,
-                port: ServerConfig_1.GServerCfg.third_cfg.email.port,
-                secure: ServerConfig_1.GServerCfg.third_cfg.email.secure,
+                host: IServerConfig_1.GServerCfg.third_cfg.email.host,
+                port: IServerConfig_1.GServerCfg.third_cfg.email.port,
+                secure: IServerConfig_1.GServerCfg.third_cfg.email.secure,
                 auth: {
-                    user: ServerConfig_1.GServerCfg.third_cfg.email.auth.user,
-                    pass: ServerConfig_1.GServerCfg.third_cfg.email.auth.pass
+                    user: IServerConfig_1.GServerCfg.third_cfg.email.auth.user,
+                    pass: IServerConfig_1.GServerCfg.third_cfg.email.auth.pass
                 }
             });
             let mail = {
-                from: ServerConfig_1.GServerCfg.third_cfg.email.from,
+                from: IServerConfig_1.GServerCfg.third_cfg.email.from,
                 to: to,
                 subject: subject,
                 html: html

package/dist/lib/ThirdParty/OpenSocial.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GOpenSocial = void 0;
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const HttpTool_1 = require("../Logic/HttpTool");
 exports.GOpenSocial = null;
 class OpenSocial {
     _getNewMsg() {
         return {
-            app_id: ServerConfig_1.GServerCfg.third_cfg.open_social.app_id,
-            app_secret: ServerConfig_1.GServerCfg.third_cfg.open_social.app_secret
+            app_id: IServerConfig_1.GServerCfg.third_cfg.open_social.app_id,
+            app_secret: IServerConfig_1.GServerCfg.third_cfg.open_social.app_secret
         };
     }
     async getUser(unionid, openid) {
@@ -16,7 +16,7 @@ class OpenSocial {
             unionid: unionid,
             openid: openid
         };
-        let rs = await HttpTool_1.GHttpTool.httpPost(ServerConfig_1.GServerCfg.third_cfg.open_social.user_url, msg);
+        let rs = await HttpTool_1.GHttpTool.httpPost(IServerConfig_1.GServerCfg.third_cfg.open_social.user_url, msg);
         return rs.body;
     }
     async updatePwd(unionid, openid, new_pwd) {
@@ -25,7 +25,7 @@ class OpenSocial {
             openid: openid,
             password: new_pwd
         };
-        let jsonData = await HttpTool_1.GHttpTool.httpPost(ServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, msg);
+        let jsonData = await HttpTool_1.GHttpTool.httpPost(IServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, msg);
         return jsonData.body || jsonData.error;
     }
 }

package/dist/lib/ThirdParty/QQTool.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QQTool = exports.GQQTool = exports.QQUserInfo = void 0;
 const _ = require("underscore");
 const URLEncode = require("urlencode");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const HttpTool_1 = require("../Logic/HttpTool");
 const Log_1 = require("../Logic/Log");
 class QQUserInfo {
@@ -45,9 +45,9 @@ class QQTool {
      */
     getAuthCodeUrl(scope, display) {
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(ServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = ServerConfig_1.GServerCfg.third_cfg.qq.app_id;
+        let client_id = IServerConfig_1.GServerCfg.third_cfg.qq.app_id;
         //必须	授权类型，此值固定为“code”。
         let response_type = "code";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
@@ -69,11 +69,11 @@ class QQTool {
         //必须	授权类型，在本步骤中，此值为“authorization_code”。
         let grant_type = "authorization_code";
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = ServerConfig_1.GServerCfg.third_cfg.qq.app_id;
+        let client_id = IServerConfig_1.GServerCfg.third_cfg.qq.app_id;
         //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = ServerConfig_1.GServerCfg.third_cfg.qq.app_key;
+        let client_secret = IServerConfig_1.GServerCfg.third_cfg.qq.app_key;
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(ServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
         let url = "https://graph.qq.com/oauth2.0/token?code=" + auth_code + "&grant_type=" + grant_type + "&client_id=" + client_id + "&client_secret=" + client_secret + "&redirect_uri=" + redirect_uri;
         let rs = await HttpTool_1.GHttpTool.httpRequest(url);
         if (rs.body && rs.body.access_token) {
@@ -103,7 +103,7 @@ class QQTool {
         return null;
     }
     async getUserInfo(access_token, openid) {
-        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + ServerConfig_1.GServerCfg.third_cfg.qq.app_id + "&openid=" + openid;
+        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + IServerConfig_1.GServerCfg.third_cfg.qq.app_id + "&openid=" + openid;
         let rs = await HttpTool_1.GHttpTool.httpRequest(url);
         if (rs.body) {
             return rs.body;

package/dist/lib/ThirdParty/QiniuTool.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GQiniuTool = void 0;
 const qiniu = require("qiniu");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 exports.GQiniuTool = null;
 class QiniuTool {
     get host() {
-        return ServerConfig_1.GServerCfg.third_cfg.qiniu.host;
+        return IServerConfig_1.GServerCfg.third_cfg.qiniu.host;
     }
     getUploadToken(filename) {
-        let mac = new qiniu.auth.digest.Mac(ServerConfig_1.GServerCfg.third_cfg.qiniu.accessKey, ServerConfig_1.GServerCfg.third_cfg.qiniu.secretKey);
+        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.GServerCfg.third_cfg.qiniu.accessKey, IServerConfig_1.GServerCfg.third_cfg.qiniu.secretKey);
         let options = {
-            scope: ServerConfig_1.GServerCfg.third_cfg.qiniu.bucket + ":" + filename,
+            scope: IServerConfig_1.GServerCfg.third_cfg.qiniu.bucket + ":" + filename,
         };
         let putPolicy = new qiniu.rs.PutPolicy(options);
         let uploadToken = putPolicy.uploadToken(mac);

package/dist/lib/ThirdParty/WechatTool.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WechatTool = exports.GWechatTool = exports.WechatUserInfo = void 0;
 const _ = require("underscore");
 const URLEncode = require("urlencode");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const HttpTool_1 = require("../Logic/HttpTool");
 const Log_1 = require("../Logic/Log");
 class WechatUserInfo {
@@ -28,8 +28,8 @@ class WechatTool {
      */
     getAuthCodeUrl() {
         let appid = "wx80f0f10fe1304e9d";
-        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + ServerConfig_1.GServerCfg.third_cfg.wechat.app_id;
-        url += "&redirect_uri=" + URLEncode.encode(ServerConfig_1.GServerCfg.third_cfg.wechat.redirect_uri);
+        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_id;
+        url += "&redirect_uri=" + URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.wechat.redirect_uri);
         url += "&response_type=code&scope=snsapi_login";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
         let state = _.random(1000000, 9999999);
@@ -40,7 +40,7 @@ class WechatTool {
         if (!auth_code) {
             return null;
         }
-        let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + ServerConfig_1.GServerCfg.third_cfg.wechat.app_id + "&secret=" + ServerConfig_1.GServerCfg.third_cfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
+        let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_id + "&secret=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
         let rs = await HttpTool_1.GHttpTool.httpRequest(url);
         /*
         {

package/dist/lib/WebServer/IWebServer.js

@@ -8,7 +8,7 @@ const MysqlManager_1 = require("../Database/MysqlManager");
 const RazorJs_1 = require("./Engine/RazorJs");
 const MongoManager_1 = require("../Database/MongoManager");
 const AlipayTool_1 = require("../ThirdParty/AlipayTool");
-const ServerConfig_1 = require("../Config/ServerConfig");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const EventTool_1 = require("../Logic/EventTool");
 const cgserver_1 = require("../cgserver");
 //实现对controller的手动注册
@@ -24,9 +24,9 @@ class IWebServer {
             Log_1.GLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db?.redis);
+        await RedisManager_1.GRedisMgr.init(IServerConfig_1.GServerCfg.db?.redis);
         await MysqlManager_1.GMysqlMgr.init();
-        await MongoManager_1.GMongoMgr.init(ServerConfig_1.GServerCfg.db?.mongo);
+        await MongoManager_1.GMongoMgr.init(IServerConfig_1.GServerCfg.db?.mongo);
         AlipayTool_1.GAlipayTool.init();
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());

package/dist/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.ServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = exports.GCgServer = void 0;
-exports.IRpcServerWebSocket = exports.IRpcClientWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
+exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = exports.GCgServer = void 0;
+exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
@@ -27,9 +27,9 @@ var Config_1 = require("./Config/Config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return Config_1.Config; } });
 var FrameworkConfig_1 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "FrameworkConfig", { enumerable: true, get: function () { return FrameworkConfig_1.FrameworkConfig; } });
-var ServerConfig_1 = require("./Config/ServerConfig");
-Object.defineProperty(exports, "ServerConfig", { enumerable: true, get: function () { return ServerConfig_1.ServerConfig; } });
-Object.defineProperty(exports, "GServerCfg", { enumerable: true, get: function () { return ServerConfig_1.GServerCfg; } });
+var IServerConfig_1 = require("./Config/IServerConfig");
+Object.defineProperty(exports, "IServerConfig", { enumerable: true, get: function () { return IServerConfig_1.IServerConfig; } });
+Object.defineProperty(exports, "GServerCfg", { enumerable: true, get: function () { return IServerConfig_1.GServerCfg; } });
 var Core_1 = require("./Core/Core");
 Object.defineProperty(exports, "core", { enumerable: true, get: function () { return Core_1.core; } });
 var Timer_1 = require("./Core/Timer");
@@ -96,10 +96,10 @@ var GoogleProtoFilter_1 = require("./SocketServer/ProtoFilter/GoogleProtoFilter"
 Object.defineProperty(exports, "GoogleProtoFilter", { enumerable: true, get: function () { return GoogleProtoFilter_1.GoogleProtoFilter; } });
 var JsonProtoFilter_1 = require("./SocketServer/ProtoFilter/JsonProtoFilter");
 Object.defineProperty(exports, "JsonProtoFilter", { enumerable: true, get: function () { return JsonProtoFilter_1.JsonProtoFilter; } });
-var IClientWebSocket_1 = require("./SocketServer/IClientWebSocket");
-Object.defineProperty(exports, "IClientWebSocket", { enumerable: true, get: function () { return IClientWebSocket_1.IClientWebSocket; } });
 var IServerWebSocket_1 = require("./SocketServer/IServerWebSocket");
 Object.defineProperty(exports, "IServerWebSocket", { enumerable: true, get: function () { return IServerWebSocket_1.IServerWebSocket; } });
+var IClientWebSocket_1 = require("./SocketServer/IClientWebSocket");
+Object.defineProperty(exports, "IClientWebSocket", { enumerable: true, get: function () { return IClientWebSocket_1.IClientWebSocket; } });
 var ISocketServer_1 = require("./SocketServer/ISocketServer");
 Object.defineProperty(exports, "ISocketServer", { enumerable: true, get: function () { return ISocketServer_1.ISocketServer; } });
 var IWebSocket_1 = require("./SocketServer/IWebSocket");
@@ -173,7 +173,7 @@ Object.defineProperty(exports, "RpcConfig", { enumerable: true, get: function ()
 var CgMq_1 = require("./ThirdParty/CgMq");
 Object.defineProperty(exports, "CgMq", { enumerable: true, get: function () { return CgMq_1.CgMq; } });
 Object.defineProperty(exports, "CgMqConfig", { enumerable: true, get: function () { return CgMq_1.CgMqConfig; } });
-var IRpcClientWebSocket_1 = require("./SocketServer/IRpcClientWebSocket");
-Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });
 var IRpcServerWebSocket_1 = require("./SocketServer/IRpcServerWebSocket");
 Object.defineProperty(exports, "IRpcServerWebSocket", { enumerable: true, get: function () { return IRpcServerWebSocket_1.IRpcServerWebSocket; } });
+var IRpcClientWebSocket_1 = require("./SocketServer/IRpcClientWebSocket");
+Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });

package/dist/types/Config/IServerConfig.d.ts

@@ -0,0 +1,9 @@
+import { FrameworkConfig } from './FrameworkConfig';
+export declare let GServerCfg: IServerConfig;
+export declare class IServerConfig extends FrameworkConfig {
+    port: number;
+    protected _server_name: string;
+    get serverName(): string;
+    constructor(server_name: string);
+    init(): boolean;
+}

package/dist/types/Database/MongoBaseService.d.ts

@@ -17,7 +17,7 @@ export declare class MongoBaseService<T> {
      * @param id
      */
     getById(id: any): Promise<any>;
-    get(proterty?: {}, where?: {}, sort?: {}): Promise<any>;
+    get(proterty?: {}, where?: {}): Promise<any>;
     countDocuments(where?: {}, options?: mongo.CountDocumentsOptions): Promise<number>;
     gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<any[]>;
     getRandoms(num: number, proterty?: {}, where?: {}): Promise<any[]>;

package/dist/types/Database/MongoManager.d.ts

@@ -56,7 +56,7 @@ declare class MongoManager {
      * 获取单条消息
      * @param collection
      */
-    findOne(collection: string, property?: {}, where?: {}, sort?: {}): Promise<{
+    findOne(collection: string, property?: {}, where?: {}): Promise<{
         errcode: {
             id: number;
             des: string;

package/dist/types/SocketServer/IClientWebSocket.d.ts

@@ -1,29 +1,17 @@
+import { ISocketServer } from './ISocketServer';
 import { IWebSocket } from './IWebSocket';
-import * as ws from 'websocket';
 import { EProtoType } from './ProtoFilter/IProtoFilter';
+import * as ws from 'websocket';
 /**
- * 客户端使用的websocket
- * 用它去主动连接服务器
- * 默认自动重连
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
  */
 export declare class IClientWebSocket extends IWebSocket {
-    protected _host: string;
-    /**
-     * 连接的服务器地址
-     */
-    get host(): string;
-    protected _port: number;
-    /**
-     * 连接的服务器端口
-     */
-    get port(): number;
-    protected _need_close: boolean;
-    constructor(protoType?: EProtoType, protoPath?: string);
-    connect(domain: string, port: number): void;
-    protected _connect(): void;
-    onOpen(e?: any): void;
-    onClose(reasonCode: number, description: string): boolean;
-    close(): void;
+    protected _server: ISocketServer;
+    get server(): ISocketServer;
+    constructor(server: ISocketServer, protoType?: EProtoType, protoPath?: string);
+    onClose(reasonCode: number, description: string): void;
+    broadCast(data: any): void;
     protected _onDecode(message: ws.Message, ...params: any[]): any;
     protected _onEncode(data: any, ...params: any[]): any;
 }

package/dist/types/SocketServer/IRpcClientWebSocket.d.ts

@@ -1,5 +1,5 @@
-import { IClientWebSocket } from "./IClientWebSocket";
 import { IRpc, RpcBaseMsg } from "./IRpc";
+import { IClientWebSocket } from "./IClientWebSocket";
 export declare class IRpcClientWebSocket extends IClientWebSocket implements IRpc {
     protected _genId(pre?: string): string;
     getNewMsg(cmd: string, errcode?: {

package/dist/types/SocketServer/IRpcServerWebSocket.d.ts

@@ -1,5 +1,5 @@
-import { IRpc, RpcBaseMsg } from "./IRpc";
 import { IServerWebSocket } from "./IServerWebSocket";
+import { IRpc, RpcBaseMsg } from "./IRpc";
 export declare class IRpcServerWebSocket extends IServerWebSocket implements IRpc {
     protected _genId(pre?: string): string;
     getNewMsg(cmd: string, errcode?: {

package/dist/types/SocketServer/IServerWebSocket.d.ts

@@ -1,17 +1,28 @@
-import { ISocketServer } from './ISocketServer';
 import { IWebSocket } from './IWebSocket';
-import { EProtoType } from './ProtoFilter/IProtoFilter';
 import * as ws from 'websocket';
+import { EProtoType } from './ProtoFilter/IProtoFilter';
 /**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
+ * 连接到服务器的websocket
+ * 默认自动重连
  */
 export declare class IServerWebSocket extends IWebSocket {
-    protected _server: ISocketServer;
-    get server(): ISocketServer;
-    constructor(server: ISocketServer, protoType?: EProtoType, protoPath?: string);
-    onClose(reasonCode: number, description: string): void;
-    broadCast(data: any): void;
+    protected _host: string;
+    /**
+     * 连接的服务器地址
+     */
+    get host(): string;
+    protected _port: number;
+    /**
+     * 连接的服务器端口
+     */
+    get port(): number;
+    protected _need_close: boolean;
+    constructor(protoType?: EProtoType, protoPath?: string);
+    connect(domain: string, port: number): void;
+    protected _connect(): void;
+    onOpen(e?: any): void;
+    onClose(reasonCode: number, description: string): boolean;
+    close(): void;
     protected _onDecode(message: ws.Message, ...params: any[]): any;
     protected _onEncode(data: any, ...params: any[]): any;
 }

package/dist/types/SocketServer/ISocketServer.d.ts

@@ -1,38 +1,45 @@
-import { IServerWebSocket } from './IServerWebSocket';
+import { IClientWebSocket } from './IClientWebSocket';
 import * as ws from 'websocket';
+import { IServerConfig } from '../Config/IServerConfig';
+import { BaseMsg } from './IWebSocket';
 export declare class ISocketServer {
+    protected _cfg: IServerConfig;
+    get cfg(): IServerConfig;
     protected _is_closed: boolean;
     get isClosed(): boolean;
-    private _code;
-    get code(): number;
-    set code(value: number);
-    protected _name: string;
     get name(): string;
-    get fullServerName(): string;
-    private _web_socket;
-    get serverWebSocket(): ws.server;
+    private _listening_websocket;
+    get listeningWebSocket(): ws.server;
     protected _ws_clients: {
-        [socketid: number]: IServerWebSocket;
+        [socketid: number]: IClientWebSocket;
     };
-    private _listen_port;
     get listenPort(): number;
-    set listenPort(value: number);
     /**
      * websocket can accepted protocol
      */
     protected _accepted_protocol: any;
     protected _name_vs_class: {};
     registerWebSocketHandleClass(name: string, cls: any): void;
-    constructor(server_name: any);
-    removeServerWebSocketBySocketId(socketId: any): void;
+    constructor(cfg: IServerConfig);
+    removeServerWebSocketBySocketId(socketId: number): void;
     run(): Promise<void>;
     stop(): void;
-    addClient(client_server: IServerWebSocket): void;
+    addClient(ws_client: IClientWebSocket): void;
     isOriginAllowed(origin: any): boolean;
     initWebSocket(wss?: any): void;
     onClose(connection: ws.connection, reason: number, desc: string): void;
     onListenning(): void;
     onRequest(req: ws.request): void;
-    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection): IServerWebSocket;
+    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection): IClientWebSocket;
     protected _getServerNameByCookies(cookies: any): string;
+    /**
+     * 广播消息
+     * @param msg
+     */
+    broadCast(msg: BaseMsg): void;
+    /**
+     * 获取任意客户端连接
+     * @returns
+     */
+    getAnyWebSocket(): IClientWebSocket;
 }

package/dist/types/ThirdParty/CgMq.d.ts

@@ -1,4 +1,4 @@
-import { IRpcClientWebSocket } from "../SocketServer/IRpcClientWebSocket";
+import { IRpcServerWebSocket } from "../SocketServer/IRpcServerWebSocket";
 import { RpcBaseMsg } from "../SocketServer/IRpc";
 declare class CgMqMsg extends RpcBaseMsg {
     /**
@@ -20,7 +20,7 @@ export declare class CgMqRetMsg extends CgMqMsg {
      */
     count: number;
 }
-declare class CgMqServerWebsocket extends IRpcClientWebSocket {
+declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     protected _cgmq: CgMq;
     /**
      * 自己的身份

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
 export { FrameworkErrorCode } from "./Config/_error_";
 export { Config } from "./Config/Config";
 export { FrameworkConfig } from "./Config/FrameworkConfig";
-export { ServerConfig, GServerCfg } from "./Config/ServerConfig";
+export { IServerConfig, GServerCfg } from "./Config/IServerConfig";
 export { core } from "./Core/Core";
 export { Timer } from "./Core/Timer";
 export { AutoIncrement } from "./Database/Decorator/AutoIncrement";
@@ -42,8 +42,8 @@ export { GMongoCacheSer, MongoCacheModel } from './Service/MongoCacheService';
 export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
 export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
 export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
-export { IClientWebSocket } from './SocketServer/IClientWebSocket';
 export { IServerWebSocket } from './SocketServer/IServerWebSocket';
+export { IClientWebSocket } from './SocketServer/IClientWebSocket';
 export { ISocketServer } from './SocketServer/ISocketServer';
 export { IWebSocket, BaseMsg } from './SocketServer/IWebSocket';
 export { GAlipayTool } from './ThirdParty/AlipayTool';
@@ -79,5 +79,5 @@ export { EAccountState } from './Service/ini';
 export { RpcBaseMsg } from './SocketServer/IRpc';
 export { Rpc, RpcConfig } from './ThirdParty/Rpc';
 export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
-export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
 export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
+export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.9.474",
+  "version": "7.0.567",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -43,7 +43,7 @@
     "@types/redis": "^2.8.32",
     "@types/reflect-metadata": "^0.1.0",
     "@types/request": "^2.48.7",
-    "@types/underscore": "^1.11.3",
+    "@types/underscore": "^1.11.4",
     "@types/urlencode": "^1.1.2",
     "@types/websocket": "^1.0.4",
     "alipay_sdk2": "^1.1.6",
@@ -74,7 +74,7 @@
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.0",
     "socket.io": "^4.3.2",
-    "underscore": "^1.13.1",
+    "underscore": "^1.13.6",
     "urlencode": "^1.1.0",
     "webpack": "^5.73.0",
     "webpack-node-externals": "^3.0.0",

package/dist/types/Config/ServerConfig.d.ts

@@ -1,10 +0,0 @@
-import { FrameworkConfig, WebServerConfig } from './FrameworkConfig';
-export declare let GServerCfg: ServerConfig;
-export declare class ServerConfig extends FrameworkConfig {
-    port: number;
-    protected _server_name: string;
-    webserver: WebServerConfig;
-    get serverName(): string;
-    constructor(server_name: any);
-    init(): boolean;
-}