cgserver 12.0.8 → 12.2.0

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

@@ -1,205 +1,117 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gAlipayTool = 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 Config_1 = require("../Config/Config");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const Log_1 = require("../Logic/Log");
-class AlipayResult {
-    alipay_trade_app_pay_response = {
-        code: "10000",
-        msg: "Success",
-        app_id: "2021003143637369",
-        auth_app_id: "2021003143637369",
-        charset: "utf-8",
-        timestamp: "2022-08-10 16:38:04",
-        out_trade_no: "62f36e657a355ecc1cb8eec2",
-        total_amount: "0.05",
-        trade_no: "2022081022001489431433911625",
-        seller_id: "2088441785429273"
-    };
-    sign = "d/Guf6QYnuk9fFlRS1EUFTY+n3/jQKp7IwQENG4WXO+qxMGglPXa3RhUHaJELTMwC4tcKhz8Z8GCiiI1Y7G84kAql1jyoekaOMWvdPRDOjkAqouP3oh5v9r23BziJUxgv/kanBRfOoTKvIT7R0L5DyfxMpEoHdssPHAtENMiniCVZlRUkAhHxjmgMrP0rzMtBvqctC5Me6UiV1yBdGWecLk9RNwMTZF8QSXKVpWXmhmimdjjFjGMcE6r7LoV9YW1Bsvjoq2kdRMX7CJZufGk1Y5Qz8Cv+E9QxTnDJMtA0XyYzte53/dSw0W3Z4Gbosn/kV4QDBRzN39NwwuoFwGuVg==";
-    sign_type = "RSA2";
-}
-exports.AlipayResult = AlipayResult;
-class AlipayCallBack {
-    gmt_create = "2022-08-10 16=38=03";
-    charset = "utf-8";
-    seller_email = "zdpuke@163.com";
-    subject = "一把砖石";
-    sign = "gytkeBGeea9V05lI6Qvvut8CZnXtXJmbb0dMDd76a6fgN2k2IO0HH4wkJylMQG3EXYJQctysURDtIB0dhqaZbDVtePsM3iQVeI2jwT3YS3XGS4xi13k8foag9vCcSgojKjxJS3ihfzuyK/Pc+KDTOQftoWP2s1dPUpJNGLcZp4sUFysl0Iyzf+2vXh4OJUPQ3DvCqePnDUawq1+AUUj63WHWvdsGCP70+eTsbKxJxWBhHfMVrwkOmUI0zivcHpHLVHbfTFvaM5LAa/ivSU8jiDHqgHYFZqqzTyZ1DLxEy0Ypo3sKBs5eK/UhdsNf5tjse7PxYJwMU2ziIo9gnqv6fQ==";
-    buyer_id = 2088202482689432;
-    invoice_amount = "0.05";
-    notify_id = 2.022081000222164e+33;
-    fund_bill_list = [{ amount: "0.05", fundChannel: "PCREDIT" }];
-    notify_type = "trade_status_sync";
-    trade_status = "TRADE_SUCCESS";
-    receipt_amount = "0.05";
-    app_id = 2021003143637369;
-    buyer_pay_amount = "0.05";
-    sign_type = "RSA2";
-    seller_id = 2088441785429273;
-    gmt_payment = "2022-08-10 16:38:03";
-    notify_time = "2022-08-10 16:38:04";
-    version = 1;
-    out_trade_no = "62f36e657a355ecc1cb8eec2";
-    total_amount = "0.05";
-    trade_no = 2.0220810220014894e+27;
-    auth_app_id = 2021003143637369;
-    buyer_logon_id = "138****3531";
-    point_amount = 0;
-}
-exports.AlipayCallBack = AlipayCallBack;
-class AlipayTool {
-    _alipaySdk = null;
-    _aliPay = null;
-    _cfg = {
-        app_id: "",
-        app_key: "",
-        gateway: "",
-        //RSA1 RSA2
-        signType: 'RSA2',
-        /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-        keyType: 'PKCS1',
-        alipay_root_cert_sn: "",
-        alipay_cert_sn: "",
-        app_cert_sn: "",
-        notify_url: ""
-    };
-    init() {
-        if (!IServerConfig_1.gServerCfg.alipay
-            || !IServerConfig_1.gServerCfg.alipay.open) {
-            return false;
-        }
-        let suffix = "";
-        if (IServerConfig_1.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],
-            //RSA1 RSA2
-            signType: IServerConfig_1.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]
-        };
-        if (this._cfg.alipay_cert_sn) {
-            this._aliPay = new AliPayUtil_1.AliPayUtil(this._cfg.alipay_cert_sn, this._cfg.app_key);
-        }
-        else {
-            let app_key = "";
-            if (this._cfg.app_key.indexOf(".pem") > 0) {
-                app_key = fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.app_key, 'ascii');
-            }
-            else {
-                app_key = this._cfg.app_key;
-            }
-            this._alipaySdk = new alipay_sdk_1.default({
-                appId: this._cfg.app_id,
-                privateKey: app_key,
-                gateway: this._cfg.gateway,
-                signType: this._cfg.signType,
-                keyType: this._cfg.keyType
-            });
-        }
-        Log_1.gLog.info("alipay init success!");
-    }
-    /**
-     *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"
-     * @param out_trade_no
-     * @param total_amount
-     * @param subject
-     * @param body
-     * @param timeout_express
-     * @param product_code
-     * @returns
-     */
-    _buildOrderParams(out_trade_no, total_amount, subject = "1", body = "我是测试数据", timeout_express = "30m", product_code = "QUICK_MSECURITY_PAY") {
-        let order_params = {
-            notifyUrl: this._cfg.notify_url,
-            bizContent: {
-                timeout_express: timeout_express,
-                product_code: product_code,
-                total_amount: total_amount,
-                subject: encodeURIComponent(subject),
-                body: encodeURIComponent(body),
-                out_trade_no: out_trade_no
-            }
-        };
-        return order_params;
-    }
-    _sign(order_params) {
-        let sign = aliUtil.sign("alipay.trade.app.pay", order_params, this._alipaySdk.config);
-        return sign;
-    }
-    getOrderInfo(out_trade_no, total_amount, subject = "1", body = "我是测试数据") {
-        let order_params = this._buildOrderParams(out_trade_no, total_amount, subject, body);
-        let sign = this._sign(order_params);
-        let { url, execParams } = this._alipaySdk["formatUrl"]("", sign);
-        const order_info = (url + '&biz_content=' + encodeURIComponent(execParams.biz_content)).substring(1);
-        return order_info;
-    }
-    /**
-     *
-     * @param title
-     * @param order_id
-     * @param money
-     */
-    doPay(title, order_id, money) {
-        const param = {
-            app_id: this._cfg.app_id,
-            notify_url: this._cfg.notify_url,
-            app_cert_sn: this._cfg.app_cert_sn,
-            alipay_root_cert_sn: this._cfg.alipay_root_cert_sn,
-            subject: title,
-            trade_no: order_id,
-            total_amount: money,
-        };
-        var str = this._aliPay.getPayCode(param);
-        return str;
-    }
-    rsaCheck(payInfo) {
-        return this._aliPay.rsaCheck(payInfo);
-    }
-    /**
-     *
-     * @param method get|post
-     * @param notifyUrl 通知回调
-     * @param returnUrl
-     * @param outTradeNo
-     * @param money 价格
-     * @param subject 标题
-     * @param body 内容介绍
-     */
-    async getAlipayPage(method, notifyUrl, returnUrl, outTradeNo, money, subject, body) {
-        if (!this._alipaySdk) {
-            Log_1.gLog.error("并未配置alipay或者初始化失败");
-            return;
-        }
-        const formData = new form_1.default();
-        // 调用 setMethod 并传入 get，会返回可以跳转到支付页面的 url
-        formData.setMethod(method);
-        formData.addField("return_url", returnUrl);
-        formData.addField('notifyUrl', notifyUrl);
-        formData.addField('bizContent', {
-            outTradeNo: outTradeNo,
-            productCode: "FAST_INSTANT_TRADE_PAY",
-            totalAmount: money,
-            subject: subject,
-            body: body,
-        });
-        let url_or_html = await this._alipaySdk.exec('alipay.trade.page.pay', {}, { formData: formData });
-        return url_or_html;
-    }
-}
-exports.AlipayTool = AlipayTool;
-exports.gAlipayTool = new AlipayTool();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gAlipayTool = exports.AlipayTool = exports.EAlipayExecType = void 0;
+const alipay_sdk_1 = require("alipay-sdk");
+const Log_1 = require("../Logic/Log");
+var EAlipayExecType;
+(function (EAlipayExecType) {
+    EAlipayExecType[EAlipayExecType["exec"] = 0] = "exec";
+    EAlipayExecType[EAlipayExecType["sdkExec"] = 1] = "sdkExec";
+    EAlipayExecType[EAlipayExecType["pageExec"] = 2] = "pageExec";
+})(EAlipayExecType || (exports.EAlipayExecType = EAlipayExecType = {}));
+class AlipayTool {
+    _alipaySdk = null;
+    get alipaySdk() {
+        return this._alipaySdk;
+    }
+    async init(cfg) {
+        if (!cfg
+            || !cfg.open) {
+            return false;
+        }
+        let ret = true;
+        // 实例化客户端
+        this._alipaySdk = new alipay_sdk_1.AlipaySdk(cfg);
+        const result = await this._alipaySdk.curl('POST', '/v3/alipay/user/deloauth/detail/query', {
+            body: {
+                date: '20230102',
+                offset: 20,
+                limit: 1,
+            },
+        });
+        if (result && result.responseHttpStatus == 200) {
+            Log_1.gLog.info(result);
+            Log_1.gLog.info("alipay init success!");
+        }
+        else {
+            Log_1.gLog.error(result);
+            Log_1.gLog.error("alipay init failed!");
+            ret = false;
+        }
+        return ret;
+    }
+    /**
+     * 创建支付宝APP支付订单
+     * @param params 支付参数
+     * @returns 支付订单信息
+     */
+    async trade_app_pay(params, execType = EAlipayExecType.exec) {
+        return await this.exec('alipay.trade.app.pay', params, execType);
+    }
+    /**
+     * 验证支付宝支付回调
+     * @param notifyData 回调数据
+     * @returns 验证结果
+     */
+    async verifyNotify(notifyData) {
+        try {
+            if (!this._alipaySdk) {
+                return false;
+            }
+            // 验证签名
+            const signValid = await this._alipaySdk.checkNotifySign(notifyData);
+            if (!signValid) {
+                Log_1.gLog.error({ tip: '支付宝回调签名验证失败' });
+                return false;
+            }
+            // 验证交易状态
+            if (notifyData.trade_status !== 'TRADE_SUCCESS' && notifyData.trade_status !== 'TRADE_FINISHED') {
+                Log_1.gLog.error({ tip: '支付宝回调交易状态异常:', status: notifyData.trade_status });
+                return false;
+            }
+            return true;
+        }
+        catch (error) {
+            Log_1.gLog.error({ tip: '验证支付宝回调失败:', error });
+            return false;
+        }
+    }
+    async exec(method, params, execType = EAlipayExecType.exec) {
+        try {
+            if (!this._alipaySdk) {
+                return null;
+            }
+            let result = null;
+            switch (execType) {
+                case EAlipayExecType.exec:
+                    result = await this._alipaySdk.exec(method, params);
+                    break;
+                case EAlipayExecType.sdkExec:
+                    result = await this._alipaySdk.sdkExec(method, params);
+                    break;
+                case EAlipayExecType.pageExec:
+                    result = await this._alipaySdk.pageExec(method, params);
+                    break;
+            }
+            return result;
+        }
+        catch (error) {
+            Log_1.gLog.error({ tip: '执行支付宝请求失败:', method, params, error: error });
+            return null;
+        }
+    }
+    /**
+     * 查询订单状态
+     * @param outTradeNo 商户订单号
+     * @returns 订单状态
+     */
+    async trade_query(outTradeNo, execType = EAlipayExecType.exec) {
+        return await this.exec('alipay.trade.query', {
+            bizContent: {
+                out_trade_no: outTradeNo
+            }
+        }, execType);
+    }
+}
+exports.AlipayTool = AlipayTool;
+exports.gAlipayTool = new AlipayTool();

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

