Browse Source

fix:配置文件读取调整

Roc 2 years ago
parent
commit
8c91c39b94
2 changed files with 40 additions and 3 deletions
  1. 22 0
      utils/common.go
  2. 18 3
      utils/config.go

+ 22 - 0
utils/common.go

@@ -11,6 +11,7 @@ import (
 	"image/png"
 	"math"
 	"math/rand"
+	"net"
 	"os"
 	"os/exec"
 	"regexp"
@@ -550,3 +551,24 @@ func ConvertToFormatDay(excelDaysString string) string {
 	resultTime := time.Unix(int64(baseOriginSecond+realDiffSecond), 0).Format("2006-01-02")
 	return resultTime
 }
+
+func GetLocalIP() (ip string, err error) {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return
+	}
+	for _, addr := range addrs {
+		ipAddr, ok := addr.(*net.IPNet)
+		if !ok {
+			continue
+		}
+		if ipAddr.IP.IsLoopback() {
+			continue
+		}
+		if !ipAddr.IP.IsGlobalUnicast() {
+			continue
+		}
+		return ipAddr.IP.String(), nil
+	}
+	return
+}

+ 18 - 3
utils/config.go

@@ -49,12 +49,27 @@ func init() {
 	}
 	RunMode = tmpRunMode
 	if RunMode == "" {
-		RunMode = "release"
-		configPath := `/home/code/config/hongze_api/conf/app.conf`
-		err := web.LoadAppConfig("ini", configPath)
+		localIp, err := GetLocalIP()
+		fmt.Println("localIp:", localIp)
+		if localIp == "10.0.0.123" {
+			RunMode = "debug"
+		} else {
+			RunMode = "release"
+		}
+		fmt.Println("RunMode:", RunMode)
+		configPath := `/home/code/config/hongze_admin/conf/app.conf`
+		fmt.Println("configPath:", configPath)
+		err = web.LoadAppConfig("ini", configPath)
 		if err != nil {
 			fmt.Println("web.LoadAppConfig Err:" + err.Error())
 		}
+
+		//RunMode = "release"
+		//configPath := `/home/code/config/hongze_api/conf/app.conf`
+		//err := web.LoadAppConfig("ini", configPath)
+		//if err != nil {
+		//	fmt.Println("web.LoadAppConfig Err:" + err.Error())
+		//}
 	}
 
 	config, err := web.AppConfig.GetSection(RunMode)