From d26ecdf69db28f9e3ac71834658e0fade6fcf5ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十月 2023 09:50:58 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/api/index.js | 159 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 23 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 1be7537..291e306 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,18 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
+
+ localStorage.removeItem('UserID')
+ localStorage.removeItem('LoginUID')
+ localStorage.removeItem('User_Name')
+ localStorage.removeItem('Full_Name')
+ localStorage.removeItem('avatar')
+ localStorage.removeItem('dataM')
+ localStorage.removeItem('localDataM')
+ localStorage.removeItem('debug')
+ localStorage.removeItem('role_id')
+ localStorage.removeItem('mk_user_type')
+
sessionStorage.clear()
if (!!(window.history && window.history.pushState)) {
window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
@@ -82,7 +94,6 @@
/**
* @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
dostarInterface (param) {
param.userid = param.userid || ''
@@ -95,6 +106,25 @@
}
/**
+ * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+ * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+ */
+ loginAndRedirect (param) {
+ let url = ''
+ if (process.env.NODE_ENV === 'production') {
+ url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
+ } else {
+ url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
+ }
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: qs.stringify(param)
+ })
+ }
+
+ /* @description 鐩存帴璇锋眰
* @description 寰俊涓氬姟璇锋眰
*/
wxAccessToken (domain = '') {
@@ -360,7 +390,6 @@
}
/**
-<<<<<<< HEAD
* @description 鐧诲綍浜屾楠岃瘉 // positecgroup
*/
verifycode (verify) {
@@ -392,9 +421,6 @@
/**
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
-=======
- * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
->>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -561,11 +587,7 @@
param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
- if (window.GLOB.mkHS && window.GLOB.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
- url = window.GLOB.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- } else if (window.GLOB.mainSystemApi) {
+ if (window.GLOB.mainSystemApi) {
if (!window.GLOB.transfer) {
url = window.GLOB.mainSystemApi
} else {
@@ -593,13 +615,7 @@
param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (window.GLOB.mkHS) { // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
- if (window.GLOB.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
- url = window.GLOB.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- }
- } else if (window.GLOB.mainSystemApi) {
+ if (window.GLOB.mainSystemApi) {
if (!window.GLOB.transfer) {
url = window.GLOB.mainSystemApi
} else {
@@ -670,7 +686,7 @@
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
- return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
+ return Promise.resolve({ErrCode: 'S', LongParam: '', message: '', status: false})
}
}
@@ -754,7 +770,7 @@
}
}
- visitOuterSystem (param, _resolve) {
+ visitOuterSystem (param, _resolve, _reject) {
let token = param.$token
delete param.$token
@@ -774,7 +790,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
+ _resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
}
if (!token) return
@@ -810,6 +826,8 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
let _param = {
@@ -857,9 +875,22 @@
data: JSON.stringify(param)
}).then(res => {
_resolve(res)
+ }, () => {
+ _reject()
})
} else {
_resolve(result)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(token.interface) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ _resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ _reject()
}
})
}
@@ -877,9 +908,9 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
+ return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
- return new Promise(resolve => this.visitOuterSystem(param, resolve))
+ return new Promise((resolve, reject) => this.visitOuterSystem(param, resolve, reject))
}
if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
@@ -916,7 +947,7 @@
let time = +sessionStorage.getItem(rduri)
let c_time = Math.round(new Date().getTime() / 1000)
- if (time && c_time - time <= 60) {
+ if (time && c_time - time <= 1800) {
sessionStorage.setItem(rduri, c_time)
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
@@ -938,6 +969,17 @@
})
} else {
resolve(res)
+ }
+ }, (e) => {
+ if (!e || !e.status) {
+ let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+ if (/^http:/.test(rduri) && /https:/.test(window.location.protocol)) {
+ msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+ }
+ resolve({status: false, ErrCode: 'E', message: msg})
+ } else {
+ reject()
}
})
})
@@ -1062,6 +1104,77 @@
data: qs.stringify(data)
})
}
+
+ /**
+ * @description sql妫�楠�
+ */
+ sDebug (sql, rduri = null) {
+ let param = {
+ func: 's_debug_sql',
+ exec_type: 'y',
+ timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ userid: sessionStorage.getItem('UserID') || '',
+ lang: sessionStorage.getItem('lang') || '',
+ SessionUid: localStorage.getItem('SessionUid') || '',
+ LoginUID: sessionStorage.getItem('LoginUID') || '',
+ appkey: window.GLOB.appkey || ''
+ }
+
+ if (window.GLOB.externalDatabase !== null) {
+ sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
+
+ sql = sql.replace(/\n/ig, ' ')
+
+ param.LText = Utils.formatOptions(sql)
+ param.secretkey = Utils.encrypt('', param.timestamp)
+
+ param = this.encryptParam(param)
+
+ let url = '/webapi/dostars'
+
+ if (rduri) {
+ url = rduri
+ }
+
+ let timer = setTimeout(() => {
+ let _param = {
+ func: 's_debug_sql_cancel',
+ userid: sessionStorage.getItem('UserID') || '',
+ lang: sessionStorage.getItem('lang') || '',
+ SessionUid: localStorage.getItem('SessionUid') || '',
+ LoginUID: sessionStorage.getItem('LoginUID') || '',
+ appkey: window.GLOB.appkey || ''
+ }
+ _param = this.encryptParam(_param)
+ axios({
+ url: `${url}/s_debug_sql_cancel`,
+ method: 'post',
+ data: JSON.stringify(_param)
+ })
+ }, 20000)
+
+ return new Promise(resolve => {
+ axios({
+ url: `${url}/s_debug_sql`,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(res => {
+ clearTimeout(timer)
+ if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
+ res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+ } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+ res.ErrCode = '-2'
+ }
+ resolve(res)
+ }, () => {
+ clearTimeout(timer)
+ resolve({status: false, ErrCode: 'E', message: '楠岃瘉澶辫触锛�1璇锋鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆锛�2璇锋鏌ョ綉缁滆繛鎺ユ槸鍚︽甯搞��'})
+ })
+ })
+ }
}
export default new Api()
\ No newline at end of file
--
Gitblit v1.8.0