Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_6.9

utils/common.go

@@ -11,6 +11,7 @@ import (
 	"image/png"
 	"math"
 	"math/rand"
+	"net"
 	"os"
 	"os/exec"
 	"regexp"
@@ -684,3 +685,24 @@ func GetOrmInReplace(num int) string {
 	}
 	return strings.Join(template, ",")
 }
+
+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
+}

utils/config.go

@@ -83,14 +83,32 @@ func init() {
 	}
 	fmt.Println("line 80:", tmpRunMode, err)
 	RunMode = tmpRunMode
+	//if RunMode == "" {
+	//	RunMode = "release"
+	//	configPath := `/home/code/config/hongze_cygx/conf/app.conf`
+	//	err := web.LoadAppConfig("ini", configPath)
+	//	if err != nil {
+	//		fmt.Println("web.LoadAppConfig Err:" + err.Error())
+	//	}
+	//}
+	fmt.Println("RunMode:", RunMode)
 	if RunMode == "" {
-		RunMode = "release"
-		configPath := `/home/code/config/hongze_cygx/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())
 		}
 	}
+
 	config, err := web.AppConfig.GetSection(RunMode)
 	if err != nil {
 		panic("配置文件读取错误 " + err.Error())