d

zhiquanquan/app/base/db/cache/vcodeCache.js

@@ -17,7 +17,6 @@ class VCodeCache extends CacheBase {
     return "g_vcode:appkey_"
   }
   async buildCacheVal(cachekey, inputkey, val, ex, ...items) {
-<<<<<<< HEAD:bigdata/app/base/db/cache/vcodeCache.js
     //【XXX】您的验证码是：602639（5分钟内有效），工作人员不会索取，请勿泄露。-------描述在模板中配置
     var pobj = val;
     var vcode = await this.smsUtil.getUidStr(6, 10);
@@ -36,18 +35,6 @@ class VCodeCache extends CacheBase {
         default:
           break;
       }
-=======
-    //inputkey采用appkey_mobile的形式
-    var mobile = inputkey;
-    var tmplCode = val;
-    var signName = items ? items[0] : "";
-    var vcode = await this.smsUtil.getUidStr(6, 10);
-    if (!tmplCode && !signName) {
-      this.smsUtil.sendMsg(mobile, vcode);
-    } //tmplCode为发送短信编码，需在阿里开通，signName为短信头描述信息，二者没有传递则用默认的发送验证码
-    else {
-      this.smsUtil.aliSendMsg(mobile, tmplCode, signName, JSON.stringify({ code: vcode }));
->>>>>>> 697713fd404794198607ced060f698ad9b3456e6:zhiquanquan/app/base/db/cache/vcodeCache.js
     }
     return JSON.stringify({ vcode: vcode });
   }