cgserver 6.5.9 → 6.6.2

package/dist/lib/Config/Config.js

@@ -18,20 +18,26 @@ class Config {
         if (this._is_init) {
             return false;
         }
-        this._suffix = "r";
+        let suffix2 = "_r";
         if (Config.debug) {
-            this._suffix = "d";
+            suffix2 = "_d";
         }
-        let path = "data/" + this._file_name + "_" + this._suffix + ".json";
+        let path = "data/" + this._file_name + "_" + this._suffix + suffix2 + ".json";
         path = path.toLowerCase();
         if (!fs.existsSync(path)) {
-            console.error(path + " not exist!");
-            path = "data/" + this._file_name + ".json";
+            path = "data/" + this._file_name + "_" + this._suffix + ".json";
             path = path.toLowerCase();
-            console.error("try path:" + path);
             if (!fs.existsSync(path)) {
-                console.error(path + " not exist!");
-                return true;
+                path = "data/" + this._file_name + suffix2 + ".json";
+                path = path.toLowerCase();
+                if (!fs.existsSync(path)) {
+                    path = "data/" + this._file_name + ".json";
+                    path = path.toLowerCase();
+                    if (!fs.existsSync(path)) {
+                        console.error(path + " not exist!");
+                        return true;
+                    }
+                }
             }
         }
         let content = fs.readFileSync(path).toString();
@@ -39,6 +45,7 @@ class Config {
         for (let key in jsonData) {
             this[key] = jsonData[key];
         }
+        console.log("loaded cfg=" + path);
         return true;
     }
 }

package/dist/lib/Config/FrameworkConfig.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FrameworkConfig = exports.GFCfg = exports.WebServerConfig = exports.ESessionType = void 0;
+exports.FrameworkConfig = exports.WebServerConfig = exports.ESessionType = void 0;
 const Log_1 = require("../Logic/Log");
