xiexiaoyuan 2 роки тому
батько
коміт
6a0804567d

+ 8 - 2
controller/english_report/english_report.go

@@ -13,6 +13,7 @@ import (
 	english_report_service "hongze/hongze_yb_en_api/services/english_report"
 	"hongze/hongze_yb_en_api/utils"
 	"html"
+	"strconv"
 )
 
 type EnglishReportController struct {}
@@ -238,9 +239,14 @@ func (er *EnglishReportController) Detail(c *gin.Context) {
 	reportItem.ContentSub = html.UnescapeString(reportItem.ContentSub)
 	reportItem.Content = html.UnescapeString(reportItem.Content)
 
+	shareEmailId := req.ShareEmail
+	if shareEmailId == 0 {
+		shareEmailIdStr := c.GetString("shareEmailId")
+		shareEmailId, _ = strconv.Atoi(shareEmailIdStr)
+	}
 	// 记录邮箱
-	if req.ShareEmail > 0 {
-		go english_report_service.DealEmail(reportItem, req.ReportCode, req.ShareEmail)
+	if shareEmailId > 0 {
+		go english_report_service.DealEmail(reportItem, req.ReportCode, shareEmailId)
 	}
 	reportDetail := &english_report.ReportDetail{
 		Id:                 reportItem.Id,

+ 1 - 1
middleware/cors.go

@@ -12,7 +12,7 @@ func Cors() gin.HandlerFunc {
 
 		c.Header("Access-Control-Allow-Origin", "*")
 		//c.Header("Access-Control-Allow-Origin", c.Request.Referer())
-		c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id")
+		c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id,shareEmailId")
 		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS,DELETE,PUT")
 		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
 		c.Header("Access-Control-Allow-Credentials", "true")

+ 13 - 0
middleware/share_email_auth.go

@@ -0,0 +1,13 @@
+package middleware
+
+import "github.com/gin-gonic/gin"
+
+func ShareEmailHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		shareId := c.Request.Header.Get("shareEmailId")
+		if shareId != "" {
+			c.Set("shareEmailId", shareId)
+		}
+		c.Next()
+	}
+}

+ 2 - 3
middleware/token_no_login.go

@@ -2,12 +2,11 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"hongze/hongze_yb_en_api/controller/resp"
 )
 
 func TokenNoLogin() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		token := c.Request.Header.Get("Authorization")
+		/*token := c.Request.Header.Get("Authorization")
 		if token == "" {
 			token = c.GetString("authorization")
 			if token == "" {
@@ -18,7 +17,7 @@ func TokenNoLogin() gin.HandlerFunc {
 			resp.TokenError(nil, "未登录或非法访问", "token为空", c)
 			c.Abort()
 			return
-		}
+		}*/
 		//sessionInfo, err := session.GetTokenByToken(token)
 		//if err != nil {
 		//	if err == utils.ErrNoRow {

+ 2 - 1
routers/english_report.go

@@ -3,12 +3,13 @@ package routers
 import (
 	"github.com/gin-gonic/gin"
 	"hongze/hongze_yb_en_api/controller/english_report"
+	"hongze/hongze_yb_en_api/middleware"
 )
 
 func InitReport(baseGroup *gin.RouterGroup) {
 	//登录
 	controller := new(english_report.EnglishReportController)
-	group := baseGroup.Group("english_report/")
+	group := baseGroup.Group("english_report/").Use(middleware.ShareEmailHandler())
 	group.GET("list", controller.List)
 	group.GET("classify", controller.Classify)
 	group.GET("filter_by_es", controller.FilterByEs)