Merge branch 'eta/2.4.5' into debug

# Conflicts:
#	controllers/excel.go
#	services/excel.go

controllers/chart.go

@@ -43,8 +43,8 @@ func (this *ChartController) ChartDetail() {
 		br.ErrMsg = "参数不能为空！"
 		return
 	}
-	url := utils.ChartLibUrl + `/chart/common/detail?UniqueCode=%s`
-	url = fmt.Sprintf(url, req.UniqueCode)
+	url := utils.ChartLibUrl + `/chart/common/detail?UniqueCode=%s&AuthToken=%s`
+	url = fmt.Sprintf(url, req.UniqueCode, req.AuthToken)
 
 	resp, e := http.Get(url)
 	if e != nil {

controllers/excel.go

@@ -37,7 +37,7 @@ func (this *ExcelController) ExcelDetail() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	url := fmt.Sprintf(utils.ChartLibUrl+`/excel_info/detail?UniqueCode=%s&FromScene=%d&ReferencedId=%d&Uuid=%s`, req.UniqueCode, req.FromScene, req.ReferencedId, req.Uuid)
+	url := fmt.Sprintf(utils.ChartLibUrl+`/excel_info/detail?UniqueCode=%s&FromScene=%d&ReferencedId=%d&Uuid=%s&AuthToken=%s`, req.UniqueCode, req.FromScene, req.ReferencedId, req.Uuid, req.AuthToken)
 
 	resp, e := http.Get(url)
 	if e != nil {

services/chart.go

@@ -3,4 +3,5 @@ package services
 type ChartDetailReq struct {
 	UniqueCode string //"图表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
 	IsReplace  int    // 是否报告转长图的场景：1-是(为了兼容内网客户，需要判断配置中是否要替换地址)
+	AuthToken  string //"授权token
 }

services/excel.go

@@ -5,4 +5,5 @@ type ExcelDetailReq struct {
 	FromScene    int    //"场景来源，1：智能研报，2：研报列表；3：英文研报；4：中文PPT；5：英文PPT"
 	ReferencedId int    `description:"被引用的ID"`
 	Uuid         string `description:"引用唯一标识"`
+	AuthToken  string //"授权token"
 }