cgserver 12.0.8 → 12.2.0

package/dist/lib/Framework/Database/Mongo/MongoServiceManager.js

@@ -1,52 +1,52 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMongoServiceMgr = exports.MongoServiceManager = void 0;
-const index_export_1 = require("../../index_export_");
-const MongoManager_1 = require("./MongoManager");
-class MongoServiceManager {
-    _services = {};
-    addService(service) {
-        let dbname = service.dbname;
-        dbname = this._tryDef(dbname);
-        let table = service.table;
-        if (!this._services[dbname][table]) {
-            this._services[dbname][table] = service;
-        }
-        return this._services[dbname][table];
-    }
-    _tryDef(dbname) {
-        if (!dbname) {
-            dbname = MongoManager_1.gMongoMgr.defdbname;
-            if (dbname && !this._services[dbname]) {
-                this._services[dbname] = this._services[""];
-                delete this._services[""];
-            }
-        }
-        else {
-            if (dbname == MongoManager_1.gMongoMgr.defdbname && !this._services[dbname]) {
-                this._services[dbname] = this._services[""];
-                delete this._services[""];
-            }
-        }
-        if (!this._services[dbname]) {
-            this._services[dbname] = {};
-        }
-        return dbname;
-    }
-    getService(table, dbname = "") {
-        dbname = this._tryDef(dbname);
-        let tablename = "";
-        if (index_export_1.core.isString(table)) {
-            tablename = table;
-        }
-        else {
-            tablename = table.table;
-        }
-        if (!this._services[dbname][tablename]) {
-            return null;
-        }
-        return this._services[dbname][tablename];
-    }
-}
-exports.MongoServiceManager = MongoServiceManager;
-exports.gMongoServiceMgr = new MongoServiceManager();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gMongoServiceMgr = exports.MongoServiceManager = void 0;
+const index_export_1 = require("../../index_export_");
+const MongoManager_1 = require("./MongoManager");
+class MongoServiceManager {
+    _services = {};
+    addService(service) {
+        let dbname = service.dbname;
+        dbname = this._tryDef(dbname);
+        let table = service.table;
+        if (!this._services[dbname][table]) {
+            this._services[dbname][table] = service;
+        }
+        return this._services[dbname][table];
+    }
+    _tryDef(dbname) {
+        if (!dbname) {
+            dbname = MongoManager_1.gMongoMgr.defdbname;
+            if (dbname && !this._services[dbname]) {
+                this._services[dbname] = this._services[""];
+                delete this._services[""];
+            }
+        }
+        else {
+            if (dbname == MongoManager_1.gMongoMgr.defdbname && !this._services[dbname]) {
+                this._services[dbname] = this._services[""];
+                delete this._services[""];
+            }
+        }
+        if (!this._services[dbname]) {
+            this._services[dbname] = {};
+        }
+        return dbname;
+    }
+    getService(table, dbname = "") {
+        dbname = this._tryDef(dbname);
+        let tablename = "";
+        if (index_export_1.core.isString(table)) {
+            tablename = table;
+        }
+        else {
+            tablename = table.table;
+        }
+        if (!this._services[dbname][tablename]) {
+            return null;
+        }
+        return this._services[dbname][tablename];
+    }
+}
+exports.MongoServiceManager = MongoServiceManager;
+exports.gMongoServiceMgr = new MongoServiceManager();

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

@@ -1,280 +1,280 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlBaseService = exports.BaseModel = void 0;
-const Log_1 = require("../../Logic/Log");
-const DBCache_1 = require("../Decorator/DBCache");
-const Property_1 = require("../Decorator/Property");
-const MysqlManager_1 = require("./MysqlManager");
-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 (!MysqlManager_1.gMysqlMgr.cfg.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.queryResult.length <= 0) {
-            return tm;
-        }
-        tm = sr.result[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.queryResult && sr.queryResult.length > 0) {
-            tm = sr.queryResult[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.queryResult && sr.queryResult.length > 0) {
-            total = sr.queryResult[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.queryResult;
-        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.queryResult.length <= 0) {
-            return 0;
-        }
-        return sr.result[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.queryResult;
-        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;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlBaseService = exports.BaseModel = void 0;
+const Log_1 = require("../../Logic/Log");
+const DBCache_1 = require("../Decorator/DBCache");
+const Property_1 = require("../Decorator/Property");
+const MysqlManager_1 = require("./MysqlManager");
+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 (!MysqlManager_1.gMysqlMgr.cfg.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.queryResult.length <= 0) {
+            return tm;
+        }
+        tm = sr.result[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.queryResult && sr.queryResult.length > 0) {
+            tm = sr.queryResult[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.queryResult && sr.queryResult.length > 0) {
+            total = sr.queryResult[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.queryResult;
+        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.queryResult.length <= 0) {
+            return 0;
+        }
+        return sr.result[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.queryResult;
+        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;