Merge branch 'eta/2.4.5' into debug

controllers/chart_common.go

@@ -76,7 +76,7 @@ func (this *ChartController) CommonChartInfoDetailFromUniqueCode() {
 	}
 
 	// 图表有效期是否开启
-	if conf[models.BusinessConfChartAuth] == "true" {
+	if conf[models.BusinessConfIsOpenChartExpired] == "true" {
 		resp.ChartInfo = chartInfo
 		br.Data = resp
 

controllers/excel_info.go

@@ -48,7 +48,7 @@ func (this *ExcelInfoController) GetTableDetail() {
 	uuid := this.GetString("Uuid")
 	authToken := this.GetString("AuthToken")
 
-	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

@@ -10,10 +10,10 @@ import (
 )
 
 const (
-	BusinessConfCompanyName      = "CompanyName"
-	BusinessConfCompanyWatermark = "CompanyWatermark"
-	BusinessConfWatermarkChart   = "WatermarkChart"
-	BusinessConfChartAuth        = "ChartAuth" // 图表是否鉴权
+	BusinessConfCompanyName        = "CompanyName"
+	BusinessConfCompanyWatermark   = "CompanyWatermark"
+	BusinessConfWatermarkChart     = "WatermarkChart"
+	BusinessConfIsOpenChartExpired = "IsOpenChartExpired" // 图表是否鉴权
 )
 
 // FromSceneMap 数据源名称与数据源ID的对应关系