Parcourir la source

url: 兼容内外网

Yi il y a 1 an
Parent
commit
d2514c2731
2 fichiers modifiés avec 21 ajouts et 8 suppressions
  1. 3 1
      Dockerfile
  2. 18 7
      src/utils/request.js

+ 3 - 1
Dockerfile

@@ -14,4 +14,6 @@ RUN npm run build
 FROM nginx:alpine
 COPY --from=builder /app/calf-feed-admin/dist/ /usr/share/nginx/html/
 COPY --from=builder /app/calf-feed-admin/default.conf.template /etc/nginx/templates/default.conf.template
-EXPOSE 80
+EXPOSE 80
+
+CMD ["/bin/sh", "-c", "sed -i \"s@<html@<html domain=\"$DOMAIN\"@\" /usr/share/nginx/html/index.html; nginx -g \"daemon off;\""]

+ 18 - 7
src/utils/request.js

@@ -1,19 +1,30 @@
 import Vue from 'vue'
 import axios from 'axios'
- 
+
 import router from '@/router/index'
 import { MessageBox, Message } from 'element-ui'
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
 
-
+//获取当前url
+const DoMainString = document.querySelector("html").getAttribute("domain");
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API
+if (DoMainString) {
+  axios.defaults.baseURL = DoMainString
+}
+
+var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
+var browserUrl = window.location.hostname
+if (reg.test(browserUrl)){
+  axios.defaults.baseURL = window.location.protocol +"//"+ browserUrl + ":8087/"
+}
+
 // create an axios instance
 const service = axios.create({
   //baseURL: process.env.VUE_APP_BASE_API, // 根目录路径
   // baseURL: 'http://192.168.1.77:8092',
   // baseURL: 'http://192.168.1.70:8087',
-  
+
   //baseURL: 'http://192.168.1.96.8090',
   withCredentials: true, // send cookies when cross-domain requests
   timeout: 60000 // request timeout
@@ -30,7 +41,7 @@ service.interceptors.request.use(
     // }
 
     // if (store.getters.token) {
- 
+
     //   if (process.env.VUE_APP_BASE_API === '/dev-api') {
     //     config.headers['X-Token'] = getToken()
     //   } else {
@@ -38,7 +49,7 @@ service.interceptors.request.use(
     //   }
     // }
     //  console.log(sessionStorage.getItem("g_token"))
-     
+
      config.headers['Authorization'] = 'Bearer '+ window.sessionStorage.getItem("g_token")
     return config
   },
@@ -65,7 +76,7 @@ service.interceptors.response.use(
 
    // console.log("response-------------",response)
      const res = response.data
- 
+
     //console.log(res)
 
     // if the custom code is not 20000, it is judged as an error.
@@ -118,7 +129,7 @@ service.interceptors.response.use(
         //跳转登录页
         router.push('/login')
         location.reload()
-        
+
       })
     }
     let config = error.config