Acasă Explorează Ajutor
Autentificare
eta_server
/
eta_api
2
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

Merge remote-tracking branch 'origin/bzq1/short_url' into eta/2.4.5

# Conflicts:
#	routers/router.go
#	services/report_v2.go
#	utils/common.go
#	utils/constants.go
Roc 2 săptămâni în urmă
părinte
eb7d0eb265 febf0b4866
comite
ee073ed64e
9 a modificat fișierele cu 243 adăugiri și 1 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 90 1
      controllers/report_v2.go
  2. 1 0
      go.mod
  3. 1 0
      go.sum
  4. 10 0
      models/report.go
  5. 18 0
      routers/commentsRouter.go
  6. 3 0
      routers/router.go
  7. 83 0
      services/report_v2.go
  8. 35 0
      utils/common.go
  9. 2 0
      utils/constants.go

+ 90 - 1
controllers/report_v2.go
Vizualizați fișierul 

@@ -12,13 +12,14 @@ import (
 
 	"eta/eta_api/services/data"
 
 	"eta/eta_api/utils"
 
 	"fmt"
 
-	"github.com/rdlucklib/rdluck_tools/paging"
 
 	"html"
 
 	"io"
 
 	"os"
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
+
 
+	"github.com/rdlucklib/rdluck_tools/paging"
 
 )
 
 
 // ListReport
 
@@ -1717,6 +1718,94 @@ func (this *ReportController) CancelApprove() {
 
 	br.Msg = "操作成功"
 
 }
 
 
+// ShareGenerate
 
+// @Title 获取复制链接
 
+// @Description 获取复制链接
 
+// @Param	request	body models.ReportShartLinkReq true "type json string"
 
+// @Success 200 Ret=200 操作成功
 
+// @router /share/generate [post]
 
+func (this *ReportController) ShareGenerate() {
 
+	br := new(models.BaseResponse).Init()
 
+	defer func() {
 
+		this.Data["json"] = br
 
+		this.ServeJSON()
 
+	}()
 
+
 
+	var req models.ReportShartUrlReq
 
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 
+		br.Msg = "参数有误"
 
+		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 == "" {
 
+		br.Msg = "复制链接失败"
 
+		br.ErrMsg = "获取复制链接失败, Err: " + err.Error()
 
+		return
 
+	}
 
+
 
+	resp := new(models.ReportShartUrlResp)
 
+	resp.UrlToken = link
 
+
 
+	br.Ret = 200
 
+	br.Success = true
 
+	br.Msg = "获取成功"
 
+	br.Data = resp
 
+}
 
+
 
+// ShareTransform
 
+// @Title 获取原始链接
 
+// @Description 获取原始链接
 
+// @Param	Token   query   string  true    "复制链接的token"
 
+// @Success 200 Ret=200 操作成功
 
+// @router /share/link [get]
 
+func (this *ReportCommonController) ShareTransform() {
 
+	br := new(models.BaseResponse).Init()
 
+	defer func() {
 
+		this.Data["json"] = br
 
+		this.ServeJSON()
 
+	}()
 
+
 
+	token := this.GetString("Token")
 
+
 
+	link, msg, err := services.TransfromToOriginUrl(token)
 
+	if err != nil {
 
+		if msg == "" {
 
+			msg = "获取失败"
 
+		}
 
+
 
+		htmlTpl := `
 
+		<!DOCTYPE html>
 
+		<html lang="zh">
 
+		<head>
 
+		    <meta charset="UTF-8">
 
+		    <title>链接失效</title>
 
+		</head>
 
+		<body>
 
+		    <h1>链接失效</h1>
 
+		    <p>%s</p>
 
+		</body>
 
+		</html>
 
+		`
 
+		htmlTpl = fmt.Sprintf(htmlTpl, msg)
 
+		this.Ctx.Output.SetStatus(404)
 
+		this.Ctx.Output.Body([]byte(htmlTpl))
 
+		utils.FileLog.Info("获取复制链接失败, Err: " + err.Error())
 
+		return
 
+	}
 
+
 
+	this.Ctx.Redirect(302, link)
 
+
 
+	br.Ret = 200
 
+	br.Success = true
 
+	br.Msg = "获取成功"
 
+}
 
