cgserver 7.9.2113 → 7.11.2113

package/dist/Framework/Database/MysqlBaseService.js

@@ -1,282 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlBaseService = exports.BaseModel = void 0;
-const Property_1 = require("./Decorator/Property");
-const MysqlManager_1 = require("./MysqlManager");
-const Log_1 = require("../Logic/Log");
-const DBCache_1 = require("./Decorator/DBCache");
-const IServerConfig_1 = require("../Config/IServerConfig");
-class BaseModel {
-}
-exports.BaseModel = BaseModel;
-class MysqlBaseService {
-    _table = "";
-    get table() {
-        return this._table;
-    }
-    get version() {
-        let table = this._t_type.prototype[Property_1.TableProperty.key];
-        return table.version;
-    }
-    _inited = false;
-    get isInited() {
-        return this._inited;
-    }
-    _t_type = null;
-    constructor(type) {
-        this._t_type = type;
-        if (MysqlManager_1.GMysqlMgr.isValid) {
-            this._init();
-        }
-        else {
-            MysqlManager_1.GMysqlMgr.registerInitCb(this._init.bind(this));
-        }
-    }
-    async _init() {
-        if (this._inited) {
-            return;
-        }
-        this._inited = true;
-        let table = this._t_type.prototype[Property_1.TableProperty.key];
-        if (!table || !table.table) {
-            throw new Error("数据表的类必须要具有Table装饰器");
-        }
-        this._table = "`" + table.table + "`";
-        if (!IServerConfig_1.GServerCfg.db.mysql.auto) {
-            //未开启自动创建数据表
-            return;
-        }
-        let droped = await this._checkDropTable(table.version);
-        if (!droped) {
-            Log_1.GLog.info("table(" + this._table + ")无需升级...");
-            //既然版本号没变，就快速返回
-            return;
-        }
-        let primary_key = null;
-        let sql = "create table if not exists " + this._table + " (";
-        for (let key in table.items) {
-            let item = table.items[key];
-            sql += "`" + key + "`" + " " + item.type;
-            if (item.type == Property_1.EPropertyType.Varchar
-                || item.type == Property_1.EPropertyType.Char
-                || item.type == Property_1.EPropertyType.NVarchar) {
-                sql += "(" + item.type_len + ")";
-            }
-            if (item.is_notnull) {
-                sql += " not null";
-            }
-            if (item.default != undefined && !item.is_primary) {
-                sql += " default \'" + item.default + "\'";
-            }
-            if (item.auto_increment) {
-                sql += " auto_increment";
-            }
-            if (item.is_primary) {
-                primary_key = key;
-            }
-            sql += ",";
-        }
-        if (primary_key) {
-            sql += "primary key (`" + primary_key + "`),";
-            sql += "unique key `" + primary_key + "_unique` (`" + primary_key + "`)";
-        }
-        else {
-            //去掉最后一个逗号
-            sql = sql.substr(0, sql.length - 1);
-        }
-        sql += ")";
-        sql += " engine=" + table.engine;
-        if (table.auto_increment != null) {
-            sql += " auto_increment=" + table.auto_increment;
-        }
-        sql += " default charset=" + table.charset;
-        if (table.comment) {
-            sql += " comment=\'" + table.comment + "\';";
-        }
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql);
-        if (sr.error) {
-            Log_1.GLog.error(sr.error);
-            throw Error("table(" + this._table + ")创建失败...");
-        }
-        else {
-            DBCache_1.GDBCache.setVersion(this.table, table.version);
-            Log_1.GLog.info("table(" + this._table + ")初始化成功...");
-            await this._onReCreated();
-        }
-    }
-    async _onReCreated() {
-    }
-    async _onDroped() {
-    }
-    async _checkDropTable(cur_version) {
-        let local_version = DBCache_1.GDBCache.getVersion(this._table);
-        if (local_version == cur_version) {
-            return false;
-        }
-        let sql = "drop table if exists " + this._table;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql);
-        if (sr.error) {
-            Log_1.GLog.error(sr.error);
-            throw Error(sr.error);
-        }
-        else {
-            Log_1.GLog.info("table(" + this._table + ")删除成功...");
-            await this._onDroped();
-        }
-        return true;
-    }
-    /**
-     * 没有id的表不能使用该函数
-     * @param id
-     */
-    async getById(id) {
-        let tm = null;
-        let sr = await MysqlManager_1.GMysqlMgr.query("select * from " + this._table + " where id=? limit 1", [id]);
-        if (sr.error || sr.results.length <= 0) {
-            return tm;
-        }
-        tm = sr.results[0];
-        return tm;
-    }
-    async get(proterty, where, args) {
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        sql += " limit 1";
-        let tm = null;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (sr.list && sr.list.length > 0) {
-            tm = sr.list[0];
-        }
-        return tm;
-    }
-    async getTotal(where, args) {
-        let sql = "select ";
-        sql += "count(*) as num";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let total = 0;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (sr.list && sr.list.length > 0) {
-            total = sr.list[0].num || 0;
-        }
-        return total;
-    }
-    async gets(proterty, where, args) {
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let tms = null;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        tms = sr.list;
-        return tms;
-    }
-    async getCount(where, args) {
-        let sql = "select count(*) as num from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (sr.error || sr.results.length <= 0) {
-            return 0;
-        }
-        return sr.results[0]["num"] || 0;
-    }
-    async getRandoms(num, proterty, where, args) {
-        num = num || 5;
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        sql += " order by rand() limit ?";
-        args = args || [];
-        args.push(num);
-        let tms = null;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        tms = sr.list;
-        return tms;
-    }
-    async updateProperty(set, where, args, limit) {
-        let sql = "update " + this._table + " set ";
-        if (set) {
-            sql += set;
-        }
-        else {
-            sql += "?";
-        }
-        if (where) {
-            sql += " where " + where;
-        }
-        if (limit) {
-            sql += " limit " + limit;
-        }
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        return sr;
-    }
-    async update(model, where, args, limit) {
-        let sql = "update " + this._table + " set ?";
-        if (!where) {
-            where = " id=?";
-        }
-        sql += " where " + where;
-        let id = model["id"];
-        delete model["id"];
-        let u_m = JSON.parse(JSON.stringify(model));
-        if (!args) {
-            args = [u_m, id];
-        }
-        else {
-            args.unshift(u_m);
-        }
-        if (limit) {
-            sql += " limit " + limit;
-        }
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (id) {
-            model["id"] = id;
-        }
-        return sr;
-    }
-    async insert(model, ip) {
-        let table = model[Property_1.TableProperty.key];
-        let id_property = table.items["id"];
-        if (id_property) {
-            if (id_property.auto_increment) {
-                delete model["id"];
-            }
-        }
-        if (table.items["create_time"] && model["create_time"] <= 0) {
-            model["create_time"] = Date.now();
-        }
-        if (table.items["create_ip"] && ip) {
-            model["create_ip"] = ip;
-        }
-        let sql = "insert into " + this._table + " set ?";
-        //这步的做法是为了去掉model种的TableProperty.key(___table___)
-        model = JSON.parse(JSON.stringify(model));
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, [model]);
-        return sr;
-    }
-    async removeById(id) {
-        let sql = "delete from " + this._table + " where id=?";
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, [id]);
-        return sr;
-    }
-    async remove(where, args) {
-        let sql = "delete from " + this._table + " where " + where;
-        let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        return sr;
-    }
-}
-exports.MysqlBaseService = MysqlBaseService;
-//# sourceMappingURL=MysqlBaseService.js.map

