fix:复制链接

controllers/report_v2.go

@@ -1657,7 +1657,7 @@ func (this *ReportController) CancelApprove() {
 // @Param	request	body models.ReportShartLinkReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /share/generate [post]
-func (this *ReportCommonController) ShareGenerate() {
+func (this *ReportController) ShareGenerate() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -1671,8 +1671,8 @@ func (this *ReportCommonController) ShareGenerate() {
 		return
 	}
 
-	link, err := services.GetReportShareUrlToken(req)
-	if err != nil {
+	link, err := services.GetReportShareUrlToken(req, this.SysUser.AdminId)
+	if err != nil || link == "" {
 		br.Msg = "复制链接失败"
 		br.ErrMsg = "获取复制链接失败, Err: " + err.Error()
 		return

routers/commentsRouter.go

@@ -9727,15 +9727,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"],
-        beego.ControllerComments{
-            Method: "ShareGenerate",
-            Router: `/share/generate`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"],
         beego.ControllerComments{
             Method: "ShareTransform",
@@ -10159,6 +10150,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "ShareGenerate",
+            Router: `/share/generate`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"],
         beego.ControllerComments{
             Method: "ThsSendTemplateMsg",

services/report_v2.go

@@ -1503,8 +1503,8 @@ func GetReportWaterMarkPdf(reportInfo *models.Report, sysUser *system.Admin) {
 }
 
 // GetReportShareUrlToken 获取报告分享链接token
-func GetReportShareUrlToken(req models.ReportShartUrlReq) (linkToken string, err error) {
-	cacheLinkKey := utils.CACHE_REPORT_SHARE_SHORT_Url + strconv.Itoa(req.ReportId)
+func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToken string, err error) {
+	cacheLinkKey := utils.CACHE_REPORT_SHARE_SHORT_Url + strconv.Itoa(req.ReportId) + "userId:" + strconv.Itoa(adminId)
 	linkToken, _ = utils.Rc.RedisString(cacheLinkKey)
 	if linkToken != "" && utils.Rc.IsExist(utils.CACHE_REPORT_SHARE_ORIGIN_Url+linkToken) {
 		return
@@ -1534,6 +1534,8 @@ func GetReportShareUrlToken(req models.ReportShartUrlReq) (linkToken string, err
 		if err != nil {
 			return
 		}
+	} else {
+		linkToken = ""
 	}
 	return
 }