From a49f4888e0bc09f4e03b1d5e12be19eb2ae8636b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 九月 2022 18:05:27 +0800
Subject: [PATCH] 2022-09-01

---
 src/menu/datasource/verifycard/utils.jsx |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 23890a5..38cfddf 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -40,8 +40,8 @@
     //   error = '绯荤粺鍑芥暟' + _customScript.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
     // }
 
-    _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
-    _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
+    _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
+    _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
 
     _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
     _customScript = _customScript.replace(/@\$|\$@/ig, '')
@@ -170,7 +170,7 @@
           ${_sql}
           aaa:
           if @ErrorCode!=''
-            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
         `
       } else {
         sumSql = `/* sql sum楠岃瘉 */
@@ -198,7 +198,7 @@
         ${_dataresource}
         aaa:
         if @ErrorCode!=''
-          insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+          insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
       `
     } else {
       sql = `/* sql 楠岃瘉 */
@@ -209,12 +209,30 @@
 
     console.info(sql)
 
+    let errors = []
+
+    if (/@[0-9a-zA-Z_]+@/ig.test(sql)) {
+      let arr = sql.match(/@[0-9a-zA-Z_]+@/ig)
+
+      arr.forEach(item => {
+        let reg = new RegExp(item, 'ig')
+        if (reg.test(_dataresource)) {
+          errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
+        }
+        scripts && scripts.forEach(script => {
+          if (reg.test(script.sql)) {
+            errors.push(`鑷畾涔夎剼鏈�(${script.$index})瀛樺湪鏈浛鎹㈠��${item}`)
+          }
+        })
+      })
+    }
+
     if (sumSql) {
       sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
 
       console.info(sumSql)
     }
     
-    return { error, sql, sumSql }
+    return { error, sql, sumSql, errors: errors.join('锛�') }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0