Commit b3a18d30 authored by wuhao's avatar wuhao 🎯

asder

parent befe29c0
...@@ -13,11 +13,13 @@ export default { ...@@ -13,11 +13,13 @@ export default {
dev: { dev: {
[defaultSetting.proxypath]: { [defaultSetting.proxypath]: {
// 要代理的地址 // 要代理的地址
target: 'http://192.168.40.117:8000' + defaultSetting.proxypath, target: 'http://192.168.40.117:8000',
changeOrigin: true,
},
'/token': {
// 要代理的地址
target: 'http://192.168.40.117:8000',
changeOrigin: true, changeOrigin: true,
pathRewrite: {
[rewrite]: '',
},
}, },
'/staticfile/': { '/staticfile/': {
target: 'http://192.168.40.2/', target: 'http://192.168.40.2/',
......
...@@ -382,3 +382,8 @@ ol { ...@@ -382,3 +382,8 @@ ol {
.diycard { .diycard {
height: 100% !important; height: 100% !important;
} }
.runtime-keep-alive-layout {
> div {
height: 100% !important;
}
}
import request from './request'; import request from './request';
import defaultSetting from '../../config/defaultSettings';
export async function doFetch({ url, params }) { export async function doFetch({ url, params }) {
if (!url) { if (!url) {
return; return;
} }
return request(url, { if (url.indexOf('token') != -1) {
method: 'post', return request(url, {
data: params, method: 'post',
}); data: params,
});
} else {
return request(defaultSetting.proxypath + url, {
method: 'post',
data: params,
});
}
} }
export async function postFetch({ url, params }) { export async function postFetch({ url, params }) {
......
...@@ -6,7 +6,6 @@ import { extend } from 'umi-request'; ...@@ -6,7 +6,6 @@ import { extend } from 'umi-request';
import { message, notification, Modal } from 'antd'; import { message, notification, Modal } from 'antd';
import { history } from '@umijs/max'; import { history } from '@umijs/max';
import qs from 'query-string'; import qs from 'query-string';
import defaultSetting from '../../config/defaultSettings';
const codeMessage = { const codeMessage = {
200: '服务器成功返回请求的数据。', 200: '服务器成功返回请求的数据。',
...@@ -49,7 +48,6 @@ const errorHandler = (error) => { ...@@ -49,7 +48,6 @@ const errorHandler = (error) => {
*/ */
const request = extend({ const request = extend({
prefix: defaultSetting.proxypath, //前缀代理
errorHandler, errorHandler,
// 默认错误处理 // 默认错误处理
credentials: 'include', // 默认请求是否带上cookie credentials: 'include', // 默认请求是否带上cookie
...@@ -62,12 +60,12 @@ request.interceptors.request.use(async (url, options) => { ...@@ -62,12 +60,12 @@ request.interceptors.request.use(async (url, options) => {
const headers = const headers =
options.type == 'form' options.type == 'form'
? { ? {
token: 'Bearer ' + token, Authorization: 'Bearer ' + token,
} }
: { : {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
Accept: 'application/json', Accept: 'application/json',
token: 'Bearer ' + token, Authorization: 'Bearer ' + token,
}; };
return { return {
url: url, url: url,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment