From b1694e84d944caede47cc816483b38bdba1f0cb4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 26 二月 2024 15:04:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 2e61da9..fa456b0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1106,7 +1106,7 @@
sDebug (sql, rduri = null) {
let param = {
func: 's_debug_sql',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
userid: sessionStorage.getItem('UserID') || '',
lang: sessionStorage.getItem('lang') || '',
@@ -1115,8 +1115,15 @@
appkey: window.GLOB.appkey || ''
}
- let id = Utils.getuuid()
- sql = sql.replace(/@time_id@/ig, `'${id}'`)
+ sql = sql.replace(/@time_id@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@ID@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@BID@/ig, `'${Utils.getuuid()}'`)
+ sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID')}'`)
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid')}'`)
+ sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID')}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey}'`)
+ // sql = sql.replace(/@datam@/ig, `''`)
+
if (window.GLOB.externalDatabase !== null) {
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
@@ -1125,7 +1132,7 @@
sql = sql.replace(/\n/ig, ' ')
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
param = this.encryptParam(param)
--
Gitblit v1.8.0