+
 
 // init
 
 // @Description: 修复历史报告数据
 
 // @author: Roc

+ 1 - 0
go.mod
Vizualizați fișierul 

@@ -40,6 +40,7 @@ require (
 
 	github.com/rdlucklib/rdluck_tools v1.0.3
 
 	github.com/shopspring/decimal v1.3.1
 
 	github.com/silenceper/wechat/v2 v2.1.6
 
+	github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72
 
 	github.com/spf13/viper v1.7.0
 
 	github.com/tealeg/xlsx v1.0.5
 
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/asr v1.0.873

+ 1 - 0
go.sum
Vizualizați fișierul 

@@ -565,6 +565,7 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 
 github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

+ 10 - 0
models/report.go
Vizualizați fișierul 

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

+ 18 - 0
routers/commentsRouter.go
Vizualizați fișierul 

@@ -11275,6 +11275,15 @@ func init() {
 
             Filters: nil,
 
             Params: nil})
 
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"],
 
+        beego.ControllerComments{
 
+            Method: "ShareTransform",
 
+            Router: `/share/link`,
 
+            AllowHTTPMethods: []string{"get"},
 
+            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: "CheckDayWeekReportChapterVideo",
 
@@ -11698,6 +11707,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",

+ 3 - 0
routers/router.go
Vizualizați fișierul 

@@ -39,6 +39,8 @@ import (
 
 	"eta/eta_api/controllers/smart_report"
 
 	"eta/eta_api/controllers/speech_recognition"
 
 	"eta/eta_api/controllers/trade_analysis"
 
+	"eta/eta_api/services"
 
+
 
 	"github.com/beego/beego/v2/server/web"
 
 	"github.com/beego/beego/v2/server/web/filter/cors"
 
 )
 
@@ -52,6 +54,7 @@ func init() {
 
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 
 		AllowCredentials: true,
 
 	}))
 
+	web.InsertFilter("/adminapi/share/*", web.BeforeRouter, services.FilterShareUrl())
 
 	ns := web.NewNamespace("/adminapi",
 
 		web.NSNamespace("/sysuser",
 
 			web.NSInclude(

+ 83 - 0
services/report_v2.go
Vizualizați fișierul 

@@ -24,6 +24,12 @@ import (
 
 	"strconv"
 
 	"strings"
 
 	"time"
 
+
 
+	"github.com/beego/beego/v2/server/web"
 
+	"github.com/beego/beego/v2/server/web/context"
 
+	"github.com/go-redis/redis/v8"
 
+	"github.com/rdlucklib/rdluck_tools/file"
 
+	"github.com/rdlucklib/rdluck_tools/http"
 
 )
 
 
 // AddReportAndChapter
 
@@ -2151,3 +2157,80 @@ func processMap(data map[string]interface{}, opType string, tokenMap map[string]
 
 	}
 
 	return nil
 
 }
 
+
 
+// GetReportShareUrlToken 获取报告分享链接token
 
+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
 
+	}
 
+
 
+	var ok bool
 
+	// 冲突检测
 
+	for i := 0; i < 3; i++ {
 
+		linkToken = req.Url
 
+		if i > 0 {
 
+			linkToken += "_" + utils.GetRandDigit(3)
 
+		}
 
+		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 {
 
+			break
 
+		}
 
+	}
 
+	if !ok {
 
+		after := time.Now().AddDate(0, 0, 7)
 
+		err = utils.Rc.Put(cacheLinkKey, linkToken, time.Until(after))
 
+		if err != nil {
 
+			return
 
+		}
 
+		err = utils.Rc.Put(utils.CACHE_REPORT_SHARE_ORIGIN_Url+linkToken, req.Url, time.Until(after))
 
+		if err != nil {
 
+			return
 
+		}
 
+	} else {
 
+		linkToken = ""
 
+		err = errors.New("生成链接失败")
 
+	}
 
+	return
 
+}
 
