cgserver 8.6.8 → 8.7.0

package/dist/lib/Framework/Config/Config.js

@@ -1,53 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = void 0;
-const fs = require("fs");
-const jsonc_1 = require("jsonc");
-class Config {
-    _suffix = "";
-    _is_init = false;
-    _file_name = "";
-    /**
-     * 是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
-     */
-    static debug = false;
-    static rootDataDir = "data/";
-    constructor(filename) {
-        this._file_name = filename;
-    }
-    init() {
-        if (this._is_init) {
-            return false;
-        }
-        let suffix2 = "_r";
-        if (Config.debug) {
-            suffix2 = "_d";
-        }
-        let path = Config.rootDataDir + this._file_name + "_" + this._suffix + suffix2 + ".json";
-        path = path.toLowerCase();
-        if (!fs.existsSync(path)) {
-            path = Config.rootDataDir + this._file_name + "_" + this._suffix + ".json";
-            path = path.toLowerCase();
-            if (!fs.existsSync(path)) {
-                path = Config.rootDataDir + this._file_name + suffix2 + ".json";
-                path = path.toLowerCase();
-                if (!fs.existsSync(path)) {
-                    path = Config.rootDataDir + this._file_name + ".json";
-                    path = path.toLowerCase();
-                    if (!fs.existsSync(path)) {
-                        console.error(path + " not exist!");
-                        return true;
-                    }
-                }
-            }
-        }
-        let content = fs.readFileSync(path).toString();
-        let jsonData = jsonc_1.jsonc.parse(content);
-        for (let key in jsonData) {
-            this[key] = jsonData[key];
-        }
-        console.log("loaded cfg=" + path);
-        return true;
-    }
-}
-exports.Config = Config;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
+const fs = require("fs");
+const jsonc_1 = require("jsonc");
+class Config {
+    _suffix = "";
+    _is_init = false;
+    _file_name = "";
+    /**
+     * 是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
+     */
+    static debug = false;
+    static rootDataDir = "data/";
+    constructor(filename) {
+        this._file_name = filename;
+    }
+    init() {
+        if (this._is_init) {
+            return false;
+        }
+        let suffix2 = "_r";
+        if (Config.debug) {
+            suffix2 = "_d";
+        }
+        let path = Config.rootDataDir + this._file_name + "_" + this._suffix + suffix2 + ".json";
+        path = path.toLowerCase();
+        if (!fs.existsSync(path)) {
+            path = Config.rootDataDir + this._file_name + "_" + this._suffix + ".json";
+            path = path.toLowerCase();
+            if (!fs.existsSync(path)) {
+                path = Config.rootDataDir + this._file_name + suffix2 + ".json";
+                path = path.toLowerCase();
+                if (!fs.existsSync(path)) {
+                    path = Config.rootDataDir + this._file_name + ".json";
+                    path = path.toLowerCase();
+                    if (!fs.existsSync(path)) {
+                        console.error(path + " not exist!");
+                        return true;
+                    }
+                }
+            }
+        }
+        let content = fs.readFileSync(path).toString();
+        let jsonData = jsonc_1.jsonc.parse(content);
+        for (let key in jsonData) {
+            this[key] = jsonData[key];
+        }
+        console.log("loaded cfg=" + path);
+        return true;
+    }
+}
+exports.Config = Config;

package/dist/lib/Framework/Config/DbConfig.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DbConfig = void 0;
+const MSSqlManager_1 = require("../Database/MSSqlManager");
+const MongoManager_1 = require("../Database/MongoManager");
+const MysqlManager_1 = require("../Database/MysqlManager");
+const RedisManager_1 = require("../Database/RedisManager");
+class DbConfig {
+    redis = new RedisManager_1.RedisConfig();
+    mongo = new MongoManager_1.MongoConfig();
+    mysql = new MysqlManager_1.MysqlConfig();
+    mssql = new MSSqlManager_1.MSSqlConfig();
+}
+exports.DbConfig = DbConfig;

package/dist/lib/Framework/Config/FrameworkConfig.js

