From 8898fcc0b759af96bd011f76a056cd1418548a01 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Wed, 13 Apr 2022 20:06:58 +0800
Subject: [PATCH] =?UTF-8?q?unicloud=20=E4=B8=8D=E6=94=AF=E6=8C=81=20=3F.?=
 =?UTF-8?q?=20=E5=86=99=E6=B3=95=EF=BC=8C=E6=8D=A2=E6=8E=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messenger.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/messenger.js b/messenger.js
index d119662..c6a10ef 100644
--- a/messenger.js
+++ b/messenger.js
@@ -20,13 +20,14 @@ module.exports = {
   
   async sendSms ({ 
     phone, 
-    vendor = my.envar?.SMS?.vendor || wo?.envar?.SMS?.vendor,
+    vendor, // = my.envar?.SMS.VENDOR || wo?.envar?.SMS.VENDOR || 'UNICLOUD'
     msg, // for vendor==='DXTON'
     msgParam, msgTemplate, // for ['ALIYUN','UNICLOUD'].includes(vendor)
     signName, // for vendor==='ALIYUN', 'TENCENT'
     appid, // for vendor==='UNICLOUD', 'TENCENT'
   } = {}) {
-    // 通过option对象，对外提供统一的调用参数格式
+    const envar = my.envar || wo.envar
+    vendor = vendor || envar.SMS.vendor
     if (/^\+\d+-\d+$/.test(phone)) {
       if (vendor === 'DXTON' && msg) {
         return await this.sendSmsDxton(phone, msg)
@@ -121,11 +122,10 @@ module.exports = {
         templateId: msgTemplate || 'uni_sms_test',
         data: msgParam // 模版中的变量的值，例如 { passcode: '234345', purpose: '注册' }
       })
-      // 调用成功，请注意这时不代表发送成功
-      return { _state:'SMS_SENT_SUCCESS' } // { code:0, errCode:0, success:true }
+      
+      return { _state: 'SMS_SENT_SUCCESS', result } // 调用成功，请注意这时不代表发送成功。// { code:0, errCode:0, success:true } 错误码参见 https://uniapp.dcloud.net.cn/uniCloud/send-sms.html
     } catch (error) {
-      // 调用失败
-      // {"code":undefined,"msg":"短信发送失败：账户余额不足"}
+      // 调用失败 例如 {"code":undefined,"msg":"短信发送失败：账户余额不足"}
       return {
         _state: 'SMS_SEND_FAIL',
         error // { errCode, errMsg }