cgserver 10.0.0 → 10.0.2

package/dist/lib/Framework/AI/BehaviorAI.js

@@ -4,7 +4,7 @@ exports.BehaviorAI = void 0;
 const Core_1 = require("../Core/Core");
 const _ = require("underscore");
 const TriggerMgr_1 = require("./TriggerMgr");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 class BehaviorAI {
     _obj;
     _targetObjs;
@@ -27,13 +27,13 @@ class BehaviorAI {
             this._targetObjs = [];
         }
         this._triggers = [];
-        let code = global_1.global.gTriggerMgr.addConditionTriggerEvent(TriggerMgr_1.EConditionType.Die, this.onTriggerDie.bind(this), { code: this._obj.getCode() });
+        let code = TriggerMgr_1.gTriggerMgr.addConditionTriggerEvent(TriggerMgr_1.EConditionType.Die, this.onTriggerDie.bind(this), { code: this._obj.getCode() });
         this._triggers.push({ type: TriggerMgr_1.EConditionType.Die, code: code });
     }
     //启动行为树AI
     start() {
         if (!this._behavior_data) {
-            global_1.global.gLog.info("------------error------------this._behavior_data  can not be null!");
+            Log_1.gLog.info("------------error------------this._behavior_data  can not be null!");
             return;
         }
         this.goto(this._behavior_data.start);
@@ -41,7 +41,7 @@ class BehaviorAI {
     //结束行为树AI
     end() {
         for (let i = 0, length = this._triggers.length; i < length; ++i) {
-            global_1.global.gTriggerMgr.removeConditionTriggerEvent(this._triggers[i].type, this._triggers[i].code);
+            TriggerMgr_1.gTriggerMgr.removeConditionTriggerEvent(this._triggers[i].type, this._triggers[i].code);
         }
         this._triggers = [];
     }
@@ -145,7 +145,7 @@ class BehaviorAI {
             }
         }
         else {
-            global_1.global.gLog.info("---------warning--------_goto->behavior_name=" + behavior_name + ".animaiton not exist!");
+            Log_1.gLog.info("---------warning--------_goto->behavior_name=" + behavior_name + ".animaiton not exist!");
         }
     }
     //检查有没有已经达到的条件,又的话就执行他的相关事件
@@ -177,7 +177,7 @@ class BehaviorAI {
                         let targetInfo = this._getNearestTarget();
                         if (targetInfo) {
                             if (this._behavior_data.name == "sm")
-                                global_1.global.gLog.info("distance" + targetInfo.distance);
+                                Log_1.gLog.info("distance" + targetInfo.distance);
                             this._targetObj = targetInfo.target;
                         }
                     }

package/dist/lib/Framework/AI/TriggerMgr.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TriggerManager = exports.Trigger = exports.EConditionType = exports.ETriggerType = void 0;
+exports.gTriggerMgr = exports.TriggerManager = exports.Trigger = exports.EConditionType = exports.ETriggerType = void 0;
 const Core_1 = require("../Core/Core");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 var ETriggerType;
 (function (ETriggerType) {
     ETriggerType[ETriggerType["Region"] = 0] = "Region";
@@ -85,8 +85,8 @@ class TriggerManager {
         if (!pos || typeof region === "undefined") {
             return false;
         }
-        global_1.global.gLog.info("pos.x" + pos.x + "  pos.y=" + pos.y);
-        global_1.global.gLog.info("region.x" + region.x + "  region.y=" + region.y);
+        Log_1.gLog.info("pos.x" + pos.x + "  pos.y=" + pos.y);
+        Log_1.gLog.info("region.x" + region.x + "  region.y=" + region.y);
         if (pos.x < (region.x - region.width / 2)) {
             return false;
         }
@@ -144,7 +144,7 @@ class TriggerManager {
         if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerIn) {
             return;
         }
-        global_1.global.gLog.info("some one triggered in");
+        Log_1.gLog.info("some one triggered in");
         this._regionTriggers.aiObj.onTriggerIn(obj, trigger);
     }
     //从里面走出去的时候触发
@@ -152,7 +152,7 @@ class TriggerManager {
         if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerOut) {
             return;
         }
-        global_1.global.gLog.info("some one triggered out");
+        Log_1.gLog.info("some one triggered out");
         this._regionTriggers.aiObj.onTriggerOut(obj, trigger);
     }
     //////////////////////////////////////条件触发器//////////////////////////////////////////////////
@@ -198,3 +198,4 @@ class TriggerManager {
     }
 }
 exports.TriggerManager = TriggerManager;
