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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index cc5223d..fa456b0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -303,6 +303,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -350,6 +355,36 @@
resolve({data: null, valid: false})
}
})
+ })
+ }
+
+ /**
+ * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
+ */
+ verifycode (verify) {
+ let param = {
+ certificate: 'certificate',
+ captcha: verify.code,
+ token: verify.token,
+ ati: verify.ati,
+ vid: verify.vid,
+ uid: verify.uid,
+ shopId: verify.shopId,
+ loginId: verify.loginId,
+ phone: verify.phone,
+ sellerNick: verify.sellerNick,
+ isRisk: verify.isRisk,
+ requestId: verify.requestId,
+ riskNum: verify.riskNum,
+ username: verify.username
+ }
+
+ let url = '/webapi/dologon'
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
})
}
@@ -669,7 +704,7 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -1071,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') || '',
@@ -1080,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)
}
@@ -1090,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