node-easywechat 2.6.10 → 2.8.0

package/README.md

@@ -1,7 +1,7 @@
 
 ## EasyWechat for Node.js
 
-[![Build Status](https://www.travis-ci.com/hpyer/node-easywechat.svg?branch=develop)](https://www.travis-ci.com/hpyer/node-easywechat) [![npm](https://img.shields.io/npm/v/node-easywechat.svg)](https://www.npmjs.com/package/node-easywechat) [![License](https://img.shields.io/npm/l/node-easywechat.svg)](LICENSE)
+[![Build Status](https://app.travis-ci.com/hpyer/node-easywechat.svg?branch=develop)](https://app.travis-ci.com/hpyer/node-easywechat) [![npm](https://img.shields.io/npm/v/node-easywechat.svg)](https://www.npmjs.com/package/node-easywechat) [![License](https://img.shields.io/npm/l/node-easywechat.svg)](LICENSE)
 
 **注：2.x分支针对 EasyWechat 的 5.x版本(由于4.x与5.x的结构基本一致，就不升级大版本了)。若您需要 EasyWechat 的 3.x版本，请切换到 [1.x](https://github.com/hpyer/node-easywechat/tree/1.x) 分支。**
 
@@ -16,7 +16,7 @@
 
 ### 使用说明
 
-绝大部分API都可以根据 [EasyWechat 的文档](https://www.easywechat.com/docs) 来使用。小部分（如获取请求相关数据、返回响应数据、支付证书等）的操作，由于语言环境的不同，会有不同处理。具体可以查看 [node-easywechat-demo](https://github.com/hpyer/node-easywechat-demo/) 以及下方的[自定义模块说明](#自定义模块模块替换使用方法) 。如果仍有疑问，请提issue，谢谢～
+绝大部分API都可以根据 [EasyWechat 的文档](https://www.easywechat.com/5.x/) 来使用。小部分（如获取请求相关数据、返回响应数据、支付证书等）的操作，由于语言环境的不同，会有不同处理。具体可以查看 [node-easywechat-demo](https://github.com/hpyer/node-easywechat-demo/) 以及下方的[自定义模块说明](#自定义模块模块替换使用方法) 。如果仍有疑问，请提issue，谢谢～
 
 更多信息详见：[API文档](docs/README.md)
 
@@ -46,6 +46,11 @@ let openPlatform = new EasyWechat.Factory.Work({
   // ...
 });
 
+// 小微商户
+let microMerchant = new EasyWechat.Factory.MicroMerchant({
+  // ...
+});
+
 // 通用方式
 let app = EasyWechat.Factory.getInstance('OficialAccount', {
   // ...
@@ -124,6 +129,24 @@ let app = EasyWechat.Factory.getInstance('OficialAccount', {
 }
 ```
 
+``` js
+// 小微商户配置
+{
+  // 商户号
+  mch_id: 'your-mch-id',
+  // 签名密钥
+  key: 'key-for-signature',
+  // V3版本签名密钥
+  apiv3_key: 'apiv3_key-for-signature',
+  // 证书地址，Node.js 只需要 .pfx 证书文件即可
+  cert_path: 'path/to/your/cert.pfx', // XXX: 绝对路径！！！！
+
+  // 以下两项配置在获取证书接口时可为空，在调用入驻接口前请先调用获取证书接口获取以下两项配置,如果获取过证书可以直接在这里配置，也可参照本文档获取平台证书章节中示例
+  // serial_no: '获取证书接口获取到的平台证书序列号',
+  // certificate: '获取证书接口获取到的证书内容'
+}
+```
+
 ### 模块支持情况
 
 - [x] 公众号模块
@@ -132,7 +155,7 @@ let app = EasyWechat.Factory.getInstance('OficialAccount', {
 - [x] 开放平台
 - [x] 企业微信
 - [ ] 企业微信开放平台
-- [ ] 小微商户
+- [x] 小微商户
 - [x] 自定义
 
 ### 自定义模块（模块替换）使用方法

package/dist/BaseService/ContentSecurity/ContentSecurityClient.d.ts

@@ -1,14 +1,16 @@
+/// <reference types="node" />
 import BaseClient from '../../Core/BaseClient';
+import Stream from 'stream';
 export default class ContentSecurityClient extends BaseClient {
     protected baseUrl: string;
     /**
      * 校验一段文本是否含有违法内容
-     * @param {string} text 待校验文本
+     * @param text 待校验文本
      */
     checkText(text: string): Promise<any>;
     /**
      * 校验一张图片是否含有敏感信息
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
-    checkImage(file: any): Promise<any>;
+    checkImage(file: string | Stream.Readable): Promise<any>;
 }

package/dist/BaseService/ContentSecurity/ContentSecurityClient.js

@@ -20,7 +20,7 @@ class ContentSecurityClient extends BaseClient_1.default {
     }
     /**
      * 校验一段文本是否含有违法内容
-     * @param {string} text 待校验文本
+     * @param text 待校验文本
      */
     checkText(text) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -31,7 +31,7 @@ class ContentSecurityClient extends BaseClient_1.default {
     }
     /**
      * 校验一张图片是否含有敏感信息
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
     checkImage(file) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/BaseService/Jssdk/JssdkClient.d.ts

@@ -10,35 +10,35 @@ export default class Client extends BaseClient {
     getTicket(refresh?: boolean, type?: string): Promise<string>;
     /**
      * 获取JSSDK的配置
-     * @param {Array<string>} jsApiList API列表
-     * @param {Boolean} debug 是否调试模式，默认：false
-     * @param {Boolean} beta 是否测试模式，默认：false
-     * @param {Boolean} json true时返回JSON字符串，默认：true
-     * @param {Array<string>} openTagList 开放标签列表，默认：[]
-     * @param {string} url 请求URL，默认：当前URL
+     * @param jsApiList API列表
+     * @param debug 是否调试模式，默认：false
+     * @param beta 是否测试模式，默认：false
+     * @param json true时返回JSON字符串，默认：true
+     * @param openTagList 开放标签列表，默认：[]
+     * @param url 请求URL，默认：当前URL
      */
     buildConfig(jsApiList: Array<string>, debug?: Boolean, beta?: Boolean, json?: Boolean, openTagList?: Array<string>, url?: string): Promise<any>;
     /**
      * 获取JSSDK的配置对象
-     * @param {Array<string>} jsApiList API列表
-     * @param {Boolean} debug 是否调试模式，默认：false
-     * @param {Boolean} beta 是否测试模式，默认：false
-     * @param {Array<string>} openTagList 开放标签列表，默认：[]
-     * @param {string} url 请求URL，默认：当前URL
+     * @param jsApiList API列表
+     * @param debug 是否调试模式，默认：false
+     * @param beta 是否测试模式，默认：false
+     * @param openTagList 开放标签列表，默认：[]
+     * @param url 请求URL，默认：当前URL
      */
     getConfigArray(jsApiList: Array<string>, debug?: Boolean, beta?: Boolean, openTagList?: Array<string>, url?: string): Promise<any>;
     /**
      * 获取签名配置
-     * @param {string} url 完整的URL地址
-     * @param {string} nonce 随机字符串，默认：随机10位
-     * @param {string} timestamp 时间戳，默认：当前时间
+     * @param url 完整的URL地址
+     * @param nonce 随机字符串，默认：随机10位
+     * @param timestamp 时间戳，默认：当前时间
      */
     configSignature(url?: string, nonce?: string, timestamp?: string): Promise<object>;
     protected getTicketSignature(ticket: string, nonce: string, timestamp: string, url: string): string;
     protected dictionaryOrderSignature(args: Array<string>): string;
     /**
      * 设置当前URL
-     * @param {string} url 完整的URL地址
+     * @param url 完整的URL地址
      */
     setUrl(url: string): this;
     /**

package/dist/BaseService/Jssdk/JssdkClient.js

@@ -46,12 +46,12 @@ class Client extends BaseClient_1.default {
     }
     /**
      * 获取JSSDK的配置
-     * @param {Array<string>} jsApiList API列表
-     * @param {Boolean} debug 是否调试模式，默认：false
-     * @param {Boolean} beta 是否测试模式，默认：false
-     * @param {Boolean} json true时返回JSON字符串，默认：true
-     * @param {Array<string>} openTagList 开放标签列表，默认：[]
-     * @param {string} url 请求URL，默认：当前URL
+     * @param jsApiList API列表
+     * @param debug 是否调试模式，默认：false
+     * @param beta 是否测试模式，默认：false
+     * @param json true时返回JSON字符串，默认：true
+     * @param openTagList 开放标签列表，默认：[]
+     * @param url 请求URL，默认：当前URL
      */
     buildConfig(jsApiList, debug = false, beta = false, json = true, openTagList = [], url = '') {
         return __awaiter(this, void 0, void 0, function* () {
@@ -63,20 +63,20 @@ class Client extends BaseClient_1.default {
     }
     /**
      * 获取JSSDK的配置对象
-     * @param {Array<string>} jsApiList API列表
-     * @param {Boolean} debug 是否调试模式，默认：false
-     * @param {Boolean} beta 是否测试模式，默认：false
-     * @param {Array<string>} openTagList 开放标签列表，默认：[]
-     * @param {string} url 请求URL，默认：当前URL
+     * @param jsApiList API列表
+     * @param debug 是否调试模式，默认：false
+     * @param beta 是否测试模式，默认：false
+     * @param openTagList 开放标签列表，默认：[]
+     * @param url 请求URL，默认：当前URL
      */
     getConfigArray(jsApiList, debug = false, beta = false, openTagList = [], url = '') {
         return this.buildConfig(jsApiList, debug, beta, false, openTagList, url);
     }
     /**
      * 获取签名配置
-     * @param {string} url 完整的URL地址
-     * @param {string} nonce 随机字符串，默认：随机10位
-     * @param {string} timestamp 时间戳，默认：当前时间
+     * @param url 完整的URL地址
+     * @param nonce 随机字符串，默认：随机10位
+     * @param timestamp 时间戳，默认：当前时间
      */
     configSignature(url = '', nonce = '', timestamp = '') {
         return __awaiter(this, void 0, void 0, function* () {
@@ -106,7 +106,7 @@ class Client extends BaseClient_1.default {
     }
     /**
      * 设置当前URL
-     * @param {string} url 完整的URL地址
+     * @param url 完整的URL地址
      */
     setUrl(url) {
         this.url = url;

package/dist/BaseService/Media/MediaClient.d.ts

@@ -1,55 +1,57 @@
+/// <reference types="node" />
 import BaseClient from '../../Core/BaseClient';
+import Stream from 'stream';
 export default class MediaClient extends BaseClient {
     protected baseUrl: string;
     protected allowTypes: Array<string>;
     /**
      * 上传图片到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
-    uploadImage(file: any): Promise<any>;
+    uploadImage(file: string | Stream.Readable): Promise<any>;
     /**
      * 上传视频到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
-    uploadVideo(file: any): Promise<any>;
+    uploadVideo(file: string | Stream.Readable): Promise<any>;
     /**
      * 上传语音到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
-    uploadVoice(file: any): Promise<any>;
+    uploadVoice(file: string | Stream.Readable): Promise<any>;
     /**
      * 上传缩略图到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
-    uploadThumb(file: any): Promise<any>;
+    uploadThumb(file: string | Stream.Readable): Promise<any>;
     /**
      * 上传到临时素材
-     * @param {string} type 类型，可选值：image,video,voice,thumb
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param type 类型，可选值：image,video,voice,thumb
+     * @param file 文件路径或可读stream
      */
-    upload(type: string, file: any): Promise<any>;
+    upload(type: string, file: string | Stream.Readable): Promise<any>;
     /**
      * 上传群发视频
-     * @param {string/ReadableStream} file 文件路径或可读stream
-     * @param {string} title 标题
-     * @param {string} description 描述
+     * @param file 文件路径或可读stream
+     * @param title 标题
+     * @param description 描述
      */
-    uploadVideoForBroadcasting(file: any, title: string, description: string): Promise<any>;
+    uploadVideoForBroadcasting(file: string | Stream.Readable, title: string, description: string): Promise<any>;
     /**
      * 创建群发消息
-     * @param {string} media_id 上传视频得到 media_id
-     * @param {string} title 标题
-     * @param {string} description 描述
+     * @param media_id 上传视频得到 media_id
+     * @param title 标题
+     * @param description 描述
      */
     createVideoForBroadcasting(media_id: string, title: string, description: string): Promise<any>;
     /**
      * 获取临时素材内容
-     * @param {string} media_id 上传视频得到 media_id
+     * @param media_id 上传视频得到 media_id
      */
     get(media_id: string): Promise<any>;
     /**
      * 获取 JSSDK 上传的高清语音
-     * @param {string} media_id 上传视频得到 media_id
+     * @param media_id 上传视频得到 media_id
      */
     getJssdkMedia(media_id: string): Promise<any>;
 }

package/dist/BaseService/Media/MediaClient.js

@@ -23,36 +23,36 @@ class MediaClient extends BaseClient_1.default {
     }
     /**
      * 上传图片到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
     uploadImage(file) {
         return this.upload('image', file);
     }
     /**
      * 上传视频到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
     uploadVideo(file) {
         return this.upload('video', file);
     }
     /**
      * 上传语音到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
     uploadVoice(file) {
         return this.upload('voice', file);
     }
     /**
      * 上传缩略图到临时素材
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param file 文件路径或可读stream
      */
     uploadThumb(file) {
         return this.upload('thumb', file);
     }
     /**
      * 上传到临时素材
-     * @param {string} type 类型，可选值：image,video,voice,thumb
-     * @param {string/ReadableStream} file 文件路径或可读stream
+     * @param type 类型，可选值：image,video,voice,thumb
+     * @param file 文件路径或可读stream
      */
     upload(type, file) {
         if (!file) {
@@ -69,9 +69,9 @@ class MediaClient extends BaseClient_1.default {
     }
     /**
      * 上传群发视频
-     * @param {string/ReadableStream} file 文件路径或可读stream
-     * @param {string} title 标题
-     * @param {string} description 描述
+     * @param file 文件路径或可读stream
+     * @param title 标题
+     * @param description 描述
      */
     uploadVideoForBroadcasting(file, title, description) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -84,9 +84,9 @@ class MediaClient extends BaseClient_1.default {
     }
     /**
      * 创建群发消息
-     * @param {string} media_id 上传视频得到 media_id
-     * @param {string} title 标题
-     * @param {string} description 描述
+     * @param media_id 上传视频得到 media_id
+     * @param title 标题
+     * @param description 描述
      */
     createVideoForBroadcasting(media_id, title, description) {
         return this.httpPostJson('media/uploadvideo', {
@@ -97,7 +97,7 @@ class MediaClient extends BaseClient_1.default {
     }
     /**
      * 获取临时素材内容
-     * @param {string} media_id 上传视频得到 media_id
+     * @param media_id 上传视频得到 media_id
      */
     get(media_id) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -123,7 +123,7 @@ class MediaClient extends BaseClient_1.default {
     }
     /**
      * 获取 JSSDK 上传的高清语音
-     * @param {string} media_id 上传视频得到 media_id
+     * @param media_id 上传视频得到 media_id
      */
     getJssdkMedia(media_id) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/BaseService/Url/UrlClient.d.ts

@@ -5,5 +5,5 @@ export default class UrlClient extends BaseClient {
      * 获取短网址
      * @param long_url 原始URL地址
      */
-    shorten(long_url: any): Promise<any>;
+    shorten(long_url: string): Promise<any>;
 }

package/dist/Core/AES.d.ts

@@ -0,0 +1,46 @@
+/// <reference types="node" />
+import { CipherGCMTypes, BinaryLike, CipherKey } from 'crypto';
+export declare class AES {
+    /**
+     * 加密
+     * @static
+     * @param plaintext 待加密文本
+     * @param key 密钥
+     * @param iv 向量
+     * @param autoPadding 自动补位，默认：null，表示不设置
+     * @param method 加密方式，默认：'aes-256-cbc'
+     */
+    static encrypt(plaintext: BinaryLike, key: CipherKey, iv?: BinaryLike, autoPadding?: boolean, method?: string): Buffer;
+    /**
+     * 解密
+     * @static
+     * @param ciphertext 待解密文本，Base64 编码字符串
+     * @param key 密钥
+     * @param iv 向量
+     * @param autoPadding 自动补位，默认：null，表示不设置
+     * @param method 加密方式，默认：aes-256-cbc
+     */
+    static decrypt(ciphertext: NodeJS.ArrayBufferView, key: BinaryLike, iv?: BinaryLike, autoPadding?: boolean, method?: string): Buffer;
+}
+export declare class AES_GCM {
+    /**
+     * GCM模式加密
+     * @static
+     * @param plaintext 待加密文本
+     * @param key 密钥
+     * @param iv 向量
+     * @param aad aad
+     * @param method 加密方式，默认：aes-256-gcm
+     */
+    static encrypt(plaintext: BinaryLike, key: CipherKey, iv?: BinaryLike, aad?: string, method?: CipherGCMTypes): Buffer;
+    /**
+     * GCM模式解密
+     * @static
+     * @param ciphertext 待解密文本，Base64 编码字符串
+     * @param key 密钥
+     * @param iv 向量
+     * @param aad aad
+     * @param method 加密方式，默认：aes-256-gcm
+     */
+    static decrypt(ciphertext: NodeJS.ArrayBufferView, key: BinaryLike, iv?: BinaryLike, aad?: string, method?: CipherGCMTypes): Buffer;
+}

package/dist/Core/AES.js

@@ -0,0 +1,95 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AES_GCM = exports.AES = void 0;
+const crypto_1 = require("crypto");
+class AES {
+    /**
+     * 加密
+     * @static
+     * @param plaintext 待加密文本
+     * @param key 密钥
+     * @param iv 向量
+     * @param autoPadding 自动补位，默认：null，表示不设置
+     * @param method 加密方式，默认：'aes-256-cbc'
+     */
+    static encrypt(plaintext, key, iv = '', autoPadding = null, method = 'aes-256-cbc') {
+        let cipher = crypto_1.createCipheriv(method, key, iv);
+        if (typeof autoPadding === 'boolean') {
+            cipher.setAutoPadding(autoPadding);
+        }
+        return Buffer.concat([
+            cipher.update(plaintext),
+            cipher.final(),
+        ]);
+    }
+    /**
+     * 解密
+     * @static
+     * @param ciphertext 待解密文本，Base64 编码字符串
+     * @param key 密钥
+     * @param iv 向量
+     * @param autoPadding 自动补位，默认：null，表示不设置
+     * @param method 加密方式，默认：aes-256-cbc
+     */
+    static decrypt(ciphertext, key, iv = '', autoPadding = null, method = 'aes-256-cbc') {
+        let decipher = crypto_1.createDecipheriv(method, key, iv);
+        if (typeof autoPadding === 'boolean') {
+            decipher.setAutoPadding(autoPadding);
+        }
+        if (typeof ciphertext === 'string') {
+            ciphertext = Buffer.from(ciphertext, 'base64');
+        }
+        let deciphered = Buffer.concat([
+            decipher.update(ciphertext),
+            decipher.final(),
+        ]);
+        return deciphered;
+    }
+}
+exports.AES = AES;
+class AES_GCM {
+    /**
+     * GCM模式加密
+     * @static
+     * @param plaintext 待加密文本
+     * @param key 密钥
+     * @param iv 向量
+     * @param aad aad
+     * @param method 加密方式，默认：aes-256-gcm
+     */
+    static encrypt(plaintext, key, iv = '', aad = '', method = 'aes-256-gcm') {
+        let cipher = crypto_1.createCipheriv(method, key, iv).setAAD(Buffer.from(aad));
+        return Buffer.concat([
+            cipher.update(plaintext),
+            cipher.final(),
+            cipher.getAuthTag(),
+        ]);
+    }
+    /**
+     * GCM模式解密
+     * @static
+     * @param ciphertext 待解密文本，Base64 编码字符串
+     * @param key 密钥
+     * @param iv 向量
+     * @param aad aad
+     * @param method 加密方式，默认：aes-256-gcm
+     */
+    static decrypt(ciphertext, key, iv = '', aad = '', method = 'aes-256-gcm') {
+        let buf = null;
+        if (typeof ciphertext === 'string') {
+            buf = Buffer.from(ciphertext, 'base64');
+        }
+        else {
+            buf = Buffer.from(ciphertext);
+        }
+        let tag = buf.slice(-16);
+        let payload = buf.slice(0, -16);
+        let decipher = crypto_1.createDecipheriv(method, key, iv).setAuthTag(tag).setAAD(Buffer.from(aad));
+        return Buffer.concat([
+            decipher.update(payload),
+            decipher.final(),
+        ]);
+    }
+}
+exports.AES_GCM = AES_GCM;
+;

package/dist/Core/Encryptor.d.ts

@@ -7,18 +7,6 @@ export default class Encryptor {
     constructor(appId: string, token: string, aesKey: string);
     getToken(): string;
     signature(...args: any[]): string;
-    encrypt(text: any, nonce?: any, timestamp?: any): object;
-    decrypt(text: any, msgSignature: any, nonce: any, timestamp: any): string;
-    /**
-     * 删除解密后明文的补位字符
-     * @param {Buffer} text 解密后的明文
-     * @return {Buffer}
-     */
-    pkcs7Unpad(text: Buffer): Buffer;
-    /**
-     * 对需要加密的明文进行填充补位
-     * @param {Buffer} text 需要进行填充补位操作的明文
-     * @return {Buffer}
-     */
-    pkcs7Pad(text: Buffer, blockSize: number): Buffer;
+    encrypt(text: string, nonce?: string, timestamp?: number): string;
+    decrypt(text: string, msgSignature: string, nonce: string, timestamp: number): string;
 }

package/dist/Core/Encryptor.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
 const Utils_1 = require("./Utils");
+const AES_1 = require("./AES");
+const PKCS_1 = require("./PKCS");
 class Encryptor {
     constructor(appId, token, aesKey) {
         this.appId = null;
@@ -20,9 +22,7 @@ class Encryptor {
     }
     signature(...args) {
         args.sort();
-        let shasum = crypto_1.default.createHash('sha1');
-        shasum.update(args.join(''));
-        return shasum.digest('hex');
+        return Utils_1.createHash(args.join(''), 'sha1');
     }
     encrypt(text, nonce = null, timestamp = null) {
         let encrypted = '';
@@ -32,10 +32,8 @@ class Encryptor {
             let msg = Buffer.from(text);
             let msgLength = Buffer.alloc(4);
             msgLength.writeUInt32BE(msg.length, 0);
-            let encoded = this.pkcs7Pad(Buffer.concat([randomString, msgLength, msg, Buffer.from(this.appId)]), this.blockSize);
-            let cipher = crypto_1.default.createCipheriv('aes-256-cbc', this.aesKey, this.aesKey.slice(0, 16));
-            cipher.setAutoPadding(false);
-            encrypted = Buffer.concat([cipher.update(encoded), cipher.final()]).toString('base64');
+            let encoded = PKCS_1.PKCS7.pad(Buffer.concat([randomString, msgLength, msg, Buffer.from(this.appId)]), this.blockSize);
+            encrypted = AES_1.AES.encrypt(encoded, this.aesKey, this.aesKey.slice(0, 16), false, 'aes-256-cbc').toString('base64');
         }
         catch (e) {
             throw new Error('Fail to encrypt data');
@@ -44,22 +42,21 @@ class Encryptor {
             nonce = this.appId.slice(0, 10);
         if (!timestamp)
             timestamp = Utils_1.getTimestamp();
-        return {
+        let response = {
             Encrypt: encrypted,
             MsgSignature: this.signature(this.token, timestamp, nonce, encrypted),
             TimeStamp: timestamp,
             Nonce: nonce,
         };
+        return Utils_1.buildXml(response);
     }
     decrypt(text, msgSignature, nonce, timestamp) {
         let signature = this.signature(this.token, nonce, timestamp, text);
         if (signature !== msgSignature) {
             throw new Error('Invalid Signature.');
         }
-        let decipher = crypto_1.default.createDecipheriv('aes-256-cbc', this.aesKey, this.aesKey.slice(0, 16));
-        decipher.setAutoPadding(false);
-        let deciphered = Buffer.concat([decipher.update(text, 'base64'), decipher.final()]);
-        deciphered = this.pkcs7Unpad(deciphered);
+        let deciphered = AES_1.AES.decrypt(Buffer.from(text, 'base64'), this.aesKey, this.aesKey.slice(0, 16), false, 'aes-256-cbc');
+        deciphered = PKCS_1.PKCS7.unpad(deciphered, this.blockSize);
         let content = deciphered.slice(16);
         let length = content.slice(0, 4).readUInt32BE(0);
         if (content.slice(length + 4).toString() !== this.appId) {
@@ -67,33 +64,6 @@ class Encryptor {
         }
         return content.slice(4, length + 4).toString();
     }
-    /**
-     * 删除解密后明文的补位字符
-     * @param {Buffer} text 解密后的明文
-     * @return {Buffer}
-     */
-    pkcs7Unpad(text) {
-        var pad = text[text.length - 1];
-        if (pad < 1 || pad > this.blockSize) {
-            pad = 0;
-        }
-        return text.slice(0, text.length - pad);
-    }
-    /**
-     * 对需要加密的明文进行填充补位
-     * @param {Buffer} text 需要进行填充补位操作的明文
-     * @return {Buffer}
-     */
-    pkcs7Pad(text, blockSize) {
-        if (blockSize > 256) {
-            throw new Error('blockSize may not be more than 256');
-        }
-        //计算需要填充的位数
-        let amountToPad = blockSize - (text.length % blockSize);
-        let result = Buffer.alloc(amountToPad);
-        result.fill(amountToPad);
-        return Buffer.concat([text, result]);
-    }
 }
 exports.default = Encryptor;
 ;