package/dist/Framework/Database/MysqlBaseService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MysqlBaseService.js","sourceRoot":"","sources":["../../../src/Framework/Database/MysqlBaseService.ts"],"names":[],"mappings":";;;AAAA,mDAA6E;AAC7E,iDAA0C;AAC1C,sCAAmC;AACnC,iDAA8C;AAC9C,2DAAoD;AAEpD,MAAa,SAAS;CAGrB;AAHD,8BAGC;AACD,MAAa,gBAAgB;IAEf,MAAM,GAAQ,EAAE,CAAA;IAC1B,IAAI,KAAK;QAEL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IACD,IAAI,OAAO;QAEP,IAAI,KAAK,GAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,wBAAa,CAAC,GAAG,CAAC,CAAA;QACjE,OAAO,KAAK,CAAC,OAAO,CAAA;IACxB,CAAC;IACS,OAAO,GAAC,KAAK,CAAA;IACvB,IAAI,QAAQ;QAER,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACS,OAAO,GAAa,IAAI,CAAA;IAClC,YAAY,IAAiB;QAEzB,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;QACjB,IAAG,wBAAS,CAAC,OAAO,EACpB;YACI,IAAI,CAAC,KAAK,EAAE,CAAA;SACf;aAED;YACI,wBAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;SAClD;IACL,CAAC;IACS,KAAK,CAAC,KAAK;QAEjB,IAAG,IAAI,CAAC,OAAO,EACf;YACI,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;QACjB,IAAI,KAAK,GAAe,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,wBAAa,CAAC,GAAG,CAAC,CAAA;QACjE,IAAG,CAAC,KAAK,IAAE,CAAC,KAAK,CAAC,KAAK,EACvB;YACI,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACxC;QACD,IAAI,CAAC,MAAM,GAAC,GAAG,GAAC,KAAK,CAAC,KAAK,GAAC,GAAG,CAAA;QAC/B,IAAG,CAAC,0BAAU,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAC5B;YACI,YAAY;YACZ,OAAM;SACT;QACD,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvD,IAAG,CAAC,MAAM,EACV;YACI,UAAI,CAAC,IAAI,CAAC,QAAQ,GAAC,IAAI,CAAC,MAAM,GAAC,UAAU,CAAC,CAAA;YAC1C,eAAe;YACf,OAAM;SACT;QACD,IAAI,WAAW,GAAU,IAAI,CAAA;QAC7B,IAAI,GAAG,GAAG,6BAA6B,GAAC,IAAI,CAAC,MAAM,GAAC,IAAI,CAAA;QACxD,KAAI,IAAI,GAAG,IAAI,KAAK,CAAC,KAAK,EAC1B;YACI,IAAI,IAAI,GAAY,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACpC,GAAG,IAAE,GAAG,GAAC,GAAG,GAAC,GAAG,GAAC,GAAG,GAAC,IAAI,CAAC,IAAI,CAAA;YAC9B,IAAG,IAAI,CAAC,IAAI,IAAE,wBAAa,CAAC,OAAO;mBAC7B,IAAI,CAAC,IAAI,IAAE,wBAAa,CAAC,IAAI;mBAC7B,IAAI,CAAC,IAAI,IAAE,wBAAa,CAAC,QAAQ,EACvC;gBACI,GAAG,IAAE,GAAG,GAAC,IAAI,CAAC,QAAQ,GAAC,GAAG,CAAC;aAC9B;YACD,IAAG,IAAI,CAAC,UAAU,EAClB;gBACI,GAAG,IAAE,WAAW,CAAA;aACnB;YACD,IAAG,IAAI,CAAC,OAAO,IAAE,SAAS,IAAE,CAAC,IAAI,CAAC,UAAU,EAC5C;gBACI,GAAG,IAAG,aAAa,GAAC,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;aACxC;YACD,IAAG,IAAI,CAAC,cAAc,EACtB;gBACI,GAAG,IAAG,iBAAiB,CAAA;aAC1B;YACD,IAAG,IAAI,CAAC,UAAU,EAClB;gBACI,WAAW,GAAC,GAAG,CAAA;aAClB;YACD,GAAG,IAAE,GAAG,CAAA;SACX;QACD,IAAG,WAAW,EACd;YACI,GAAG,IAAE,gBAAgB,GAAC,WAAW,GAAC,KAAK,CAAA;YACvC,GAAG,IAAE,cAAc,GAAC,WAAW,GAAC,aAAa,GAAC,WAAW,GAAC,IAAI,CAAA;SACjE;aAED;YACI,UAAU;YACV,GAAG,GAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAC,GAAG,CAAC,MAAM,GAAC,CAAC,CAAC,CAAA;SACjC;QACD,GAAG,IAAE,GAAG,CAAA;QACR,GAAG,IAAE,UAAU,GAAC,KAAK,CAAC,MAAM,CAAA;QAC5B,IAAG,KAAK,CAAC,cAAc,IAAE,IAAI,EAC7B;YACI,GAAG,IAAE,kBAAkB,GAAC,KAAK,CAAC,cAAc,CAAA;SAC/C;QACD,GAAG,IAAE,mBAAmB,GAAC,KAAK,CAAC,OAAO,CAAA;QACtC,IAAG,KAAK,CAAC,OAAO,EAChB;YACI,GAAG,IAAE,aAAa,GAAC,KAAK,CAAC,OAAO,GAAC,KAAK,CAAA;SACzC;QACD,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnC,IAAG,EAAE,CAAC,KAAK,EACX;YACI,UAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;YACpB,MAAM,KAAK,CAAC,QAAQ,GAAC,IAAI,CAAC,MAAM,GAAC,UAAU,CAAC,CAAA;SAC/C;aAED;YACI,kBAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE9C,UAAI,CAAC,IAAI,CAAC,QAAQ,GAAC,IAAI,CAAC,MAAM,GAAC,WAAW,CAAC,CAAA;YAC3C,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;SAC5B;IACL,CAAC;IACS,KAAK,CAAC,YAAY;IAG5B,CAAC;IACS,KAAK,CAAC,SAAS;IAGzB,CAAC;IACS,KAAK,CAAC,eAAe,CAAC,WAAkB;QAE9C,IAAI,aAAa,GAAG,kBAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpD,IAAG,aAAa,IAAE,WAAW,EAC7B;YACI,OAAO,KAAK,CAAA;SACf;QACD,IAAI,GAAG,GAAC,uBAAuB,GAAC,IAAI,CAAC,MAAM,CAAA;QAC3C,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnC,IAAG,EAAE,CAAC,KAAK,EACX;YACI,UAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;YACpB,MAAM,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;SACxB;aAED;YACI,UAAI,CAAC,IAAI,CAAC,QAAQ,GAAC,IAAI,CAAC,MAAM,GAAC,UAAU,CAAC,CAAA;YAC1C,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;SACzB;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IACD;;;OAGG;IACH,KAAK,CAAC,OAAO,CAAC,EAAM;QAEhB,IAAI,EAAE,GAAG,IAAI,CAAA;QACb,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,gBAAgB,GAAC,IAAI,CAAC,MAAM,GAAC,qBAAqB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACrF,IAAG,EAAE,CAAC,KAAK,IAAE,EAAE,CAAC,OAAO,CAAC,MAAM,IAAE,CAAC,EACjC;YACI,OAAO,EAAE,CAAA;SACZ;QACD,EAAE,GAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAChB,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,QAAgB,EAAC,KAAa,EAAC,IAAgB;QAErD,IAAI,GAAG,GAAC,SAAS,CAAA;QACjB,GAAG,IAAE,QAAQ,IAAE,GAAG,CAAA;QAClB,GAAG,IAAE,QAAQ,GAAC,IAAI,CAAC,MAAM,CAAA;QACzB,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,GAAG,IAAE,UAAU,CAAA;QACf,IAAI,EAAE,GAAC,IAAI,CAAA;QACX,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACtC,IAAG,EAAE,CAAC,IAAI,IAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAC,CAAC,EAC5B;YACI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAClB;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAC,IAAgB;QAEzC,IAAI,GAAG,GAAC,SAAS,CAAA;QACjB,GAAG,IAAE,iBAAiB,CAAA;QACtB,GAAG,IAAE,QAAQ,GAAC,IAAI,CAAC,MAAM,CAAA;QACzB,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAI,KAAK,GAAC,CAAC,CAAA;QACX,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACtC,IAAG,EAAE,CAAC,IAAI,IAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAC,CAAC,EAC5B;YACI,KAAK,GAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAE,CAAC,CAAA;SAC1B;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,QAAgB,EAAC,KAAa,EAAC,IAAgB;QAEtD,IAAI,GAAG,GAAC,SAAS,CAAA;QACjB,GAAG,IAAE,QAAQ,IAAE,GAAG,CAAA;QAClB,GAAG,IAAE,QAAQ,GAAC,IAAI,CAAC,MAAM,CAAA;QACzB,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAI,GAAG,GAAY,IAAI,CAAA;QACvB,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACtC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;QACb,OAAO,GAAG,CAAA;IACd,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAC,IAAgB;QAEzC,IAAI,GAAG,GAAC,8BAA8B,GAAC,IAAI,CAAC,MAAM,CAAA;QAClD,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACtC,IAAG,EAAE,CAAC,KAAK,IAAE,EAAE,CAAC,OAAO,CAAC,MAAM,IAAE,CAAC,EACjC;YACI,OAAO,CAAC,CAAA;SACX;QACD,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAE,CAAC,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,GAAU,EAAC,QAAgB,EAAC,KAAa,EAAC,IAAgB;QAEvE,GAAG,GAAC,GAAG,IAAE,CAAC,CAAA;QACV,IAAI,GAAG,GAAC,SAAS,CAAA;QACjB,GAAG,IAAE,QAAQ,IAAE,GAAG,CAAA;QAClB,GAAG,IAAE,QAAQ,GAAC,IAAI,CAAC,MAAM,CAAA;QACzB,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,GAAG,IAAE,0BAA0B,CAAA;QAC/B,IAAI,GAAC,IAAI,IAAE,EAAE,CAAA;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACd,IAAI,GAAG,GAAY,IAAI,CAAA;QACvB,IAAI,EAAE,GAAC,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACtC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;QACb,OAAO,GAAG,CAAA;IACd,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,GAAU,EAAC,KAAa,EAAC,IAAgB,EAAC,KAAa;QAExE,IAAI,GAAG,GAAG,SAAS,GAAC,IAAI,CAAC,MAAM,GAAC,OAAO,CAAA;QACvC,IAAG,GAAG,EACN;YACI,GAAG,IAAE,GAAG,CAAA;SACX;aAED;YACI,GAAG,IAAE,GAAG,CAAA;SACX;QACD,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACxC,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,KAAO,EAAC,KAAa,EAAC,IAAgB,EAAC,KAAa;QAE7D,IAAI,GAAG,GAAG,SAAS,GAAC,IAAI,CAAC,MAAM,GAAC,QAAQ,CAAA;QACxC,IAAG,CAAC,KAAK,EACT;YACI,KAAK,GAAG,OAAO,CAAA;SAClB;QACD,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;QACpB,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAA;QAClB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3C,IAAG,CAAC,IAAI,EACR;YACI,IAAI,GAAC,CAAC,GAAG,EAAC,EAAE,CAAC,CAAA;SAChB;aAED;YACI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SACpB;QACD,IAAG,KAAK,EACR;YACI,GAAG,IAAE,SAAS,GAAC,KAAK,CAAA;SACvB;QACD,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACxC,IAAG,EAAE,EACL;YACI,KAAK,CAAC,IAAI,CAAC,GAAC,EAAE,CAAA;SACjB;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,KAAO,EAAC,EAAU;QAE3B,IAAI,KAAK,GAAiB,KAAK,CAAC,wBAAa,CAAC,GAAG,CAAC,CAAA;QAClD,IAAI,WAAW,GAAY,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5C,IAAG,WAAW,EACd;YACI,IAAG,WAAW,CAAC,cAAc,EAC7B;gBACI,OAAO,KAAK,CAAC,IAAI,CAAC,CAAA;aACrB;SACJ;QACD,IAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,IAAE,KAAK,CAAC,aAAa,CAAC,IAAE,CAAC,EACtD;YACI,KAAK,CAAC,aAAa,CAAC,GAAC,IAAI,CAAC,GAAG,EAAE,CAAA;SAClC;QACD,IAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAE,EAAE,EAC/B;YACI,KAAK,CAAC,WAAW,CAAC,GAAC,EAAE,CAAA;SACxB;QACD,IAAI,GAAG,GAAG,cAAc,GAAC,IAAI,CAAC,MAAM,GAAC,QAAQ,CAAA;QAC7C,iDAAiD;QACjD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QACzC,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3C,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,EAAM;QAEnB,IAAI,GAAG,GAAG,cAAc,GAAC,IAAI,CAAC,MAAM,GAAC,aAAa,CAAA;QAClD,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACxC,OAAO,EAAE,CAAA;IACb,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,KAAY,EAAC,IAAgB;QAEtC,IAAI,GAAG,GAAG,cAAc,GAAC,IAAI,CAAC,MAAM,GAAC,SAAS,GAAC,KAAK,CAAA;QACpD,IAAI,EAAE,GAAG,MAAM,wBAAS,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,CAAC,CAAA;QACxC,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA9UD,4CA8UC"}

package/dist/Framework/Database/MysqlManager.js

@@ -1,182 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GMysqlMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = void 0;
-const tslib_1 = require("tslib");
-const _error_1 = require("./../Config/_error_");
-const Log_1 = require("../Logic/Log");
-const mysql = tslib_1.__importStar(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");
-//# sourceMappingURL=MysqlManager.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"MysqlManager.js","sourceRoot":"","sources":["../../../src/Framework/Database/MysqlManager.ts"],"names":[],"mappings":"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"}