From 81b563e4c4edef76775a4e4fefc0ba9fa9d35d3f Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sun, 3 Apr 2022 16:19:26 +0800 Subject: [PATCH] rename envi to envar --- messenger.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/messenger.js b/messenger.js index 3f35bda..caba79c 100644 --- a/messenger.js +++ b/messenger.js @@ -5,16 +5,16 @@ const NodeMailer = require('nodemailer') const my = {} module.exports = { - init (envi) { - my.envi = envi - my.smtpTransporter = NodeMailer.createTransport(envi.SMTP) - my.smsClientAliyun = new (require('@alicloud/sms-sdk'))(envi.SMS.ALIYUN) // https://www.npmjs.com/package/@alicloud/sms-sdk - my.smsClientTencent = new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envi.SMS.TENCENT) // https://cloud.tencent.com/document/product/382/43197 + init (envar) { + my.envar = envar + my.smtpTransporter = NodeMailer.createTransport(envar.SMTP) + my.smsClientAliyun = new (require('@alicloud/sms-sdk'))(envar.SMS.ALIYUN) // https://www.npmjs.com/package/@alicloud/sms-sdk + my.smsClientTencent = new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envar.SMS.TENCENT) // https://cloud.tencent.com/document/product/382/43197 }, // 或者如果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) + my.smtpTransporter = my.smtpTransporter || NodeMailer.createTransport(wo.envar.SMTP) return await util.promisify(my.smtpTransporter.sendMail).call(my.smtpTransporter, messageObject) }, @@ -52,10 +52,10 @@ module.exports = { var matches = phone.match(/\d+/g) var smsNumber, smsUrl if (matches[0] === '86') { - smsUrl = wo.envi.SMS.DXTON.urlChina + smsUrl = wo.envar.SMS.DXTON.urlChina smsNumber = matches[1] } else { - smsUrl = wo.envi.SMS.DXTON.urlWorld // 国际短信不需要签名、模板，可发送任意内容。 + smsUrl = wo.envar.SMS.DXTON.urlWorld // 国际短信不需要签名、模板，可发送任意内容。 smsNumber = matches[0] + matches[1] } // let returnCode = await RequestPromise.get(smsUrl + '&mobile=' + smsNumber + '&content=' + encodeURIComponent(msg)) @@ -79,9 +79,9 @@ module.exports = { }, async sendSmsAliyun (phone, msgParam, msgTemplate, signName) { - const envi = my.envi || wo.envi + const envar = my.envar || wo.envar - my.smsClientAliyun = my.smsClientAliyun || new (require('@alicloud/sms-sdk'))(envi.SMS.ALIYUN) + my.smsClientAliyun = my.smsClientAliyun || new (require('@alicloud/sms-sdk'))(envar.SMS.ALIYUN) const [countryCode, callNumber] = phone.match(/\d+/g) const smsNumber = countryCode === '86' ? callNumber : `00${countryCode}${callNumber}` @@ -89,7 +89,7 @@ module.exports = { return await my.smsClientAliyun .sendSMS({ PhoneNumbers: smsNumber, //必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式；发送国际/港澳台消息时，接收号码格式为00+国际区号+号码，如“0085200000000” - SignName: signName || envi.SMS.ALIYUN.signName, //必填:短信签名-可在短信控制台中找到 + SignName: signName || envar.SMS.ALIYUN.signName, //必填:短信签名-可在短信控制台中找到 TemplateCode: msgTemplate, //必填:短信模板-可在短信控制台中找到，发送国际/港澳台消息时，请使用国际/港澳台短信模版 TemplateParam: JSON.stringify(msgParam), //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时。 }) @@ -110,11 +110,11 @@ module.exports = { async sendSmsUnicloud({ phone, msgTemplate, msgParam, appid }) { try { - const envi = my.envi || wo.envi // 不能在下面调用 my.envi.*** 因为 my.envi 可能并未初始化，而 unicloud 又不支持 ?. 操作符. + const envar = my.envar || wo.envar // 不能在下面调用 my.envar.*** 因为 my.envar 可能并未初始化，而 unicloud 又不支持 ?. 操作符. const result = await uniCloud.sendSms({ - appid: appid || envi.SMS.UNICLOUD.appid, - smsKey: envi.SMS.UNICLOUD.smsKey, - smsSecret: envi.SMS.UNICLOUD.smsSecret, + appid: appid || envar.SMS.UNICLOUD.appid, + smsKey: envar.SMS.UNICLOUD.smsKey, + smsSecret: envar.SMS.UNICLOUD.smsSecret, phone: phone.match(/\d+/g)[1], templateId: msgTemplate || 'uni_sms_test', data: msgParam // 模版中的变量的值，例如 { passcode: '234345', purpose: '注册' } @@ -132,14 +132,14 @@ module.exports = { }, async sendSmsTencent ({ phone, msgTemplate, msgParam, signName, appid }) { - const envi = my.envi || wo.envi + const envar = my.envar || wo.envar - my.smsClientTencent = my.smsClientTencent || new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envi.SMS.TENCENT) + my.smsClientTencent = my.smsClientTencent || new (require('tencentcloud-sdk-nodejs').sms.v20210111.Client)(envar.SMS.TENCENT) return await my.smsClientTencent.SendSms({ // API: https://cloud.tencent.com/document/product/382/55981 PhoneNumberSet: [phone.replace('-', '')], - SmsSdkAppId: appid || envi.SMS.TENCENT.appid, - SignName: signName || envi.SMS.TENCENT.signName, + SmsSdkAppId: appid || envar.SMS.TENCENT.appid, + SignName: signName || envar.SMS.TENCENT.signName, TemplateId: msgTemplate, TemplateParamSet: Object.values(msgParam), }).then(