node-easywechat 3.3.5 → 3.3.6

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v3.3.6 (2023-05-12)
+
+- Fix: 修复微信支付v3签名错误
+
 ## v3.3.5 (2023-04-28)
 
 - Fix: 修复部分接口请求方式及请求参数设置方式异常的问题

package/dist/Core/Support/RSA.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import crypto from 'crypto';
+import crypto, { BinaryToTextEncoding } from 'crypto';
 declare class RSA {
     protected publicKey: crypto.KeyObject;
     /**
@@ -40,21 +40,19 @@ declare class RSA {
     /**
      * 计算签名
      * @param data 待解密文本
-     * @param hashType 哈希方式，默认：'sha256'
+     * @param hashType 哈希方式，默认：'RSA-SHA256'
      * @param encoding 编码，默认：'base64'
-     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
      * @returns
      */
-    sign(data: string, hashType?: string, encoding?: BufferEncoding, padding?: number): string;
+    sign(data: string, hashType?: string, encoding?: BinaryToTextEncoding): string;
     /**
      * 验证签名
      * @param signature 待验证签名字符串
      * @param data 待解密文本
-     * @param hashType 哈希方式，默认：'sha256'
+     * @param hashType 哈希方式，默认：'RSA-SHA256'
      * @param encoding 编码，默认：'base64'
-     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
      * @returns
      */
-    verify(signature: string, data: string, hashType: string, encoding?: BufferEncoding, padding?: number): boolean;
+    verify(signature: string, data: string, hashType?: string, encoding?: BinaryToTextEncoding): boolean;
 }
 export = RSA;

package/dist/Core/Support/RSA.js

@@ -65,33 +65,28 @@ class RSA {
     /**
      * 计算签名
      * @param data 待解密文本
-     * @param hashType 哈希方式，默认：'sha256'
+     * @param hashType 哈希方式，默认：'RSA-SHA256'
      * @param encoding 编码，默认：'base64'
-     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
      * @returns
      */
-    sign(data, hashType = 'sha256', encoding = 'base64', padding = crypto_1.default.constants.RSA_PKCS1_PSS_PADDING) {
-        let signature = crypto_1.default.sign(hashType, Buffer.from(data), {
-            key: this.privateKey,
-            padding,
-        });
-        return signature.toString(encoding);
+    sign(data, hashType = 'RSA-SHA256', encoding = 'base64') {
+        return crypto_1.default
+            .createSign(hashType)
+            .update(data)
+            .sign(this.privateKey, encoding);
     }
     /**
      * 验证签名
      * @param signature 待验证签名字符串
      * @param data 待解密文本
-     * @param hashType 哈希方式，默认：'sha256'
+     * @param hashType 哈希方式，默认：'RSA-SHA256'
      * @param encoding 编码，默认：'base64'
-     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
      * @returns
      */
-    verify(signature, data, hashType, encoding = 'base64', padding = crypto_1.default.constants.RSA_PKCS1_PSS_PADDING) {
-        let isVerified = crypto_1.default.verify(hashType, Buffer.from(data), {
-            key: this.publicKey,
-            padding,
-        }, Buffer.from(signature, encoding));
-        return !!isVerified;
+    verify(signature, data, hashType = 'RSA-SHA256', encoding = 'base64') {
+        const verify = crypto_1.default.createVerify(hashType);
+        verify.update(data);
+        return verify.verify(this.publicKey, signature, encoding);
     }
 }
 ;

package/dist/Pay/Application.js

@@ -84,7 +84,7 @@ class Application {
      */
     getHttpClientDefaultOptions() {
         return (0, merge_1.default)(true, {
-            baseURL: 'https://api.weixin.qq.com/',
+            baseURL: 'https://api.mch.weixin.qq.com',
         }, this.getConfig().get('http'));
     }
 }

package/dist/Pay/Signature.js

@@ -34,7 +34,7 @@ class Signature {
                 body = payload.data;
             }
         }
-        let signString = `${method.toUpperCase()}\n${pathname}\n${timestamp}\n${nonce}\n${body}`;
+        let signString = `${method.toUpperCase()}\n${pathname}\n${timestamp}\n${nonce}\n${body}\n`;
         let rsa = new RSA_1.default;
         rsa.setPublicKey(this.merchant.getCertificate().getValue());
         rsa.setPrivateKey(this.merchant.getPrivateKey().getKey());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {