拆分ETA服务

go.mod

@@ -23,6 +23,7 @@ require (
 require (
 	github.com/andybalholm/cascadia v1.3.1 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 // indirect
+	github.com/astaxie/beego v1.12.3 // indirect
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect

services/wx_template_msg.go

@@ -70,47 +70,7 @@ func SendWxMsgWithFrequency(first, keyword1, keyword2, remark string, openIdList
 	return
 }
 
-<<<<<<< HEAD
-func WxSendTemplateMsg(sendUrl string, sendMap map[string]interface{}, items []*models.OpenIdList) (err error) {
-	for _, v := range items {
-		sendMap["touser"] = v.OpenId
-		data, err := json.Marshal(sendMap)
-		if err != nil {
-			fmt.Println("SendTemplateMsgOne Marshal Err:", err.Error())
-			return err
-		}
-		utils.FileLog.Info(fmt.Sprintf("One SendData:%s", string(data)))
-		err = SendTemplateMsg(sendUrl, data)
-		if err != nil {
-			fmt.Println("send err:", err.Error())
-			return err
-		}
-	}
-	return
-}
-
-func SendTemplateMsg(sendUrl string, data []byte) (err error) {
-	client := http.Client{}
-	resp, err := client.Post(sendUrl, "application/json", bytes.NewBuffer(data))
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-
-	body, _ := ioutil.ReadAll(resp.Body)
-	utils.FileLog.Info(fmt.Sprintf("SendResult:%s", string(body)))
-	var templateResponse models.SendTemplateResponse
-	err = json.Unmarshal(body, &templateResponse)
-	if err != nil {
-		return err
-	}
-	return
-}
-
-// SendWxMsgWithCompanyRemind 到期提醒模板消息
-=======
 // 到期提醒模板消息
->>>>>>> master
 func SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark, code string, openIdList []*models.OpenIdList) (err error) {
 	var msg string
 	defer func() {
@@ -177,33 +137,9 @@ func SendWxMsgWithActivityAppointmentRemind(first, keyword1, keyword2, keyword3,
 	}()
 	utils.FileLog.Info("%s", "services SendMsg")
 
-<<<<<<< HEAD
-	// 获取研报小程序配置
-	ybConf, err := GetYbAppIdInfo()
-	if err != nil {
-		msg = "获取研报小程序配置失败"
-		return
-	}
-
-	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	sendMap := make(map[string]interface{})
-	sendData := make(map[string]interface{})
-
-	sendMap["template_id"] = utils.AppointmentRemindTemplateId
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["activity_name"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["reserve_results"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-	sendData["activity_time"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
-	sendData["activity_address"] = map[string]interface{}{"value": keyword4, "color": "#173177"}
-	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
-
-	if wxAppPath != "" {
-		sendMap["miniprogram"] = map[string]interface{}{"appid": ybConf.AppId, "pagepath": wxAppPath}
-=======
 	openIdArr := make([]string, len(openIdList))
 	for i, v := range openIdList {
 		openIdArr[i] = v.OpenId
->>>>>>> master
 	}
 	sendInfo := new(SendWxTemplate)
 	sendInfo.WxAppId = utils.WxAppId
@@ -298,13 +234,6 @@ func SendYbVoiceBroadcastWxMsg(broadcastId int, sectionName, broadcastName strin
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 
-	// 获取研报小程序配置
-	ybConf, err := GetYbAppIdInfo()
-	if err != nil {
-		msg = "获取研报小程序配置失败"
-		return
-	}
-
 	first := "您好，有新的语音播报待查看"
 	//keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
 	//keyword2 := "待查看"
@@ -318,7 +247,7 @@ func SendYbVoiceBroadcastWxMsg(broadcastId int, sectionName, broadcastName strin
 	sendInfo.Keyword2 = keyword2
 	sendInfo.RedirectUrl = wxAppPath
 	sendInfo.TemplateId = utils.YbCommonTemplateId
-	sendInfo.RedirectTarget = ybConf.MsgRedirectType
+	sendInfo.RedirectTarget = 1
 	sendInfo.Resource = wxAppPath
 	sendInfo.SendType = utils.TEMPLATE_MSG_YB_VOICE_BROADCAST
 	sendInfo.OpenIdArr = openIdArr