From 4b8fe41a4dbdc54ad0cc2d892f735b0608ec8f36 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sun, 27 Mar 2022 23:19:50 +0800 Subject: [PATCH] u --- ConfigSecret.Template.js | 2 ++ messenger.js | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ConfigSecret.Template.js b/ConfigSecret.Template.js index 3583bed..49d0b31 100644 --- a/ConfigSecret.Template.js +++ b/ConfigSecret.Template.js @@ -36,6 +36,8 @@ module.exports = { TEMPLATE_PASSCODE_SIMPLEST: ' ?????? ', }, TENCENT: { // https://cloud.tencent.com/document/product/382/43197 + appid: '', + signName: '', credential: { /* 必填:腾讯云账户密钥对secretId,secretKey。 * 这里采用的是从环境变量读取的方式,需要在环境变量中先设置这两个值。 diff --git a/messenger.js b/messenger.js index bd30d88..3f35bda 100644 --- a/messenger.js +++ b/messenger.js @@ -79,11 +79,12 @@ module.exports = { }, async sendSmsAliyun (phone, msgParam, msgTemplate, signName) { - my.smsClientAliyun = my.smsClientAliyun || new (require('@alicloud/sms-sdk'))(wo.envi.SMS.ALIYUN) + const envi = my.envi || wo.envi + + my.smsClientAliyun = my.smsClientAliyun || new (require('@alicloud/sms-sdk'))(envi.SMS.ALIYUN) const [countryCode, callNumber] = phone.match(/\d+/g) const smsNumber = countryCode === '86' ? callNumber : `00${countryCode}${callNumber}` - const envi = my.envi || wo.envi return await my.smsClientAliyun .sendSMS({ @@ -131,16 +132,16 @@ module.exports = { }, async sendSmsTencent ({ phone, msgTemplate, msgParam, signName, appid }) { - my.smsClientTencent = my.smsClientTencent || new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envi.SMS.TENCENT) - const envi = my.envi || wo.envi + my.smsClientTencent = my.smsClientTencent || new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envi.SMS.TENCENT) + return await my.smsClientTencent.SendSms({ // API: https://cloud.tencent.com/document/product/382/55981 - PhoneNumber: phone.replace('-', ''), - SmsSdkAppid: appid || envi.SMS.TENCENT.appid, + PhoneNumberSet: [phone.replace('-', '')], + SmsSdkAppId: appid || envi.SMS.TENCENT.appid, SignName: signName || envi.SMS.TENCENT.signName, - TemplateID: msgTemplate, - TemplateParam: msgParam, + TemplateId: msgTemplate, + TemplateParamSet: Object.values(msgParam), }).then( function ({SendStatusSet, RequestId} = {}) { let { SerialNo, PhoneNumber, Fee, Code, Message, IsoCode } = SendStatusSet[0]