cgserver 9.2.7 → 10.0.1

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

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAlipayTool = exports.AlipayCallBack = exports.AlipayResult = void 0;
+exports.AlipayTool = exports.AlipayCallBack = exports.AlipayResult = void 0;
 const alipay_sdk_1 = require("alipay-sdk");
 const aliUtil = require("alipay-sdk/lib/util");
 const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
 const fs = require("fs");
 const form_1 = require("alipay-sdk/lib/form");
-const Log_1 = require("../Logic/Log");
-const IServerConfig_1 = require("../Config/IServerConfig");
 const Config_1 = require("../Config/Config");
+const global_1 = require("../global");
 class AlipayResult {
     alipay_trade_app_pay_response = {
         code: "10000",
@@ -54,7 +53,6 @@ class AlipayCallBack {
     point_amount = 0;
 }
 exports.AlipayCallBack = AlipayCallBack;
-exports.GAlipayTool = null;
 class AlipayTool {
     _alipaySdk = null;
     _aliPay = null;
@@ -72,26 +70,26 @@ class AlipayTool {
         notify_url: ""
     };
     init() {
-        if (!IServerConfig_1.GServerCfg.alipay
-            || !IServerConfig_1.GServerCfg.alipay.open) {
+        if (!global_1.global.gServerCfg.alipay
+            || !global_1.global.gServerCfg.alipay.open) {
             return false;
         }
         let suffix = "";
-        if (IServerConfig_1.GServerCfg.alipay.dev) {
+        if (global_1.global.gServerCfg.alipay.dev) {
             suffix = "_dev";
         }
         this._cfg = {
-            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],
+            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],
             //RSA1 RSA2
-            signType: IServerConfig_1.GServerCfg.alipay["signType" + suffix],
+            signType: global_1.global.gServerCfg.alipay["signType" + suffix],
             /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            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]
+            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]
         };
         if (this._cfg.alipay_cert_sn) {
             this._aliPay = new AliPayUtil_1.AliPayUtil(this._cfg.alipay_cert_sn, this._cfg.app_key);
@@ -112,7 +110,7 @@ class AlipayTool {
                 keyType: this._cfg.keyType
             });
         }
-        Log_1.GLog.info("alipay init success!");
+        global_1.global.gLog.info("alipay init success!");
     }
     /**
      *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"
@@ -183,7 +181,7 @@ class AlipayTool {
      */
     async getAlipayPage(method, notifyUrl, returnUrl, outTradeNo, money, subject, body) {
         if (!this._alipaySdk) {
-            Log_1.GLog.error("并未配置alipay或者初始化失败");
+            global_1.global.gLog.error("并未配置alipay或者初始化失败");
             return;
         }
         const formData = new form_1.default();
@@ -202,4 +200,4 @@ class AlipayTool {
         return url_or_html;
     }
 }
-exports.GAlipayTool = new AlipayTool();
+exports.AlipayTool = AlipayTool;

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

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

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAppleTool = exports.NotificationBody = exports.NotificationType = exports.ResponseBody = void 0;
-const Log_1 = require("../Logic/Log");
-const HttpTool_1 = require("./../Logic/HttpTool");
+exports.AppleTool = exports.NotificationBody = exports.NotificationType = exports.ResponseBody = void 0;
 const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
 const fs = require("fs");
-const IServerConfig_1 = require("../Config/IServerConfig");
 const Config_1 = require("../Config/Config");
