Merge branch 'feature/docker-env-url' of duanxiaoduan/tmr-group-admin into develop

.env.development

@@ -3,8 +3,7 @@ ENV = 'development'
 
 # base api
 # 测试线
-# VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
-VUE_APP_BASE_API = $VUE_APP_BASE_API
+VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
 
 #许义平本地
 # VUE_APP_BASE_API = 'http://192.168.1.96:8090/'

.env.production

@@ -3,5 +3,4 @@ ENV = 'production'
 
 # base api
 # 正式线
-VUE_APP_BASE_API = $VUE_APP_BASE_API
-
+VUE_APP_BASE_API = 'http://192.168.1.70:8081/'

Dockerfile

@@ -1,7 +1,5 @@
 FROM node:14.0.0 as builder
 WORKDIR /app/tmr-group-admin
-ENV VUE_APP_BASE_API=https://www.baidu.com/
-ENV VITE_DOMAIN=https://www.baidu.com/123
 #拷贝源码
 COPY . .
 #安装依赖

src/utils/request.js

@@ -15,13 +15,13 @@ console.log(URL,'===========URL')
 //获取当前url
 if(URL.indexOf('/')==0 && URL.length==1){
   URL= window.location.protocol + "//"+window.location.host+URL
-
 }
-  const service = axios.create({
-    baseURL: URL, // url = base url + request url
-    withCredentials: true, // send cookies when cross-domain requests
-    timeout: 60000 ,// request timeout
-  })
+
+const service = axios.create({
+  baseURL: URL, // url = base url + request url
+  withCredentials: true, // send cookies when cross-domain requests
+  timeout: 60000 ,// request timeout
+})
 // request interceptor
 service.interceptors.request.use(
   config => {