cgserver 10.0.1 → 10.0.3

package/dist/lib/Framework/ThirdParty/QQTool.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QQTool = exports.QQUserInfo = void 0;
+exports.gQQTool = exports.QQTool = exports.QQUserInfo = void 0;
 const _ = require("underscore");
 const URLEncode = require("urlencode");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
+const HttpTool_1 = require("../Logic/HttpTool");
+const IServerConfig_1 = require("../Config/IServerConfig");
 class QQUserInfo {
     ret = 0;
     msg = "";
@@ -41,14 +43,14 @@ class QQTool {
                     如果传入“mobile”，则展示为mobile端下的样式。
      */
     getAuthCodeUrl(scope, display) {
-        if (!global_1.global.gServerCfg.qq) {
-            global_1.global.gLog.error("qq config not found!");
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
             return null;
         }
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(global_1.global.gServerCfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.qq.redirect_uri);
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = global_1.global.gServerCfg.qq.app_id;
+        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
         //必须	授权类型，此值固定为“code”。
         let response_type = "code";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
@@ -67,31 +69,31 @@ class QQTool {
         if (!auth_code) {
             return null;
         }
-        if (!global_1.global.gServerCfg.qq) {
-            global_1.global.gLog.error("qq config not found!");
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
             return null;
         }
         //必须	授权类型，在本步骤中，此值为“authorization_code”。
         let grant_type = "authorization_code";
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = global_1.global.gServerCfg.qq.app_id;
+        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
         //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = global_1.global.gServerCfg.qq.app_key;
+        let client_secret = IServerConfig_1.gServerCfg.qq.app_key;
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(global_1.global.gServerCfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.qq.redirect_uri);
         let url = "https://graph.qq.com/oauth2.0/token?code=" + auth_code + "&grant_type=" + grant_type + "&client_id=" + client_id + "&client_secret=" + client_secret + "&redirect_uri=" + redirect_uri;
-        let rs = await global_1.global.gHttpTool.get(url);
+        let rs = await HttpTool_1.gHttpTool.get(url);
         if (rs.body && rs.body.access_token) {
             return rs.body.access_token;
         }
         else {
-            global_1.global.gLog.error(rs.body);
+            Log_1.gLog.error(rs.body);
         }
         return null;
     }
     async getOpenId(access_token) {
         let url = "https://graph.qq.com/oauth2.0/me?access_token=" + access_token;
-        let rs = await global_1.global.gHttpTool.get(url);
+        let rs = await HttpTool_1.gHttpTool.get(url);
         let body = rs.response ? rs.response.body : null;
         if (body) {
             body = body.replace("callback( ", "");
@@ -101,7 +103,7 @@ class QQTool {
             }
             catch (e) { }
             if (!body.openid) {
-                global_1.global.gLog.error(rs.response.body);
+                Log_1.gLog.error(rs.response.body);
             }
             return body.openid;
         }
@@ -111,12 +113,12 @@ class QQTool {
         if (!access_token || !openid) {
             return null;
         }
-        if (!global_1.global.gServerCfg.qq) {
-            global_1.global.gLog.error("qq config not found!");
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
             return null;
         }
-        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + global_1.global.gServerCfg.qq.app_id + "&openid=" + openid;
-        let rs = await global_1.global.gHttpTool.get(url);
+        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + IServerConfig_1.gServerCfg.qq.app_id + "&openid=" + openid;
+        let rs = await HttpTool_1.gHttpTool.get(url);
         if (rs.body) {
             return rs.body;
         }
@@ -124,3 +126,4 @@ class QQTool {
     }
 }
 exports.QQTool = QQTool;
+exports.gQQTool = new QQTool();

package/dist/lib/Framework/ThirdParty/QiniuTool.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QiniuTool = void 0;
+exports.gQiniuTool = exports.QiniuTool = void 0;
 const qiniu = require("qiniu");
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
 class QiniuTool {
     get host() {
-        if (!global_1.global.gServerCfg.qiniu) {
+        if (!IServerConfig_1.gServerCfg.qiniu) {
             return "";
         }
-        return global_1.global.gServerCfg.qiniu.host;
+        return IServerConfig_1.gServerCfg.qiniu.host;
     }
     getUploadToken(filename) {
-        if (!global_1.global.gServerCfg.qiniu) {
-            global_1.global.gLog.error("qiniu config not found!");
+        if (!IServerConfig_1.gServerCfg.qiniu) {
+            Log_1.gLog.error("qiniu config not found!");
             return "";
         }
-        let mac = new qiniu.auth.digest.Mac(global_1.global.gServerCfg.qiniu.accessKey, global_1.global.gServerCfg.qiniu.secretKey);
+        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.gServerCfg.qiniu.accessKey, IServerConfig_1.gServerCfg.qiniu.secretKey);
         let options = {
-            scope: global_1.global.gServerCfg.qiniu.bucket + ":" + filename,
+            scope: IServerConfig_1.gServerCfg.qiniu.bucket + ":" + filename,
         };
         let putPolicy = new qiniu.rs.PutPolicy(options);
         let uploadToken = putPolicy.uploadToken(mac);
@@ -25,3 +26,4 @@ class QiniuTool {
     }
 }
 exports.QiniuTool = QiniuTool;
+exports.gQiniuTool = new QiniuTool();

package/dist/lib/Framework/ThirdParty/Rpc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rpc = void 0;
 const Core_1 = require("../Core/Core");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 const CgMq_1 = require("./CgMq");
 class Remote {
     _retmsg = null;
@@ -50,7 +50,7 @@ class Rpc {
         let cmd = msg.data.cmd;
         let func = this[cmd];
         if (!func) {
-            global_1.global.gLog.error({ des: "rpc no cmd", msg });
+            Log_1.gLog.error({ des: "rpc no cmd", msg });
             return;
         }
         let data = await Core_1.core.safeCall(func, this, ...msg.data?.args, msg);

package/dist/lib/Framework/ThirdParty/WechatTool.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WechatTool = exports.WechatUserInfo = exports.WechatOAMsg = void 0;
+exports.gWechatTool = exports.WechatTool = exports.WechatUserInfo = exports.WechatOAMsg = void 0;
 const _ = require("underscore");
 const URLEncode = require("urlencode");
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
+const HttpTool_1 = require("../Logic/HttpTool");
 class WechatOAMsg {
     // <xml>
     // <ToUserName><![CDATA[toUser]]></ToUserName>
@@ -41,12 +43,12 @@ class WechatTool {
      * 获取获取code的url
      */
     getAuthCodeUrl() {
-        if (!global_1.global.gServerCfg.wechat) {
-            global_1.global.gLog.error("wechat config not found!");
+        if (!IServerConfig_1.gServerCfg.wechat) {
+            Log_1.gLog.error("wechat config not found!");
             return null;
         }
-        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + global_1.global.gServerCfg.wechat.app_id;
-        url += "&redirect_uri=" + URLEncode.encode(global_1.global.gServerCfg.wechat.redirect_uri);
+        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + IServerConfig_1.gServerCfg.wechat.app_id;
+        url += "&redirect_uri=" + URLEncode.encode(IServerConfig_1.gServerCfg.wechat.redirect_uri);
         url += "&response_type=code&scope=snsapi_login";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
         let state = _.random(1000000, 9999999);
@@ -57,12 +59,12 @@ class WechatTool {
         if (!auth_code) {
             return null;
         }
-        if (!global_1.global.gServerCfg.wechat) {
-            global_1.global.gLog.error("wechat config not found!");
+        if (!IServerConfig_1.gServerCfg.wechat) {
+            Log_1.gLog.error("wechat config not found!");
             return null;
         }
-        let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + global_1.global.gServerCfg.wechat.app_id + "&secret=" + global_1.global.gServerCfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
-        let rs = await global_1.global.gHttpTool.get(url);
+        let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + IServerConfig_1.gServerCfg.wechat.app_id + "&secret=" + IServerConfig_1.gServerCfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
+        let rs = await HttpTool_1.gHttpTool.get(url);
         /*
         {
             "access_token":"ACCESS_TOKEN",
@@ -78,13 +80,13 @@ class WechatTool {
             return rs.body;
         }
         else {
-            global_1.global.gLog.error(rs.body);
+            Log_1.gLog.error(rs.body);
         }
         return null;
     }
     async getUserInfo(access_token, openid) {
         let url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid;
-        let rs = await global_1.global.gHttpTool.get(url);
+        let rs = await HttpTool_1.gHttpTool.get(url);
         if (rs.body) {
             return rs.body;
         }
@@ -129,3 +131,4 @@ class WechatTool {
     }
 }
 exports.WechatTool = WechatTool;
+exports.gWechatTool = new WechatTool();

package/dist/lib/Framework/WebServer/Controller/MongoBaseUserController.js

@@ -6,7 +6,8 @@ const FrameworkConfig_1 = require("../../Config/FrameworkConfig");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
 const ini_1 = require("../../Service/ini");
 const MongoUserService_1 = require("../../Service/MongoUserService");
-const global_1 = require("../../global");
+const CacheTool_1 = require("../../Logic/CacheTool");
+const RedisManager_1 = require("../../Database/RedisManager");
 class MongoBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
@@ -66,19 +67,19 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         //每次强制从cache中先找，提高效率
         //if(this._engine.cfg.session_type==ESessionType.Cache)
         {
-            user = global_1.global.gCacheTool.get(this._session_id);
+            user = CacheTool_1.gCacheTool.get(this._session_id);
         }
         if (user) {
             return user;
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = parseInt((await global_1.global.gRedisMgr.redis.get(this._session_id)) || "-1");
+            let user_id = parseInt((await RedisManager_1.gRedisMgr.redis.get(this._session_id)) || "-1");
             if (user_id > 0) {
                 user = (await MongoUserService_1.GMongoUserSer.getById(user_id));
             }
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let user_id = (await global_1.global.gMongoCacheSer.getData(this._session_id)) || -1;
+            let user_id = (await MongoCacheService_1.gMongoCacheSer.getData(this._session_id)) || -1;
             if (user_id > 0) {
                 user = (await MongoUserService_1.GMongoUserSer.getById(user_id));
             }
@@ -91,13 +92,13 @@ class MongoBaseUserController extends BaseController_1.BaseController {
     _logout() {
         if (this._session_id) {
             if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-                global_1.global.gCacheTool.remove(this._session_id);
+                CacheTool_1.gCacheTool.remove(this._session_id);
             }
             else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-                global_1.global.gRedisMgr.redis.del(this._session_id);
+                RedisManager_1.gRedisMgr.redis.del(this._session_id);
             }
             else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-                global_1.global.gMongoCacheSer.deleteOne({ key: this._session_id });
+                MongoCacheService_1.gMongoCacheSer.deleteOne({ key: this._session_id });
             }
             this._session_id = null;
         }
@@ -121,15 +122,15 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         //if(this._engine.cfg.session_type==ESessionType.Cache)
         {
             if (time > 24 * 60 * 60) {
-                global_1.global.gCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
+                CacheTool_1.gCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
             }
             else {
-                global_1.global.gCacheTool.add(this._session_id, user, time * 1000);
+                CacheTool_1.gCacheTool.add(this._session_id, user, time * 1000);
             }
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            global_1.global.gRedisMgr.redis.set(this._session_id, user.id).then(() => {
-                global_1.global.gRedisMgr.redis.expire(this._session_id, time);
+            RedisManager_1.gRedisMgr.redis.set(this._session_id, user.id).then(() => {
+                RedisManager_1.gRedisMgr.redis.expire(this._session_id, time);
             });
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
@@ -137,7 +138,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            global_1.global.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
         }
         this._self_user = user;
     }

package/dist/lib/Framework/WebServer/Controller/MysqlBaseUserController.js

@@ -6,7 +6,8 @@ const MysqlUserService_1 = require("../../Service/MysqlUserService");
 const FrameworkConfig_1 = require("../../Config/FrameworkConfig");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
 const ini_1 = require("../../Service/ini");
-const global_1 = require("../../global");
+const CacheTool_1 = require("../../Logic/CacheTool");
+const RedisManager_1 = require("../../Database/RedisManager");
 class MysqlBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
@@ -66,19 +67,19 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
         //每次强制从cache中先找，提高效率
         //if(this._engine.cfg.session_type==ESessionType.Cache)
         {
-            user = global_1.global.gCacheTool.get(this._session_id);
+            user = CacheTool_1.gCacheTool.get(this._session_id);
         }
         if (user) {
             return user;
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = parseInt((await global_1.global.gRedisMgr.redis.get(this._session_id)) || "-1");
+            let user_id = parseInt((await RedisManager_1.gRedisMgr.redis.get(this._session_id)) || "-1");
             if (user_id > 0) {
                 user = (await MysqlUserService_1.GUserSer.getById(user_id));
             }
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let user_id = (await global_1.global.gMongoCacheSer.getData(this._session_id)) || -1;
+            let user_id = (await MongoCacheService_1.gMongoCacheSer.getData(this._session_id)) || -1;
             if (user_id > 0) {
                 user = (await MysqlUserService_1.GUserSer.getById(user_id));
             }
@@ -91,13 +92,13 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
     _logout() {
         if (this._session_id) {
             if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-                global_1.global.gCacheTool.remove(this._session_id);
+                CacheTool_1.gCacheTool.remove(this._session_id);
             }
             else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-                global_1.global.gRedisMgr.redis.del(this._session_id);
+                RedisManager_1.gRedisMgr.redis.del(this._session_id);
             }
             else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-                global_1.global.gMongoCacheSer.deleteOne({ key: this._session_id });
+                MongoCacheService_1.gMongoCacheSer.deleteOne({ key: this._session_id });
             }
             this._session_id = null;
         }
@@ -121,15 +122,15 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
         //if(this._engine.cfg.session_type==ESessionType.Cache)
         {
             if (time > 24 * 60 * 60) {
-                global_1.global.gCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
+                CacheTool_1.gCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
             }
             else {
-                global_1.global.gCacheTool.add(this._session_id, user, time * 1000);
+                CacheTool_1.gCacheTool.add(this._session_id, user, time * 1000);
             }
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            global_1.global.gRedisMgr.redis.set(this._session_id, user.id).then(() => {
-                global_1.global.gRedisMgr.redis.expire(this._session_id, time);
+            RedisManager_1.gRedisMgr.redis.set(this._session_id, user.id).then(() => {
+                RedisManager_1.gRedisMgr.redis.expire(this._session_id, time);
             });
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
@@ -137,7 +138,7 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            global_1.global.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
         }
         this._self_user = user;
     }

package/dist/lib/Framework/WebServer/Engine/ControllerManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerManager = void 0;
+exports.gCtrMgr = exports.ControllerManager = void 0;
 /**
  * web服务中mvc的控制器管理器
  */
@@ -112,3 +112,4 @@ class ControllerManager {
     }
 }
 exports.ControllerManager = ControllerManager;
+exports.gCtrMgr = new ControllerManager();

package/dist/lib/Framework/WebServer/Engine/Engine.js

@@ -9,7 +9,8 @@ const cors = require("cors");
 const Express = require("express");
 const cookieParser = require("cookie-parser");
 const Config_1 = require("../../Config/Config");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
+const ControllerManager_1 = require("./ControllerManager");
 class Engine {
     _app = Express();
     _cfg = null;
@@ -33,7 +34,7 @@ class Engine {
         //let https = require("https");
         let fs = require("fs");
         if (!port) {
-            global_1.global.gLog.error(this._cfg);
+            Log_1.gLog.error(this._cfg);
             return;
         }
         if (this._cfg.ssl) {
@@ -43,13 +44,13 @@ class Engine {
             };
             https.createServer(httpsOption, this._app).listen(port, () => {
                 this._is_running = true;
-                global_1.global.gLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + port + "/");
+                Log_1.gLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + port + "/");
             });
         }
         else {
             http.createServer(this._app).listen(port, () => {
                 this._is_running = true;
-                global_1.global.gLog.info("Server(" + this._cfg.web_name + ") running at http://127.0.0.1:" + port + "/");
+                Log_1.gLog.info("Server(" + this._cfg.web_name + ") running at http://127.0.0.1:" + port + "/");
             });
         }
         this._app.use(cookieParser());
@@ -62,7 +63,7 @@ class Engine {
             }, }));
         this._app.use((err, req, res, next) => {
             if (err) {
-                global_1.global.gLog.error(err);
+                Log_1.gLog.error(err);
             }
             next(err);
         });
@@ -96,15 +97,15 @@ class Engine {
             this._onall(req, res).then(() => {
                 if (this._cfg.debug) {
                     let time_str = (Date.now() - time) + "ms";
-                    global_1.global.gLog.info("[" + time_str + "] " + req.method + " " + req.url);
+                    Log_1.gLog.info("[" + time_str + "] " + req.method + " " + req.url);
                 }
             }).catch((err) => {
                 res.sendStatus(500);
                 let exreq = new Request_1.Request(req, this._cfg);
                 let info = exreq.getDebugInfo();
                 info["tip"] = "server error";
-                global_1.global.gLog.error(info);
-                global_1.global.gLog.error(err);
+                Log_1.gLog.error(info);
+                Log_1.gLog.error(err);
             });
         });
     }
@@ -141,15 +142,15 @@ class Engine {
             res.sendStatus(500);
             let info = req.getDebugInfo();
             info["tip"] = "not support method:" + method;
-            global_1.global.gLog.error(info);
+            Log_1.gLog.error(info);
             return null;
         }
-        let action_name = global_1.global.gCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
+        let action_name = ControllerManager_1.gCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
         if (!action_name) {
             res.sendStatus(500);
             let info = req.getDebugInfo();
             info["tip"] = "request has no action";
-            global_1.global.gLog.error(info);
+            Log_1.gLog.error(info);
             return null;
         }
         return {
@@ -159,10 +160,10 @@ class Engine {
         };
     }
     async _callCtrAction(action_name, req, res) {
-        let ctr = global_1.global.gCtrMgr.getStaticCtr(req.module, req.controller);
+        let ctr = ControllerManager_1.gCtrMgr.getStaticCtr(req.module, req.controller);
         let cls_ctr = null;
         if (!ctr) {
-            cls_ctr = global_1.global.gCtrMgr.getClass(req.module, req.controller);
+            cls_ctr = ControllerManager_1.gCtrMgr.getClass(req.module, req.controller);
         }
         if (!ctr) {
             ctr = new cls_ctr(req, res, this);
@@ -175,19 +176,19 @@ class Engine {
     }
     pause() {
         if (!this._is_running) {
-            global_1.global.gLog.error("webserver has paused:" + this._cfg.web_name);
+            Log_1.gLog.error("webserver has paused:" + this._cfg.web_name);
             return;
         }
         this._is_running = false;
-        global_1.global.gLog.info("webserver paused:" + this._cfg.web_name);
+        Log_1.gLog.info("webserver paused:" + this._cfg.web_name);
     }
     resume() {
         if (this._is_running) {
-            global_1.global.gLog.error("webserver is running:" + this._cfg.web_name);
+            Log_1.gLog.error("webserver is running:" + this._cfg.web_name);
             return;
         }
         this._is_running = true;
-        global_1.global.gLog.info("webserver resumed:" + this._cfg.web_name);
+        Log_1.gLog.info("webserver resumed:" + this._cfg.web_name);
     }
     getRenderHtml(req, res, datas) {
         let rootview = this._cfg.rootview || "view";

package/dist/lib/Framework/WebServer/Engine/RazorJs.js

@@ -1,7 +1,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RazorJs = void 0;
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 var _suffix = ".cshtml";
 var _MATCH_HTML = /[&<>\'"]/g;
 var _ENCODE_HTML_RULES = {
@@ -190,7 +190,7 @@ class RazorJs {
             if (html) {
                 return html;
             }
-            global_1.global.gLog.error("no view:" + tmpl_path);
+            Log_1.gLog.error("no view:" + tmpl_path);
             return "Server Error(No View)";
         }
         data = data || {};

package/dist/lib/Framework/WebServer/Engine/Request.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
 const url_1 = require("url");
 const Core_1 = require("../../Core/Core");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 class Request {
     _req = null;
     get baseReq() {
@@ -73,7 +73,7 @@ class Request {
                 body = JSON.parse(body);
             }
             catch (e) {
-                global_1.global.gLog.error("post data--" + body + "--parse error");
+                Log_1.gLog.error("post data--" + body + "--parse error");
                 body = {};
             }
         }
@@ -224,7 +224,7 @@ class Request {
             return;
         }
         let debuginfo = this.getDebugInfo();
-        global_1.global.gLog.info(debuginfo);
+        Log_1.gLog.info(debuginfo);
     }
 }
 exports.Request = Request;

package/dist/lib/Framework/WebServer/Engine/Response.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Response = void 0;
 const fs = require("fs");
 const mime = require("mime");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 class Response {
     _res = null;
     _cookie_prefix = "";
@@ -79,7 +79,7 @@ class Response {
         if (!this._cfg.debug) {
             return;
         }
-        global_1.global.gLog.info(data);
+        Log_1.gLog.info(data);
     }
 }
 exports.Response = Response;

package/dist/lib/Framework/WebServer/IWebServer.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IWebServer = void 0;
 const Engine_1 = require("./Engine/Engine");
 const RazorJs_1 = require("./Engine/RazorJs");
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const cgserver_1 = require("../cgserver");
+const EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -12,19 +15,19 @@ class IWebServer {
      * @param server_index 这个是服务器的配置index
      */
     async start(cfg) {
-        global_1.global.gCgServer.addWebServer(this);
+        cgserver_1.gCgServer.addWebServer(this);
         if (!cfg) {
-            global_1.global.gLog.error("webserver 配置不存在，启动服务器失败");
+            Log_1.gLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        let dbcfg = global_1.global.gServerCfg.db;
-        await global_1.global.gCgServer.initDb(dbcfg);
+        let dbcfg = IServerConfig_1.gServerCfg.db;
+        await cgserver_1.gCgServer.initDb(dbcfg);
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());
         this._engine.start();
         this._registerController();
         this._registerRouter();
-        global_1.global.gEventTool.emit("web_server_init_done");
+        EventTool_1.gEventTool.emit("web_server_init_done");
         return true;
     }
     pause() {