@@ -1,50 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gSMSTool = exports.SMSTool = void 0;
-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 (!IServerConfig_1.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!");
-    }
-    /**
-     * 发送短信验证码
-     * @param code 验证码
-     * @param phone 手机号
-     * @param callback 回调
-     */
-    sendSMS(code, phone) {
-        return new Promise((resolve, reject) => {
-            this._sms_client.sendSMS({
-                PhoneNumbers: phone,
-                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 {
-                    Log_1.gLog.error("phone:" + phone + " code:" + res.Code);
-                    resolve(res.Code);
-                }
-            }, (err) => {
-                Log_1.gLog.error(err);
-                resolve(err);
-            });
-        });
-    }
-}
-exports.SMSTool = SMSTool;
-exports.gSMSTool = new SMSTool();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gSMSTool = exports.SMSTool = exports.AliSmsConfig = void 0;
+const Log_1 = require("../Logic/Log");
+let SMSClient = require("@alicloud/sms-sdk");
+class AliSmsConfig {
+    open = false;
+    signName = "";
+    accessKeyId = "";
+    secretAccessKey = "";
+    templateCode = "";
+}
+exports.AliSmsConfig = AliSmsConfig;
+class SMSTool {
+    _is_init = false;
+    _sms_client = null;
+    _cfg = null;
+    init(cfg) {
+        if (!cfg
+            || !cfg.open) {
+            return false;
+        }
+        this._cfg = cfg;
+        if (this._is_init) {
+            return true;
+        }
+        this._is_init = true;
+        this._sms_client = new SMSClient({ accessKeyId: cfg.accessKeyId, secretAccessKey: cfg.secretAccessKey });
+        Log_1.gLog.info("SMSClient init success!");
+    }
+    /**
+     * 发送短信验证码
+     * @param code 验证码
+     * @param phone 手机号
+     * @param callback 回调
+     */
+    sendSMS(code, phone) {
+        let param = typeof code == "string" ? { code: code } : code;
+        return new Promise((resolve, reject) => {
+            this._sms_client.sendSMS({
+                PhoneNumbers: phone,
+                SignName: this._cfg.signName,
+                TemplateCode: this._cfg.templateCode,
+                TemplateParam: JSON.stringify(param)
+            }).then((res) => {
+                if (res.Code == "OK") {
+                    resolve(null);
+                }
+                else {
+                    Log_1.gLog.error("phone:" + phone + " code:" + res.Code);
+                    resolve(res.Code);
+                }
+            }, (err) => {
+                Log_1.gLog.error(err);
+                resolve(err);
+            });
+        });
+    }
+}
+exports.SMSTool = SMSTool;
+exports.gSMSTool = new SMSTool();