diff --git a/.env.development b/.env.development index 12fb88a..cbd903c 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # .env.development -VITE_APP_BASEURL=https://yls-api-uat.dctest.digitalyili.com/ +VITE_APP_BASEURL=https://yls-api-uat.dctest.digitalyili.com VITE_APP_ENV=development VITE_APP_CURRENTMODE=dev VITE_APP_BASEOSS=https://diaoyan-files.automark.cc diff --git a/.env.uat b/.env.uat index 44ece3a..4d7dde8 100644 --- a/.env.uat +++ b/.env.uat @@ -1,5 +1,5 @@ # .env.development -VITE_APP_BASEURL=https://yls-api-uat.dctest.digitalyili.com/ +VITE_APP_BASEURL=https://yls-api-uat.dctest.digitalyili.com VITE_APP_ENV=uat VITE_APP_CURRENTMODE=uat VITE_APP_BASEOSS=https://diaoyan-files.automark.cc diff --git a/src/utils/request.js b/src/utils/request.js index 1e78411..f04e9dc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,13 +7,12 @@ import * as config from '@/config.js'; // import {proxyUrl} from config.default // const NODE_ENV = import.meta.env.VITE_APP_ENV; const baseURL = config.default.proxyUrl; - // axios.defaults.withCredentials = true; // create an axios instance const service = axios.create({ // url = base url + request url - baseURL: `${baseURL}`, + baseURL: `${baseURL}/api`, // withCredentials: true, // send cookies when cross-domain requests // request timeout timeout: 30000 @@ -26,9 +25,10 @@ service.interceptors.request.use( config.headers.Accept = 'application/json'; } config.headers.Authorization = `${localStorage.getItem('plantToken')}`; - if (!config.headers.remoteIp) { - config.baseURL += '/api'; - } + + // if (!config.headers.remoteIp) { + // config.baseURL += '/api'; + // } delete config.headers.host; config.headers.remoteIp = localStorage.getItem('plantIp') || '127.0.0.1'; // if (store.state.common.token) { @@ -44,10 +44,10 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if ( - response.status === 200 - || response.status === 201 - || response.status === 202 - || response.status === 204 + response.status === 200 || + response.status === 201 || + response.status === 202 || + response.status === 204 ) { if (response.config.method === 'put') { // message.success('保存中...');