Merge branch '3.3.1-dspf' into 3.3.2-dzxxp

vue.config.js

@@ -1,16 +1,31 @@
 'use strict'
 const path = require('path')
 
-// 获取git版本信息
+const ip = '192.168.1.43'
+const os = require('os')
 const fs = require("fs")
-const gitHEAD = fs.readFileSync('.git/HEAD', 'utf-8').trim()
-const ref = gitHEAD.split(': ')[1]
-const develop = gitHEAD.split('/')[2]
-const gitVersion = fs.readFileSync('.git/' + ref, 'utf-8').trim()
-const buildEdition = develop + ': ' + gitVersion
-const myDate = new Date();
+//判断环境
+let ifaces = os.networkInterfaces()
+let localityIp = '', result = []
+for(let dev in ifaces) {
+  ifaces[dev].forEach(function(details) {
+    if(localityIp === '' && details.family === 'IPv4' && !details.internal) {
+      localityIp = details.address
+      return;
+    }
+  })
+}
+let getFile = localityIp == ip?false:true
+/******** 获取git版本信息 ********/
+const gitHEAD = getFile ? fs.readFileSync('.git/HEAD', 'utf-8').trim() : false
+const ref = getFile ? gitHEAD.split(': ')[1] : false
+const develop = getFile ? gitHEAD.split('/')[2] : false
+const gitVersion = getFile ? fs.readFileSync('.git/' + ref, 'utf-8').trim() : false
+const buildEdition = develop && gitVersion ? develop + ': ' + gitVersion : '未配置'
+const myDate = new Date()
 const buildTime = myDate.getFullYear() +'-'+ (myDate.getMonth()+1) +'-'+ myDate.getDate() +' '+ myDate.getHours() +':'+ myDate.getMinutes();
-const buildUser = fs.readFileSync('.git/logs/HEAD', 'utf-8').match(/<(\S*)>/)[1].match(/\+(\S*)@/)[1]
+const logsList = getFile ? fs.readFileSync('.git/logs/HEAD', 'utf-8').replace(/\r\n|\r/g, "\n").split("\n") : false
+const buildUser = getFile ? logsList[logsList.length-2].split(" ")[2] : '未配置'
 
 function resolve(dir) {
   return path.join(__dirname, dir)