Merge branch 'bzq1/short_url' into debug

controllers/report_v2.go

@@ -1819,6 +1819,10 @@ func (this *ReportController) ShareGenerate() {
 		br.ErrMsg = "参数解析失败, Err: " + e.Error()
 		return
 	}
+	reportItem, _ := models.GetReportByReportId(req.ReportId)
+	if reportItem != nil && reportItem.Title != "" {
+		req.Title = reportItem.Title
+	}
 
 	link, err := services.GetReportShareUrlToken(req, this.SysUser.AdminId)
 	if err != nil || link == "" {

models/report.go

@@ -1688,6 +1688,7 @@ func FindReportListByCondition(condition string, pars []interface{}) (items []*R
 type ReportShartUrlReq struct {
 	Url      string `description:"分享链接"`
 	ReportId int    `description:"报告ID"`
+	Title    string `description:"报告标题"`
 }
 
 type ReportShartUrlResp struct {

services/report_v2.go

@@ -1667,6 +1667,7 @@ func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToke
 	if linkToken != "" && utils.Rc.IsExist(utils.CACHE_REPORT_SHARE_ORIGIN_Url+linkToken) {
 		return
 	}
+
 	var ok bool
 	// 冲突检测
 	for i := 0; i < 3; i++ {
@@ -1676,6 +1677,8 @@ func GetReportShareUrlToken(req models.ReportShartUrlReq, adminId int) (linkToke
 		}
 		hashUrl := utils.MurmurHash64([]byte(linkToken))
 		linkToken = utils.ConvertNumToBase62(hashUrl)
+		// 拼上报告标题
+		linkToken = fmt.Sprintf("%s %s", linkToken, req.Title)
 
 		ok = utils.Rc.IsExist(utils.CACHE_REPORT_SHARE_ORIGIN_Url + linkToken)
 		if !ok {