cgserver 12.0.8 → 12.2.0

package/dist/lib/Framework/Database/Mysql/MysqlManager.js

@@ -1,105 +1,138 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMysqlMgr = exports.MysqlManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
-const Log_1 = require("../../Logic/Log");
-const _error_1 = require("../../Config/_error_");
-const mysql2 = require("mysql2/promise");
-const DBCache_1 = require("../Decorator/DBCache");
-class MysqlConfig {
-    open = false;
-    auto = false;
-    poolcfg = null;
-}
-exports.MysqlConfig = MysqlConfig;
-class SqlReturn {
-    error = null;
-    result = null;
-    fields = null;
-    get queryResult() {
-        return this.result;
-    }
-    get execResult() {
-        return this.result;
-    }
-}
-exports.SqlReturn = SqlReturn;
-class SqlReturns {
-    error = null;
-    srs = [];
-}
-exports.SqlReturns = SqlReturns;
-class MysqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get isValid() {
-        return !!this._pool;
-    }
-    _cfg = null;
-    get cfg() {
-        return this._cfg;
-    }
-    constructor() {
-    }
-    async init(cfg) {
-        if (this._pool
-            || !cfg
-            || !cfg.open) {
-            return;
-        }
-        this._cfg = cfg;
-        this._pool = mysql2.createPool(cfg.poolcfg);
-        console.log("mysql config=" + JSON.stringify(cfg));
-        //这个的初始化位置不能变，必须位于cbs前，pool后
-        if (cfg.auto) {
-            await DBCache_1.gDbCache.init();
-        }
-        for (let i = 0; i < this._init_cbs.length; ++i) {
-            this._init_cbs[i]();
-        }
-    }
-    registerInitCb(cb) {
-        this._init_cbs.push(cb);
-    }
-    async query(sqlStr, values) {
-        let sr = new SqlReturn();
-        if (!this._pool) {
-            //表示没有开通数据库，不用记录错误日志
-            sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.gLog.error(sr.error);
-            return sr;
-        }
-        try {
-            const [result, fields] = await this._pool.query(sqlStr, values);
-            sr.result = result;
-            sr.fields = fields;
-        }
-        catch (error) {
-            sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.gLog.error(sr.error);
-            return sr;
-        }
-        return sr;
-    }
-    async transaction(sqls) {
-        let srs = new SqlReturns();
-        try {
-            await this._pool.beginTransaction();
-            for (let i = 0; i < sqls.length; ++i) {
-                let sql = sqls[i];
-                let sr = await this.query(sql.sql, sql.values);
-                if (sr.error) {
-                    srs.error = sr.error;
-                    await this._pool.rollback();
-                    return srs;
-                }
-            }
-            await this._pool.commit();
-        }
-        catch (err) {
-            srs.error = err;
-            Log_1.gLog.error(err);
-        }
-    }
-}
-exports.MysqlManager = MysqlManager;
-exports.gMysqlMgr = new MysqlManager();
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gMysqlMgr = exports.MysqlManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
+const Log_1 = require("../../Logic/Log");
+const _error_1 = require("../../Config/_error_");
+const mysql2 = __importStar(require("mysql2/promise"));
+const DBCache_1 = require("../Decorator/DBCache");
+class MysqlConfig {
+    open = false;
+    auto = false;
+    poolcfg = null;
+}
+exports.MysqlConfig = MysqlConfig;
+class SqlReturn {
+    error = null;
+    result = null;
+    fields = null;
+    get queryResult() {
+        return this.result;
+    }
+    get execResult() {
+        return this.result;
+    }
+}
+exports.SqlReturn = SqlReturn;
+class SqlReturns {
+    error = null;
+    srs = [];
+}
+exports.SqlReturns = SqlReturns;
+class MysqlManager {
+    _init_cbs = [];
+    _pool = null;
+    get isValid() {
+        return !!this._pool;
+    }
+    _cfg = null;
+    get cfg() {
+        return this._cfg;
+    }
+    constructor() {
+    }
+    async init(cfg) {
+        if (this._pool
+            || !cfg
+            || !cfg.open) {
+            return;
+        }
+        this._cfg = cfg;
+        this._pool = mysql2.createPool(cfg.poolcfg);
+        console.log("mysql config=" + JSON.stringify(cfg));
+        //这个的初始化位置不能变，必须位于cbs前，pool后
+        if (cfg.auto) {
+            await DBCache_1.gDbCache.init();
+        }
+        for (let i = 0; i < this._init_cbs.length; ++i) {
+            this._init_cbs[i]();
+        }
+    }
+    registerInitCb(cb) {
+        this._init_cbs.push(cb);
+    }
+    async query(sqlStr, values) {
+        let sr = new SqlReturn();
+        if (!this._pool) {
+            //表示没有开通数据库，不用记录错误日志
+            sr.error = _error_1.EErrorCode.No_Mysql;
+            Log_1.gLog.error(sr.error);
+            return sr;
+        }
+        try {
+            const [result, fields] = await this._pool.query(sqlStr, values);
+            sr.result = result;
+            sr.fields = fields;
+        }
+        catch (error) {
+            sr.error = _error_1.EErrorCode.No_Mysql;
+            Log_1.gLog.error(sr.error);
+            return sr;
+        }
+        return sr;
+    }
+    async transaction(sqls) {
+        let srs = new SqlReturns();
+        try {
+            await this._pool.beginTransaction();
+            for (let i = 0; i < sqls.length; ++i) {
+                let sql = sqls[i];
+                let sr = await this.query(sql.sql, sql.values);
+                if (sr.error) {
+                    srs.error = sr.error;
+                    await this._pool.rollback();
+                    return srs;
+                }
+            }
+            await this._pool.commit();
+        }
+        catch (err) {
+            srs.error = err;
+            Log_1.gLog.error(err);
+        }
+    }
+}
+exports.MysqlManager = MysqlManager;
+exports.gMysqlMgr = new MysqlManager();