@@ -1,240 +1,207 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FrameworkConfig = exports.WebServerConfig = exports.ESessionType = void 0;
-const Log_1 = require("../Logic/Log");
-const Config_1 = require("./Config");
-var ESessionType;
-(function (ESessionType) {
-    ESessionType[ESessionType["Cache"] = 0] = "Cache";
-    ESessionType[ESessionType["Redis"] = 1] = "Redis";
-    ESessionType[ESessionType["Mongo"] = 2] = "Mongo";
-})(ESessionType = exports.ESessionType || (exports.ESessionType = {}));
-class WebServerConfig {
-    cache = {};
-    session_type = ESessionType.Cache;
-    debug = false;
-    web_name = "web";
-    port = 0;
-    cookie = {
-        prefix: "tiny_cookie_",
-        expires: {
-            account_remember: 7 * 24 * 60 * 60,
-            account: 10 * 60
-        }
-    };
-    routs = {
-        /**
-         * 如果设置了这一项，那网址里面就不用带模块名称，是不回解析的
-         */
-        onlyModule: "Web",
-        defaults: { module: "Web", controller: "Index", action: "Index" }
-    };
-    ssl = null;
-    //默认不跨域
-    cors = null;
-}
-exports.WebServerConfig = WebServerConfig;
-class FrameworkConfig extends Config_1.Config {
-    /*
-    *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
-    */
-    console_level = 0;
-    log = {
-        appenders: {
-            console: {
-                "type": "console",
-                "category": "console"
-            },
-            log_file: {
-                category: "log_file",
-                type: "file",
-                filename: "./logs/log_file/file.log",
-                maxLogSize: 10 * 1024 * 1024,
-                backups: 100,
-            },
-            log_date: {
-                category: "log_date",
-                type: "dateFile",
-                filename: "./logs/log_date/date",
-                alwaysIncludePattern: true,
-                pattern: "yyyy-MM-dd-hh.log",
-            },
-            client_log_file: {
-                category: "log_file",
-                type: "file",
-                filename: "./logs/client_log_file/file.log",
-                maxLogSize: 10 * 1024 * 1024,
-                backups: 100,
-            },
-            client_log_date: {
-                category: "log_date",
-                type: "dateFile",
-                filename: "./logs/client_log_date/date",
-                alwaysIncludePattern: true,
-                pattern: "yyyy-MM-dd.log"
-            },
-            error_log_file: {
-                category: "error_log_file",
-                type: "file",
-                filename: "./logs/error_log_file/file.log",
-                maxLogSize: 5 * 1024 * 1024,
-                backups: 100,
-            }
-        },
-        categories: {
-            default: {
-                appenders: ['log_date'],
-                level: 'ALL'
-            },
-            console: {
-                appenders: ['console'],
-                level: 'ALL'
-            },
-            log_file: {
-                appenders: ['log_file'],
-                level: 'ALL'
-            },
-            log_date: {
-                appenders: ['log_date'],
-                level: 'ALL'
-            },
-            client_log_file: {
-                appenders: ['client_log_file'],
-                level: 'ALL'
-            },
-            client_log_date: {
-                appenders: ['client_log_date'],
-                level: 'ALL'
-            },
-            error_log_file: {
-                appenders: ['error_log_file'],
-                level: 'ALL'
-            },
-        }
-    };
-    /**
-     * 控制网络消息的
-     */
-    debug_msg = false;
-    local_host = "127.0.0.1";
-    internet_host = "127.0.0.1";
-    db = {
-        redis: {
-            open: false,
-            host: "127.0.0.1",
-            port: 6379,
-            database: 0,
-            password: null
-        },
-        mongo: {
-            open: false,
-            host: "www.eryinet.com",
-            port: 27017,
-            options: null,
-            database: 'achat'
-        },
-        mysql: {
-            open: false,
-            auto: false,
-            host: '127.0.0.1',
-            port: 3306,
-            user: 'root',
-            password: 'root',
-            database: 'gameall',
-            charset: 'utf8mb4'
-        },
-        mssql: {
-            open: false,
-            auto: false,
-            domain: '127.0.0.1',
-            port: 3306,
-            user: 'root',
-            password: 'root',
-            database: 'gameall',
-            charset: 'utf8mb4'
-        }
-    };
-    third_cfg = {
-        open_social: {
-            app_id: "appid_42313131",
-            app_secret: "apps_FDS4342J34JL432",
-            auth_url: "http://47.99.195.103:6666/auth/account/",
-            user_url: "http://47.99.195.103:6666/auth/userinfo/",
-            update_pwd_url: "http://47.99.195.103:6666/auth/updatepwd/"
-        },
-        aliSms: {
-            signName: "而已网络",
-            accessKeyId: "LTAIeqjiZ5OCev0B",
-            secretAccessKey: "0w1fmDEORshI94QqtampBaAPQDqUAj",
-            templateCode: "SMS_154589473"
-        },
-        qiniu: {
-            host: "p0bj0dycx.bkt.clouddn.com",
-            bucket: "eryiniuniu",
-            accessKey: "OETxflxP9V5ZzPcjE30asCv-YxWBvDpmMPJegtI4",
-            secretKey: "kZWsom120P0-cfQt_9_1-wR_X8RwuLeMXKbU_uc4"
-        },
-        email: {
-            host: "smtp.live.com",
-            port: 587,
-            secure: false,
-            auth: {
-                user: "chengang01@live.com",
-                pass: "cg123!@#" // generated ethereal password
-            },
-            from: "OpenSocial <chengang01@live.com>"
-        },
-        qq: {
-            app_id: "101775753",
-            app_key: "753d0f02f3c4093062e7b2f56c7fcb0c",
-            redirect_uri: "http://www.eryinet.com/qq/callback"
-        },
-        wechat: {
-            app_id: "wx80f0f10fe1304e9d",
-            app_key: "a76fc337c49b309886a6538d31c344e2",
-            redirect_uri: "http://www.eryinet.com/wechat/callback"
-        },
-        alipay: {
-            open: false,
-            dev: false,
-            app_id: "",
-            app_key: "",
-            gateway: "",
-            //RSA1 RSA2
-            signType: 'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: 'PKCS1',
-            alipay_root_cert_sn: "",
-            alipay_cert_sn: "",
-            app_cert_sn: "",
-            notify_url: "",
-            app_id_dev: "",
-            app_key_dev: "",
-            gateway_dev: "",
-            //RSA1 RSA2
-            signType_dev: 'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType_dev: 'PKCS1',
-            alipay_root_cert_sn_dev: "",
-            alipay_cert_sn_dev: "",
-            app_cert_sn_dev: "",
-            notify_url_dev: ""
-        },
-        apple: {
-            keyIds: {}
-        },
-        cgmq: null
-    };
-    //key是ip，value是domain
-    ip_to_domain = {};
-    root_path = process.cwd();
-    constructor() {
-        super("FrameworkConfig");
-    }
-    init() {
-        let ret = super.init();
-        Log_1.GLog.init(this.log, this.console_level || 0);
-        return ret;
-    }
-}
-exports.FrameworkConfig = FrameworkConfig;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FrameworkConfig = exports.WebServerConfig = exports.ESessionType = void 0;
+const Log_1 = require("../Logic/Log");
+const Config_1 = require("./Config");
+const DbConfig_1 = require("./DbConfig");
+var ESessionType;
+(function (ESessionType) {
+    ESessionType[ESessionType["Cache"] = 0] = "Cache";
+    ESessionType[ESessionType["Redis"] = 1] = "Redis";
+    ESessionType[ESessionType["Mongo"] = 2] = "Mongo";
+})(ESessionType || (exports.ESessionType = ESessionType = {}));
+class WebServerConfig {
+    cache = {};
+    session_type = ESessionType.Cache;
+    debug = false;
+    web_name = "web";
+    port = 0;
+    cookie = {
+        prefix: "tiny_cookie_",
+        expires: {
+            account_remember: 7 * 24 * 60 * 60,
+            account: 10 * 60
+        }
+    };
+    routs = {
+        /**
+         * 如果设置了这一项，那网址里面就不用带模块名称，是不回解析的
+         */
+        onlyModule: "Web",
+        defaults: { module: "Web", controller: "Index", action: "Index" }
+    };
+    ssl = null;
+    //默认不跨域
+    cors = null;
+    static = null;
+}
+exports.WebServerConfig = WebServerConfig;
+class FrameworkConfig extends Config_1.Config {
+    /*
+    *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
+    */
+    console_level = 0;
+    log = {
+        appenders: {
+            console: {
+                "type": "console",
+                "category": "console"
+            },
+            log_file: {
+                category: "log_file",
+                type: "file",
+                filename: "./logs/log_file/file.log",
+                maxLogSize: 10 * 1024 * 1024,
+                backups: 100,
+            },
+            log_date: {
+                category: "log_date",
+                type: "dateFile",
+                filename: "./logs/log_date/date",
+                alwaysIncludePattern: true,
+                pattern: "yyyy-MM-dd-hh.log",
+            },
+            client_log_file: {
+                category: "log_file",
+                type: "file",
+                filename: "./logs/client_log_file/file.log",
+                maxLogSize: 10 * 1024 * 1024,
+                backups: 100,
+            },
+            client_log_date: {
+                category: "log_date",
+                type: "dateFile",
+                filename: "./logs/client_log_date/date",
+                alwaysIncludePattern: true,
+                pattern: "yyyy-MM-dd.log"
+            },
+            error_log_file: {
+                category: "error_log_file",
+                type: "file",
+                filename: "./logs/error_log_file/file.log",
+                maxLogSize: 5 * 1024 * 1024,
+                backups: 100,
+            }
+        },
+        categories: {
+            default: {
+                appenders: ['log_date'],
+                level: 'ALL'
+            },
+            console: {
+                appenders: ['console'],
+                level: 'ALL'
+            },
+            log_file: {
+                appenders: ['log_file'],
+                level: 'ALL'
+            },
+            log_date: {
+                appenders: ['log_date'],
+                level: 'ALL'
+            },
+            client_log_file: {
+                appenders: ['client_log_file'],
+                level: 'ALL'
+            },
+            client_log_date: {
+                appenders: ['client_log_date'],
+                level: 'ALL'
+            },
+            error_log_file: {
+                appenders: ['error_log_file'],
+                level: 'ALL'
+            },
+        }
+    };
+    /**
+     * 控制网络消息的
+     */
+    debug_msg = false;
+    local_host = "127.0.0.1";
+    internet_host = "127.0.0.1";
+    db = new DbConfig_1.DbConfig();
+    third_cfg = {
+        open_social: {
+            app_id: "appid_42313131",
+            app_secret: "apps_FDS4342J34JL432",
+            auth_url: "http://47.99.195.103:6666/auth/account/",
+            user_url: "http://47.99.195.103:6666/auth/userinfo/",
+            update_pwd_url: "http://47.99.195.103:6666/auth/updatepwd/"
+        },
+        aliSms: {
+            signName: "而已网络",
+            accessKeyId: "LTAIeqjiZ5OCev0B",
+            secretAccessKey: "0w1fmDEORshI94QqtampBaAPQDqUAj",
+            templateCode: "SMS_154589473"
+        },
+        qiniu: {
+            host: "p0bj0dycx.bkt.clouddn.com",
+            bucket: "eryiniuniu",
+            accessKey: "OETxflxP9V5ZzPcjE30asCv-YxWBvDpmMPJegtI4",
+            secretKey: "kZWsom120P0-cfQt_9_1-wR_X8RwuLeMXKbU_uc4"
+        },
+        email: {
+            host: "smtp.live.com",
+            port: 587,
+            secure: false, // true for 465, false for other ports
+            auth: {
+                user: "chengang01@live.com", // generated ethereal user
+                pass: "cg123!@#" // generated ethereal password
+            },
+            from: "OpenSocial <chengang01@live.com>"
+        },
+        qq: {
+            app_id: "101775753",
+            app_key: "753d0f02f3c4093062e7b2f56c7fcb0c",
+            redirect_uri: "http://www.eryinet.com/qq/callback"
+        },
+        wechat: {
+            app_id: "wx80f0f10fe1304e9d",
+            app_key: "a76fc337c49b309886a6538d31c344e2",
+            redirect_uri: "http://www.eryinet.com/wechat/callback"
+        },
+        alipay: {
+            open: false,
+            dev: false,
+            app_id: "",
+            app_key: "",
+            gateway: "",
+            //RSA1 RSA2
+            signType: 'RSA2',
+            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+            keyType: 'PKCS1',
+            alipay_root_cert_sn: "",
+            alipay_cert_sn: "",
+            app_cert_sn: "",
+            notify_url: "",
+            app_id_dev: "",
+            app_key_dev: "",
+            gateway_dev: "",
+            //RSA1 RSA2
+            signType_dev: 'RSA2',
+            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+            keyType_dev: 'PKCS1',
+            alipay_root_cert_sn_dev: "",
+            alipay_cert_sn_dev: "",
+            app_cert_sn_dev: "",
+            notify_url_dev: ""
+        },
+        apple: {
+            keyIds: {}
+        },
+        cgmq: null
+    };
+    //key是ip，value是domain
+    ip_to_domain = {};
+    root_path = process.cwd();
+    constructor() {
+        super("FrameworkConfig");
+    }
+    init() {
+        let ret = super.init();
+        Log_1.GLog.init(this.log, this.console_level || 0);
+        return ret;
+    }
+}
+exports.FrameworkConfig = FrameworkConfig;

package/dist/lib/Framework/Config/IServerConfig.js

@@ -1,26 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerConfig = exports.GServerCfg = void 0;
-const FrameworkConfig_1 = require("./FrameworkConfig");
-exports.GServerCfg = null;
-class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
-    port = -1;
-    _server_name = "";
-    get serverName() {
-        return this._server_name;
-    }
-    constructor(server_name) {
-        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.IServerConfig = IServerConfig;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IServerConfig = exports.GServerCfg = void 0;
+const FrameworkConfig_1 = require("./FrameworkConfig");
+exports.GServerCfg = null;
+class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
+    port = -1;
+    _server_name = "";
+    get serverName() {
+        return this._server_name;
+    }
+    constructor(server_name) {
+        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.IServerConfig = IServerConfig;