node-easywechat 2.9.5 → 2.9.6

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v2.9.6 (2022-04-25)
+
+- Docs: 更新企业微信支付证书说明
+
 ## v2.9.5 (2022-04-23)
 
 - Fix: 修复企业微信获取注册定制化URL接口未自动获取到注册码的问题

package/README.md

@@ -107,8 +107,8 @@ let app = EasyWechat.Factory.getInstance('OficialAccount', {
   key: 'key-for-signature',
   // 默认回调地址，也可以在下单时单独设置来覆盖它，完整URL，不带参数
   notify_url: 'http://xxx.com/pay/notify',
-  // 证书地址，Node.js 只需要 .pfx 证书文件即可
-  cert_path: 'path/to/your/cert.pfx', // XXX: 绝对路径！！！！
+  // 证书地址，Node.js 只需要 apiclient_cert.p12 证书文件即可
+  cert_path: 'path/to/your/apiclient_cert.p12', // XXX: 绝对路径！！！！
 }
 ```
 
@@ -143,8 +143,8 @@ let app = EasyWechat.Factory.getInstance('OficialAccount', {
   key: 'key-for-signature',
   // V3版本签名密钥
   apiv3_key: 'apiv3_key-for-signature',
-  // 证书地址，Node.js 只需要 .pfx 证书文件即可
-  cert_path: 'path/to/your/cert.pfx', // XXX: 绝对路径！！！！
+  // 证书地址，Node.js 只需要 apiclient_cert.p12 证书文件即可
+  cert_path: 'path/to/your/apiclient_cert.p12', // XXX: 绝对路径！！！！
 
   // 以下两项配置在获取证书接口时可为空，在调用入驻接口前请先调用获取证书接口获取以下两项配置,如果获取过证书可以直接在这里配置，也可参照本文档获取平台证书章节中示例
   // serial_no: '获取证书接口获取到的平台证书序列号',

package/dist/Core/BaseAccessToken.d.ts

@@ -63,7 +63,7 @@ declare abstract class BaseAccessToken implements HttpMixin {
     protected getCredentials(): Promise<object>;
     getEndpoint(): Promise<string>;
     getCacheKey(): Promise<string>;
-    requestToken(credentials: object): Promise<any>;
+    requestToken(credentials: object): Promise<Record<string, any>>;
     /**
      * 获取Token
      * @param refresh 为true时表示强制刷新
@@ -77,10 +77,10 @@ declare abstract class BaseAccessToken implements HttpMixin {
     protected warpAccessToken(token: Record<string, any>): AccessToken;
     /**
      * 设置Token
-     * @param access_token AccessToken
+     * @param access_token Record<string, any>
      * @param expires_in 有效时间，单位：秒
      */
-    setToken(access_token: string, expires_in?: number): Promise<this>;
+    setToken(token: Record<string, any>, expires_in?: number): Promise<this>;
     /**
      * 刷新Token
      */

package/dist/Core/BaseAccessToken.js

@@ -151,6 +151,9 @@ class BaseAccessToken {
                     return this.warpAccessToken(token);
             }
             let res = yield this.requestToken(yield this.getCredentials());
+            if (res.errcode) {
+                throw new Error(res.errmsg);
+            }
             yield this.setToken(res, res.expires_in || 7200);
             return this.warpAccessToken(res);
         });
@@ -165,14 +168,14 @@ class BaseAccessToken {
     }
     /**
      * 设置Token
-     * @param access_token AccessToken
+     * @param access_token Record<string, any>
      * @param expires_in 有效时间，单位：秒
      */
-    setToken(access_token, expires_in = 7200) {
+    setToken(token, expires_in = 7200) {
         return __awaiter(this, void 0, void 0, function* () {
             let cacheKey = yield this.getCacheKey();
             let cache = this.app.getCache();
-            yield cache.set(cacheKey, access_token, expires_in);
+            yield cache.set(cacheKey, token, expires_in);
             if (!cache.has(cacheKey)) {
                 throw new Error('Failed to cache access token.');
             }

package/dist/Core/Types.d.ts

@@ -98,7 +98,7 @@ export declare interface EasyWechatConfig {
      */
     sub_mch_id?: string;
     /**
-     * pfx 证书路径（敏感接口（如退款、发送红包等）需要）
+     * apiclient_cert.p12 证书文件路径（敏感接口（如退款、发送红包等）需要）
      * @scope Payment | MicroMerchant
      */
     cert_path?: string;

package/dist/OpenPlatform/Application.d.ts

@@ -52,37 +52,37 @@ export default class OpenPlatform extends BaseApplication {
      * 使用授权码换取接口调用凭据和授权信息
      * @param authCode 授权码, 会在授权成功的回调返回给第三方平台
      */
-    handleAuthorize(): Promise<any>;
+    handleAuthorize(...arg: any[]): Promise<any>;
     /**
      * 获取授权方的帐号基本信息
      * @param appId 授权方app_id
      */
-    getAuthorizer(): Promise<any>;
+    getAuthorizer(...arg: any[]): Promise<any>;
     /**
      * 设置授权方的选项信息
      * @param appId 授权方app_id
      * @param name 选项名称
      */
-    getAuthorizerOption(): Promise<any>;
+    getAuthorizerOption(...arg: any[]): Promise<any>;
     /**
      * 设置授权方的选项信息
      * @param appId 授权方app_id
      * @param name 选项名称
      * @param value 选项值
      */
-    setAuthorizerOption(): Promise<any>;
+    setAuthorizerOption(...arg: any[]): Promise<any>;
     /**
      * 获取已授权的授权方列表
      * @param offset 起始位置，从0开始
      * @param count 获取记录数，最大500
      */
-    getAuthorizers(): Promise<any>;
+    getAuthorizers(...arg: any[]): Promise<any>;
     /**
      * 获取预授权码
      */
-    createPreAuthorizationCode(): Promise<any>;
+    createPreAuthorizationCode(...arg: any[]): Promise<any>;
     /**
      * 清零调用次数
      */
-    clearQuota(): Promise<any>;
+    clearQuota(...arg: any[]): Promise<any>;
 }

package/dist/OpenPlatform/Application.js

@@ -171,23 +171,23 @@ class OpenPlatform extends BaseApplication_1.default {
      * 使用授权码换取接口调用凭据和授权信息
      * @param authCode 授权码, 会在授权成功的回调返回给第三方平台
      */
-    handleAuthorize() {
-        return this.base.handleAuthorize.apply(this.base, arguments);
+    handleAuthorize(...arg) {
+        return this.base.handleAuthorize.apply(this.base, arg);
     }
     /**
      * 获取授权方的帐号基本信息
      * @param appId 授权方app_id
      */
-    getAuthorizer() {
-        return this.base.getAuthorizer.apply(this.base, arguments);
+    getAuthorizer(...arg) {
+        return this.base.getAuthorizer.apply(this.base, arg);
     }
     /**
      * 设置授权方的选项信息
      * @param appId 授权方app_id
      * @param name 选项名称
      */
-    getAuthorizerOption() {
-        return this.base.getAuthorizerOption.apply(this.base, arguments);
+    getAuthorizerOption(...arg) {
+        return this.base.getAuthorizerOption.apply(this.base, arg);
     }
     /**
      * 设置授权方的选项信息
@@ -195,28 +195,28 @@ class OpenPlatform extends BaseApplication_1.default {
      * @param name 选项名称
      * @param value 选项值
      */
-    setAuthorizerOption() {
-        return this.base.setAuthorizerOption.apply(this.base, arguments);
+    setAuthorizerOption(...arg) {
+        return this.base.setAuthorizerOption.apply(this.base, arg);
     }
     /**
      * 获取已授权的授权方列表
      * @param offset 起始位置，从0开始
      * @param count 获取记录数，最大500
      */
-    getAuthorizers() {
-        return this.base.getAuthorizers.apply(this.base, arguments);
+    getAuthorizers(...arg) {
+        return this.base.getAuthorizers.apply(this.base, arg);
     }
     /**
      * 获取预授权码
      */
-    createPreAuthorizationCode() {
-        return this.base.createPreAuthorizationCode.apply(this.base, arguments);
+    createPreAuthorizationCode(...arg) {
+        return this.base.createPreAuthorizationCode.apply(this.base, arg);
     }
     /**
      * 清零调用次数
      */
-    clearQuota() {
-        return this.base.clearQuota.apply(this.base, arguments);
+    clearQuota(...arg) {
+        return this.base.clearQuota.apply(this.base, arg);
     }
 }
 exports.default = OpenPlatform;

package/dist/OpenPlatform/Authorizer/MiniProgram/Application.js

@@ -17,10 +17,9 @@ class MiniProgram extends Application_1.default {
         this.account = null;
         this.setting = null;
         this.tester = null;
-        this.registerProviders();
     }
     registerProviders() {
-        this.registerCommonProviders();
+        super.registerProviders();
         this.offsetSet('code', function (app) {
             return new CodeClient_1.default(app);
         });

package/dist/OpenPlatform/Authorizer/OfficialAccount/Application.js

@@ -9,10 +9,9 @@ class OfficialAccount extends Application_1.default {
     constructor(config = {}, prepends = {}, id = null) {
         super(config, prepends, id);
         this.mini_program = null;
-        this.registerProviders();
     }
     registerProviders() {
-        this.registerCommonProviders();
+        super.registerProviders();
         this.offsetSet('mini_program', function (app) {
             return new MiniProgramClient_1.default(app);
         });

package/package.json

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