Merge branch 'eta/2.4.5' into debug

# Conflicts:
#	models/business_conf.go

controllers/data_manage/chart_common.go

@@ -379,7 +379,7 @@ func (this *ChartInfoController) GeneralChartToken() {
 		return
 	}
 
-	businessConf, err := models.GetBusinessConfByKey(models.BusinessConfChartAuth)
+	businessConf, err := models.GetBusinessConfByKey(models.BusinessConfIsOpenChartExpired)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取配置失败，Err:" + err.Error()

models/business_conf.go

@@ -56,7 +56,7 @@ const (
 	BusinessConfReportViewUrl                = "ReportViewUrl"                // 报告详情地址
 	BusinessConfEsIndexNameExcel             = "EsIndexNameExcel"             // ES索引名称-表格
 	BusinessConfEsIndexNameDataSource        = "EsIndexNameDataSource"        // ES索引名称-数据源
-	BusinessConfChartAuth          = "ChartAuth"          // 图表是否鉴权
+	BusinessConfIsOpenChartExpired = "IsOpenChartExpired" // 图表是否鉴权
 )
 
 const (