From d35398d7c7793e505aceab4d28d1685fbead1277 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Wed, 23 Mar 2022 09:22:44 +0800 Subject: [PATCH] u --- ConfigTemplate.js | 19 ++++++++++++++----- messenger.js | 27 +++++++++++++++------------ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ConfigTemplate.js b/ConfigTemplate.js index 321cf92..7448bb3 100644 --- a/ConfigTemplate.js +++ b/ConfigTemplate.js @@ -10,18 +10,27 @@ module.exports = { tls: { rejectUnauthorized: false } }, SMS: { - UNICLOUD: { - appid: '？？？？', - smsSecret: '？？？？', - smsKey: '？？？？', - }, DXTON: { urlChina:'http://sms.106jiekou.com/utf8/sms.aspx?account=？？？？&password=？？？？', urlWorld:'http://sms.106jiekou.com/utf8/worldapi.aspx?account=？？？？&password=？？？？', }, + UNICLOUD: { + appid: '？？？？', + smsSecret: '？？？？', + smsKey: '？？？？', + TEMPLATE_PASSCODE_REGISTER_NEWUSER: ' ?????? ', + TEMPLATE_PASSCODE_RESET_PASSWORD: ' ?????? ', + TEMPLATE_PASSCODE_CHANGE_PHONE: ' ?????? ', + TEMPLATE_PASSCODE_GENERAL: ' ?????? ', + }, ALIYUN: { accessKeyId:'？？？？', secretAccessKey:'？？？？', + signName:'？？？？', + TEMPLATE_PASSCODE_REGISTER_NEWUSER: ' ?????? ', + TEMPLATE_PASSCODE_RESET_PASSWORD: ' ?????? ', + TEMPLATE_PASSCODE_CHANGE_PHONE: ' ?????? ', + TEMPLATE_PASSCODE_GENERAL: ' ?????? ', }, TENCENT: { // https://cloud.tencent.com/document/product/382/43197 credential: { diff --git a/messenger.js b/messenger.js index d9ee6b3..131a8d5 100644 --- a/messenger.js +++ b/messenger.js @@ -11,24 +11,26 @@ module.exports = { my.smsClient = new (require('@alicloud/sms-sdk'))(envi.SMS.aliyun) // https://www.npmjs.com/package/@alicloud/sms-sdk }, - async sendMail (option) { // 或者如果smtp参数已经确定，就可以直接定义 sendMail: Bluebird.promisify(Smtp.sendMail).bind(Smtp) + // 或者如果smtp参数已经确定，就可以直接定义 sendMail: Bluebird.promisify(Smtp.sendMail).bind(Smtp) + async sendMail (messageObject) { // messageObject: { from, to, cc, bcc, subject, text, html, sender, replyTo, inReplyTo } my.smtpTransporter = my.smtpTransporter || NodeMailer.createTransport(wo.envi.SMTP) - return await util.promisify(my.smtpTransporter.sendMail).call(my.smtpTransporter, option) + return await util.promisify(my.smtpTransporter.sendMail).call(my.smtpTransporter, messageObject) }, async sendSms ({ phone, vendor, msg, // for vendor==='DXTON' msgParam, msgTemplate, // for ['ALIYUN','UNICLOUD'].includes(vendor) - signName // for vendor==='ALIYUN' + signName, // for vendor==='ALIYUN', + appid, // for vendor==='UNICLOUD', } = {}) { // 通过option对象，对外提供统一的调用参数格式 if (/^\+\d+-\d+$/.test(phone)) { if (vendor === 'DXTON' && msg) { return await this.sendSmsDxton(phone, msg) - } else if (vendor === 'ALIYUN' && msgParam && msgTemplate && signName) { + } else if (vendor === 'ALIYUN' && msgParam && msgTemplate) { return await this.sendSmsAliyun(phone, msgParam, msgTemplate, signName) } else if (vendor === 'UNICLOUD' && msgParam && msgTemplate) { - return await this.sendSmsUnicloud({phone, msgParam, msgTemplate}) + return await this.sendSmsUnicloud({phone, msgParam, msgTemplate, appid}) } } return null // 手机号格式错误，或者 vendor 错误。 @@ -58,13 +60,13 @@ module.exports = { resp.on('returnCode', (chunk) => { returnCode += chunk }) resp.on('end', () => { if (parseInt(returnCode)===100){ - resolve({ _state: 'SMS_SENT_SUCCESS', code: returnCode }) // 100: 发送成功 （表示已和我们接口连通） + resolve({ _state: 'SMS_SENT_SUCCESS' }) // 100: 发送成功 （表示已和我们接口连通） }else{ - resolve({ _state: 'SMS_SEND_FAIL', code: returnCode }) // 短信接口错误代码：http://www.dxton.com/help_detail/2.html + resolve({ _state: 'SMS_SEND_FAIL', error: { returnCode }}) // 短信接口错误代码：http://www.dxton.com/help_detail/2.html } }) }).on("error",(error)=>{ - reject({ _state: 'SMS_SEND_ERROR', msg: error.message }) + reject({ _state: 'SMS_SEND_ERROR', error }) }) }) @@ -80,10 +82,11 @@ module.exports = { } else { smsNumber = '00' + matches[0] + matches[1] } + const envi = my.envi || wo.envi return await my.smsClient .sendSMS({ PhoneNumbers: smsNumber, //必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式；发送国际/港澳台消息时，接收号码格式为00+国际区号+号码，如“0085200000000” - SignName: signName, //必填:短信签名-可在短信控制台中找到 + SignName: signName || envi.SMS.ALIYUN.signName, //必填:短信签名-可在短信控制台中找到 TemplateCode: msgTemplate, //必填:短信模板-可在短信控制台中找到，发送国际/港澳台消息时，请使用国际/港澳台短信模版 TemplateParam: JSON.stringify(msgParam), //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时。 }) @@ -93,7 +96,7 @@ module.exports = { if (Code === 'OK') { return { _state: 'SMS_SENT_SUCCESS' } } else { - return { _state: 'SMS_SEND_FAIL', result } + return { _state: 'SMS_SEND_FAIL', error: result } } }, function (error) { @@ -102,7 +105,7 @@ module.exports = { ) }, - async sendSmsUniCloud({ phone, msgTemplate, msgParam, appid, smsKey, smsSecret }) { + async sendSmsUnicloud({ phone, msgTemplate, msgParam, appid, smsKey, smsSecret }) { try { const envi = my.envi || wo.envi // 不能在下面调用 my.envi.*** 因为 my.envi 可能并未初始化，而 unicloud 又不支持 ?. 操作符. const result = await uniCloud.sendSms({ @@ -114,7 +117,7 @@ module.exports = { data: msgParam // 模版中的变量的值，例如 { passcode: '234345', purpose: '注册' } }) // 调用成功，请注意这时不代表发送成功 - return Object.assign(result, { _state:'SMS_SENT_SUCCESS' }) // { code:0, errCode:0, success:true } + return { _state:'SMS_SENT_SUCCESS' } // { code:0, errCode:0, success:true } } catch (error) { // 调用失败 // {"code":undefined,"msg":"短信发送失败：账户余额不足"}