From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 74c1c5b..39c477c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -29,7 +29,7 @@
axios.interceptors.request.use((config) => {
if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
config.data = qs.stringify(config.data)
- } else if (config.url.includes('doupload') || config.url.includes('dopreload')) {
+ } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
config.headers = { 'Content-Type': 'multipart/form-data' }
} else if (config.method === 'post' && config.data) {
config.data = JSON.stringify(config.data)
@@ -810,17 +810,16 @@
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || param.LoginUID || ''
}
- // 寰呬紭鍖栵紝澧炲姞鏄惁鏀寔璺ㄥ煙璇锋眰
- // let url = '/webapi/dostars'
- // if (param.rduri) {
- // url = param.rduri
- // delete param.rduri
- // }
+ let url = '/webapi/dostars'
+ if (param.rduri && /\/dostars/.test(param.rduri)) {
+ url = param.rduri
+ delete param.rduri
+ }
param = this.encryptParam(param)
return axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
})
@@ -929,6 +928,33 @@
}
/**
+ * @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,
+ method: 'post',
+ data: param
+ })
+ }
+
+ /**
* @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
*/
getWxNativePay (param) {
--
Gitblit v1.8.0