Merge branch 'feature/ci-drone' of duanxiaoduan/tmr-group-admin into develop

Dockerfile

@@ -2,6 +2,9 @@ FROM node:14.0.0 as builder
 WORKDIR /app/tmr-group-admin
 #拷贝源码
 COPY . .
+
+CMD sed -i "s/SERVER_URL/$hostip/g" ./src/utils/config.js
+
 #安装依赖
 RUN npm install --registry=https://registry.npm.taobao.org
 

src/utils/configs.js

@@ -56,3 +56,6 @@ export const dataType = [
   { name: 'longtext', needQuotation: true, availableFunc: ['count', 'none', 'custbiaozhun', 'custbianyi'] },
   { name: 'integer', needQuotation: false, availableFunc: ['sum', 'avg', 'max', 'min', 'count', 'none', 'custbiaozhun', 'custbianyi'] }
 ]
+
+export const SERVER_URL = '127.0.0.1:8081';
+// export const SERVER_URL = 'http://192.168.1.70:8081/';

src/utils/request.js

@@ -2,11 +2,13 @@ import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import { SERVER_URL } from '@/utils/configs'
 
 //获取当前url
 
-var aa = process.env.VUE_APP_BASE_API
-console.log(process.env.VUE_APP_BASE_API)
+// var aa = process.env.VUE_APP_BASE_API
+var aa = SERVER_URL
+console.log(SERVER_URL,'===')
 console.log(process.env.VUE_APP_BASE_API1)
 console.log(process.env.VUE_APP_BASE_API2)
 console.log(process.env.VUE_APP_BASE_API3)