@jayfong/x-server 1.24.1 → 1.24.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.24.2](https://github.com/jfWorks/x-server/compare/v1.24.1...v1.24.2) (2022-05-02)
+
+
+### Bug Fixes
+
+* returnUrl? ([fb46884](https://github.com/jfWorks/x-server/commit/fb4688405c16986727be2785695e9faa6a2db386))
+* verifyNotifyData ([a4b76e3](https://github.com/jfWorks/x-server/commit/a4b76e3c63babc2f789646f932b1375a1c0a76e4))
+
 ### [1.24.1](https://github.com/jfWorks/x-server/compare/v1.24.0...v1.24.1) (2022-05-02)
 
 ## [1.24.0](https://github.com/jfWorks/x-server/compare/v1.23.0...v1.24.0) (2022-05-02)

package/lib/_cjs/services/pay.js

@@ -15,8 +15,6 @@ var _got = _interopRequireDefault(require("got"));
 
 var _http_error = require("../core/http_error");
 
-var _x = require("../x");
-
 class PayService {
   constructor(options) {
     this.options = options;
@@ -33,18 +31,21 @@ class PayService {
       });
     }
 
-    const token = await _x.x.cache.save('x', '1h');
     const formData = new _form.default();
     formData.setMethod('get');
     formData.addField('notifyUrl', options.notifyUrl);
-    formData.addField('returnUrl', options.returnUrl);
+
+    if (options.returnUrl) {
+      formData.addField('returnUrl', options.returnUrl);
+    }
+
     formData.addField('bizContent', {
       outTradeNo: options.tradeNumber,
       productCode: 'FAST_INSTANT_TRADE_PAY',
       totalAmount: options.totalMoney,
       subject: options.goodsName,
       goodsType: '0',
-      passbackParams: token
+      passbackParams: 'alipay'
     });
     const payUrl = await this.alipaySdk.exec('alipay.trade.page.pay', {}, {
       formData: formData
@@ -55,13 +56,12 @@ class PayService {
   }
 
   async prepareWepay(options) {
-    const token = await _x.x.cache.save('x', '1h');
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
       appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
-      attach: token,
+      attach: 'wepay',
       notify_url: options.notifyUrl,
       amount: {
         total: options.totalMoney * 100,
@@ -91,19 +91,20 @@ class PayService {
     };
   }
 
-  async verifyNotifyData(data) {
-    if (!data || typeof data !== 'object') return false;
-    const token = // 微信支付
-    data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach : // 支付宝
-    data.passback_params;
-    if (!token) return false;
-    if ((await _x.x.cache.get(token)) == null) return false;
-    await _x.x.cache.remove(token);
-    return true;
+  verifyNotifyData(data) {
+    try {
+      var _this$alipaySdk;
+
+      return !!data && typeof data === 'object' && ( // 支付宝
+      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
+      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+    } catch {
+      return false;
+    }
   }
 
-  async verifyNotifyDataOrFail(data, message) {
-    if (!(await this.verifyNotifyData(data))) {
+  verifyNotifyDataOrFail(data, message) {
+    if (!this.verifyNotifyData(data)) {
       throw new _http_error.HttpError.BadRequest(message);
     }
   }

package/lib/services/pay.d.ts

@@ -33,7 +33,7 @@ export interface PayPrepareAlipayOptions {
     /** 通知地址(POST) */
     notifyUrl: string;
     /** 返回地址 */
-    returnUrl: string;
+    returnUrl?: string;
 }
 export interface PayPrepareAlipayResult {
     /** 支付地址，需跳转过去 */
@@ -69,8 +69,8 @@ export declare class PayService implements BaseService {
     constructor(options: PayOptions);
     prepareAlipay(options: PayPrepareAlipayOptions): Promise<PayPrepareAlipayResult>;
     prepareWepay(options: PayPrepareWepayOptions): Promise<PayPrepareWepayResult>;
-    verifyNotifyData(data: any): Promise<boolean>;
-    verifyNotifyDataOrFail(data: any, message?: string): Promise<void>;
+    verifyNotifyData(data: any): boolean;
+    verifyNotifyDataOrFail(data: any, message?: string): void;
     private wepaySign;
     private wepayDecrypt;
     private wepayRequest;

package/lib/services/pay.js

@@ -3,7 +3,6 @@ import AlipaySdk from 'alipay-sdk';
 import crypto from 'crypto';
 import got from 'got';
 import { HttpError } from "../core/http_error";
-import { x } from "../x";
 export class PayService {
   constructor(options) {
     this.options = options;
@@ -20,18 +19,21 @@ export class PayService {
       });
     }
 
-    const token = await x.cache.save('x', '1h');
     const formData = new AlipayFormData();
     formData.setMethod('get');
     formData.addField('notifyUrl', options.notifyUrl);
-    formData.addField('returnUrl', options.returnUrl);
+
+    if (options.returnUrl) {
+      formData.addField('returnUrl', options.returnUrl);
+    }
+
     formData.addField('bizContent', {
       outTradeNo: options.tradeNumber,
       productCode: 'FAST_INSTANT_TRADE_PAY',
       totalAmount: options.totalMoney,
       subject: options.goodsName,
       goodsType: '0',
-      passbackParams: token
+      passbackParams: 'alipay'
     });
     const payUrl = await this.alipaySdk.exec('alipay.trade.page.pay', {}, {
       formData: formData
@@ -42,13 +44,12 @@ export class PayService {
   }
 
   async prepareWepay(options) {
-    const token = await x.cache.save('x', '1h');
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
       appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
-      attach: token,
+      attach: 'wepay',
       notify_url: options.notifyUrl,
       amount: {
         total: options.totalMoney * 100,
@@ -78,19 +79,20 @@ export class PayService {
     };
   }
 
-  async verifyNotifyData(data) {
-    if (!data || typeof data !== 'object') return false;
-    const token = // 微信支付
-    data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach : // 支付宝
-    data.passback_params;
-    if (!token) return false;
-    if ((await x.cache.get(token)) == null) return false;
-    await x.cache.remove(token);
-    return true;
+  verifyNotifyData(data) {
+    try {
+      var _this$alipaySdk;
+
+      return !!data && typeof data === 'object' && ( // 支付宝
+      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
+      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+    } catch {
+      return false;
+    }
   }
 
-  async verifyNotifyDataOrFail(data, message) {
-    if (!(await this.verifyNotifyData(data))) {
+  verifyNotifyDataOrFail(data, message) {
+    if (!this.verifyNotifyData(data)) {
       throw new HttpError.BadRequest(message);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",