From 11b6387d74467f81e33eba8f882bff610f240115 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:01:09 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index e34235a..42ee457 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -299,22 +299,12 @@
       _scripts.push(values)
     }
 
-    let param = {
-      func: 's_debug_sql',
-      exec_type: 'y',
-      LText: SettingUtils.getCustomDebugSql(_scripts, this.props.regoptions)
-    }
-
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.LText = param.LText.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
-    param.LText = param.LText.replace(/\n/g, ' ')
-    
-    param.LText = Utils.formatOptions(param.LText)
-    param.secretkey = Utils.encrypt('', param.timestamp)
+    let sql = SettingUtils.getCustomDebugSql(_scripts, this.props.regoptions)
+    sql = sql.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'1949-10-01 15:00:00'`)
     
     this.setState({loading: true})
-    Api.genericInterface(param).then(result => {
-      if (result.status) {
+    Api.sDebug(sql).then(result => {
+      if (result.status || result.ErrCode === '-2') {
         this.setState({
           loading: false,
           scripts: _scripts,
@@ -446,7 +436,7 @@
             </Col>
             <Col span={20}>
               <Form.Item labelCol={{span: 4}} wrapperCol={{span: 20}} label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
-                ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+                ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
               </Form.Item>
             </Col>
             <Col span={24} className="sqlfield">

--
Gitblit v1.8.0