+exports.gTriggerMgr = new TriggerManager();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FrameworkConfig = exports.WebServerConfig = exports.ESessionType = void 0;
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 const Config_1 = require("./Config");
 const DbConfig_1 = require("./DbConfig");
 var ESessionType;
@@ -186,7 +186,7 @@ class FrameworkConfig extends Config_1.Config {
     }
     init() {
         let ret = super.init();
-        global_1.global.gLog.init(this.log, this.console_level || 0);
+        Log_1.gLog.init(this.log, this.console_level || 0);
         return ret;
     }
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerConfig = void 0;
-const global_1 = require("../global");
+exports.gServerCfg = exports.IServerConfig = void 0;
 const FrameworkConfig_1 = require("./FrameworkConfig");
 class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     port = -1;
@@ -19,8 +18,9 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
         if (!ret) {
             return ret;
         }
-        global_1.global.gServerCfg = this;
+        exports.gServerCfg = this;
         return ret;
     }
 }
 exports.IServerConfig = IServerConfig;
+exports.gServerCfg = null;

package/dist/lib/Framework/Core/Core.js

@@ -8,9 +8,11 @@ const crypto = require("crypto");
 const CryptoJS = require("crypto-js");
 const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 /**
- * 常用的工具函数类
+ * 一些通用的常用函数，
+ * 比如格式化字符串，常用加解密，
+ * 时间计算，类型判断等
  */
 class core {
     /**
@@ -598,13 +600,13 @@ class core {
             if (core.isAsyncFunc(func)) {
                 if (thisArg) {
                     rs = await func.call(thisArg, ...params).catch((reason) => {
-                        global_1.global.gLog.error(reason);
+                        Log_1.gLog.error(reason);
                         rs = { errcode: { id: 1008611, des: "failed" } };
                     });
                 }
                 else {
                     rs = await func(...params).catch((reason) => {
-                        global_1.global.gLog.error(reason);
+                        Log_1.gLog.error(reason);
                         rs = { errcode: { id: 1008612, des: "failed" } };
                     });
                 }
@@ -620,7 +622,7 @@ class core {
             return rs;
         }
         catch (e) {
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error(e.stack);
             return { errcode: { id: 1008613, des: "failed" } };
         }
     }

package/dist/lib/Framework/Core/Timer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timer = void 0;
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 class Timer {
     _deadline = -1;
     get deadline() {
@@ -38,10 +38,10 @@ class Timer {
             }
             catch (e) {
                 if (e && e.stack) {
-                    global_1.global.gLog.error(e.stack);
+                    Log_1.gLog.error(e.stack);
                 }
                 else {
-                    global_1.global.gLog.error(e);
+                    Log_1.gLog.error(e);
                 }
             }
         }, timeout, ...args);
@@ -61,10 +61,10 @@ class Timer {
             }
             catch (e) {
                 if (e && e.stack) {
-                    global_1.global.gLog.error(e.stack);
+                    Log_1.gLog.error(e.stack);
                 }
                 else {
-                    global_1.global.gLog.error(e);
+                    Log_1.gLog.error(e);
                 }
             }
         }, timeout, ...args);

package/dist/lib/Framework/Database/Decorator/DBCache.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBCache = exports.VersionModel = void 0;
+exports.gDbCache = exports.DBCache = exports.VersionModel = void 0;
 const fs = require("fs");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 class VersionModel {
     table = "";
     version = 0;
@@ -20,14 +20,14 @@ class DBCache {
     _versions = {};
     _path = __dirname + "/tmp_table_version.json";
     async init() {
-        global_1.global.gLog.warn("mysql auto 功能建议只使用在开发环境中，因为会导致数据丢失，数据表重建");
+        Log_1.gLog.warn("mysql auto 功能建议只使用在开发环境中，因为会导致数据丢失，数据表重建");
         if (fs.existsSync(this._path)) {
             try {
                 let table = fs.readFileSync(this._path);
                 this._versions = JSON.parse(table.toString());
             }
             catch (e) {
-                global_1.global.gLog.info("error:" + this._path);
+                Log_1.gLog.info("error:" + this._path);
                 process.exit();
             }
         }
@@ -62,3 +62,4 @@ class DBCache {
     }
 }
 exports.DBCache = DBCache;
+exports.gDbCache = new DBCache();

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MSSqlManager = exports.MssqlReturn = exports.MSSqlConfig = void 0;
+exports.gMSSqlMgr = exports.MSSqlManager = exports.MssqlReturn = exports.MSSqlConfig = void 0;
 const mssql = require("mssql");
-const global_1 = require("../global");
+const DBCache_1 = require("./Decorator/DBCache");
 class MSSqlConfig {
     open = false;
     auto = false;
@@ -40,7 +40,7 @@ class MSSqlManager {
         this._pool = await mssql.connect(cfg);
         console.log("mssql config=" + JSON.stringify(cfg));
         //这个的初始化位置不能变，必须位于cbs前，pool后
-        await global_1.global.gDbCache.init();
+        await DBCache_1.gDbCache.init();
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
         }
@@ -50,3 +50,4 @@ class MSSqlManager {
     }
 }
 exports.MSSqlManager = MSSqlManager;
+exports.gMSSqlMgr = new MSSqlManager();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoBaseService = void 0;
-const global_1 = require("../../global");
+const MongoManager_1 = require("./MongoManager");
 class MongoBaseService {
     _table = "";
     get table() {
@@ -12,12 +12,12 @@ class MongoBaseService {
         return this._inited;
     }
     get mongoDb() {
-        return global_1.global.gMongoMgr.getMongo(this._dbname);
+        return MongoManager_1.gMongoMgr.getMongo(this._dbname);
     }
     _dbname = "";
     get dbname() {
         if (!this._dbname) {
-            this._dbname = global_1.global.gMongoMgr.defdbname;
+            this._dbname = MongoManager_1.gMongoMgr.defdbname;
         }
         return this._dbname;
     }

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoExt = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
+exports.gMongoMgr = exports.MongoExt = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
 const mongo = require("mongodb");
 const _error_1 = require("../../Config/_error_");
 const Core_1 = require("../../Core/Core");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 class MongoConfig {
     open = false;
     host = "127.0.0.1";
@@ -62,13 +62,13 @@ class MongoManager {
     }
     async addMongo(cfg) {
         if (this._dbs[cfg.database]) {
-            global_1.global.gLog.error("数据库配置得database不能相同!database=" + cfg.database);
+            Log_1.gLog.error("数据库配置得database不能相同!database=" + cfg.database);
             return false;
         }
         let mongoext = new MongoExt();
         let ret = await mongoext.init(cfg);
         if (!ret) {
-            global_1.global.gLog.error("数据库初始化失败!cfg=" + JSON.stringify(cfg));
+            Log_1.gLog.error("数据库初始化失败!cfg=" + JSON.stringify(cfg));
             return false;
         }
         this._dbs[cfg.database] = mongoext;
@@ -122,7 +122,7 @@ class MongoExt {
         }
         this._mongocfg = cfg;
         this._inited = true;
-        global_1.global.gLog.info("mongo config=" + JSON.stringify(this._mongocfg));
+        Log_1.gLog.info("mongo config=" + JSON.stringify(this._mongocfg));
         this._mongoClient = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
         await Core_1.core.safeCall(this._mongoClient.connect, this._mongoClient);
         this.onConnect();
@@ -140,7 +140,7 @@ class MongoExt {
     }
     onConnect() {
         this._mongo_init_succ = true;
-        global_1.global.gLog.info("mongo has connected!");
+        Log_1.gLog.info("mongo has connected!");
     }
     /**
      * 获取自增长id
@@ -162,7 +162,7 @@ class MongoExt {
             return 1;
         }
         catch (e) {
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error(e.stack);
         }
         return -2;
     }
@@ -201,8 +201,8 @@ class MongoExt {
             one = await col.findOne(where, { projection: property });
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, property, where });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, property, where });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.one = one;
@@ -231,8 +231,8 @@ class MongoExt {
             list = await cursor.toArray();
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, property, where, sort, skip, limit });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, property, where, sort, skip, limit });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;
@@ -251,8 +251,8 @@ class MongoExt {
             count = await col.countDocuments(where || {}, options);
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, where });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, where });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.count = count;
@@ -271,8 +271,8 @@ class MongoExt {
             del_rs = await col.deleteOne(where || {});
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, where });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, where });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         if (del_rs) {
@@ -293,8 +293,8 @@ class MongoExt {
             del_rs = await col.deleteMany(where || {});
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, where });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, where });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         if (del_rs) {
@@ -319,8 +319,8 @@ class MongoExt {
             in_rs = await col.insertOne(data);
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, data });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, data });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
@@ -338,8 +338,8 @@ class MongoExt {
             in_rs = await col.insertMany(data);
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, data });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, data });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
@@ -379,8 +379,8 @@ class MongoExt {
             up_rs = await col.updateOne(where, updatemodel, { upsert: upsert });
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, model, where, upsert });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, model, where, upsert });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
@@ -410,8 +410,8 @@ class MongoExt {
             up_rs = await col.updateMany(where, updateModel, { upsert: upsert });
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, model, where, upsert });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, model, where, upsert });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
@@ -429,8 +429,8 @@ class MongoExt {
             i_rs = await col.createIndex(index, options);
         }
         catch (e) {
-            global_1.global.gLog.error({ collection, index });
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error({ collection, index });
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = i_rs;
@@ -465,7 +465,7 @@ class MongoExt {
             }
         }
         catch (e) {
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;
@@ -498,7 +498,7 @@ class MongoExt {
         }
         catch (e) {
             await session.abortTransaction();
-            global_1.global.gLog.error(e.stack);
+            Log_1.gLog.error(e.stack);
         }
         finally {
             await session.endSession();
@@ -507,3 +507,4 @@ class MongoExt {
     }
 }
 exports.MongoExt = MongoExt;
+exports.gMongoMgr = new MongoManager();

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlBaseService = exports.BaseModel = void 0;
-const global_1 = require("../global");
+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;
@@ -22,11 +24,11 @@ class MysqlBaseService {
     _t_type = null;
     constructor(type) {
         this._t_type = type;
-        if (global_1.global.gMysqlMgr.isValid) {
+        if (MysqlManager_1.gMysqlMgr.isValid) {
             this._init();
         }
         else {
-            global_1.global.gMysqlMgr.registerInitCb(this._init.bind(this));
+            MysqlManager_1.gMysqlMgr.registerInitCb(this._init.bind(this));
         }
     }
     async _init() {
@@ -39,13 +41,13 @@ class MysqlBaseService {
             throw new Error("数据表的类必须要具有Table装饰器");
         }
         this._table = "`" + table.table + "`";
-        if (!global_1.global.gMysqlMgr.cfg.auto) {
+        if (!MysqlManager_1.gMysqlMgr.cfg.auto) {
             //未开启自动创建数据表
             return;
         }
         let droped = await this._checkDropTable(table.version);
         if (!droped) {
-            global_1.global.gLog.info("table(" + this._table + ")无需升级...");
+            Log_1.gLog.info("table(" + this._table + ")无需升级...");
             //既然版本号没变，就快速返回
             return;
         }
@@ -90,14 +92,14 @@ class MysqlBaseService {
         if (table.comment) {
             sql += " comment=\'" + table.comment + "\';";
         }
-        let sr = await global_1.global.gMysqlMgr.query(sql);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
         if (sr.error) {
-            global_1.global.gLog.error(sr.error);
+            Log_1.gLog.error(sr.error);
             throw Error("table(" + this._table + ")创建失败...");
         }
         else {
-            global_1.global.gDbCache.setVersion(this.table, table.version);
-            global_1.global.gLog.info("table(" + this._table + ")初始化成功...");
+            DBCache_1.gDbCache.setVersion(this.table, table.version);
+            Log_1.gLog.info("table(" + this._table + ")初始化成功...");
             await this._onReCreated();
         }
     }
@@ -106,18 +108,18 @@ class MysqlBaseService {
     async _onDroped() {
     }
     async _checkDropTable(cur_version) {
-        let local_version = global_1.global.gDbCache.getVersion(this._table);
+        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 global_1.global.gMysqlMgr.query(sql);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
         if (sr.error) {
-            global_1.global.gLog.error(sr.error);
+            Log_1.gLog.error(sr.error);
             throw Error(sr.error);
         }
         else {
-            global_1.global.gLog.info("table(" + this._table + ")删除成功...");
+            Log_1.gLog.info("table(" + this._table + ")删除成功...");
             await this._onDroped();
         }
         return true;
@@ -128,7 +130,7 @@ class MysqlBaseService {
      */
     async getById(id) {
         let tm = null;
-        let sr = await global_1.global.gMysqlMgr.query("select * from " + this._table + " where id=? limit 1", [id]);
+        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;
         }
@@ -144,7 +146,7 @@ class MysqlBaseService {
         }
         sql += " limit 1";
         let tm = null;
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         if (sr.queryResult && sr.queryResult.length > 0) {
             tm = sr.queryResult[0];
         }
@@ -158,7 +160,7 @@ class MysqlBaseService {
             sql += " where " + where;
         }
         let total = 0;
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         if (sr.queryResult && sr.queryResult.length > 0) {
             total = sr.queryResult[0].num || 0;
         }
@@ -172,7 +174,7 @@ class MysqlBaseService {
             sql += " where " + where;
         }
         let tms = null;
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         tms = sr.queryResult;
         return tms;
     }
@@ -181,7 +183,7 @@ class MysqlBaseService {
         if (where) {
             sql += " where " + where;
         }
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         if (sr.error || sr.queryResult.length <= 0) {
             return 0;
         }
@@ -199,7 +201,7 @@ class MysqlBaseService {
         args = args || [];
         args.push(num);
         let tms = null;
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         tms = sr.queryResult;
         return tms;
     }
@@ -217,7 +219,7 @@ class MysqlBaseService {
         if (limit) {
             sql += " limit " + limit;
         }
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         return sr;
     }
     async update(model, where, args, limit) {
@@ -238,7 +240,7 @@ class MysqlBaseService {
         if (limit) {
             sql += " limit " + limit;
         }
-        let sr = await global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         if (id) {
             model["id"] = id;
         }
@@ -261,17 +263,17 @@ class MysqlBaseService {
         let sql = "insert into " + this._table + " set ?";
         //这步的做法是为了去掉model种的TableProperty.key(___table___)
         model = JSON.parse(JSON.stringify(model));
-        let sr = await global_1.global.gMysqlMgr.query(sql, [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 global_1.global.gMysqlMgr.query(sql, [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 global_1.global.gMysqlMgr.query(sql, args);
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
         return sr;
     }
 }