+
 
+func TransfromToOriginUrl(linkToken string) (originLink string, msg string, err error) {
 
+	cacheLinkKey := utils.CACHE_REPORT_SHARE_ORIGIN_Url + linkToken
 
+	originLink, err = utils.Rc.RedisString(cacheLinkKey)
 
+	if err != nil {
 
+		if err == redis.Nil {
 
+			msg = "链接已失效, 请重新获取"
 
+			return
 
+		}
 
+		msg = "获取链接失败"
 
+		return
 
+	}
 
+	if originLink == "" {
 
+		msg = "链接已失效, 请重新获取"
 
+		return
 
+	}
 
+	return
 
+}
 
+
 
+func FilterShareUrl() web.FilterFunc {
 
+	return func(c *context.Context) {
 
+		path := c.Input.Context.Request.URL.Path
 
+		tokenArr := strings.Split(path, "/")
 
+		token := tokenArr[len(tokenArr)-1]
 
+
 
+		newPath := "/adminapi/report/share/link"
 
+		q := c.Input.Context.Request.URL.Query()
 
+		q.Add("Token", token)
 
+		c.Input.Context.Request.URL.Path = newPath
 
+		c.Input.Context.Request.URL.RawQuery = q.Encode()
 
+
 
+		utils.ApiLog.Info(fmt.Sprintf("原始请求为：%s, 已修改请求路径为：%s?%s", path, newPath, q.Encode()))
 
+	}
 
+}
 
+

+ 35 - 0
utils/common.go
Vizualizați fișierul 

@@ -34,6 +34,7 @@ import (
 
 	"github.com/PuerkitoBio/goquery"
 
 	"github.com/microcosm-cc/bluemonday"
 
 	"github.com/shopspring/decimal"
 
+	"github.com/spaolacci/murmur3"
 
 	xhtml "golang.org/x/net/html"
 
 )
 
 
@@ -2857,3 +2858,37 @@ func GetExcelDate(strDate string) (newDate time.Time, err error) {
 
 
 	return
 
 }
 
+
 
+// MurmurHash64 计算字符串的64位哈希值
 
+func MurmurHash64(val []byte) uint64 {
 
+	hash64 := murmur3.New64()
 
+	hash64.Write(val)
 
+	return hash64.Sum64()
 
+}
 
+
 
+const base62Chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
+
 
+type TUint interface {
 
+	uint64 | uint32 | uint16 | uint8 | uint
 
+}
 
+
 
+// ConvertNumToBase62 转换数字为base62编码
 
+func ConvertNumToBase62[T TUint](num T) string {
 
+	if num == 0 {
 
+		return string(base62Chars[0])
 
+	}
 
+
 
+	var result []byte
 
+	for num > 0 {
 
+		remainder := num % 62
 
+		result = append(result, base62Chars[remainder])
 
+		num /= 62
 
+	}
 
+
 
+	// 反转结果
 
+	for i, j := 0, len(result)-1; i < j; i, j = i+1, j-1 {
 
+		result[i], result[j] = result[j], result[i]
 
+	}
 
+
 
+	return string(result)
 
+}

+ 2 - 0
utils/constants.go
Vizualizați fișierul 

@@ -256,6 +256,8 @@ const (
 
 	CACHE_EDB_TERMINAL_CODE_URL      = "edb:terminal_code:edb_code:"     // 指标与终端关系的缓存
 
 
 	CACHE_KEY_REPLACE_EDB = "eta:replace_edb" //系统用户操作日志队列
 
+	CACHE_REPORT_SHARE_SHORT_Url  = "eta:report_share_url:report_id:" //报告短链映射key
 
+	CACHE_REPORT_SHARE_ORIGIN_Url = "eta:report_share_url:token:"     //短链与原始报告链接的映射key
 
 
 	CACHE_DATA_SOURCE_ES_HANDLE = "eta:data_source_es:handle" // 数据源es处理队列