-const ServerConfig_1 = require("./ServerConfig");
+const Config_1 = require("./Config");
 var ESessionType;
 (function (ESessionType) {
     ESessionType[ESessionType["Cache"] = 0] = "Cache";
@@ -34,8 +34,7 @@ class WebServerConfig {
     cors = null;
 }
 exports.WebServerConfig = WebServerConfig;
-exports.GFCfg = null;
-class FrameworkConfig extends ServerConfig_1.ServerConfig {
+class FrameworkConfig extends Config_1.Config {
     /*
     *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
     */
@@ -228,13 +227,12 @@ class FrameworkConfig extends ServerConfig_1.ServerConfig {
     //key是ip，value是domain
     ip_to_domain = {};
     root_path = process.cwd();
-    constructor(server_name) {
-        super(server_name);
+    constructor() {
+        super("FrameworkConfig");
     }
     init() {
         let ret = super.init();
         Log_1.GLog.init(this.log, this.console_level || 0);
-        exports.GFCfg = this;
         return ret;
     }
 }

package/dist/lib/Config/ServerConfig.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerConfig = void 0;
-const Config_1 = require("./Config");
-class ServerConfig extends Config_1.Config {
+exports.ServerConfig = exports.GServerCfg = void 0;
+const FrameworkConfig_1 = require("./FrameworkConfig");
+exports.GServerCfg = null;
+class ServerConfig extends FrameworkConfig_1.FrameworkConfig {
     port = -1;
     _server_name = "";
     webserver = null;
@@ -10,9 +11,17 @@ class ServerConfig extends Config_1.Config {
         return this._server_name;
     }
     constructor(server_name) {
-        super("FrameworkConfig");
+        super();
         this._suffix = server_name;
         this._server_name = server_name;
     }
+    init() {
+        let ret = super.init();
+        if (!ret) {
+            return ret;
+        }
+        exports.GServerCfg = this;
+        return ret;
+    }
 }
 exports.ServerConfig = ServerConfig;

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 FrameworkConfig_1 = require("../Config/FrameworkConfig");
+const ServerConfig_1 = require("../Config/ServerConfig");
 const DBCache_1 = require("./Decorator/DBCache");
 class MssqlReturn {
     error = null;
@@ -24,12 +24,12 @@ class MSSqlManager {
     }
     async init() {
         if (this._pool
-            || !FrameworkConfig_1.GFCfg.db.mssql
-            || !FrameworkConfig_1.GFCfg.db.mssql.open) {
+            || !ServerConfig_1.GServerCfg.db.mssql
+            || !ServerConfig_1.GServerCfg.db.mssql.open) {
             return;
         }
-        this._pool = await mssql.connect(FrameworkConfig_1.GFCfg.db.mssql);
-        console.log("mssql config=" + JSON.stringify(FrameworkConfig_1.GFCfg.db.mssql));
+        this._pool = await mssql.connect(ServerConfig_1.GServerCfg.db.mssql);
+        console.log("mssql config=" + JSON.stringify(ServerConfig_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/MongoManager.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = void 0;
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const Log_1 = require("../Logic/Log");
 const mongo = require("mongodb");
 const _error_1 = require("../Config/_error_");
 const Core_1 = require("../Core/Core");
+const ServerConfig_1 = require("../Config/ServerConfig");
 class MongoBaseModel {
     _id;
 }
@@ -57,15 +57,15 @@ class MongoManager {
         if (this._mongo) {
             return true;
         }
-        if (!FrameworkConfig_1.GFCfg.db.mongo || !FrameworkConfig_1.GFCfg.db.mongo.open) {
+        if (!ServerConfig_1.GServerCfg.db.mongo || !ServerConfig_1.GServerCfg.db.mongo.open) {
             return true;
         }
         this._inited = true;
-        Log_1.GLog.info("mongo config=" + JSON.stringify(FrameworkConfig_1.GFCfg.db.mongo));
-        let client = new mongo.MongoClient("mongodb://" + FrameworkConfig_1.GFCfg.db.mongo.host + ":" + FrameworkConfig_1.GFCfg.db.mongo.port, FrameworkConfig_1.GFCfg.db.mongo.options);
+        Log_1.GLog.info("mongo config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mongo));
+        let client = new mongo.MongoClient("mongodb://" + ServerConfig_1.GServerCfg.db.mongo.host + ":" + ServerConfig_1.GServerCfg.db.mongo.port, ServerConfig_1.GServerCfg.db.mongo.options);
         await client.connect();
         this.onConnect();
-        this._mongo = client.db(FrameworkConfig_1.GFCfg.db.mongo.database);
+        this._mongo = client.db(ServerConfig_1.GServerCfg.db.mongo.database);
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[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 FrameworkConfig_1 = require("../Config/FrameworkConfig");
+const ServerConfig_1 = require("../Config/ServerConfig");
 class BaseModel {
 }
 exports.BaseModel = BaseModel;
@@ -42,7 +42,7 @@ class MysqlBaseService {
             throw new Error("数据表的类必须要具有Table装饰器");
         }
         this._table = "`" + table.table + "`";
-        if (!FrameworkConfig_1.GFCfg.db.mysql.auto) {
+        if (!ServerConfig_1.GServerCfg.db.mysql.auto) {
             //未开启自动创建数据表
             return;
         }

package/dist/lib/Database/MysqlManager.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMysqlMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = void 0;
 const _error_1 = require("./../Config/_error_");
 const Log_1 = require("../Logic/Log");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const mysql = require("mysql");
 class SqlResult {
     /**
@@ -48,22 +47,22 @@ class MysqlManager {
     async init() {
         return new Promise(async (resolve) => {
             if (this._pool
-                || !FrameworkConfig_1.GFCfg.db.mysql
-                || !FrameworkConfig_1.GFCfg.db.mysql.open) {
+                || !ServerConfig_1.GServerCfg.db.mysql
+                || !ServerConfig_1.GServerCfg.db.mysql.open) {
                 resolve(null);
                 return;
             }
             this._pool = mysql.createPool({
                 connectionLimit: 100,
-                host: FrameworkConfig_1.GFCfg.db.mysql.host,
-                port: FrameworkConfig_1.GFCfg.db.mysql.port,
-                user: FrameworkConfig_1.GFCfg.db.mysql.user,
-                password: FrameworkConfig_1.GFCfg.db.mysql.password,
-                database: FrameworkConfig_1.GFCfg.db.mysql.database,
+                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,
                 supportBigNumbers: true,
                 charset: "utf8mb4"
             });
-            console.log("mysql config=" + JSON.stringify(FrameworkConfig_1.GFCfg.db.mysql));
+            console.log("mysql config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mysql));
             //这个的初始化位置不能变，必须位于cbs前，pool后
             await DBCache_1.GDBCache.init();
             resolve(null);
@@ -178,3 +177,4 @@ class MysqlManager {
 exports.GMysqlMgr = new MysqlManager();
 //该import必须放在GMysqlMgr实例化之后，否则version基类找不到GMysqlMgr
 const DBCache_1 = require("./Decorator/DBCache");
+const ServerConfig_1 = require("../Config/ServerConfig");

package/dist/lib/SocketServer/ISocketServer.js

@@ -8,10 +8,11 @@ const Log_1 = require("./../Logic/Log");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 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 cgserver_1 = require("../cgserver");
 class ISocketServer {
     //服务器已被关闭
     _is_closed = false;
@@ -69,9 +70,10 @@ class ISocketServer {
         delete this._ws_clients[socketId];
     }
     async run() {
+        cgserver_1.GCgServer.addSocketServer(this);
         await MSSqlManager_1.GMSSqlMgr.init();
         await MysqlManager_1.GMysqlMgr.init();
-        await RedisManager_1.GRedisMgr.init(FrameworkConfig_1.GFCfg.db.redis);
+        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db.redis);
         await MongoManager_1.GMongoMgr.init();
         let code = await RedisManager_1.GRedisMgr.incr("server_code");
         this._code = code;

package/dist/lib/SocketServer/IWebSocket.js

@@ -5,8 +5,8 @@ const Log_1 = require("../Logic/Log");
 const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 const Core_1 = require("../Core/Core");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const _ = require("underscore");
+const ServerConfig_1 = require("../Config/ServerConfig");
 let WebSocketIdMgr = {
     id: _.random(0, 99999999),
     getNewID() {
@@ -53,7 +53,7 @@ class IWebSocket {
         return false;
     }
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        this._debug_msg = FrameworkConfig_1.GFCfg.debug_msg;
+        this._debug_msg = ServerConfig_1.GServerCfg.debug_msg;
         this._socket_id = WebSocketIdMgr.getNewID();
         this._protoType = protoType;
         this._protoPath = protoPath;

package/dist/lib/ThirdParty/AlipayTool.js

@@ -5,9 +5,9 @@ const alipay_sdk_1 = require("alipay-sdk");
 const aliUtil = require("alipay-sdk/lib/util");
 const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
 const fs = require("fs");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const form_1 = require("alipay-sdk/lib/form");
 const Log_1 = require("../Logic/Log");
+const ServerConfig_1 = require("../Config/ServerConfig");
 class AlipayResult {
     alipay_trade_app_pay_response = {
         code: "10000",
@@ -71,26 +71,26 @@ class AlipayTool {
         notify_url: ""
     };
     init() {
-        if (!FrameworkConfig_1.GFCfg.third_cfg.alipay
-            || !FrameworkConfig_1.GFCfg.third_cfg.alipay.open) {
+        if (!ServerConfig_1.GServerCfg.third_cfg.alipay
+            || !ServerConfig_1.GServerCfg.third_cfg.alipay.open) {
             return false;
         }
         let suffix = "";
-        if (FrameworkConfig_1.GFCfg.third_cfg.alipay.dev) {
+        if (ServerConfig_1.GServerCfg.third_cfg.alipay.dev) {
             suffix = "_dev";
         }
         this._cfg = {
-            app_id: FrameworkConfig_1.GFCfg.third_cfg.alipay["app_id" + suffix],
-            app_key: FrameworkConfig_1.GFCfg.third_cfg.alipay["app_key" + suffix],
-            gateway: FrameworkConfig_1.GFCfg.third_cfg.alipay["gateway" + suffix],
+            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],
             //RSA1 RSA2
-            signType: FrameworkConfig_1.GFCfg.third_cfg.alipay["signType" + suffix],
+            signType: ServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
             /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: FrameworkConfig_1.GFCfg.third_cfg.alipay["signType" + suffix],
-            alipay_root_cert_sn: FrameworkConfig_1.GFCfg.third_cfg.alipay["alipay_root_cert_sn" + suffix],
-            alipay_cert_sn: FrameworkConfig_1.GFCfg.third_cfg.alipay["alipay_cert_sn" + suffix],
-            app_cert_sn: FrameworkConfig_1.GFCfg.third_cfg.alipay["app_cert_sn" + suffix],
-            notify_url: FrameworkConfig_1.GFCfg.third_cfg.alipay["notify_url" + suffix]
+            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]
         };
         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,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GSmsTool = void 0;
+const ServerConfig_1 = require("../Config/ServerConfig");
 const Log_1 = require("./../Logic/Log");
 let SMSClient = require("@alicloud/sms-sdk");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 exports.GSmsTool = null;
 class SMSTool {
     _is_init = false;
@@ -13,7 +13,7 @@ class SMSTool {
             return true;
         }
         this._is_init = true;
-        this._sms_client = new SMSClient({ accessKeyId: FrameworkConfig_1.GFCfg.third_cfg.aliSms.accessKeyId, secretAccessKey: FrameworkConfig_1.GFCfg.third_cfg.aliSms.secretAccessKey });
+        this._sms_client = new SMSClient({ accessKeyId: ServerConfig_1.GServerCfg.third_cfg.aliSms.accessKeyId, secretAccessKey: ServerConfig_1.GServerCfg.third_cfg.aliSms.secretAccessKey });
     }
     /**
      * 发送短信验证码
@@ -25,8 +25,8 @@ class SMSTool {
         return new Promise((resolve, reject) => {
             this._sms_client.sendSMS({
                 PhoneNumbers: phone,
-                SignName: FrameworkConfig_1.GFCfg.third_cfg.aliSms.signName,
-                TemplateCode: FrameworkConfig_1.GFCfg.third_cfg.aliSms.templateCode,
+                SignName: ServerConfig_1.GServerCfg.third_cfg.aliSms.signName,
+                TemplateCode: ServerConfig_1.GServerCfg.third_cfg.aliSms.templateCode,
                 TemplateParam: JSON.stringify({ code: code })
             }).then((res) => {
                 if (res.Code == "OK") {

package/dist/lib/ThirdParty/AppleTool.js

@@ -5,8 +5,8 @@ const Log_1 = require("../Logic/Log");
 const HttpTool_1 = require("./../Logic/HttpTool");
 const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const fs = require("fs");
+const ServerConfig_1 = require("../Config/ServerConfig");
 //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 FrameworkConfig_1.GFCfg.third_cfg.apple.keyIds) {
+        for (var k in ServerConfig_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 = FrameworkConfig_1.GFCfg.third_cfg.apple.keyIds[keyIdentifier];
+        const path = ServerConfig_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/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 Log_1 = require("../Logic/Log");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 exports.GEmailTool = null;
 class EmailTool {
     send(to, subject, html) {
         return new Promise((resolve, reject) => {
             let transport = nodeMailer.createTransport({
-                host: FrameworkConfig_1.GFCfg.third_cfg.email.host,
-                port: FrameworkConfig_1.GFCfg.third_cfg.email.port,
-                secure: FrameworkConfig_1.GFCfg.third_cfg.email.secure,
+                host: ServerConfig_1.GServerCfg.third_cfg.email.host,
+                port: ServerConfig_1.GServerCfg.third_cfg.email.port,
+                secure: ServerConfig_1.GServerCfg.third_cfg.email.secure,
                 auth: {
-                    user: FrameworkConfig_1.GFCfg.third_cfg.email.auth.user,
-                    pass: FrameworkConfig_1.GFCfg.third_cfg.email.auth.pass
+                    user: ServerConfig_1.GServerCfg.third_cfg.email.auth.user,
+                    pass: ServerConfig_1.GServerCfg.third_cfg.email.auth.pass
                 }
             });
             let mail = {
-                from: FrameworkConfig_1.GFCfg.third_cfg.email.from,
+                from: ServerConfig_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 HttpTool_1 = require("../Logic/HttpTool");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 exports.GOpenSocial = null;
 class OpenSocial {
     _getNewMsg() {
         return {
-            app_id: FrameworkConfig_1.GFCfg.third_cfg.open_social.app_id,
-            app_secret: FrameworkConfig_1.GFCfg.third_cfg.open_social.app_secret
+            app_id: ServerConfig_1.GServerCfg.third_cfg.open_social.app_id,
+            app_secret: ServerConfig_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(FrameworkConfig_1.GFCfg.third_cfg.open_social.user_url, msg);
+        let rs = await HttpTool_1.GHttpTool.httpPost(ServerConfig_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(FrameworkConfig_1.GFCfg.third_cfg.open_social.update_pwd_url, msg);
+        let jsonData = await HttpTool_1.GHttpTool.httpPost(ServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, msg);
         return jsonData.body || jsonData.error;
     }
 }

package/dist/lib/ThirdParty/QQTool.js

@@ -3,8 +3,8 @@ 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 HttpTool_1 = require("../Logic/HttpTool");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const Log_1 = require("../Logic/Log");
 class QQUserInfo {
     ret = 0;
@@ -45,9 +45,9 @@ class QQTool {
      */
     getAuthCodeUrl(scope, display) {
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(FrameworkConfig_1.GFCfg.third_cfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(ServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = FrameworkConfig_1.GFCfg.third_cfg.qq.app_id;
+        let client_id = ServerConfig_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 = FrameworkConfig_1.GFCfg.third_cfg.qq.app_id;
+        let client_id = ServerConfig_1.GServerCfg.third_cfg.qq.app_id;
         //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = FrameworkConfig_1.GFCfg.third_cfg.qq.app_key;
+        let client_secret = ServerConfig_1.GServerCfg.third_cfg.qq.app_key;
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(FrameworkConfig_1.GFCfg.third_cfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(ServerConfig_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=" + FrameworkConfig_1.GFCfg.third_cfg.qq.app_id + "&openid=" + 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 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 FrameworkConfig_1 = require("../Config/FrameworkConfig");
+const ServerConfig_1 = require("../Config/ServerConfig");
 exports.GQiniuTool = null;
 class QiniuTool {
     get host() {
-        return FrameworkConfig_1.GFCfg.third_cfg.qiniu.host;
+        return ServerConfig_1.GServerCfg.third_cfg.qiniu.host;
     }
     getUploadToken(filename) {
-        let mac = new qiniu.auth.digest.Mac(FrameworkConfig_1.GFCfg.third_cfg.qiniu.accessKey, FrameworkConfig_1.GFCfg.third_cfg.qiniu.secretKey);
+        let mac = new qiniu.auth.digest.Mac(ServerConfig_1.GServerCfg.third_cfg.qiniu.accessKey, ServerConfig_1.GServerCfg.third_cfg.qiniu.secretKey);
         let options = {
-            scope: FrameworkConfig_1.GFCfg.third_cfg.qiniu.bucket + ":" + filename,
+            scope: ServerConfig_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,8 +3,8 @@ 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 HttpTool_1 = require("../Logic/HttpTool");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const Log_1 = require("../Logic/Log");
 class WechatUserInfo {
     openid = "OPENID";
@@ -28,8 +28,8 @@ class WechatTool {
      */
     getAuthCodeUrl() {
         let appid = "wx80f0f10fe1304e9d";
-        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + FrameworkConfig_1.GFCfg.third_cfg.wechat.app_id;
-        url += "&redirect_uri=" + URLEncode.encode(FrameworkConfig_1.GFCfg.third_cfg.wechat.redirect_uri);
+        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);
         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=" + FrameworkConfig_1.GFCfg.third_cfg.wechat.app_id + "&secret=" + FrameworkConfig_1.GFCfg.third_cfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
+        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 rs = await HttpTool_1.GHttpTool.httpRequest(url);
         /*
         {

package/dist/lib/WebServer/IWebServer.js

@@ -5,10 +5,12 @@ const Engine_1 = require("./Engine/Engine");
 const Log_1 = require("../Logic/Log");
 const RedisManager_1 = require("../Database/RedisManager");
 const MysqlManager_1 = require("../Database/MysqlManager");
-const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 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 EventTool_1 = require("../Logic/EventTool");
+const cgserver_1 = require("../cgserver");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -17,11 +19,12 @@ class IWebServer {
      * @param server_index 这个是服务器的配置index
      */
     async start(cfg) {
+        cgserver_1.GCgServer.addWebServer(this);
         if (!cfg) {
             Log_1.GLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        await RedisManager_1.GRedisMgr.init(FrameworkConfig_1.GFCfg.db.redis);
+        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db.redis);
         await MysqlManager_1.GMysqlMgr.init();
         await MongoManager_1.GMongoMgr.init();
         AlipayTool_1.GAlipayTool.init();
@@ -30,6 +33,7 @@ class IWebServer {
         this._engine.start();
         this._registerController();
         this._registerRouter();
+        EventTool_1.GEventTool.emit("web_server_init_done");
     }
     stop() {
         this._engine.stop();

package/dist/lib/cgserver.js

@@ -6,6 +6,14 @@ const EventTool_1 = require("./Logic/EventTool");
 const Core_1 = require("./Core/Core");
 const Config_1 = require("./Config/Config");
 class CgServer {
+    _webservers = [];
+    get webServers() {
+        return this._webservers;
+    }
+    _socketservers = [];
+    get socketServers() {
+        return this._socketservers;
+    }
     _events = {};
     _debug = false;
     get debug() {
@@ -14,10 +22,11 @@ class CgServer {
     constructor() {
         this.init();
     }
-    init() {
+    init(servernum = 1) {
         process.on("uncaughtException", this.onUnCaughtException.bind(this));
         process.env.TZ = "Asia/Shanghai";
         EventTool_1.GEventTool.on("socket_server_init_done", this.onStart.bind(this));
+        EventTool_1.GEventTool.on("web_server_init_done", this.onStart.bind(this));
         let argv = process.argv || [];
         for (let i = 0; i < argv.length; ++i) {
             let arg = argv[i].toLowerCase();
@@ -27,7 +36,13 @@ class CgServer {
             }
         }
     }
+    _done = 0;
     onStart() {
+        ++this._done;
+        let total = this._webservers.length + this._socketservers.length;
+        if (this._done != total) {
+            return;
+        }
         let events = this._events["start"] || [];
         for (let i = 0; i < events.length; ++i) {
             Core_1.core.safeCall(events[i]);
@@ -52,5 +67,11 @@ class CgServer {
     onUnCaughtException(e) {
         Log_1.GLog.error(e.stack);
     }
+    addWebServer(server) {
+        this._webservers.push(server);
+    }
+    addSocketServer(server) {
+        this._socketservers.push(server);
+    }
 }
 exports.GCgServer = new CgServer();

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 "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.ServerConfig = exports.GFCfg = 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.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.EAccountState = exports.GEventTool = exports.GAsyncQueueTool = 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.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
@@ -27,10 +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; } });
-Object.defineProperty(exports, "GFCfg", { enumerable: true, get: function () { return FrameworkConfig_1.GFCfg; } });
 var ServerConfig_1 = require("./Config/ServerConfig");
 Object.defineProperty(exports, "ServerConfig", { enumerable: true, get: function () { return ServerConfig_1.ServerConfig; } });
-9;
+Object.defineProperty(exports, "GServerCfg", { enumerable: true, get: function () { return ServerConfig_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");

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

@@ -1,5 +1,5 @@
 import { MongoClientOptions } from "mongodb";
-import { ServerConfig } from "./ServerConfig";
+import { Config } from "./Config";
 export declare enum ESessionType {
     Cache = 0,
     Redis = 1,
@@ -40,8 +40,7 @@ export declare class WebServerConfig {
         credentials: boolean;
     };
 }
-export declare let GFCfg: FrameworkConfig;
-export declare class FrameworkConfig extends ServerConfig {
+export declare class FrameworkConfig extends Config {
     console_level: number;
     log: {
         appenders: {
@@ -228,6 +227,6 @@ export declare class FrameworkConfig extends ServerConfig {
     };
     ip_to_domain: {};
     root_path: string;
-    constructor(server_name: any);
+    constructor();
     init(): boolean;
 }

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

@@ -1,9 +1,10 @@
-import { WebServerConfig } from './FrameworkConfig';
-import { Config } from "./Config";
-export declare class ServerConfig extends Config {
+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;
 }

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

@@ -33,7 +33,7 @@ export declare class MongoBaseService<T> {
             id: number;
             des: string;
         };
-        rs: mongo.UpdateResult | mongo.Document;
+        rs: mongo.Document | mongo.UpdateResult;
     }>;
     insert(model: T): Promise<{
         errcode: {

package/dist/types/cgserver.d.ts

@@ -1,15 +1,24 @@
+import { IWebServer } from "./WebServer/IWebServer";
+import { ISocketServer } from "./SocketServer/ISocketServer";
 declare class CgServer {
+    protected _webservers: IWebServer[];
+    get webServers(): IWebServer[];
+    protected _socketservers: ISocketServer[];
+    get socketServers(): ISocketServer[];
     protected _events: {
         [name: string]: Function[];
     };
     protected _debug: boolean;
     get debug(): boolean;
     constructor();
-    init(): void;
+    init(servernum?: number): void;
+    protected _done: number;
     onStart(): void;
     addListener(event: "start", func: () => void): void;
     removeListener(event: "start", func: () => void): boolean;
     onUnCaughtException(e: any): void;
+    addWebServer(server: IWebServer): void;
+    addSocketServer(server: ISocketServer): void;
 }
 export declare let GCgServer: CgServer;
 export {};

package/dist/types/index.d.ts

@@ -9,8 +9,8 @@ export { Point } from "./AI/Point";
 export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
 export { FrameworkErrorCode } from "./Config/_error_";
 export { Config } from "./Config/Config";
-export { FrameworkConfig, GFCfg } from "./Config/FrameworkConfig";
-export { ServerConfig } from "./Config/ServerConfig";
+export { FrameworkConfig } from "./Config/FrameworkConfig";
+export { ServerConfig, GServerCfg } from "./Config/ServerConfig";
 export { core } from "./Core/Core";
 export { Timer } from "./Core/Timer";
 export { AutoIncrement } from "./Database/Decorator/AutoIncrement";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.5.9",
+  "version": "6.6.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",