cgserver 9.2.7 → 10.0.1

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

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

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GMysqlMgr = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
+exports.MysqlManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
 const _error_1 = require("./../Config/_error_");
-const Log_1 = require("../Logic/Log");
 const mysql2 = require("mysql2/promise");
+const global_1 = require("../global");
 class MysqlConfig {
     open = false;
     auto = false;
@@ -27,7 +27,6 @@ class SqlReturns {
     srs = [];
 }
 exports.SqlReturns = SqlReturns;
-exports.GMysqlMgr = null;
 class MysqlManager {
     _init_cbs = [];
     _pool = null;
@@ -51,7 +50,7 @@ class MysqlManager {
         console.log("mysql config=" + JSON.stringify(cfg));
         //这个的初始化位置不能变，必须位于cbs前，pool后
         if (cfg.auto) {
-            await DBCache_1.GDBCache.init();
+            await global_1.global.gDbCache.init();
         }
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
@@ -65,7 +64,7 @@ class MysqlManager {
         if (!this._pool) {
             //表示没有开通数据库，不用记录错误日志
             sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.GLog.error(sr.error);
+            global_1.global.gLog.error(sr.error);
             return sr;
         }
         try {
@@ -75,7 +74,7 @@ class MysqlManager {
         }
         catch (error) {
             sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.GLog.error(sr.error);
+            global_1.global.gLog.error(sr.error);
             return sr;
         }
         return sr;
@@ -97,10 +96,8 @@ class MysqlManager {
         }
         catch (err) {
             srs.error = err;
-            Log_1.GLog.error(err);
+            global_1.global.gLog.error(err);
         }
     }
 }
-exports.GMysqlMgr = new MysqlManager();
-//该import必须放在GMysqlMgr实例化之后，否则version基类找不到GMysqlMgr
-const DBCache_1 = require("./Decorator/DBCache");
+exports.MysqlManager = MysqlManager;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisManager = exports.GRedisMgr = exports.RedisConfig = void 0;
-const Log_1 = require("../Logic/Log");
+exports.RedisManager = exports.RedisConfig = void 0;
 const redis = require("redis");
+const global_1 = require("../global");
 class RedisConfig {
     open = false;
     host = "127.0.0.1";
@@ -11,7 +11,6 @@ class RedisConfig {
     password = null;
 }
 exports.RedisConfig = RedisConfig;
-exports.GRedisMgr = null;
 class RedisManager {
     _redis = null;
     get redis() {
@@ -29,7 +28,7 @@ class RedisManager {
                 return;
             }
             this._redisCfg = redisCfg;
-            Log_1.GLog.info("begin connect redis=" + JSON.stringify(redisCfg));
+            global_1.global.gLog.info("begin connect redis=" + JSON.stringify(redisCfg));
             this._redis = redis.createClient(redisCfg);
             this._redis.on("connect", () => {
                 this.onConnect();
@@ -47,15 +46,14 @@ class RedisManager {
         return ret;
     }
     onConnect() {
-        Log_1.GLog.info("redis has connected!");
+        global_1.global.gLog.info("redis has connected!");
     }
     onEnd() {
         this._redis = null;
         this.init(this._redisCfg); //重连
     }
     onError(err) {
-        Log_1.GLog.info("Error connected=" + this._redis + ": " + err);
+        global_1.global.gLog.info("Error connected=" + this._redis + ": " + err);
     }
 }
 exports.RedisManager = RedisManager;
-exports.GRedisMgr = (new RedisManager());

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncCall2 = exports.SyncCall = void 0;
-const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+const global_1 = require("../global");
 /**
  * 异步函数变为同步函数，当前进程有效
  * @param target
@@ -12,7 +12,7 @@ function SyncCall(target, propertyName, descriptor) {
     let method = descriptor.value;
     descriptor.value = function () {
         let self = this;
-        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+        let ret = global_1.global.gSyncQueueTool.add(method.name, async () => {
             return await method.apply(self, arguments);
         });
         return ret;
@@ -32,7 +32,7 @@ function SyncCall2(param_index) {
             if (param_index != undefined && param_index < arguments.length) {
                 key = propertyName + "_" + arguments[param_index];
             }
-            let ret = SyncQueueTool_1.GSyncQueueTool.add(key, async () => {
+            let ret = global_1.global.gSyncQueueTool.add(key, async () => {
                 return await method.apply(self, arguments);
             });
             return ret;

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncCallServer2 = exports.SyncCallServer = void 0;
 const Core_1 = require("../Core/Core");
-const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
-const MongoCacheService_1 = require("../Service/MongoCacheService");
+const global_1 = require("../global");
 /**
  * 异步函数变为同步函数
  * 服务器间的异步，效率低
@@ -15,24 +14,24 @@ function SyncCallServer(target, propertyName, descriptor) {
     descriptor.value = async () => {
         let key = "sync_" + method.name;
         let func = async () => {
-            let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            let item = await global_1.global.gMongoCacheSer.getData(key);
             let ret = null;
             while (item) {
                 await Core_1.core.sleep(200);
-                item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                item = await global_1.global.gMongoCacheSer.getData(key);
             }
             //10秒后过期，避免卡死
-            let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+            let mcm = await global_1.global.gMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
             if (!mcm) {
                 await func();
             }
             return;
         };
         await func();
-        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+        let ret = global_1.global.gSyncQueueTool.add(method.name, async () => {
             return await method.apply(self, arguments);
         });
-        await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+        await global_1.global.gMongoCacheSer.deleteOne({ key });
         return ret;
     };
 }
@@ -52,24 +51,24 @@ let SyncCallServer2 = function (params_index) {
                 key = key + "_" + arguments[params_index];
             }
             let func = async () => {
-                let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                let item = await global_1.global.gMongoCacheSer.getData(key);
                 let ret = null;
                 while (item) {
                     await Core_1.core.sleep(200);
-                    item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                    item = await global_1.global.gMongoCacheSer.getData(key);
                 }
                 //10秒后过期，避免卡死
-                let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+                let mcm = await global_1.global.gMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
                 if (!mcm) {
                     await func();
                 }
                 return;
             };
             await func();
-            let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            let ret = global_1.global.gSyncQueueTool.add(method.name, async () => {
                 return await method.apply(self, arguments);
             });
-            await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+            await global_1.global.gMongoCacheSer.deleteOne({ key });
             return ret;
         };
     };

package/dist/lib/Framework/Logic/CacheTool.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GCacheTool = void 0;
+exports.CacheTool = void 0;
 const _ = require("underscore");
-exports.GCacheTool = null;
 class CacheItem {
     key = "";
     value = null;
@@ -70,4 +69,4 @@ class CacheTool {
         delete this._items[key];
     }
 }
-exports.GCacheTool = new CacheTool();
+exports.CacheTool = CacheTool;

package/dist/lib/Framework/Logic/EventTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GEventTool = void 0;
+exports.EventTool = void 0;
 const EventEmitter = require("events");
 class EventTool {
     _event_emitter = new EventEmitter();
@@ -24,4 +24,4 @@ class EventTool {
         return count;
     }
 }
-exports.GEventTool = new EventTool();
+exports.EventTool = EventTool;

package/dist/lib/Framework/Logic/HttpTool.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GHttpTool = void 0;
+exports.HttpTool = void 0;
 const request = require("request");
 const qs = require("querystring");
-const Log_1 = require("./Log");
 const Core_1 = require("../Core/Core");
-exports.GHttpTool = null;
+const global_1 = require("../global");
 class HttpTool {
     _debug = false;
     get debug() {
@@ -24,14 +23,14 @@ class HttpTool {
             options = options_url;
         }
         if (this._debug) {
-            Log_1.GLog.info("prepare get:" + options.url);
+            global_1.global.gLog.info("prepare get:" + options.url);
         }
         return new Promise((resolve, reject) => {
             request.get(options, (error, response, body) => {
                 let originbody = body;
                 if (error) {
-                    Log_1.GLog.error("get:" + options.url);
-                    Log_1.GLog.error(error);
+                    global_1.global.gLog.error("get:" + options.url);
+                    global_1.global.gLog.error(error);
                 }
                 try {
                     if (Core_1.core.isString(body)) {
@@ -47,7 +46,7 @@ class HttpTool {
                     }
                 }
                 if (this._debug) {
-                    Log_1.GLog.info({
+                    global_1.global.gLog.info({
                         dttime: (Date.now() - time) + "ms",
                         url: options.url,
                         originbody: originbody
@@ -67,14 +66,14 @@ class HttpTool {
             options = options_url;
         }
         if (this._debug) {
-            Log_1.GLog.info("prepare post:" + options.url);
+            global_1.global.gLog.info("prepare post:" + options.url);
         }
         return new Promise((resolve, reject) => {
             request.post(options, (error, response, body) => {
                 let originbody = body;
                 if (error) {
-                    Log_1.GLog.error("post:" + options.url);
-                    Log_1.GLog.error(error);
+                    global_1.global.gLog.error("post:" + options.url);
+                    global_1.global.gLog.error(error);
                 }
                 try {
                     if (Core_1.core.isString(body)) {
@@ -90,7 +89,7 @@ class HttpTool {
                     }
                 }
                 if (this._debug) {
-                    Log_1.GLog.info({
+                    global_1.global.gLog.info({
                         dttime: (Date.now() - time) + "ms",
                         url: options.url,
                         originbody: originbody
@@ -101,4 +100,4 @@ class HttpTool {
         });
     }
 }
-exports.GHttpTool = new HttpTool();
+exports.HttpTool = HttpTool;

package/dist/lib/Framework/Logic/Log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLog = void 0;
+exports.Log = void 0;
 const colors = require("colors");
 const log4js = require("log4js");
 /**
@@ -18,7 +18,6 @@ colors.setTheme({
     debug: 'magenta',
     error: 'red'
 });
-exports.GLog = null;
 class Log {
     //default log
     _logger = null;
@@ -138,4 +137,4 @@ class Log {
         }
     }
 }
-exports.GLog = new Log();
+exports.Log = Log;

package/dist/lib/Framework/Logic/SyncQueueTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GSyncQueueTool = void 0;
+exports.SyncQueueTool = void 0;
 const Core_1 = require("../Core/Core");
 class SyncQueueItem {
     key = "";
@@ -40,4 +40,4 @@ class SyncQueueTool {
         return error;
     }
 }
-exports.GSyncQueueTool = new SyncQueueTool();
+exports.SyncQueueTool = SyncQueueTool;

package/dist/lib/Framework/Service/MongoAccountService.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoAccountService = exports.MongoAccountModel = void 0;
 const _error_1 = require("../Config/_error_");
-const MongoBaseService_1 = require("../Database/MongoBaseService");
-const MongoManager_1 = require("../Database/MongoManager");
-const CacheTool_1 = require("../Logic/CacheTool");
-const QQTool_1 = require("../ThirdParty/QQTool");
-const WechatTool_1 = require("../ThirdParty/WechatTool");
+const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
+const MongoManager_1 = require("../Database/Mongo/MongoManager");
+const global_1 = require("../global");
 const ini_1 = require("./ini");
 const MongoUserService_1 = require("./MongoUserService");
 class MongoAccountModel extends MongoManager_1.MongoBaseModel {
@@ -149,7 +147,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             return rs;
         }
         if (force_user) {
-            let user = await MongoUserService_1.GUserSer.getByAccountId(account.id);
+            let user = await MongoUserService_1.GMongoUserSer.getByAccountId(account.id);
             if (!user) {
                 switch (from) {
                     case ini_1.EAccountFrom.QQ:
@@ -159,7 +157,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                         {
                             if (!extra_info) {
                                 if (from == ini_1.EAccountFrom.QQ) {
-                                    let userInfo = await QQTool_1.GQQTool.getUserInfo(access_token, openid);
+                                    let userInfo = await global_1.global.gQQTool.getUserInfo(access_token, openid);
                                     if (!userInfo) {
                                         rs.errcode = _error_1.EErrorCode.Server_Error;
                                         return rs;
@@ -172,7 +170,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                                         };
                                 }
                                 else if (from == ini_1.EAccountFrom.WeChat) {
-                                    let userInfo = await WechatTool_1.GWechatTool.getUserInfo(access_token, openid);
+                                    let userInfo = await global_1.global.gWechatOATool.getUserInfo(access_token, openid);
                                     if (userInfo.errcode) {
                                         rs.errcode = _error_1.EErrorCode.Server_Error;
                                         return rs;
@@ -193,7 +191,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                                         };
                                 }
                             }
-                            let user = await MongoUserService_1.GUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                            let user = await MongoUserService_1.GMongoUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
                             if (!user) {
                                 this.deleteOne({ id: account.id });
                                 rs.errcode = _error_1.EErrorCode.User_Create_Failed;
@@ -206,10 +204,10 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                         {
                             let user = null;
                             if (extra_info) {
-                                user = await MongoUserService_1.GUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                                user = await MongoUserService_1.GMongoUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
                             }
                             else {
-                                user = await MongoUserService_1.GUserSer.add(account.id, null, null, null);
+                                user = await MongoUserService_1.GMongoUserSer.add(account.id, null, null, null);
                             }
                             if (!user) {
                                 this.deleteOne({ id: account.id });
@@ -245,7 +243,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         }
         else if (from == ini_1.EAccountFrom.QuickPhone) {
             let key = "phone_code_" + unionid;
-            let code = CacheTool_1.GCacheTool.get(key);
+            let code = global_1.global.gCacheTool.get(key);
             if (!code || code != openid) {
                 rs.errcode = _error_1.EErrorCode.Wrong_Phone_Code;
                 return rs;
@@ -253,19 +251,19 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             rs.account = await this.getByPhone(unionid);
         }
         else if (from == ini_1.EAccountFrom.Phone) {
-            rs.account = await this.get(null, { phone: unionid, password: openid });
+            rs.account = await this.get({ phone: unionid, password: openid });
             if (!rs.account) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
         }
         else if (from == ini_1.EAccountFrom.Email) {
-            rs.account = await this.get(null, { email: unionid, password: openid });
+            rs.account = await this.get({ email: unionid, password: openid });
             if (!rs.account) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
         }
         else if (from == ini_1.EAccountFrom.Name || from == ini_1.EAccountFrom.Guest) {
-            rs.account = await this.get(null, { name: unionid, password: openid });
+            rs.account = await this.get({ name: unionid, password: openid });
             if (!rs.account && from == ini_1.EAccountFrom.Name) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
@@ -280,7 +278,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             case ini_1.EAccountFrom.Phone:
                 {
                     am.phone = key;
-                    let temp = await this.get({ id: 1 }, { phone: key });
+                    let temp = await this.get({ phone: key }, { id: 1 });
                     if (temp) {
                         rs.errcode = _error_1.EErrorCode.Account_Phone_Exist;
                         return rs;
@@ -290,7 +288,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             case ini_1.EAccountFrom.Email:
                 {
                     am.email = key;
-                    let temp = await this.get({ id: 1 }, { email: key });
+                    let temp = await this.get({ email: key }, { id: 1 });
                     if (temp) {
                         rs.errcode = _error_1.EErrorCode.Account_Email_Exist;
                         return rs;
@@ -300,7 +298,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             case ini_1.EAccountFrom.Name:
                 {
                     am.name = key;
-                    let temp = await this.get({ id: 1 }, { name: key });
+                    let temp = await this.get({ name: key }, { id: 1 });
                     if (temp) {
                         rs.errcode = _error_1.EErrorCode.Account_Name_Exist;
                         return rs;
@@ -324,7 +322,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             rs.errcode = _error_1.EErrorCode.Mysql_Error;
             return rs;
         }
-        let user = await MongoUserService_1.GUserSer.add(am.id, extra.nickname, extra.sex, extra.logo);
+        let user = await MongoUserService_1.GMongoUserSer.add(am.id, extra.nickname, extra.sex, extra.logo);
         if (!user) {
             this.deleteOne({ id: am.id });
             rs.errcode = _error_1.EErrorCode.User_Create_Failed;