fix

services/report_v2.go

@@ -2078,23 +2078,36 @@ func GeneralChartToken(showType, uniqueCode string) (token string, err error) {
 // @param uniqueCode string
 // @return token string
 // @return err error
-func GeneralReportToken(linkToken string) (token string, err error) {
+func GeneralReportToken(linkToken string, reportId int) (token string, err error) {
 	// 缓存key
 	token = utils.MD5(fmt.Sprint(linkToken, time.Now().UnixNano()/1e6))
-	key := getReportTokenKey(linkToken)
-	err = utils.Rc.Put(key, token, utils.BusinessConfReportChartExpiredTime)
+	reportKey := getReportShareTokenKey(linkToken)
+	err = utils.Rc.Put(reportKey, token, utils.BusinessConfReportChartExpiredTime)
+
+	reportTokenKey := getReportTokenKey(token)
+	err = utils.Rc.Put(reportTokenKey, fmt.Sprint(reportId), utils.BusinessConfReportChartExpiredTime)
 
 	return
 }
 
-// GetReportToken
+// getReportShareTokenKey
+// @Description:
+// @author: Roc
+// @datetime 2025-03-17 14:00:14
+// @param linkToken string
+// @return string
+func getReportShareTokenKey(linkToken string) string {
+	return fmt.Sprint(utils.CACHE_REPORT_SHARE_AUTH, utils.MD5(linkToken))
+}
+
+// GetReporGetReportAuthTokentToken
 // @Description: 获取报告token
 // @author: Roc
 // @datetime 2025-03-17 14:02:29
 // @param linkToken string
 // @return string
-func GetReportToken(linkToken string) string {
-	key := getReportTokenKey(linkToken)
+func GetReportAuthToken(linkToken string) string {
+	key := getReportShareTokenKey(linkToken)
 	return utils.Rc.GetStr(key)
 
 }
@@ -2105,8 +2118,8 @@ func GetReportToken(linkToken string) string {
 // @datetime 2025-03-17 14:00:14
 // @param linkToken string
 // @return string
-func getReportTokenKey(linkToken string) string {
-	return fmt.Sprint(utils.CACHE_REPORT_AUTH, utils.MD5(linkToken))
+func getReportTokenKey(token string) string {
+	return fmt.Sprint(utils.CACHE_REPORT_AUTH, token)
 }
 
 // HandleReportContentStruct
@@ -2197,7 +2210,7 @@ func processMap(data map[string]interface{}, opType string, tokenMap map[string]
 func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToken string, err error) {
 	defer func() {
 		if err == nil && linkToken != `` {
-			GeneralReportToken(linkToken)
+			GeneralReportToken(linkToken, req.ReportId)
 		}
 	}()
 	cacheLinkKey := utils.CACHE_REPORT_SHARE_SHORT_Url + strconv.Itoa(req.ReportId) + "userId:" + strconv.Itoa(adminId)
@@ -2258,9 +2271,9 @@ func TransfromToOriginUrl(linkToken string) (originLink string, msg string, err
 		return
 	}
 
-	reportToken := GetReportToken(linkToken)
+	reportToken := GetReportAuthToken(linkToken)
 	if reportToken != "" {
-		originLink += `&AuthToken=` + reportToken
+		originLink += `&authToken=` + reportToken
 	}
 
 	return

utils/constants.go

@@ -261,9 +261,10 @@ const (
 
 	CACHE_DATA_SOURCE_ES_HANDLE = "eta:data_source_es:handle" // 数据源es处理队列
 
-	CACHE_EXCEL_REFRESH = "CACHE_EXCEL_REFRESH" // 表格刷新
-	CACHE_CHART_AUTH    = "eta:chart:auth:"     //图表数据授权
-	CACHE_REPORT_AUTH   = "eta:report:auth:"    //图表数据授权
+	CACHE_EXCEL_REFRESH     = "CACHE_EXCEL_REFRESH"    // 表格刷新
+	CACHE_CHART_AUTH        = "eta:chart:auth:"        //图表数据授权
+	CACHE_REPORT_SHARE_AUTH = "eta:report:auth:share:" //报告短链映射key
+	CACHE_REPORT_AUTH       = "eta:report:auth:"       //图表数据授权
 )
 
 // 模板消息推送类型