cgserver 10.0.1 → 10.0.2

package/dist/lib/Framework/SocketServer/ISocketServer.js

@@ -5,8 +5,11 @@ const ws = require("websocket");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
+const IServerConfig_1 = require("../Config/IServerConfig");
 const Config_1 = require("../Config/Config");
-const global_1 = require("../global");
+const cgserver_1 = require("../cgserver");
+const Log_1 = require("../Logic/Log");
+const EventTool_1 = require("../Logic/EventTool");
 class ISocketServer {
     _cfg = null;
     //方便提示
@@ -54,27 +57,27 @@ class ISocketServer {
         delete this._ws_clients[socketId];
     }
     async run() {
-        global_1.global.gCgServer.addSocketServer(this);
-        let dbcfg = global_1.global.gServerCfg.db;
-        await global_1.global.gCgServer.initDb(dbcfg);
+        cgserver_1.gCgServer.addSocketServer(this);
+        let dbcfg = IServerConfig_1.gServerCfg.db;
+        await cgserver_1.gCgServer.initDb(dbcfg);
         this.initWebSocket();
     }
     pause() {
         if (!this._is_runging) {
-            global_1.global.gLog.error("websocketserver has paused:" + this._cfg.port);
+            Log_1.gLog.error("websocketserver has paused:" + this._cfg.port);
             return;
         }
         this._is_runging = false;
         this._listening_websocket.closeAllConnections();
-        global_1.global.gLog.info("websocketserver paused:" + this._cfg.port);
+        Log_1.gLog.info("websocketserver paused:" + this._cfg.port);
     }
     resume() {
         if (this._is_runging) {
-            global_1.global.gLog.error("websocketserver is running:" + this._cfg.port);
+            Log_1.gLog.error("websocketserver is running:" + this._cfg.port);
             return;
         }
         this._is_runging = true;
-        global_1.global.gLog.error("websocketserver resumed:" + this._cfg.port);
+        Log_1.gLog.error("websocketserver resumed:" + this._cfg.port);
     }
     /*
         把所有的客户端链接保存起来
@@ -98,14 +101,14 @@ class ISocketServer {
                 //passphrase:'1234'//如果秘钥文件有密码的话，用这个属性设置密码
             };
             server = https.createServer(options, (request, response) => {
-                global_1.global.gLog.info((new Date()) + 'wss Received request for ' + request.url);
+                Log_1.gLog.info((new Date()) + 'wss Received request for ' + request.url);
                 response.writeHead(200);
                 response.end();
             });
         }
         else {
             server = http.createServer((request, response) => {
-                global_1.global.gLog.info((new Date()) + 'ws Received request for ' + request.url);
+                Log_1.gLog.info((new Date()) + 'ws Received request for ' + request.url);
                 response.writeHead(200);
                 response.end();
             });
@@ -127,14 +130,14 @@ class ISocketServer {
     }
     onListenning() {
         this._is_runging = true;
-        global_1.global.gEventTool.emit("socket_server_init_done");
+        EventTool_1.gEventTool.emit("socket_server_init_done");
         let info = (new Date()) + "  Server " + this.name + " is listening on port " + this._cfg.port;
-        global_1.global.gLog.info(info);
+        Log_1.gLog.info(info);
     }
     onRequest(req) {
         if (!this._is_runging) {
             req.reject();
-            global_1.global.gLog.error(' Connection from origin ' + req.origin + ' rejected.');
+            Log_1.gLog.error(' Connection from origin ' + req.origin + ' rejected.');
             return;
         }
         let protocol = null;
@@ -144,28 +147,28 @@ class ISocketServer {
         let allowed = this.isOriginAllowed(req.origin);
         if (!allowed) {
             req.reject();
-            global_1.global.gLog.error(' Connection from origin ' + req.origin + ' rejected.');
+            Log_1.gLog.error(' Connection from origin ' + req.origin + ' rejected.');
             return;
         }
         try {
             let conn = req.accept(this._accepted_protocol, req.origin);
             if (!conn) {
-                global_1.global.gLog.error(' protocol reject');
+                Log_1.gLog.error(' protocol reject');
                 return;
             }
-            global_1.global.gLog.info((new Date()) + ' Connection accepted.');
+            Log_1.gLog.info((new Date()) + ' Connection accepted.');
             let server_name = this._getServerNameByCookies(req.cookies);
             this.createWebSocketObjectByProtocol(server_name, conn, req);
         }
         catch (e) {
-            global_1.global.gLog.error(' protocol reject');
+            Log_1.gLog.error(' protocol reject');
         }
     }
     createWebSocketObjectByProtocol(server_name, _ws, req) {
         server_name = server_name || "default";
         let cls = this._name_vs_class[server_name];
         if (!cls) {
-            global_1.global.gLog.error("(createWebSocketObjectByProtocol in server(" + this.name + "))no this websocket handle class=" + server_name);
+            Log_1.gLog.error("(createWebSocketObjectByProtocol in server(" + this.name + "))no this websocket handle class=" + server_name);
             return null;
         }
         let ws_server = (new cls(this));

package/dist/lib/Framework/SocketServer/IWebSocket.js

@@ -4,7 +4,9 @@ exports.IWebSocket = exports.BaseMsg = void 0;
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 const Core_1 = require("../Core/Core");
 const _ = require("underscore");
-const global_1 = require("../global");
+const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
+const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+const Log_1 = require("../Logic/Log");
 class BaseMsg {
     cmd;
     errcode;
@@ -83,7 +85,7 @@ class IWebSocket {
         this._ws = _ws;
         this._req = _req;
         if (!this._protoFilter) {
-            this._protoFilter = global_1.global.gProtoFactory.createFilter(this._protoType);
+            this._protoFilter = ProtoFactory_1.gProtoFactory.createFilter(this._protoType);
             this._protoFilter.init(this._protoPath);
         }
         this._ws.on("message", this.onMessage.bind(this));
@@ -95,14 +97,14 @@ class IWebSocket {
         try {
             let msg = this._onDecode(message);
             if (this._is_sync_msg) {
-                global_1.global.gSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
+                SyncQueueTool_1.gSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
             }
             else {
                 this._onMessage(msg);
             }
         }
         catch (e) {
-            global_1.global.gLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
+            Log_1.gLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
         }
     }
     _onDecode(message, ...params) {
@@ -126,14 +128,14 @@ class IWebSocket {
      */
     filterMsg(msg) {
         if (!msg) {
-            global_1.global.gLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
+            Log_1.gLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
             return false;
         }
         if (this._debug_msg && !this._nodebugmsgs[msg.cmd]) {
-            global_1.global.gLog.info({ tipKey: this.tipKey, action: "receive", msg });
+            Log_1.gLog.info({ tipKey: this.tipKey, action: "receive", msg });
         }
         if (!msg.cmd) {
-            global_1.global.gLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
+            Log_1.gLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
             return false;
         }
         return true;
@@ -152,14 +154,14 @@ class IWebSocket {
                 await Core_1.core.safeCall(otherfunc, this, jsonData);
             }
             else {
-                global_1.global.gLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
+                Log_1.gLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
             }
         }
         else {
             await Core_1.core.safeCall(func, this, jsonData);
         }
         if (this._debug_msg && !this._nodebugmsgs[jsonData.cmd]) {
-            global_1.global.gLog.info("[" + (Date.now() - time) + "ms] " + jsonData.cmd);
+            Log_1.gLog.info("[" + (Date.now() - time) + "ms] " + jsonData.cmd);
         }
     }
     onOpen(e) {
@@ -167,19 +169,19 @@ class IWebSocket {
     onError(e) {
     }
     onClose(reasonCode, description) {
-        global_1.global.gLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
+        Log_1.gLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
     filterSendMsg(msg) {
         if (!this.connected) {
             return false;
         }
         if (!msg) {
-            global_1.global.gLog.error(this.tipKey + " Send Message warning:null data!");
+            Log_1.gLog.error(this.tipKey + " Send Message warning:null data!");
             return false;
         }
         if (this._debug_msg
             && msg.cmd != "heartbeat") {
-            global_1.global.gLog.info({ tipKey: this.tipKey, action: "send", msg });
+            Log_1.gLog.info({ tipKey: this.tipKey, action: "send", msg });
         }
         return true;
     }

package/dist/lib/Framework/SocketServer/ProtoFilter/GoogleProtoFilter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleProtoFilter = void 0;
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 const protobufjs = require("protobufjs");
 class GoogleProtoFilter {
     _root = new protobufjs.Root();
@@ -15,7 +15,7 @@ class GoogleProtoFilter {
             this._root.loadSync(path, { keepCase: true });
         }
         catch (e) {
-            global_1.global.gLog.error(e);
+            Log_1.gLog.error(e);
             return false;
         }
         return true;
@@ -40,12 +40,12 @@ class GoogleProtoFilter {
     decode(data, root) {
         let body = this._root.lookupType(root);
         if (!body) {
-            global_1.global.gLog.info("proto body not in proto(!" + root + ")");
+            Log_1.gLog.info("proto body not in proto(!" + root + ")");
             return null;
         }
         let msgBody = body.decode(data);
         if (!msgBody) {
-            global_1.global.gLog.info("proto body decode wrong!");
+            Log_1.gLog.info("proto body decode wrong!");
             return null;
         }
         let objBody = body.toObject(msgBody);

package/dist/lib/Framework/SocketServer/ProtoFilter/JsonProtoFilter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonProtoFilter = void 0;
 const Core_1 = require("../../Core/Core");
-const global_1 = require("../../global");
+const Log_1 = require("../../Logic/Log");
 class JsonProtoFilter {
     init(path) {
         return true;
@@ -20,7 +20,7 @@ class JsonProtoFilter {
             }
         }
         catch (e) {
-            global_1.global.gLog.error("decode json data Failed-----data=" + data);
+            Log_1.gLog.error("decode json data Failed-----data=" + data);
             return;
         }
         return data;

package/dist/lib/Framework/SocketServer/ProtoFilter/ProtoFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtoFactory = void 0;
+exports.gProtoFactory = exports.ProtoFactory = void 0;
 const GoogleProtoFilter_1 = require("./GoogleProtoFilter");
 const JsonProtoFilter_1 = require("./JsonProtoFilter");
 const IProtoFilter_1 = require("./IProtoFilter");
@@ -32,3 +32,4 @@ class ProtoFactory {
     }
 }
 exports.ProtoFactory = ProtoFactory;
+exports.gProtoFactory = new ProtoFactory();

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

@@ -7,7 +7,8 @@ const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
 const fs = require("fs");
 const form_1 = require("alipay-sdk/lib/form");
 const Config_1 = require("../Config/Config");
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
 class AlipayResult {
     alipay_trade_app_pay_response = {
         code: "10000",
@@ -70,26 +71,26 @@ class AlipayTool {
         notify_url: ""
     };
     init() {
-        if (!global_1.global.gServerCfg.alipay
-            || !global_1.global.gServerCfg.alipay.open) {
+        if (!IServerConfig_1.gServerCfg.alipay
+            || !IServerConfig_1.gServerCfg.alipay.open) {
             return false;
         }
         let suffix = "";
-        if (global_1.global.gServerCfg.alipay.dev) {
+        if (IServerConfig_1.gServerCfg.alipay.dev) {
             suffix = "_dev";
         }
         this._cfg = {
-            app_id: global_1.global.gServerCfg.alipay["app_id" + suffix],
-            app_key: global_1.global.gServerCfg.alipay["app_key" + suffix],
-            gateway: global_1.global.gServerCfg.alipay["gateway" + suffix],
+            app_id: IServerConfig_1.gServerCfg.alipay["app_id" + suffix],
+            app_key: IServerConfig_1.gServerCfg.alipay["app_key" + suffix],
+            gateway: IServerConfig_1.gServerCfg.alipay["gateway" + suffix],
             //RSA1 RSA2
-            signType: global_1.global.gServerCfg.alipay["signType" + suffix],
+            signType: IServerConfig_1.gServerCfg.alipay["signType" + suffix],
             /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: global_1.global.gServerCfg.alipay["signType" + suffix],
-            alipay_root_cert_sn: global_1.global.gServerCfg.alipay["alipay_root_cert_sn" + suffix],
-            alipay_cert_sn: global_1.global.gServerCfg.alipay["alipay_cert_sn" + suffix],
-            app_cert_sn: global_1.global.gServerCfg.alipay["app_cert_sn" + suffix],
-            notify_url: global_1.global.gServerCfg.alipay["notify_url" + suffix]
+            keyType: IServerConfig_1.gServerCfg.alipay["signType" + suffix],
+            alipay_root_cert_sn: IServerConfig_1.gServerCfg.alipay["alipay_root_cert_sn" + suffix],
+            alipay_cert_sn: IServerConfig_1.gServerCfg.alipay["alipay_cert_sn" + suffix],
+            app_cert_sn: IServerConfig_1.gServerCfg.alipay["app_cert_sn" + suffix],
+            notify_url: IServerConfig_1.gServerCfg.alipay["notify_url" + suffix]
         };
         if (this._cfg.alipay_cert_sn) {
             this._aliPay = new AliPayUtil_1.AliPayUtil(this._cfg.alipay_cert_sn, this._cfg.app_key);
@@ -110,7 +111,7 @@ class AlipayTool {
                 keyType: this._cfg.keyType
             });
         }
-        global_1.global.gLog.info("alipay init success!");
+        Log_1.gLog.info("alipay init success!");
     }
     /**
      *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"
@@ -181,7 +182,7 @@ class AlipayTool {
      */
     async getAlipayPage(method, notifyUrl, returnUrl, outTradeNo, money, subject, body) {
         if (!this._alipaySdk) {
-            global_1.global.gLog.error("并未配置alipay或者初始化失败");
+            Log_1.gLog.error("并未配置alipay或者初始化失败");
             return;
         }
         const formData = new form_1.default();

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

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SMSTool = void 0;
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
 let SMSClient = require("@alicloud/sms-sdk");
 class SMSTool {
     _is_init = false;
     _sms_client = null;
     init() {
-        if (!global_1.global.gServerCfg.aliSms) {
+        if (!IServerConfig_1.gServerCfg.aliSms) {
             return false;
         }
         if (this._is_init) {
             return true;
         }
         this._is_init = true;
-        this._sms_client = new SMSClient({ accessKeyId: global_1.global.gServerCfg.aliSms.accessKeyId, secretAccessKey: global_1.global.gServerCfg.aliSms.secretAccessKey });
-        global_1.global.gLog.info("SMSClient init success!");
+        this._sms_client = new SMSClient({ accessKeyId: IServerConfig_1.gServerCfg.aliSms.accessKeyId, secretAccessKey: IServerConfig_1.gServerCfg.aliSms.secretAccessKey });
+        Log_1.gLog.info("SMSClient init success!");
     }
     /**
      * 发送短信验证码
@@ -27,19 +28,19 @@ class SMSTool {
         return new Promise((resolve, reject) => {
             this._sms_client.sendSMS({
                 PhoneNumbers: phone,
-                SignName: global_1.global.gServerCfg.aliSms.signName,
-                TemplateCode: global_1.global.gServerCfg.aliSms.templateCode,
+                SignName: IServerConfig_1.gServerCfg.aliSms.signName,
+                TemplateCode: IServerConfig_1.gServerCfg.aliSms.templateCode,
                 TemplateParam: JSON.stringify({ code: code })
             }).then((res) => {
                 if (res.Code == "OK") {
                     resolve(null);
                 }
                 else {
-                    global_1.global.gLog.error("phone:" + phone + " code:" + res.Code);
+                    Log_1.gLog.error("phone:" + phone + " code:" + res.Code);
                     resolve(res.Code);
                 }
             }, (err) => {
-                global_1.global.gLog.error(err);
+                Log_1.gLog.error(err);
                 resolve(err);
             });
         });

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

@@ -5,7 +5,9 @@ const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
 const fs = require("fs");
 const Config_1 = require("../Config/Config");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
+const HttpTool_1 = require("../Logic/HttpTool");
+const IServerConfig_1 = require("../Config/IServerConfig");
 //developer.apple.com/documentation/appstorereceipts/responsebody
 class ReceiptInfo {
     cancellation_date = "";
@@ -158,34 +160,34 @@ class AppleTool {
             "expire_date": latest_one?.expires_date,
             "receipt_expire_date": nb.unified_receipt?.receipt?.expiration_date
         };
-        global_1.global.gLog.info(msg);
-        global_1.global.gLog.info(nb);
+        Log_1.gLog.info(msg);
+        Log_1.gLog.info(nb);
     }
     async onVerify(receipt, environment) {
-        global_1.global.gLog.info("begin onVerify============================" + environment);
+        Log_1.gLog.info("begin onVerify============================" + environment);
         let url = this._verifyUrl;
         // if(environment.toLowerCase()=="sandbox")
         // {
         //     url=this._sandboxVerifyUrl
         // }
-        global_1.global.gLog.info("url============================" + url);
+        Log_1.gLog.info("url============================" + url);
         let reqb = new RequestBody();
         reqb['receipt-data'] = receipt;
         //先验证生产环境
-        var resb = (await global_1.global.gHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
-        global_1.global.gLog.info("production end onVerify_Res============================status=" + (resb ? resb.status : "null"));
+        var resb = (await HttpTool_1.gHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
+        Log_1.gLog.info("production end onVerify_Res============================status=" + (resb ? resb.status : "null"));
         //状态21007表示是沙盒环境
         if (resb && resb.status == 21007) {
             url = this._sandboxVerifyUrl;
-            resb = (await global_1.global.gHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
-            global_1.global.gLog.info("sandbox end onVerify_Res============================status=" + (resb ? resb.status : "null"));
+            resb = (await HttpTool_1.gHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
+            Log_1.gLog.info("sandbox end onVerify_Res============================status=" + (resb ? resb.status : "null"));
         }
-        global_1.global.gLog.info(resb);
+        Log_1.gLog.info(resb);
         return resb;
     }
     signature(nickname, create_time, appBundleID, productIdentifier, offerIdentifier) {
         let keyIdentifier = "";
-        for (var k in global_1.global.gServerCfg.apple.keyIds) {
+        for (var k in IServerConfig_1.gServerCfg.apple.keyIds) {
             keyIdentifier = k;
             break;
         }
@@ -198,7 +200,7 @@ class AppleTool {
             nonce.toLowerCase() + '\u2063' +
             create_time;
         // Get the PEM-formatted private key string associated with the Key ID.
-        const path = global_1.global.gServerCfg.apple.keyIds[keyIdentifier];
+        const path = IServerConfig_1.gServerCfg.apple.keyIds[keyIdentifier];
         const keyString = fs.readFileSync(Config_1.Config.rootDataDir + path).toString();
         // Create an Elliptic Curve Digital Signature Algorithm (ECDSA) object using the private key.
         const key = new ec_key_1.default(keyString, 'pem');

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CgMq = exports.RpcConfig = void 0;
 const Core_1 = require("../Core/Core");
 const IRpcServerWebSocket_1 = require("../SocketServer/IRpcServerWebSocket");
-const global_1 = require("../global");
+const Log_1 = require("../Logic/Log");
 class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
     _cgmq = null;
     constructor(cgmq) {
@@ -79,7 +79,7 @@ class CgMq {
         this._cfg = cfg;
         this._onmsg = onmsg;
         if (this._inited) {
-            global_1.global.gLog.error("dulplicate init for CgMq");
+            Log_1.gLog.error("dulplicate init for CgMq");
             return true;
         }
         this._inited = true;
@@ -112,7 +112,7 @@ class CgMq {
         };
         let ret_rpcmsg = await this._ws.push(group, data, to_id);
         if (this._ws.debug_msg) {
-            global_1.global.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
+            Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
         }
         return ret_rpcmsg;
     }

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

@@ -2,32 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailTool = void 0;
 const nodeMailer = require("nodemailer");
-const global_1 = require("../global");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
 class EmailTool {
     send(to, subject, html) {
         return new Promise((resolve, reject) => {
-            if (!global_1.global.gServerCfg.email) {
-                global_1.global.gLog.error("email config not found!");
+            if (!IServerConfig_1.gServerCfg.email) {
+                Log_1.gLog.error("email config not found!");
                 resolve("email config not found!");
                 return;
             }
             let transport = nodeMailer.createTransport({
-                host: global_1.global.gServerCfg.email.host,
-                port: global_1.global.gServerCfg.email.port,
-                secure: global_1.global.gServerCfg.email.secure,
+                host: IServerConfig_1.gServerCfg.email.host,
+                port: IServerConfig_1.gServerCfg.email.port,
+                secure: IServerConfig_1.gServerCfg.email.secure,
                 auth: {
-                    user: global_1.global.gServerCfg.email.auth.user,
-                    pass: global_1.global.gServerCfg.email.auth.pass
+                    user: IServerConfig_1.gServerCfg.email.auth.user,
+                    pass: IServerConfig_1.gServerCfg.email.auth.pass
                 }
             });
             let mail = {
-                from: global_1.global.gServerCfg.email.from,
+                from: IServerConfig_1.gServerCfg.email.from,
                 to: to,
                 subject: subject,
                 html: html
             };
             transport.sendMail(mail, (_err, msg) => {
-                global_1.global.gLog.error(_err);
+                Log_1.gLog.error(_err);
                 resolve(_err);
             });
         });

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();