package/dist/lib/Framework/Database/Redis/RedisManager.js

@@ -1,61 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gRedisMgr = exports.RedisManager = exports.RedisConfig = void 0;
-const redis = require("redis");
-const Log_1 = require("../../Logic/Log");
-class RedisConfig {
-    open = false;
-    host = "127.0.0.1";
-    port = 6379;
-    database = 0;
-    password = null;
-}
-exports.RedisConfig = RedisConfig;
-class RedisManager {
-    _redis = null;
-    get redis() {
-        return this._redis;
-    }
-    _redisCfg = null;
-    async init(redisCfg) {
-        let p = new Promise((resolve) => {
-            if (!redisCfg || !redisCfg.open) {
-                resolve(null);
-                return;
-            }
-            if (this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redisCfg = redisCfg;
-            Log_1.gLog.info("begin connect redis=" + JSON.stringify(redisCfg));
-            this._redis = redis.createClient(redisCfg);
-            this._redis.on("connect", () => {
-                this.onConnect();
-                resolve(null);
-            });
-            this._redis.on("end", this.onEnd.bind(this));
-            this._redis.on("error", this.onError.bind(this));
-            this._redis.connect();
-        });
-        let ret = await p;
-        for (let key in this._redis) {
-            if (typeof this._redis[key] == "function") {
-                this[key] = this._redis[key].bind(this._redis);
-            }
-        }
-        return ret;
-    }
-    onConnect() {
-        Log_1.gLog.info("redis has connected!");
-    }
-    onEnd() {
-        this._redis = null;
-        this.init(this._redisCfg); //重连
-    }
-    onError(err) {
-        Log_1.gLog.info("Error connected=" + this._redis + ": " + err);
-    }
-}
-exports.RedisManager = RedisManager;
-exports.gRedisMgr = new RedisManager();
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gRedisMgr = exports.RedisManager = exports.RedisConfig = void 0;
+const redis = __importStar(require("redis"));
+const Log_1 = require("../../Logic/Log");
+class RedisConfig {
+    open = false;
+    host = "127.0.0.1";
+    port = 6379;
+    database = 0;
+    password = null;
+}
+exports.RedisConfig = RedisConfig;
+class RedisManager {
+    _redis = null;
+    get redis() {
+        return this._redis;
+    }
+    _redisCfg = null;
+    async init(redisCfg) {
+        let p = new Promise((resolve) => {
+            if (!redisCfg || !redisCfg.open) {
+                resolve(null);
+                return;
+            }
+            if (this._redis) {
+                resolve(null);
+                return;
+            }
+            this._redisCfg = redisCfg;
+            Log_1.gLog.info("begin connect redis=" + JSON.stringify(redisCfg));
+            this._redis = redis.createClient(redisCfg);
+            this._redis.on("connect", () => {
+                this.onConnect();
+                resolve(null);
+            });
+            this._redis.on("end", this.onEnd.bind(this));
+            this._redis.on("error", this.onError.bind(this));
+            this._redis.connect();
+        });
+        let ret = await p;
+        for (let key in this._redis) {
+            if (typeof this._redis[key] == "function") {
+                this[key] = this._redis[key].bind(this._redis);
+            }
+        }
+        return ret;
+    }
+    onConnect() {
+        Log_1.gLog.info("redis has connected!");
+    }
+    onEnd() {
+        this._redis = null;
+        this.init(this._redisCfg); //重连
+    }
+    onError(err) {
+        Log_1.gLog.info("Error connected=" + this._redis + ": " + err);
+    }
+}
+exports.RedisManager = RedisManager;
+exports.gRedisMgr = new RedisManager();

package/dist/lib/Framework/Decorator/AdminValidate.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdminValidate = void 0;
-function AdminValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.redirect(null, "Login");
-            return;
-        }
-        if (!self.isAdmin) {
-            self.showText("需要管理员权限");
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.AdminValidate = AdminValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminValidate = AdminValidate;
+function AdminValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.redirect(null, "Login");
+            return;
+        }
+        if (!self.isAdmin) {
+            self.showText("需要管理员权限");
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}

package/dist/lib/Framework/Decorator/AuthorityValidate.js

@@ -1,22 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthorityValidate = void 0;
-let AuthorityValidate = function (rg, ctr_name) {
-    ctr_name = ctr_name || "Wechat";
-    return function (target, propertyName, descriptor) {
-        let method = descriptor.value;
-        descriptor.value = function () {
-            let self = this;
-            if (!self.isLogin) {
-                self.redirect(null, ctr_name);
-                return;
-            }
-            if (rg && self.selfUser.role_group != rg) {
-                self.redirect(null, ctr_name); //权限不足
-                return;
-            }
-            return method.apply(this, arguments);
-        };
-    };
-};
-exports.AuthorityValidate = AuthorityValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthorityValidate = void 0;
+let AuthorityValidate = function (rg, ctr_name) {
+    ctr_name = ctr_name || "Wechat";
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let self = this;
+            if (!self.isLogin) {
+                self.redirect(null, ctr_name);
+                return;
+            }
+            if (rg && self.selfUser.role_group != rg) {
+                self.redirect(null, ctr_name); //权限不足
+                return;
+            }
+            return method.apply(this, arguments);
+        };
+    };
+};
+exports.AuthorityValidate = AuthorityValidate;

package/dist/lib/Framework/Decorator/CreatorValidate.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreatorValidate = void 0;
-function CreatorValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.redirect(null, "Login");
-            return;
-        }
-        if (!self.isCreator) {
-            self.showText("需要创始人权限");
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.CreatorValidate = CreatorValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreatorValidate = CreatorValidate;
+function CreatorValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.redirect(null, "Login");
+            return;
+        }
+        if (!self.isCreator) {
+            self.showText("需要创始人权限");
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}

package/dist/lib/Framework/Decorator/JsonAdminValidate.js

@@ -1,15 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonAdminValidate = void 0;
-function JsonAdminValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isAdmin) {
-            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" } });
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.JsonAdminValidate = JsonAdminValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonAdminValidate = JsonAdminValidate;
+function JsonAdminValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isAdmin) {
+            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" } });
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}

package/dist/lib/Framework/Decorator/JsonAuthorityValidate.js

@@ -1,20 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonAuthorityValidate = void 0;
-let JsonAuthorityValidate = function (rg) {
-    return function (target, propertyName, descriptor) {
-        let method = descriptor.value;
-        descriptor.value = function () {
-            let self = this;
-            if (!self.isLogin) {
-                self.showJson({ errcode: { id: 1, des: "未登陆" }, err: "未登陆" });
-            }
-            if (rg && self.selfUser.role_group != rg) {
-                self.showJson({ errcode: { id: 2, des: "权限不足" }, err: "权限不足" });
-                return;
-            }
-            return method.apply(this, arguments);
-        };
-    };
-};
-exports.JsonAuthorityValidate = JsonAuthorityValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonAuthorityValidate = void 0;
+let JsonAuthorityValidate = function (rg) {
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let self = this;
+            if (!self.isLogin) {
+                self.showJson({ errcode: { id: 1, des: "未登陆" }, err: "未登陆" });
+            }
+            if (rg && self.selfUser.role_group != rg) {
+                self.showJson({ errcode: { id: 2, des: "权限不足" }, err: "权限不足" });
+                return;
+            }
+            return method.apply(this, arguments);
+        };
+    };
+};
+exports.JsonAuthorityValidate = JsonAuthorityValidate;

package/dist/lib/Framework/Decorator/JsonCreatorValidate.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonCreatorValidate = void 0;
-function JsonCreatorValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.showJson({ errcode: { id: 1, des: "请登陆后尝试" }, err: "请登陆后尝试" });
-            return;
-        }
-        if (!self.isCreator) {
-            self.showJson({ errcode: { id: 1, des: "需要创始人权限" }, err: "需要创始人权限" });
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.JsonCreatorValidate = JsonCreatorValidate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonCreatorValidate = JsonCreatorValidate;
+function JsonCreatorValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.showJson({ errcode: { id: 1, des: "请登陆后尝试" }, err: "请登陆后尝试" });
+            return;
+        }
+        if (!self.isCreator) {
+            self.showJson({ errcode: { id: 1, des: "需要创始人权限" }, err: "需要创始人权限" });
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}