yuang-framework-ui-common 1.0.23 → 1.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/httpConfig.ts +16 -8
- package/package.json +1 -1
package/lib/config/httpConfig.ts
CHANGED
|
@@ -15,17 +15,16 @@ const messageMap = {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
const http = axios.create({
|
|
18
|
-
baseURL:
|
|
19
|
-
timeout:
|
|
18
|
+
baseURL: '/gateway-server',
|
|
19
|
+
timeout: 10000,
|
|
20
20
|
headers: {}
|
|
21
21
|
})
|
|
22
22
|
|
|
23
23
|
|
|
24
|
-
|
|
25
24
|
/* 请求拦截 */
|
|
26
25
|
http.interceptors.request.use(async config => {
|
|
27
26
|
let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
|
|
28
|
-
if(!gatewayAccessToken && config.url != getGatewayConfigUrl) {
|
|
27
|
+
if (!gatewayAccessToken && config.url != getGatewayConfigUrl) {
|
|
29
28
|
await initGatewayConfig();
|
|
30
29
|
}
|
|
31
30
|
beforeRequestConfig(config);
|
|
@@ -82,7 +81,16 @@ http.interceptors.response.use((res) => {
|
|
|
82
81
|
}
|
|
83
82
|
return res;
|
|
84
83
|
}, (error) => {
|
|
85
|
-
|
|
84
|
+
let errorMessage = '';
|
|
85
|
+
if (error?.response?.data) {
|
|
86
|
+
let { statusCode, message } = error?.response?.data;
|
|
87
|
+
if (statusCode !== 200) {
|
|
88
|
+
errorMessage = message;
|
|
89
|
+
}
|
|
90
|
+
} else {
|
|
91
|
+
errorMessage = error?.message || messageMap.requestError;
|
|
92
|
+
}
|
|
93
|
+
showErrorMessage(errorMessage);
|
|
86
94
|
return Promise.reject(error);
|
|
87
95
|
});
|
|
88
96
|
|
|
@@ -90,8 +98,8 @@ http.interceptors.response.use((res) => {
|
|
|
90
98
|
* 请求之前的配置
|
|
91
99
|
* @param config
|
|
92
100
|
*/
|
|
93
|
-
const beforeRequestConfig = (config) => {
|
|
94
|
-
if(!config.url){
|
|
101
|
+
const beforeRequestConfig = (config: any) => {
|
|
102
|
+
if (!config.url) {
|
|
95
103
|
return console.error('参数[url]不存在');
|
|
96
104
|
}
|
|
97
105
|
config.headers["X-Requested-With"] = 'XMLHttpRequest';
|
|
@@ -110,7 +118,7 @@ const beforeRequestConfig = (config) => {
|
|
|
110
118
|
if (ssoAccessToken) {
|
|
111
119
|
config.headers["Sso-Access-Token"] = ssoAccessToken;
|
|
112
120
|
}
|
|
113
|
-
config.headers["Request-Id"] = new Date().getTime().toString() +
|
|
121
|
+
config.headers["Request-Id"] = new Date().getTime().toString() + (Math.random() * 10000);
|
|
114
122
|
}
|
|
115
123
|
|
|
116
124
|
|