Merge branch 'bzq1/bug_season_cf' of eta_server/eta_api into debug

controllers/data_manage/chart_info.go

@@ -1615,6 +1615,9 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 			}
 		}
 	}
+	if dateType == utils.DateTypeNYears && chartInfo.ChartType == utils.CHART_TYPE_SEASON {
+		dateMax = time.Date(dateMax.Year()+1, 1, 1, 0, 0, 0, 0, time.Local)
+	}
 	startDate, endDate = utils.GetDateByDateTypeV2(dateType, startDate, endDate, startYear, dateMax)
 
 	if chartInfo.ChartType == 2 {

services/binlog/handler.go

@@ -77,7 +77,7 @@ func (h *EdbEventHandler) Insert(e *canal.RowsEvent) error {
 				return err
 			}
 		} else {
-			ok, err := utils.Rc.SIsMember(edbmonitorSvr.EDB_MONITOR_ID_SET_CACHE, newEdbInfo)
+			ok, err := utils.Rc.SIsMember(edbmonitorSvr.EDB_MONITOR_ID_SET_CACHE, newEdbInfo.EdbInfoId)
 			if err != nil {
 				return err
 			}
@@ -114,7 +114,7 @@ func (h *EdbEventHandler) Update(e *canal.RowsEvent) error {
 				return err
 			}
 		} else {
-			ok, err := utils.Rc.SIsMember(edbmonitorSvr.EDB_MONITOR_ID_SET_CACHE, newEdbInfo)
+			ok, err := utils.Rc.SIsMember(edbmonitorSvr.EDB_MONITOR_ID_SET_CACHE, newEdbInfo.EdbInfoId)
 			if err != nil {
 				return err
 			}