Merge branch 'fix/2022-08-25' into debug

# Conflicts:
#	utils/constants.go

services/chart/chart_info.go

@@ -1,6 +1,7 @@
 package chart
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"hongze/hongze_yb/global"
@@ -148,6 +149,11 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *chartInfoModel.SaveChar
 		}
 	}
 
+	// 清除缓存
+	{
+		key := GetChartInfoDataKey(req.ChartInfoId)
+		_ = global.Redis.Del(context.TODO(), key)
+	}
 	return
 }
 
@@ -393,3 +399,9 @@ func RefreshChart(chartInfoId int) (err error) {
 
 	return
 }
+
+// GetChartInfoDataKey 获取图表缓存的key
+func GetChartInfoDataKey(chartInfoId int) string {
+	key := fmt.Sprint(utils.CACHE_CHART_INFO_DATA, chartInfoId)
+	return key
+}

utils/constants.go

@@ -191,3 +191,16 @@ var SystemSourceList = []int{
 const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
+
+//缓存key
+const (
+	CACHE_KEY_LOGS               = "HZ_ADMIN_CACHE_KEY_LOGS"         //api用户操作日志队列
+	CACHE_KEY_ADMIN              = "calendar:admin:list"             //系统用户列表缓存key
+	CACHE_KEY_ADMIN_ID           = "calendar:admin:id:list"          //系统用户列表缓存key
+	CACHE_KEY_OLD_REPORT_PUBLISH = "HZ_CACHE_KEY_OLD_REPORT_PUBLISH" // 老后台报告发布队列
+	CACHE_ADMIN_YB_CONFIG        = "admin:yb_config:"                //研报配置相关缓存前缀
+	CACHE_WIND_URL               = "CACHE_WIND_URL"                  //指标与wind服务器的绑定关系
+	CACHE_CHART_INFO_DATA        = "chart:info:data:"                //图表数据
+	CACHE_CHART_CLASSIFY         = "chart:classify"                  //图表分类数据
+	CACHE_IMPORT_MANUAL_DATA     = "import:manual:data"              //手工数据导入后刷新
+)