fix:桥接服务

services/eta_bridge/eta_bridge.go

@@ -81,7 +81,76 @@ func HttpEtaBridgePost(urlStr string, param interface{}) (bResult []byte, err er
 	result := new(BaseEtaBridgeDataResp)
 	if e = json.Unmarshal(bResult, &result); e != nil {
 		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(bResult))
-		utils.FileLog.Info("第三方登录（向桥接服务换取token）:\n" + string(bResult))
+		utils.FileLog.Info("桥接服务post请求失败:\n" + string(bResult))
+		return
+	}
+	if result.Code != 200 {
+		errMsg = result.Msg
+		err = fmt.Errorf("result: %s", string(bResult))
+		return
+	}
+
+	return
+}
+
+// HttpEtaBridgeGet
+// @Description: eta-bridge的get请求
+// @author: Roc
+// @datetime 2024-02-28 16:55:02
+// @param urlStr string
+// @param postData string
+// @return bResult []byte
+// @return err error
+// @return errMsg string
+func HttpEtaBridgeGet(urlStr string) (bResult []byte, err error, errMsg string) {
+	if utils.EtaBridgeUrl == "" {
+		errMsg = `未配置第三方的桥接服务地址`
+		err = errors.New(errMsg)
+		return
+	}
+
+	postUrl := utils.EtaBridgeUrl + "/api" + urlStr
+
+	client := &http.Client{}
+	req, e := http.NewRequest("GET", postUrl, nil)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+
+	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
+	req.Header.Set("Authorization", checkToken)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	bResult, e = io.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(bResult) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	// 生产环境解密, 注意有个坑前后的双引号
+	if utils.RunMode == "release" {
+		str := string(bResult)
+		str = strings.Trim(str, `"`)
+		bResult = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
+	}
+
+	result := new(BaseEtaBridgeDataResp)
+	if e = json.Unmarshal(bResult, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(bResult))
+		utils.FileLog.Info("桥接服务get请求失败:\n" + string(bResult))
 		return
 	}
 	if result.Code != 200 {

services/eta_bridge/xy.go

@@ -10,6 +10,30 @@ import (
 	"strings"
 )
 
+// SyncUser
+// @Description: 定时同步ETA指标信息变更数据至第三方
+// @author: Roc
+// @datetime 2024-02-28 14:00:45
+// @param cont context.Context
+// @return err error
+func SyncUser(cont context.Context) (err error) {
+	defer func() {
+		if err != nil {
+			tips := "SyncUser-定时将第三方的用户数据同步到ETA失败, ErrMsg:\n" + err.Error()
+			utils.FileLog.Info(tips)
+			go alarm_msg.SendAlarmMsg(tips, 3)
+		}
+	}()
+
+	uri := "/xy/user/pull"
+	_, err, _ = HttpEtaBridgeGet(uri)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
 // PushBaseParamReq
 // @Description: 业务报文
 type PushBaseParamReq struct {
@@ -861,22 +885,22 @@ func checkUpdateType(oldEdbInfo, newEdbInfo *data_manage.EdbInfo) (isUpdateEdbIn
 	return
 }
 
-func pushIndex(pushIndexList []*PushIndexParamDataReq) {
-	if len(pushIndexList) <= 0 {
-		return
-	}
-
-	uri := "/xy/index/pushIndexData"
-	req := PushBaseParamReq{
-		SerialID:    utils.GetRandString(32), //todo
-		TableCode:   "",
-		Total:       lenData,
-		IsEmailWarn: 0,
-		Data:        dataList,
-	}
-
-	var pushIndexList []*PushIndexParamDataReq
-	dataLimitList := make([][]PushBaseParamReq, 0)
-
-	_, e, errMsg := HttpEtaBridgePost(uri, req)
-}
+//func pushIndex(pushIndexList []*PushIndexParamDataReq) {
+//	if len(pushIndexList) <= 0 {
+//		return
+//	}
+//
+//	uri := "/xy/index/pushIndexData"
+//	req := PushBaseParamReq{
+//		SerialID:    utils.GetRandString(32), //todo
+//		TableCode:   "",
+//		Total:       lenData,
+//		IsEmailWarn: 0,
+//		Data:        dataList,
+//	}
+//
+//	var pushIndexList []*PushIndexParamDataReq
+//	dataLimitList := make([][]PushBaseParamReq, 0)
+//
+//	_, e, errMsg := HttpEtaBridgePost(uri, req)
+//}

services/task_xy.go

@@ -3,6 +3,7 @@ package services
 import (
 	"eta/eta_task/services/eta_bridge"
 	"eta/eta_task/utils"
+	"github.com/beego/beego/v2/task"
 )
 
 func XyTask() {
@@ -10,12 +11,21 @@ func XyTask() {
 		return
 	}
 
-	eta_bridge.SyncIndexList(nil)
+	//eta_bridge.SyncIndexList(nil)
 	//eta_bridge.SyncIndexValueList(nil)
 	//eta_bridge.SyncClassifyList(nil)
 	//eta_bridge.SyncEdbClassifyList(nil)
 	//return
 
+	if utils.SyncUserPath != `` {
+		syncUserTime := utils.SyncUserTime
+		if syncUserTime == `` {
+			syncUserTime = "0 0 * * * *"
+		}
+		// 每天同步一次指标列表
+		syncUser := task.NewTask("SyncUser", syncUserTime, eta_bridge.SyncUser)
+		task.AddTask("定时同步用户账号", syncUser)
+	}
 	// 每天同步一次指标列表
 	//syncIndex := task.NewTask("syncZhongJiIndexList", "0 0 17 * * *", eta_bridge.SyncIndexList)
 	//task.AddTask("定时同步指标列表", syncIndex)

utils/config.go

@@ -125,6 +125,8 @@ var (
 	EtaBridgeAppNameEn string // 桥接服务英文名称-鉴权用
 	EtaBridgeMd5Key    string // 桥接服务Md5密钥-鉴权用
 	EtaBridgeDesKey    string // 桥接服务Des密钥-解密数据用
+	SyncUserPath       string // 桥接服务-用户同步服务地址
+	SyncUserTime       string // 桥接服务-用户同步的时间配置
 )
 
 var HzDataApi string
@@ -261,6 +263,8 @@ func init() {
 		EtaBridgeAppNameEn = config["eta_bridge_app_name_en"] // 桥接服务英文名称-鉴权用
 		EtaBridgeMd5Key = config["eta_bridge_md5_key"]        // 桥接服务Md5密钥-鉴权用
 		EtaBridgeDesKey = config["eta_bridge_des_key"]        // 桥接服务Des密钥-解密数据用
+		SyncUserPath = config["sync_user_path"]               // 桥接服务-用户同步服务地址
+		SyncUserTime = config["sync_user_time"]               // 桥接服务-用户同步的时间配置
 	}
 
 	HzDataApi = config["hz_data_api"]