From 010fdcf8abd58bde5c1106db8ed8448effc75b4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2025 16:37:46 +0800
Subject: [PATCH] 2025-02-25
---
src/api/index.js | 506 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 349 insertions(+), 157 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index d602b0a..da8093a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -15,7 +15,9 @@
window.GLOB.$error = false
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
-let db = `mkdb${service}`
+let lang = sessionStorage.getItem('lang') || 'zh-CN'
+lang = lang !== 'zh-CN' ? lang : ''
+let db = `mkdb${service + lang}`
if (window.indexedDB) {
CacheUtils.openIndexDB(db)
@@ -57,6 +59,9 @@
return Promise.reject(response.data)
} else {
+ if (response.config.requestId) {
+ response.data.$requestId = response.config.requestId
+ }
return Promise.resolve(response.data)
}
}, (error) => {
@@ -70,6 +75,32 @@
placement: 'bottomRight',
duration: 15
})
+ if ([500, 504].includes(response.status) && error.config && error.config.url && error.config.data) {
+ window.mkInfo(error.config.url)
+ window.mkInfo(error.config.data)
+ if (window.GLOB.errorLog && !sessionStorage.getItem('local_error')) {
+ let urlReg = new RegExp('^(' + window.GLOB.baseurl + '|/)webapi/(exstars|dostars)', 'ig')
+ if (urlReg.test(error.config.url) && !/s_special_error_note_log/.test(error.config.url)) {
+ let res = null
+ try {
+ let data = JSON.parse(error.config.data)
+ if (!data.rduri) {
+ res = {
+ api_url: error.config.url,
+ error_code: response.status,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: error.config.data
+ }
+ }
+ } catch (e) {
+ res = null
+ }
+ if (res) {
+ sessionStorage.setItem('local_error', JSON.stringify(res))
+ }
+ }
+ }
+ }
}
return Promise.reject(response)
@@ -94,77 +125,52 @@
}
/**
- * @description 寰俊涓氬姟璇锋眰
+ * @description 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
*/
- wxAccessToken (domain = '') {
- let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
+ // wxAccessToken (appId, domain = '') {
+ // let _url = domain || window.GLOB.baseurl
- if (domain) {
- _url = domain + 'wxpay/getaccesstoken'
- }
-
- return new Promise(resolve => {
- if (window.GLOB.accessToken.domain === domain && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
- resolve(window.GLOB.accessToken)
- } else {
- window.GLOB.accessToken = {domain}
- axios({
- url: _url,
- method: 'get'
- }).then(res => {
- if (res.oa_access_token || res.mini_access_token) {
- window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
- window.GLOB.accessToken.oa_access_token = res.oa_access_token
- window.GLOB.accessToken.mini_access_token = res.mini_access_token
- }
- resolve(res)
- })
- }
- })
- }
+ // return axios({
+ // url: _url + 'wechat/getaccesstoken',
+ // method: 'post',
+ // data: JSON.stringify({app_id: appId})
+ // })
+ // }
/**
- * @description 寰俊涓氬姟璇锋眰
+ * @description 蹇�掓煡璇�
*/
- wxNginxRequest (url, method, param) {
- let _url = url
-
- if (!/^http/.test(url)) {
- _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
- }
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/' + url
- }
- }
- }
-
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
+ expressRequest (url) {
return axios({
- url: _url,
- method
+ url: window.GLOB.location + '/' + url,
+ method: 'get'
})
}
/**
* @description 鐩存帴璇锋眰
*/
- directRequest (params) {
+ directRequest (params, script, position) {
+ if (script) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', 'notification', script)
+ let promise = func(axios, this, params, position, window.GLOB.systemType, notification)
+
+ if (promise instanceof Promise) {
+ return promise
+ }
+ } catch (e) {
+ console.warn(e)
+ }
+
+ return Promise.resolve({
+ status: false,
+ message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+ ErrCode: 'E'
+ })
+ }
+
return axios(params)
}
@@ -172,12 +178,7 @@
* @description 娓稿鐧诲綍
*/
getTouristMsg (binding_type, appid, openid, memberid, scanId) {
- let _SessionUid = localStorage.getItem('SessionUid')
-
- if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
- _SessionUid = Utils.getuuid()
- localStorage.setItem('SessionUid', _SessionUid)
- }
+ let _SessionUid = localStorage.getItem('SessionUid') || ''
let param = {
func: 's_visitor_login',
@@ -213,6 +214,9 @@
} else {
param.linkurl = window.GLOB.linkurl
}
+ } else if (binding_type === 'cloud') { // 鐧诲綍浜戠
+ delete param.rduri
+ url = window.atob('aHR0cHM6Ly9jbG91$mkZC5tazloLmNu'.replace('$mk', '')) + '/webapi/dologon/s_visitor_login'
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -398,7 +402,7 @@
this.getSystemConfig(param).then(res => {
if (!res.status) {
- reject()
+ reject(res.message)
return
}
@@ -431,14 +435,14 @@
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
- if (reHome) {
+ if (reHome && reload !== 'home_page_id') {
MKEmitter.emit('reloadMenuView', 'home_page_id')
}
}
CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
- resolve()
+ resolve(list)
})
}, () => {
reject()
@@ -489,26 +493,26 @@
/**
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
- getSystemFuncs (time) {
- let param = {
- func: 's_get_func_base_sso',
- update_date: time,
- userid: sessionStorage.getItem('UserID') || '',
- lang: sessionStorage.getItem('lang') || '',
- SessionUid: localStorage.getItem('SessionUid') || '',
- LoginUID: sessionStorage.getItem('LoginUID') || '',
- appkey: window.GLOB.appkey
- }
+ // getSystemFuncs (time) {
+ // let param = {
+ // func: 's_get_func_base_sso',
+ // update_date: time,
+ // userid: sessionStorage.getItem('UserID') || '',
+ // lang: sessionStorage.getItem('lang') || '',
+ // SessionUid: localStorage.getItem('SessionUid') || '',
+ // LoginUID: sessionStorage.getItem('LoginUID') || '',
+ // appkey: window.GLOB.appkey
+ // }
- let url = window.GLOB.mainSystemApi || '/webapi/dostars'
- param = this.encryptParam(param)
+ // let url = window.GLOB.mainSystemApi || '/webapi/dostars'
+ // param = this.encryptParam(param)
- return axios({
- url: `${url}/${param.func}`,
- method: 'post',
- data: JSON.stringify(param)
- })
- }
+ // return axios({
+ // url: `${url}/${param.func}`,
+ // method: 'post',
+ // data: JSON.stringify(param)
+ // })
+ // }
/**
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
@@ -645,7 +649,7 @@
param.sign = md5(values)
param.t = new Date().getTime();
- ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+ ['arr_field', 'custom_script', 'LText', 'DateCount'].forEach(key => {
if (param[key]) {
let val = param[key]
delete param[key]
@@ -659,7 +663,7 @@
/**
* @description 鑾峰彇绯荤粺閰嶇疆锛屼紭鍏堜粠缂撳瓨涓彇鍊硷紝澧炲姞appkey
* @param {Object} param 璇锋眰鍙傛暟
- * @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
+ * @param {Boolean} cache 鏄惁浣跨敤缂撳瓨
*/
getSystemCacheConfig (param, cache = true) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
@@ -667,6 +671,69 @@
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+
+ if (param.$backend) {
+ delete param.$backend
+
+ let id = ''
+ if (cache) {
+ id = param.data[0].id
+
+ if (window.GLOB.CacheMap.has(id)) {
+ return Promise.resolve(window.GLOB.CacheMap.get(id))
+ }
+ }
+
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ param.s_debug = window.GLOB.debugger ? 'Y' : ''
+ param.data_md5 = param.data_md5 || ''
+ param.time_limit = param.time_limit || 0
+
+ let url = '/webapi/exstars'
+ if (param.rduri) {
+ param.rduri = param.rduri.replace(/dostars/ig, 'exstars')
+ if (!window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+ }
+
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
+ param = this.encryptParam(param)
+
+ return new Promise((resolve) => {
+ axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(res => {
+ if (res.mksqls) {
+ res.mksqls.forEach(n => {
+ n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+ if (!res.status && param.data[0] && param.data[0].menuname) {
+ window.mkInfo('%c' + param.data[0].menuname, 'color: #f5222d')
+ }
+ window.mkInfo(n)
+ })
+ }
+ delete res.mksqls
+ if (res.ErrCode === 'version_error') {
+ res.ErrCode = '-2'
+ MKEmitter.emit('reloadTabs')
+ }
+ if (res.status && id) {
+ window.GLOB.CacheMap.set(id, res)
+ }
+ resolve(res)
+ })
+ })
+ }
let url = '/webapi/dostars'
if (param.rduri && !window.GLOB.transfer) {
@@ -755,7 +822,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -804,7 +871,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -834,7 +901,7 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
* 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
*/
- genericInterface (param) {
+ genericInterface (param, script = '', position, requestId = '') {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -852,9 +919,6 @@
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
- let login = false
- let rduri = null
-
if (param.rduri && /\s|\n/.test(param.rduri)) {
param.rduri = param.rduri.replace(/\s|\n/g, '')
if (!param.rduri) {
@@ -862,31 +926,50 @@
}
}
- if (param.$login && !window.GLOB.transfer) {
- login = true
- rduri = param.rduri || ''
- }
- delete param.$login
+ if (script) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', 'notification', script)
+ let promise = func(axios, this, param, position, window.GLOB.systemType, notification)
- let url = '/webapi/dostars'
+ if (promise instanceof Promise) {
+ return promise
+ }
+ } catch (e) {
+ console.warn(e)
+ }
- if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
- url = param.rduri
+ return Promise.resolve({
+ status: false,
+ message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+ ErrCode: 'E'
+ })
+ } else if (param.$login) {
+ let rduri = param.rduri || ''
+
+ delete param.$login
delete param.rduri
- }
- param = this.encryptParam(param)
+ param = this.encryptParam(param)
- if (login) {
let time = +sessionStorage.getItem(rduri)
let c_time = Math.round(new Date().getTime() / 1000)
if (time && c_time - time <= 1800) {
sessionStorage.setItem(rduri, c_time)
- return axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: JSON.stringify(param)
+ return new Promise((resolve, reject) => {
+ axios({
+ url: `${rduri}${param.func ? '/' + param.func : ''}`,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(result => {
+ if (result && result.ErrCode === 'LoginError') {
+ sessionStorage.removeItem(rduri)
+ }
+ resolve(result)
+ }, () => {
+ reject()
+ })
})
}
@@ -895,11 +978,13 @@
if (res.status) {
sessionStorage.setItem(rduri, c_time)
axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
+ url: `${rduri}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(result => {
resolve(result)
+ }, () => {
+ reject()
})
} else {
resolve(res)
@@ -917,13 +1002,100 @@
}
})
})
+ } else if (param.$backend) {
+ delete param.$backend
+
+ let url = '/webapi/exstars'
+ if (param.rduri) {
+ param.rduri = param.rduri.replace(/dostars/ig, 'exstars')
+ if (!window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+ }
+
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ param.s_debug = window.GLOB.debugger ? 'Y' : ''
+ param.data_md5 = param.data_md5 || ''
+ param.time_limit = param.time_limit || 0
+
+ param = this.encryptParam(param)
+
+ return new Promise((resolve) => {
+ axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param),
+ requestId
+ }).then(res => {
+ if (res.mksqls) {
+ res.mksqls.forEach(n => {
+ n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+ if (!res.status && param.data[0] && param.data[0].menuname) {
+ window.mkInfo('%c' + param.data[0].menuname, 'color: #f5222d')
+ }
+ window.mkInfo(n)
+ })
+ }
+ delete res.mksqls
+ if (!res.status) {
+ if (res.ErrCode === 'version_error') {
+ res.ErrCode = '-2'
+ MKEmitter.emit('reloadTabs')
+ } else if (res.message === 'permission deny') {
+ res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ }
+ }
+ resolve(res)
+ })
+ })
} else {
+ let url = '/webapi/dostars'
+ if (param.rduri && (!window.GLOB.transfer || /https:\/\/sso.mk9h.cn/.test(param.rduri)) && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
+ url = param.rduri
+ delete param.rduri
+ }
+
+ param = this.encryptParam(param)
+
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: JSON.stringify(param)
+ data: JSON.stringify(param),
+ requestId
})
}
+ }
+
+ /**
+ * @description 娓呯┖鍚庣缂撳瓨
+ */
+ cacheInterface (param) {
+ param.appkey = window.GLOB.appkey || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
+
+ let url = '/webapi/excache'
+ if (param.rduri && !window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+
+ param = this.encryptParam(param)
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param),
+ })
}
/**
@@ -969,49 +1141,52 @@
/**
* @description 澶ф枃浠朵笂浼�
*/
- getLargeFileUpload (param) {
- return axios({
- url: '/webapi/doupload',
- method: 'post',
- headers: { 'Content-Type': 'multipart/form-data' },
- data: param
+ getFileUpload (param) {
+ param.append('shardingCnt', 1)
+ param.append('LoginUID', sessionStorage.getItem('LoginUID') || '')
+ param.append('UserID', sessionStorage.getItem('UserID') || '')
+
+ return new Promise((resolve, reject) => {
+ axios({
+ url: '/webapi/doupload',
+ method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
+ data: param
+ }).then(res => {
+ if (res.status && res.urlPath) {
+ if (!/Content\/images/.test(res.urlPath)) {
+ let key = CryptoJS.enc.Utf8.parse('D1185ED7B32568C9')
+ let wordArray = CryptoJS.enc.Base64.parse(res.urlPath)
+ let decryptedWordArray = CryptoJS.AES.decrypt({ ciphertext: wordArray }, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+ res.urlPath = CryptoJS.enc.Utf8.stringify(decryptedWordArray)
+ }
+ if (!/^http/.test(res.urlPath)) {
+ res.urlPath = window.GLOB.baseurl + res.urlPath
+ }
+ }
+ resolve(res)
+ })
})
}
/**
* @description 鏌ヨ鏂囦欢鏄惁宸蹭笂浼�
*/
- getFilePreUpload (param) {
- return axios({
- url: '/webapi/dopreload',
- method: 'post',
- headers: { 'Content-Type': 'multipart/form-data' },
- data: param
- })
- }
+ // getFilePreUpload (param) {
+ // return axios({
+ // url: '/webapi/dopreload',
+ // method: 'post',
+ // headers: { 'Content-Type': 'multipart/form-data' },
+ // data: param
+ // })
+ // }
/**
* @description oss鏂囦欢涓婁紶
*/
fileOssUpload (param) {
- let _url = window.GLOB.location + '/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/file/oss/upload'
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/file/oss/upload'
- }
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/file/oss/upload'
- }
- }
-
return axios({
- url: _url,
+ url: window.GLOB.location + '/file/oss/upload',
method: 'post',
headers: { 'Content-Type': 'multipart/form-data' },
data: param
@@ -1019,15 +1194,24 @@
}
/**
- * @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
+ * @description 鑾峰彇寰俊鏀粯浜岀淮鐮� 鍘熸帴鍙xpay/wxNativePay
*/
getWxNativePay (param) {
- let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
-
return axios({
- url: _url,
+ url: window.GLOB.baseurl + 'wechat/native',
method: 'post',
- data: qs.stringify(param)
+ data: JSON.stringify(param)
+ })
+ }
+
+ /**
+ * @description 寰俊鏀粯閫�娆� 鍘熸帴鍙xpay/wxRefund
+ */
+ setRefund (param) {
+ return axios({
+ url: window.GLOB.baseurl + 'wechat/wxRefund',
+ method: 'post',
+ data: JSON.stringify(param)
})
}
@@ -1042,10 +1226,10 @@
/**
* @description sql妫�楠�
*/
- sDebug (sql, rduri = null) {
+ sDebug (sql, skip = false) {
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') || '',
@@ -1054,24 +1238,32 @@
appkey: window.GLOB.appkey || ''
}
+ 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(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
+ // sql = sql.replace(/@datam@/ig, `''`)
+
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')}`)
+ window.mkInfo(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
+
+ if (skip) return
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)
let url = '/webapi/dostars'
-
- if (rduri) {
- url = rduri
- }
let timer = setTimeout(() => {
let _param = {
@@ -1099,7 +1291,7 @@
clearTimeout(timer)
if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
- } else if (res.message === 'ROLLBACK TRANSACTION 璇锋眰娌℃湁瀵瑰簲鐨� BEGIN TRANSACTION銆� EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0銆� ROLLBACK TRANSACTION 璇锋眰娌℃湁瀵瑰簲鐨� BEGIN TRANSACTION銆�') {
+ } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
res.ErrCode = '-2'
}
resolve(res)
--
Gitblit v1.8.0