node-easywechat 3.0.0 → 3.0.1

package/CHANGELOG.md

@@ -1,7 +1,11 @@
 # CHANGELOG
 
 
-## v3.0.0 (2022-07-28)
+## v3.0.1 (2022-08-26)
+
+- Fix: 修复with方法无效的问题
+
+## v3.0.0, origin/3.x (2022-07-28)
 
 - Feat: 请求后自动解析响应结果，简化获取数据的方式
 - Feat: 新增微信支付模块的公共调用方法
@@ -17,6 +21,7 @@
 - Fix: 调整默认Message提示的作用域为公众号和小程序
 - Fix: 修复AccessToken对象声明错误的问题
 
+- Docs: 更新client调用方法说明
 - Docs: 增加微信支付相关说明文档
 
 ## v3.0.0-beta.5 (2022-06-29)

package/dist/Core/HttpClient/Mixins/PresetMixin.d.ts

@@ -62,18 +62,6 @@ declare class PresetMixin {
      * @returns
      */
     withSecret(new_secret?: string): this;
-    /**
-     * 预设置mch_id（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
-     * @param new_mch_id
-     * @returns
-     */
-    withMchId(new_mch_id?: string): this;
-    /**
-     * 预设置mch_id别名（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
-     * @param new_alias
-     * @returns
-     */
-    withMchIdAs(new_alias?: string): this;
     /**
      * 预设置文件
      * @param file  文件路径或可读文件流

package/dist/Core/HttpClient/Mixins/PresetMixin.js

@@ -109,24 +109,6 @@ class PresetMixin {
         this.with('secret', new_secret);
         return this;
     }
-    /**
-     * 预设置mch_id（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
-     * @param new_mch_id
-     * @returns
-     */
-    withMchId(new_mch_id = null) {
-        this.with('mch_id', new_mch_id);
-        return this;
-    }
-    /**
-     * 预设置mch_id别名（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
-     * @param new_alias
-     * @returns
-     */
-    withMchIdAs(new_alias = null) {
-        this.with(new_alias, this.presets['mch_id']);
-        return this;
-    }
     /**
      * 预设置文件
      * @param file  文件路径或可读文件流

package/dist/Pay/Application.d.ts

@@ -9,7 +9,7 @@ import { PayConfig } from '../Types/global';
 import MerchantInterface from './Contracts/MerchantInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';
 import Utils from './Utils';
-import HttpClientInterface from '../Core/HttpClient/Contracts/HttpClientInterface';
+import Client from './Client';
 /**
  * 微信支付应用
  */
@@ -18,7 +18,7 @@ declare class Application implements ApplicationInterface {
     protected merchant: MerchantInterface;
     protected encryptor: Encryptor;
     protected server: ServerInterface;
-    protected client: HttpClientInterface;
+    protected client: Client;
     getMerchant(): MerchantInterface;
     /**
      * 设置当前账户实例
@@ -34,13 +34,13 @@ declare class Application implements ApplicationInterface {
      */
     setServer(server: ServerInterface): this;
     getUtils(): Utils;
-    getClient(): HttpClientInterface;
+    getClient(): Client;
     /**
      * 设置客户端
      * @param client
      * @returns
      */
-    setClient(client: HttpClientInterface): this;
+    setClient(client: Client): this;
     /**
      * 获取请求默认配置
      * @returns

package/dist/Pay/Application.js

@@ -77,7 +77,7 @@ class Application {
      * @returns
      */
     setClient(client) {
-        this.client = client;
+        this.client = client.setPresets(this.config.all());
         return this;
     }
     /**

package/dist/Pay/Client.d.ts

@@ -36,6 +36,18 @@ declare class Client implements HttpClientInterface {
      * @returns
      */
     protected attachLegacySignature(body: Record<string, any>): Record<string, string | number>;
+    /**
+     * 预设置mch_id（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
+     * @param new_mch_id
+     * @returns
+     */
+    withMchId(new_mch_id?: string): this;
+    /**
+     * 预设置mch_id别名（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
+     * @param new_alias
+     * @returns
+     */
+    withMchIdAs(new_alias?: string): this;
 }
 interface Client extends HttpClientMethodsMixin, PresetMixin {
 }

package/dist/Pay/Client.js

@@ -81,6 +81,9 @@ class Client {
                     payload.headers['content-type'] = 'text/xml';
                 }
             }
+            if (this.prependData && Object.keys(this.prependData).length > 0) {
+                payload.data = Object.assign(Object.assign({}, this.prependData), payload.data);
+            }
             if (this.prependHeaders && Object.keys(this.prependHeaders).length > 0) {
                 payload.headers = Object.assign(Object.assign({}, this.prependHeaders), payload.headers);
             }
@@ -119,6 +122,24 @@ class Client {
     attachLegacySignature(body) {
         return (new LegacySignature_1.default(this.merchant)).sign(body);
     }
+    /**
+     * 预设置mch_id（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
+     * @param new_mch_id
+     * @returns
+     */
+    withMchId(new_mch_id = null) {
+        this.with('mch_id', new_mch_id);
+        return this;
+    }
+    /**
+     * 预设置mch_id别名（因nodejs不支持魔术方法，只好预先设置几个常用的方法）
+     * @param new_alias
+     * @returns
+     */
+    withMchIdAs(new_alias = null) {
+        this.with(new_alias, this.presets['mch_id']);
+        return this;
+    }
 }
 ;
 (0, Utils_1.applyMixins)(Client, [HttpClientMethodsMixin_1.default, PresetMixin_1.default]);

package/package.json

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