cgserver 8.6.8 → 8.7.0

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

@@ -1,180 +1,179 @@
-"use strict";
-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 mysql = require("mysql");
-class SqlResult {
-    /**
-     * select 的数据量
-     */
-    length = 0;
-    /**
-     * 插入数据的自增id
-     */
-    insertId = null;
-    /**
-     * update 更新数据的影响条数
-     */
-    changedRows = null;
-    /**
-     * 插入或删除数据的影响条数
-     */
-    affectedRows = null;
-}
-exports.SqlResult = SqlResult;
-class SqlReturn {
-    error = null;
-    results = null;
-    fields = null;
-    list = null;
-}
-exports.SqlReturn = SqlReturn;
-class SqlReturns {
-    error = null;
-    srs = [];
-}
-exports.SqlReturns = SqlReturns;
-exports.GMysqlMgr = null;
-class MysqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get isValid() {
-        return !!this._pool;
-    }
-    constructor() {
-    }
-    async init() {
-        return new Promise(async (resolve) => {
-            if (this._pool
-                || !IServerConfig_1.GServerCfg.db.mysql
-                || !IServerConfig_1.GServerCfg.db.mysql.open) {
-                resolve(null);
-                return;
-            }
-            this._pool = mysql.createPool({
-                connectionLimit: 100,
-                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(IServerConfig_1.GServerCfg.db.mysql));
-            //这个的初始化位置不能变，必须位于cbs前，pool后
-            await DBCache_1.GDBCache.init();
-            resolve(null);
-            for (let i = 0; i < this._init_cbs.length; ++i) {
-                this._init_cbs[i]();
-            }
-        });
-    }
-    registerInitCb(cb) {
-        this._init_cbs.push(cb);
-    }
-    query(sqlStr, values, no_err_log) {
-        return new Promise((resolve, reject) => {
-            let sr = new SqlReturn();
-            if (!this._pool) {
-                //表示没有开通数据库，不用记录错误日志
-                sr.error = _error_1.EErrorCode.No_Mysql;
-                Log_1.GLog.error(sr.error);
-                resolve(sr);
-                return;
-            }
-            this._pool.getConnection((err, conn) => {
-                if (err) {
-                    sr.error = err;
-                    Log_1.GLog.error(err);
-                    resolve(sr);
-                    return;
-                }
-                conn.query(sqlStr, values, (error, results, fields) => {
-                    sr.error = error;
-                    sr.results = results;
-                    if (sr.results && sr.results.length > 0) {
-                        sr.list = [];
-                        for (let i = 0; i < sr.results.length; ++i) {
-                            sr.list.push(sr.results[i]);
-                        }
-                    }
-                    sr.fields = fields;
-                    conn.release();
-                    if (error && !no_err_log) {
-                        Log_1.GLog.error(error);
-                    }
-                    resolve(sr);
-                });
-            });
-        });
-    }
-    transaction(sqls) {
-        return new Promise((resolve, reject) => {
-            let srs = new SqlReturns();
-            this._pool.getConnection((err, conn) => {
-                if (err) {
-                    srs.error = err;
-                    Log_1.GLog.error(err);
-                    resolve(srs);
-                    return;
-                }
-                conn.beginTransaction((err) => {
-                    if (err) {
-                        srs.error = err;
-                        Log_1.GLog.error(err);
-                        conn.release();
-                        resolve(srs);
-                        return;
-                    }
-                    let funcs = [];
-                    for (let i = 0; i < sqls.length; ++i) {
-                        let sql = sqls[i];
-                        funcs.push(() => {
-                            conn.query(sql.sql, sql.values, (error, results, fields) => {
-                                srs.srs.push(results);
-                                if (error) {
-                                    return conn.rollback(() => {
-                                        Log_1.GLog.error(error);
-                                        srs.error = error;
-                                        conn.release();
-                                        resolve(srs);
-                                    });
-                                }
-                                else {
-                                    if (funcs.length > 0) {
-                                        let f = funcs.shift();
-                                        f();
-                                    }
-                                    else {
-                                        conn.commit((error) => {
-                                            if (error) {
-                                                return conn.rollback(() => {
-                                                    srs.error = error;
-                                                    Log_1.GLog.error(error);
-                                                    conn.release();
-                                                    resolve(srs);
-                                                });
-                                            }
-                                            else {
-                                                conn.release();
-                                                resolve(srs);
-                                            }
-                                        });
-                                    }
-                                }
-                            });
-                        });
-                    }
-                    let f = funcs.shift();
-                    f();
-                });
-            });
-        });
-    }
-}
-exports.GMysqlMgr = new MysqlManager();
-//该import必须放在GMysqlMgr实例化之后，否则version基类找不到GMysqlMgr
-const DBCache_1 = require("./Decorator/DBCache");
-const IServerConfig_1 = require("../Config/IServerConfig");
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GMysqlMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.MysqlConfig = void 0;
+const _error_1 = require("./../Config/_error_");
+const Log_1 = require("../Logic/Log");
+const mysql = require("mysql");
+class MysqlConfig {
+    open = false;
+    auto = false;
+    host = '127.0.0.1';
+    port = 3306;
+    user = 'root';
+    password = 'root';
+    database = 'gameall';
+    charset = 'utf8mb4';
+    supportBigNumbers = true;
+    connectionLimit = 100;
+}
+exports.MysqlConfig = MysqlConfig;
+class SqlResult {
+    /**
+     * select 的数据量
+     */
+    length = 0;
+    /**
+     * 插入数据的自增id
+     */
+    insertId = null;
+    /**
+     * update 更新数据的影响条数
+     */
+    changedRows = null;
+    /**
+     * 插入或删除数据的影响条数
+     */
+    affectedRows = null;
+}
+exports.SqlResult = SqlResult;
+class SqlReturn {
+    error = null;
+    results = null;
+    fields = null;
+    list = null;
+}
+exports.SqlReturn = SqlReturn;
+class SqlReturns {
+    error = null;
+    srs = [];
+}
+exports.SqlReturns = SqlReturns;
+exports.GMysqlMgr = null;
+class MysqlManager {
+    _init_cbs = [];
+    _pool = null;
+    get isValid() {
+        return !!this._pool;
+    }
+    constructor() {
+    }
+    async init(cfg) {
+        if (this._pool
+            || !cfg
+            || !cfg.open) {
+            return;
+        }
+        this._pool = mysql.createPool(cfg);
+        console.log("mysql config=" + JSON.stringify(cfg));
+        //这个的初始化位置不能变，必须位于cbs前，pool后
+        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);
+    }
+    query(sqlStr, values, no_err_log) {
+        return new Promise((resolve, reject) => {
+            let sr = new SqlReturn();
+            if (!this._pool) {
+                //表示没有开通数据库，不用记录错误日志
+                sr.error = _error_1.EErrorCode.No_Mysql;
+                Log_1.GLog.error(sr.error);
+                resolve(sr);
+                return;
+            }
+            this._pool.getConnection((err, conn) => {
+                if (err) {
+                    sr.error = err;
+                    Log_1.GLog.error(err);
+                    resolve(sr);
+                    return;
+                }
+                conn.query(sqlStr, values, (error, results, fields) => {
+                    sr.error = error;
+                    sr.results = results;
+                    if (sr.results && sr.results.length > 0) {
+                        sr.list = [];
+                        for (let i = 0; i < sr.results.length; ++i) {
+                            sr.list.push(sr.results[i]);
+                        }
+                    }
+                    sr.fields = fields;
+                    conn.release();
+                    if (error && !no_err_log) {
+                        Log_1.GLog.error(error);
+                    }
+                    resolve(sr);
+                });
+            });
+        });
+    }
+    transaction(sqls) {
+        return new Promise((resolve, reject) => {
+            let srs = new SqlReturns();
+            this._pool.getConnection((err, conn) => {
+                if (err) {
+                    srs.error = err;
+                    Log_1.GLog.error(err);
+                    resolve(srs);
+                    return;
+                }
+                conn.beginTransaction((err) => {
+                    if (err) {
+                        srs.error = err;
+                        Log_1.GLog.error(err);
+                        conn.release();
+                        resolve(srs);
+                        return;
+                    }
+                    let funcs = [];
+                    for (let i = 0; i < sqls.length; ++i) {
+                        let sql = sqls[i];
+                        funcs.push(() => {
+                            conn.query(sql.sql, sql.values, (error, results, fields) => {
+                                srs.srs.push(results);
+                                if (error) {
+                                    return conn.rollback(() => {
+                                        Log_1.GLog.error(error);
+                                        srs.error = error;
+                                        conn.release();
+                                        resolve(srs);
+                                    });
+                                }
+                                else {
+                                    if (funcs.length > 0) {
+                                        let f = funcs.shift();
+                                        f();
+                                    }
+                                    else {
+                                        conn.commit((error) => {
+                                            if (error) {
+                                                return conn.rollback(() => {
+                                                    srs.error = error;
+                                                    Log_1.GLog.error(error);
+                                                    conn.release();
+                                                    resolve(srs);
+                                                });
+                                            }
+                                            else {
+                                                conn.release();
+                                                resolve(srs);
+                                            }
+                                        });
+                                    }
+                                }
+                            });
+                        });
+                    }
+                    let f = funcs.shift();
+                    f();
+                });
+            });
+        });
+    }
+}
+exports.GMysqlMgr = new MysqlManager();
+//该import必须放在GMysqlMgr实例化之后，否则version基类找不到GMysqlMgr
+const DBCache_1 = require("./Decorator/DBCache");

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

@@ -1,53 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisManager = exports.GRedisMgr = void 0;
-const Log_1 = require("../Logic/Log");
-const redis = require("redis");
-exports.GRedisMgr = null;
-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));
-        });
-        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";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisManager = exports.GRedisMgr = exports.RedisConfig = void 0;
+const Log_1 = require("../Logic/Log");
+const redis = require("redis");
+class RedisConfig {
+    open = false;
+    host = "127.0.0.1";
+    port = 6379;
+    database = 0;
+    password = null;
+}
+exports.RedisConfig = RedisConfig;
+exports.GRedisMgr = null;
+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));
+        });
+        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,19 @@
-"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 = 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;

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,19 @@
-"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 = 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;

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

@@ -1,15 +1,15 @@
-"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: "需要管理员或创始人权限" }, err: "需要管理员或创始人权限" });
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.JsonAdminValidate = JsonAdminValidate;
+"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: "需要管理员或创始人权限" }, err: "需要管理员或创始人权限" });
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}
+exports.JsonAdminValidate = JsonAdminValidate;