Merge branch 'fix/refresh' into debug

# Conflicts:
#	models/wx_template_msg.go

models/wx_template_msg.go

@@ -33,6 +33,13 @@ func GetWxOpenIdList() (items []*OpenIdList, err error) {
 	return
 }
 
+func DeleteTemplateRecordByDate(date string) (err error) {
+	sql := `DELETE FROM user_template_record WHERE create_time<? `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, date).Exec()
+	return
+}
+
 // GetOpenIdListV2 2022-08-18从hongze_admin复制过来的最新的代码
 func GetOpenIdListV2() (items []*OpenIdList, err error) {
 	sql := `SELECT DISTINCT
@@ -48,10 +55,3 @@ func GetOpenIdListV2() (items []*OpenIdList, err error) {
 	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
 }
-
-func DeleteTemplateRecordByDate(date string) (err error) {
-	sql := `DELETE FROM user_template_record WHERE create_time<? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, date).Exec()
-	return
-}

services/alarm_msg/alarm_msg.go

@@ -26,4 +26,25 @@ func SendAlarmMsg(msgBody string, level int) {
 		return
 	}
 	http.Post(AlarmMsgUrl, string(param))
-}
+}
+
+// SendAlarmMsgWithEmail 指定邮箱通知
+//projectName-项目名称
+//runMode-运行模式
+//msgBody-消息内容
+//email-需要发送的邮箱
+//level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
+func SendAlarmMsgWithEmail(msgBody, email string, level int) {
+	params := make(map[string]interface{})
+	params["ProjectName"] = utils.APPNAME
+	params["RunMode"] = utils.RunMode
+	params["MsgBody"] = msgBody
+	params["Email"] = email
+	params["Level"] = level
+	param, err := json.Marshal(params)
+	if err != nil {
+		utils.FileLog.Info("SendAlarmMsg json.Marshal Err:" + err.Error())
+		return
+	}
+	http.Post(AlarmMsgUrl, string(param))
+}

services/data/edb_info.go

@@ -61,18 +61,18 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			err = errors.New("GetEdbInfoMaxAndMinInfo Err:" + err.Error())
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				err = errors.New("ModifyEdbInfoMaxAndMinInfo Err:" + err.Error())
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	err = errors.New("GetEdbInfoMaxAndMinInfo Err:" + err.Error())
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		err = errors.New("ModifyEdbInfoMaxAndMinInfo Err:" + err.Error())
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -126,16 +126,16 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -188,16 +188,16 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 		//minDate, maxDate, err := data.GetEdbDataPbMaxOrMinDate(v.EdbInfoId)
 		//if err != nil {
 		//	return errors.New("GetEdbDataThsMaxOrMinDate:" + err.Error())
@@ -259,16 +259,16 @@ func RefreshDataFromPbFinance(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 		//minDate, maxDate, err := data.GetEdbDataPbMaxOrMinDate(v.EdbInfoId)
 		//if err != nil {
 		//	return errors.New("GetEdbDataThsMaxOrMinDate:" + err.Error())
@@ -908,21 +908,21 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
-				return err
-			} else {
-				err = nil
-			}
-		} else {
-			if item != nil {
-				err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-				if err != nil {
-					return err
-				}
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	if err.Error() != utils.ErrNoRow() {
+		//		return err
+		//	} else {
+		//		err = nil
+		//	}
+		//} else {
+		//	if item != nil {
+		//		err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//		if err != nil {
+		//			return err
+		//		}
+		//	}
+		//}
 	}
 	return err
 }
@@ -976,16 +976,16 @@ func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1039,16 +1039,16 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1101,16 +1101,16 @@ func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1163,16 +1163,16 @@ func RefreshDataFromSh(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1225,16 +1225,16 @@ func RefreshDataFromDl(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1287,16 +1287,16 @@ func RefreshDataFromShfe(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1349,16 +1349,16 @@ func RefreshDataFromCffex(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1411,16 +1411,16 @@ func RefreshDataFromZz(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1459,16 +1459,16 @@ func RefreshDataFromLt(wg *sync.WaitGroup) (err error) {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
 		//更新指标的最新数据
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1550,16 +1550,16 @@ func RefreshDataFromCoal(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
@@ -1612,21 +1612,20 @@ func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }
 
-
 // RefreshDataFromEic 刷新谷歌出行数据
 func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
 	defer func() {
@@ -1668,16 +1667,16 @@ func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
 		if resp.Ret != 200 {
 			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
-		if err != nil {
-			return err
-		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return err
-			}
-		}
+		//item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		//if err != nil {
+		//	return err
+		//}
+		//if item != nil {
+		//	err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
 	}
 	return err
 }

services/report_push.go

@@ -601,7 +601,8 @@ func CheckThsReportList(cont context.Context) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
 		if len(errMsgList) > 0 {
-			go alarm_msg.SendAlarmMsg("定时检测同花顺客群推送状态： ErrMsg:"+strings.Join(errMsgList, "\n"), 3)
+			emailStr := `317699326@qq.com;984198890@qq.com;pdzhao@hzinsights.com`
+			go alarm_msg.SendAlarmMsgWithEmail("定时检测同花顺客群推送状态：<br/>"+strings.Join(errMsgList, "<br/>"), emailStr, 3)
 			//fmt.Println("定时检测同花顺客群推送状态：\n"+strings.Join(errMsgList, "\n"), 3)
 		}
 	}()
@@ -669,7 +670,7 @@ func thsReportList(numPerPageStr string) (tshListRowsResult TshListRowsResult, e
 	body, _ := ioutil.ReadAll(resp.Body)
 
 	//fmt.Println(string(body))
-	utils.FileLog.Info(fmt.Sprintf("Ths List Result :%s", string(body)))
+	//utils.FileLog.Info(fmt.Sprintf("Ths List Result :%s", string(body)))
 
 	//同花顺接口返回数据
 	var tshResult TshListResult