瀏覽代碼

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

xuyiping 1 年之前
父節點
當前提交
8383d8654f
共有 5 個文件被更改,包括 47 次插入4 次删除
  1. 1 1
      .env.development
  2. 42 0
      before.js
  3. 1 1
      src/utils/configs.js
  4. 1 1
      src/utils/request.js
  5. 2 1
      vue.config.js

+ 1 - 1
.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 # base api
 # 测试线
 VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
-
 VUE_APP_BASE_API1 = 'http://210.16.189.72:8081/'
+
 VUE_APP_BASE_API2 = 'http://210.16.189.72:8081/'
 VUE_APP_BASE_API3 = 'http://192.168.1.104:8081/'
 VUE_APP_BASE_API4 = 'http://192.168.1.70:8081/'

+ 42 - 0
before.js

@@ -0,0 +1,42 @@
+const fs = require('fs');
+const os = require('os');
+
+function getIPAdress(flag = false) {
+  const interfaces = os.networkInterfaces();
+  for (const devName in interfaces) {
+    const iface = interfaces[devName];
+    for (let i = 0; i < iface.length; i++) {
+      const alias = iface[i];
+      const isIPV4 = !flag;
+      if (isIPV4) {
+        if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
+          return alias.address;
+        }
+      } else if (alias.address !== '127.0.0.1' && !alias.internal) {
+        if (alias.family === 'IPv6') {
+          return alias.address;
+        }
+      }
+    }
+  }
+}
+
+const IPv4 = getIPAdress();
+
+const envFile = fs.readFileSync('.env.development', 'utf8');
+
+const envVars = envFile.split('\n').reduce((result, line) => {
+  const parts = line.split('=');
+  if (parts.length === 2) {
+    result[parts[0].trim()] = parts[1].trim();
+  }
+  return result;
+}, {});
+
+envVars.VUE_APP_BASE_URL = `http://${IPv4}:8081`;
+
+const newEnvFile = Object.keys(envVars)
+  .map(key => `${key}=${envVars[key]}`)
+  .join('\n');
+
+fs.writeFileSync('.env.development', newEnvFile);

+ 1 - 1
src/utils/configs.js

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

+ 1 - 1
src/utils/request.js

@@ -8,7 +8,7 @@ import { SERVER_URL } from '@/utils/configs'
 
 // var aa = process.env.VUE_APP_BASE_API
 var aa = SERVER_URL
-// console.log(SERVER_URL,'===')
+console.log(aa,'===')
 //获取当前url
 // if(aa.indexOf('/')==0 && aa.length==1){
 //   // aa= window.location.protocol + "//"+window.location.host+aa

+ 2 - 1
vue.config.js

@@ -12,7 +12,7 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // use administrator privileges to execute the command line.
 // For example, Mac: sudo npm run
 const port = 9529 // dev port
-
+
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**
@@ -138,3 +138,4 @@ module.exports = {
       )
   }
 }
+