+const global_1 = require("../global");
 //developer.apple.com/documentation/appstorereceipts/responsebody
 class ReceiptInfo {
     cancellation_date = "";
@@ -144,7 +142,6 @@ class RequestBody {
     password = "5203c7781e254aac8942290a0a2467ac";
     "exclude-old-transactions" = true;
 }
-exports.GAppleTool = null;
 class AppleTool {
     _verifyUrl = "https://buy.itunes.apple.com/verifyReceipt";
     _sandboxVerifyUrl = "https://sandbox.itunes.apple.com/verifyReceipt";
@@ -161,34 +158,34 @@ class AppleTool {
             "expire_date": latest_one?.expires_date,
             "receipt_expire_date": nb.unified_receipt?.receipt?.expiration_date
         };
-        Log_1.GLog.info(msg);
-        Log_1.GLog.info(nb);
+        global_1.global.gLog.info(msg);
+        global_1.global.gLog.info(nb);
     }
     async onVerify(receipt, environment) {
-        Log_1.GLog.info("begin onVerify============================" + environment);
+        global_1.global.gLog.info("begin onVerify============================" + environment);
         let url = this._verifyUrl;
         // if(environment.toLowerCase()=="sandbox")
         // {
         //     url=this._sandboxVerifyUrl
         // }
-        Log_1.GLog.info("url============================" + url);
+        global_1.global.gLog.info("url============================" + url);
         let reqb = new RequestBody();
         reqb['receipt-data'] = receipt;
         //先验证生产环境
-        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"));
+        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"));
         //状态21007表示是沙盒环境
         if (resb && resb.status == 21007) {
             url = this._sandboxVerifyUrl;
-            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"));
+            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"));
         }
-        Log_1.GLog.info(resb);
+        global_1.global.gLog.info(resb);
         return resb;
     }
     signature(nickname, create_time, appBundleID, productIdentifier, offerIdentifier) {
         let keyIdentifier = "";
-        for (var k in IServerConfig_1.GServerCfg.apple.keyIds) {
+        for (var k in global_1.global.gServerCfg.apple.keyIds) {
             keyIdentifier = k;
             break;
         }
@@ -201,7 +198,7 @@ class AppleTool {
             nonce.toLowerCase() + '\u2063' +
             create_time;
         // Get the PEM-formatted private key string associated with the Key ID.
-        const path = IServerConfig_1.GServerCfg.apple.keyIds[keyIdentifier];
+        const path = global_1.global.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');
@@ -232,4 +229,4 @@ class AppleTool {
         return;
     }
 }
-exports.GAppleTool = new AppleTool();
+exports.AppleTool = AppleTool;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CgMq = exports.RpcConfig = void 0;
 const Core_1 = require("../Core/Core");
-const Log_1 = require("../Logic/Log");
 const IRpcServerWebSocket_1 = require("../SocketServer/IRpcServerWebSocket");
+const global_1 = require("../global");
 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) {
-            Log_1.GLog.error("dulplicate init for CgMq");
+            global_1.global.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) {
-            Log_1.GLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
+            global_1.global.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
         }
         return ret_rpcmsg;
     }

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

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

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

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

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

@@ -1,29 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GQiniuTool = void 0;
+exports.QiniuTool = void 0;
 const qiniu = require("qiniu");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const Log_1 = require("../Logic/Log");
-exports.GQiniuTool = null;
+const global_1 = require("../global");
 class QiniuTool {
     get host() {
-        if (!IServerConfig_1.GServerCfg.qiniu) {
+        if (!global_1.global.gServerCfg.qiniu) {
             return "";
         }
-        return IServerConfig_1.GServerCfg.qiniu.host;
+        return global_1.global.gServerCfg.qiniu.host;
     }
     getUploadToken(filename) {
-        if (!IServerConfig_1.GServerCfg.qiniu) {
-            Log_1.GLog.error("qiniu config not found!");
+        if (!global_1.global.gServerCfg.qiniu) {
+            global_1.global.gLog.error("qiniu config not found!");
             return "";
         }
-        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.GServerCfg.qiniu.accessKey, IServerConfig_1.GServerCfg.qiniu.secretKey);
+        let mac = new qiniu.auth.digest.Mac(global_1.global.gServerCfg.qiniu.accessKey, global_1.global.gServerCfg.qiniu.secretKey);
         let options = {
-            scope: IServerConfig_1.GServerCfg.qiniu.bucket + ":" + filename,
+            scope: global_1.global.gServerCfg.qiniu.bucket + ":" + filename,
         };
         let putPolicy = new qiniu.rs.PutPolicy(options);
         let uploadToken = putPolicy.uploadToken(mac);
         return uploadToken;
     }
 }
-exports.GQiniuTool = new QiniuTool();
+exports.QiniuTool = 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 Log_1 = require("../Logic/Log");
+const global_1 = require("../global");
 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) {
-            Log_1.GLog.error({ des: "rpc no cmd", msg });
+            global_1.global.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,11 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WechatTool = exports.GWechatTool = exports.WechatUserInfo = void 0;
+exports.WechatTool = exports.WechatUserInfo = exports.WechatOAMsg = void 0;
 const _ = require("underscore");
 const URLEncode = require("urlencode");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const HttpTool_1 = require("../Logic/HttpTool");
-const Log_1 = require("../Logic/Log");
+const global_1 = require("../global");
+class WechatOAMsg {
+    // <xml>
+    // <ToUserName><![CDATA[toUser]]></ToUserName>
+    // <FromUserName><![CDATA[fromUser]]></FromUserName>
+    // <CreateTime>1348831860</CreateTime>
+    // <MsgType><![CDATA[text]]></MsgType>
+    // <Content><![CDATA[this is a test]]></Content>
+    // <MsgId>1234567890123456</MsgId>
+    // </xml>
+    toUserName = "";
+    fromUserName = ""; //其实是一个userid
+    createTime = -1;
+    msgType = ""; //text文本
+    content = "";
+    msgId = -1; //只有收到消息才会有
+}
+exports.WechatOAMsg = WechatOAMsg;
 class WechatUserInfo {
     openid = "OPENID";
     nickname = "NICKNAME";
@@ -21,18 +36,17 @@ class WechatUserInfo {
     unionid = "o6_bmasdasdsad6_2sgVt7hMZOPfL";
 }
 exports.WechatUserInfo = WechatUserInfo;
-exports.GWechatTool = null;
 class WechatTool {
     /**
      * 获取获取code的url
      */
     getAuthCodeUrl() {
-        if (!IServerConfig_1.GServerCfg.wechat) {
-            Log_1.GLog.error("wechat config not found!");
+        if (!global_1.global.gServerCfg.wechat) {
+            global_1.global.gLog.error("wechat config not found!");
             return null;
         }
-        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);
+        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);
         url += "&response_type=code&scope=snsapi_login";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
         let state = _.random(1000000, 9999999);
@@ -43,12 +57,12 @@ class WechatTool {
         if (!auth_code) {
             return null;
         }
-        if (!IServerConfig_1.GServerCfg.wechat) {
-            Log_1.GLog.error("wechat config not found!");
+        if (!global_1.global.gServerCfg.wechat) {
+            global_1.global.gLog.error("wechat config not found!");
             return null;
         }
-        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);
+        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);
         /*
         {
             "access_token":"ACCESS_TOKEN",
@@ -64,18 +78,54 @@ class WechatTool {
             return rs.body;
         }
         else {
-            Log_1.GLog.error(rs.body);
+            global_1.global.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 HttpTool_1.GHttpTool.get(url);
+        let rs = await global_1.global.gHttpTool.get(url);
         if (rs.body) {
             return rs.body;
         }
         return null;
     }
+    //公众号
+    convertOAMsg(xmlStr) {
+        if (!xmlStr) {
+            return null;
+        }
+        let msg = new WechatOAMsg();
+        let pre = "<ToUserName><![CDATA[";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.toUserName = xmlStr.substr(0, xmlStr.indexOf("]"));
+        pre = "<FromUserName><![CDATA[";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.fromUserName = xmlStr.substr(0, xmlStr.indexOf("]"));
+        pre = "<CreateTime>";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.createTime = parseInt(xmlStr.substr(0, xmlStr.indexOf("<")));
+        pre = "<MsgType><![CDATA[";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.msgType = xmlStr.substr(0, xmlStr.indexOf("]"));
+        pre = "<Content><![CDATA[";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.content = xmlStr.substr(0, xmlStr.indexOf("]"));
+        pre = "<MsgId>";
+        xmlStr = xmlStr.substr(xmlStr.indexOf(pre) + pre.length);
+        msg.msgId = parseInt(xmlStr.substr(0, xmlStr.indexOf("<")));
+        return msg;
+    }
+    //公众号
+    toReplyXmlStr(msg) {
+        let xmlStr = "<xml>";
+        xmlStr += "<ToUserName><![CDATA[" + msg.toUserName + "]]></ToUserName>";
+        xmlStr += "<FromUserName><![CDATA[" + msg.fromUserName + "]]></FromUserName>";
+        xmlStr += "<CreateTime>" + msg.createTime + "</CreateTime>";
+        xmlStr += "<MsgType><![CDATA[" + msg.msgType + "]]></MsgType>";
+        xmlStr += "<Content><![CDATA[" + msg.content + "]]></Content>";
+        xmlStr += "</xml>";
+        return xmlStr;
+    }
 }
 exports.WechatTool = WechatTool;
-exports.GWechatTool = new WechatTool();