From 1aa5654a0b51bb82948fff8bed77b166f25f11ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 59 +++++++++++++++++------------------------------------------
1 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 0a95a2e..da8093a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -15,7 +15,8 @@
window.GLOB.$error = false
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
-let lang = sessionStorage.getItem('lang') !== 'zh-CN' ? sessionStorage.getItem('lang') : ''
+let lang = sessionStorage.getItem('lang') || 'zh-CN'
+lang = lang !== 'zh-CN' ? lang : ''
let db = `mkdb${service + lang}`
if (window.indexedDB) {
@@ -79,7 +80,7 @@
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(response.config.url) && !/s_special_error_note_log/.test(response.config.url)) {
+ 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)
@@ -137,36 +138,12 @@
// }
/**
- * @description 寰俊涓氬姟璇锋眰
- * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
+ * @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 (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
- _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
- _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
- _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
- }
-
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
+ expressRequest (url) {
return axios({
- url: _url,
- method
+ url: window.GLOB.location + '/' + url,
+ method: 'get'
})
}
@@ -237,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 || '')))
@@ -736,6 +716,9 @@
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)
})
}
@@ -1055,6 +1038,9 @@
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)
})
}
@@ -1199,19 +1185,8 @@
* @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 (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
- _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
- _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
- _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
- }
-
return axios({
- url: _url,
+ url: window.GLOB.location + '/file/oss/upload',
method: 'post',
headers: { 'Content-Type': 'multipart/form-data' },
data: param
--
Gitblit v1.8.0