Merge branch 'fix/2022-07-30'

models/company_product.go

@@ -41,6 +41,11 @@ func CompanyFreeze(companyId, productId int) (companyReportPermissionList []*Com
 		freezeEndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
 	}
 
+	// 权益客户 冻结期 改为两个月
+	if productId == 2 {
+		freezeEndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+	}
+
 	//客户产品 状态 变更
 	sql := `UPDATE company_product SET status='冻结',is_formal=0,is_suspend=0,freeze_time=NOW(),modify_time=NOW(),start_date=?,end_date=?,freeze_start_date=?,freeze_end_date=?,try_stage=1 WHERE company_id=? AND product_id=? `
 	_, err = o.Raw(sql, freezeStartDate, freezeEndDate, freezeStartDate, freezeEndDate, companyId, productId).Exec()

services/data/edb_info.go

@@ -330,13 +330,13 @@ func CheckThsDataInterface(cont context.Context) (err error) {
 		body, err := http.Get(checkUrl)
 		if err != nil {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckPbDataInterface ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-			msg := "检测同花顺数据服务器失败：CheckPbDataInterface ErrMsg:" + err.Error()
+			msg := "检测同花顺数据服务器失败：CheckThsDataInterface ErrMsg:" + err.Error()
 			go alarm_msg.SendAlarmMsg(msg, 3)
 		} else {
 			result := string(body)
 			if result != "1" {
 				//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"检测数据接口：失败提醒", "CheckPbDataInterface ErrMsg:"+string(body), utils.EmailSendToUsers)
-				msg := "检测同花顺数据服务器失败：CheckPbDataInterface ErrMsg:" + string(body)
+				msg := "检测同花顺数据服务器失败：CheckThsDataInterface ErrMsg:" + string(body)
 				go alarm_msg.SendAlarmMsg(msg, 3)
 			}
 		}

utils/common.go

@@ -13,6 +13,7 @@ import (
 	"image/png"
 	"math"
 	"math/rand"
+	"net"
 	"os"
 	"regexp"
 	"strconv"
@@ -766,3 +767,24 @@ func InArrayByStr(idStrList []string, searchId string) (has bool) {
 	}
 	return
 }
+
+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

@@ -69,9 +69,16 @@ func init() {
 	}
 	RunMode = tmpRunMode
 	if RunMode == "" {
-		RunMode = "release"
+		localIp, err := GetLocalIP()
+		fmt.Println("localIp:", localIp)
+		if localIp == "10.0.0.123" {
+			RunMode = "debug"
+		} else {
+			RunMode = "release"
+		}
+		//RunMode = "release"
 		configPath := `/home/code/config/hongze_task/conf/app.conf`
-		err := web.LoadAppConfig("ini", configPath)
+		err = web.LoadAppConfig("ini", configPath)
 		if err != nil {
 			fmt.Println("web.LoadAppConfig Err:" + err.Error())
 		}