node-easywechat 3.5.11 → 3.5.12

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v3.5.12 (2023-12-19)
+
+- Fix: 修复类型错误
+
 ## v3.5.11 (2023-12-19)
 
 - Fix: 微信支付获取平台证书优化为随用随获取的方式，并增加缓存 (#57)

package/dist/Pay/Application.d.ts

@@ -5,12 +5,14 @@ import ConfigMixin from '../Core/Mixins/ConfigMixin';
 import HttpClientMixin from '../Core/Mixins/HttpClientMixin';
 import ServerRequestMixin from '../Core/Mixins/ServerRequestMixin';
 import { PayConfig } from '../Types/global';
+import Merchant from './Merchant';
 import MerchantInterface from './Contracts/MerchantInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';
 import Server from './Server';
 import Utils from './Utils';
 import Client from './Client';
 import Validator from './Validator';
+import ValidatorInterface from './Contracts/ValidatorInterface';
 /**
  * 微信支付应用
  */
@@ -21,8 +23,8 @@ declare class Application implements ApplicationInterface {
     protected server: Server;
     protected client: Client;
     protected utils: Utils;
-    protected validator: Validator;
-    getMerchant(): MerchantInterface;
+    protected validator: ValidatorInterface;
+    getMerchant(): Merchant;
     /**
      * 设置当前账户实例
      * @param merchant
@@ -46,7 +48,7 @@ declare class Application implements ApplicationInterface {
      * 设置验证器实例
      * @param validator
      */
-    setValidator(validator: Validator): void;
+    setValidator(validator: ValidatorInterface): void;
     getValidator(): Validator;
     getClient(): Client;
     /**

package/dist/Pay/Contracts/MerchantInterface.d.ts

@@ -42,9 +42,9 @@ declare abstract class MerchantInterface {
     getPlatformCert(serial: string): Promise<PublicKey>;
     /**
      * 获取平台证书
-     * @param force 是否强制刷新缓存
+     * @param force 是否强制刷新缓存，默认：false
      */
-    loadPlatformCerts(force: boolean): void;
+    loadPlatformCerts(force?: boolean): Promise<void>;
     /**
      * 设置平台证书
      * @param certs 键名：序列号，键值：PublicKey实例或者文件内容字符串

package/dist/Pay/Contracts/MerchantInterface.js

@@ -41,9 +41,9 @@ class MerchantInterface {
     getPlatformCert(serial) { return null; }
     /**
      * 获取平台证书
-     * @param force 是否强制刷新缓存
+     * @param force 是否强制刷新缓存，默认：false
      */
-    loadPlatformCerts(force) { }
+    loadPlatformCerts(force = false) { return; }
     /**
      * 设置平台证书
      * @param certs 键名：序列号，键值：PublicKey实例或者文件内容字符串

package/dist/Pay/Merchant.d.ts

@@ -27,6 +27,6 @@ declare class Merchant implements MerchantInterface {
     setPlatformCerts(certs: Record<string, PublicKey | string>): void;
     getPlatformCertKey(): string;
     setPlatformCertKey(key: string): this;
-    loadPlatformCerts(force?: boolean): Promise<Record<string, string>>;
+    loadPlatformCerts(force?: boolean): Promise<void>;
 }
 export = Merchant;

package/dist/Pay/Merchant.js

@@ -108,13 +108,13 @@ class Merchant {
                 certs = {};
                 let response = yield this.app.getClient().get('/v3/certificates');
                 let data = response.toObject();
-                if (!data || !data.data || data.data.length === 0)
-                    return certs;
-                data.data.forEach((item) => {
-                    let content = AES_1.AES_GCM.decrypt(item.encrypt_certificate.ciphertext, this.app.getConfig().get('secret_key'), item.encrypt_certificate.nonce, item.encrypt_certificate.associated_data).toString();
-                    certs[item.serial_no] = content;
-                });
-                yield cache.set(cacheKey, certs, 36000); // 缓存10小时
+                if (data && data.data && data.data.length > 0) {
+                    data.data.forEach((item) => {
+                        let content = AES_1.AES_GCM.decrypt(item.encrypt_certificate.ciphertext, this.app.getConfig().get('secret_key'), item.encrypt_certificate.nonce, item.encrypt_certificate.associated_data).toString();
+                        certs[item.serial_no] = content;
+                    });
+                    yield cache.set(cacheKey, certs, 36000); // 缓存10小时
+                }
             }
             this.setPlatformCerts(certs);
         });

package/package.json

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