From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 2b021a4..4a56408 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -868,7 +868,11 @@
           if (/'/.test(val)) {
             val = val.replace(/'/ig, '"')
           }
-          _initFormfields.push(`@${_key}='${val}'`)
+          if (form.isconst) {
+            _initFormfields.push(`@${_key}=N'${val}'`)
+          } else {
+            _initFormfields.push(`@${_key}='${val}'`)
+          }
         }
       }
       
@@ -2101,7 +2105,18 @@
       this.sendMessage(btn.verify, id)
     }
     if (btn.verify.wxNote === 'true') {
-      this.sendWxMessage(btn.verify, id)
+      if (btn.verify.wxTemplateId === 'mk_category_temp') {
+        let verify = fromJS(btn.verify).toJS()
+        verify.wxTemplateId = verify.wxCustomTempId
+
+        verify.wxNoteKeys = verify.wxNoteKeys.filter(item => item.key)
+
+        if (!verify.wxTemplateId || verify.wxNoteKeys.length === 0) return
+
+        this.sendWxMessage(verify, id)
+      } else {
+        this.sendWxMessage(btn.verify, id)
+      }
     }
   }
 
@@ -2124,8 +2139,15 @@
     param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
     param.secretkey = Utils.encrypt(param.LText, param.timestamp)
 
+    let domain1 = ''
+    let domain2 = ''
+    if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && options.sysType !== 'cloud') {
+      domain1 = 'https://cloud.mk9h.cn/'
+      domain2 = 'https://cloud.mk9h.cn:8443/'
+    }
+
     Api.genericInterface(param).then(res => {
-      // res.data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: '2223333', first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', keyword1: '010000000001', keyword2: '2022骞�07鏈�03鏃�', keyword3: '渚涙殩缂磋垂', keyword4: '20鍏�', keyword5: '鎴愬姛', remark: '鎰熻阿鎮ㄧ殑浣跨敤锛�'}]
+      // res.send_data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: Utils.getuuid(), p1: '010000000001', p2: '鏄庣', p3: 'dddd', p4: '椤洪', p5: '鎴愬姛'}]
       if (!res.status) {
         notification.warning({
           top: 92,
@@ -2133,7 +2155,12 @@
           duration: 5
         })
         return
-      } else if (!res.send_data || res.send_data.length === 0) {
+      }
+
+      let sends = res.send_data || []
+      sends = sends.filter(item => !!item.openid)
+
+      if (sends.length === 0) {
         return
       }
 
@@ -2157,13 +2184,13 @@
       }
       
       verify.wxNoteKeys.forEach(item => {
-        _param.data[item.key] = {value: '', color: item.color}
+        _param.data[item.key] = {value: ''}
       })
 
-      let params = res.send_data.map(item => {
+      let params = sends.map(item => {
         let m = fromJS(_param).toJS()
 
-        m.touser = item.openid || ''
+        m.touser = item.openid
         if (item.bid && m.miniprogram && m.miniprogram.pagepath.indexOf('MenuId') > -1) {
           m.miniprogram.pagepath = m.miniprogram.pagepath + `&BID=${item.bid}`
         }
@@ -2181,21 +2208,25 @@
         return m
       })
 
-      Api.wxAccessToken().then(res => {
+      Api.wxAccessToken(domain1).then(res => {
         if (!res.oa_access_token) return
   
         params.forEach(n => {
-          if (!n.touser) return
-
-          Api.wxNginxRequest(`cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', n).then(re => {
+          Api.wxNginxRequest(`${domain2}cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', n).then(re => {
             if (verify.wxNoteCallback === 'true') {
+              let msg = re.errmsg || ''
+
+              if (msg.length > 50) {
+                msg = msg.substr(0, 50)
+              }
+
               let _p = {
                 func: 's_get_sms_weixin_local_suc_err',
                 upid: id,
                 send_id: n.client_msg_id || '',
                 status_result: re.errcode === 0 ? 'S' : 'E',
                 errcode: re.errcode,
-                msg_result: re.errmsg
+                msg_result: msg
               }
 
               _p.LText = Utils.formatOptions(Utils.getuuid())
@@ -2605,7 +2636,8 @@
         fieldlen: item.fieldlength || 50,
         writein: item.writein !== 'false',
         type: item.type,
-        value: item.initval
+        value: item.initval,
+        isconst: item.constant === 'true'
       }
 
       let key = item.field.toLowerCase()

--
Gitblit v1.8.0