From 65febdb4ab01115025b9e5d10883dc0e0fb16ffa Mon Sep 17 00:00:00 2001 From: kanade <3136520963@qq.com> Date: Wed, 31 Mar 2021 09:14:49 +0800 Subject: [PATCH] test --- app/controller/order/goods.go | 2 +- app/controller/short/short.go | 2 +- app/lib/client/client.go | 1 + app/lib/recook/order.go | 3 ++- app/lib/recook/trend.go | 3 ++- app/lib/recook/user.go | 3 ++- app/logic/short/short.go | 4 ++-- app/logic/user/trend.go | 4 ++-- app/router/middleware/auto.go | 4 +++- app/router/middleware/bothAuto.go | 3 ++- app/router/middleware/cors.go | 2 +- app/task/live.go | 7 ++++++- 12 files changed, 25 insertions(+), 13 deletions(-) diff --git a/app/controller/order/goods.go b/app/controller/order/goods.go index afd7081..5fd72a1 100644 --- a/app/controller/order/goods.go +++ b/app/controller/order/goods.go @@ -17,7 +17,7 @@ func (g *Goods) Histroy(c *gin.Context) { back.Fail(c, err.Error()) return } - list, err := recook.Order.GetHistoryGoods(c.Request.Header.Get("X-Recook-Id"), c.Request.Header.Get("X-Recook-Token"), page) + list, err := recook.Order.GetHistoryGoods(c.Request.Header.Get("X-Recook-Id"), c.Request.Header.Get("X-Recook-Token"), c.Request.Header.Get("Device-Type"), page) if err != nil { back.Fail(c, err.Error()) return diff --git a/app/controller/short/short.go b/app/controller/short/short.go index ea30507..c8dc7b4 100644 --- a/app/controller/short/short.go +++ b/app/controller/short/short.go @@ -49,7 +49,7 @@ func (s *Short) Publish(c *gin.Context) { back.Fail(c, "参数错误") return } - err := (&short.Short{}).Publish(uid, args.GoodsId, args.TopicId, args.FileId, args.Content, c.Request.Header.Get("X-Recook-Id"), c.Request.Header.Get("X-Recook-Token")) + err := (&short.Short{}).Publish(uid, args.GoodsId, args.TopicId, args.FileId, args.Content, c.Request.Header.Get("X-Recook-Id"), c.Request.Header.Get("X-Recook-Token"), c.Request.Header.Get("Device-Type")) if err != nil { back.Fail(c, err.Error()) return diff --git a/app/lib/client/client.go b/app/lib/client/client.go index d1deb52..970cf01 100644 --- a/app/lib/client/client.go +++ b/app/lib/client/client.go @@ -65,6 +65,7 @@ func RequestFormData(url string, data url.Values, headers ...map[string]string) } else { reqest.Header.Add("Content-Type", write.FormDataContentType()) } + reqest.Header.Add("X-Recook-System", "recookapi") response, err := client.Do(reqest) if err != nil { return nil, err diff --git a/app/lib/recook/order.go b/app/lib/recook/order.go index dadeec0..f12fdfb 100644 --- a/app/lib/recook/order.go +++ b/app/lib/recook/order.go @@ -26,7 +26,7 @@ type ArgsHistoryList struct { } // @Title 获取会员购买历史商品 -func (o *order) GetHistoryGoods(id string, token string, page lib.Page) (result *ArgsHistoryList, err error) { +func (o *order) GetHistoryGoods(id string, token, deviceType string, page lib.Page) (result *ArgsHistoryList, err error) { result = &ArgsHistoryList{} err = RecookClient.Exec(actionHistory, url.Values{ "page": []string{strconv.Itoa(page.GetPage())}, @@ -34,6 +34,7 @@ func (o *order) GetHistoryGoods(id string, token string, page lib.Page) (result }, result, map[string]string{ "X-Recook-ID": id, "X-Recook-Token": token, + "Device-Type": deviceType, }) if err != nil { return diff --git a/app/lib/recook/trend.go b/app/lib/recook/trend.go index c502230..8a14470 100644 --- a/app/lib/recook/trend.go +++ b/app/lib/recook/trend.go @@ -88,7 +88,7 @@ func (t *trend) GetGoods(goodsIds []uint) (result map[uint]TrendGoods) { } // @Title 添加会员动态 -func (t *trend) AddTrend(userId, originId uint, trendType, isShow int, id, token string) error { +func (t *trend) AddTrend(userId, originId uint, trendType, isShow int, id, token, deviceType string) error { result := "" if userId <= 0 || originId <= 0 || trendType <= 0 { return errors.New("参数错误") @@ -101,6 +101,7 @@ func (t *trend) AddTrend(userId, originId uint, trendType, isShow int, id, token }, &result, map[string]string{ "X-Recook-ID": id, "X-Recook-Token": token, + "Device-Type": deviceType, }); err != nil { return err } diff --git a/app/lib/recook/user.go b/app/lib/recook/user.go index 4785c0b..8d824a0 100644 --- a/app/lib/recook/user.go +++ b/app/lib/recook/user.go @@ -23,11 +23,12 @@ type Userinfo struct { UserId uint `json:"userId"` } -func (u *user) GetUserId(id uint, token string) uint { +func (u *user) GetUserId(id uint, token, deviceType string) uint { userinfo := &Userinfo{} if err := RecookClient.Exec(actionUserinfo, url.Values{}, userinfo, map[string]string{ "X-Recook-ID": strconv.FormatUint(uint64(id), 10), "X-Recook-Token": token, + "Device-Type": deviceType, }); err != nil { return 0 } diff --git a/app/logic/short/short.go b/app/logic/short/short.go index ea3d2ec..7d4a4bf 100644 --- a/app/logic/short/short.go +++ b/app/logic/short/short.go @@ -22,7 +22,7 @@ type Short struct { // @Param topicIc uint true "参与话题id 0=未参与话题" // @Param fileId string true "腾讯云视频id" // @Param content string true "发布内容" -func (s *Short) Publish(userId, goodsId, topicId uint, fileId, content string, loginId, token string) error { +func (s *Short) Publish(userId, goodsId, topicId uint, fileId, content string, loginId, token, deviceType string) error { info, err := tencent.Short.GetInfo(fileId) if err != nil { return errors.New("上传视频错误") @@ -41,7 +41,7 @@ func (s *Short) Publish(userId, goodsId, topicId uint, fileId, content string, l CoverUrl: fileInfo.BasicInfo.CoverUrl, }) if id > 0 { - err := (&user.Trend{}).AddTrend(userId, id, user.TREND_TYPE_short, 1, loginId, token) + err := (&user.Trend{}).AddTrend(userId, id, user.TREND_TYPE_short, 1, loginId, token, deviceType) if err != nil { log.Println("视频上传错误, err:", err) } diff --git a/app/logic/user/trend.go b/app/logic/user/trend.go index 78df477..7c03bc8 100644 --- a/app/logic/user/trend.go +++ b/app/logic/user/trend.go @@ -89,8 +89,8 @@ func (t *Trend) GetList(loginUserId, userId uint, page lib.Page) *recook.TrendLi } // @Title 添加会员动态信息 -func (t *Trend) AddTrend(userId, originId uint, trendType, isShow int, id, token string) error { - return recook.Trend.AddTrend(userId, originId, trendType, isShow, id, token) +func (t *Trend) AddTrend(userId, originId uint, trendType, isShow int, id, token, deviceType string) error { + return recook.Trend.AddTrend(userId, originId, trendType, isShow, id, token, deviceType) } // @Title 更改会员动态信息 diff --git a/app/router/middleware/auto.go b/app/router/middleware/auto.go index 87134f3..dea675d 100644 --- a/app/router/middleware/auto.go +++ b/app/router/middleware/auto.go @@ -34,8 +34,10 @@ func Auth() gin.HandlerFunc { return } + deviceType := c.Request.Header.Get("Device-Type") + token := c.Request.Header.Get("X-Recook-Token") - userId := recook.User.GetUserId(uint(id), token) + userId := recook.User.GetUserId(uint(id), token, deviceType) if userId == 0 { back.Unauthorized(c) c.Abort() diff --git a/app/router/middleware/bothAuto.go b/app/router/middleware/bothAuto.go index 4fb5282..01669f6 100644 --- a/app/router/middleware/bothAuto.go +++ b/app/router/middleware/bothAuto.go @@ -27,8 +27,9 @@ func BothAuth() gin.HandlerFunc { return } + deviceType := c.Request.Header.Get("Device-Type") token := c.Request.Header.Get("X-Recook-Token") - userId := recook.User.GetUserId(uint(id), token) + userId := recook.User.GetUserId(uint(id), token, deviceType) if userId == 0 { return } diff --git a/app/router/middleware/cors.go b/app/router/middleware/cors.go index 1b639d8..f95af68 100755 --- a/app/router/middleware/cors.go +++ b/app/router/middleware/cors.go @@ -13,7 +13,7 @@ func CORS() gin.HandlerFunc { c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") c.Writer.Header().Set( "Access-Control-Allow-Headers", - "Content-Type, Cookie, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, token, Cache-Control, X-Recook-ID, X-Recook-Token, X-Requested-With") + "Content-Type, Cookie, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, token, Cache-Control, Device-Type, X-Recook-ID, X-Recook-Token, X-Requested-With") c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET") if c.Request.Method == "OPTIONS" { diff --git a/app/task/live.go b/app/task/live.go index f3e15de..7d58379 100644 --- a/app/task/live.go +++ b/app/task/live.go @@ -1,6 +1,7 @@ package task import ( + "encoding/json" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" @@ -42,9 +43,13 @@ func (live *Live) Run() { handle = append(handle, *event.EventHandle) switch *event.EventType { case "NewFileUpload": + log.Println("NewFileUpload", event) live.upSuc(event) + case "TranscodeComplete": + log.Println("TranscodeComplete", event) } - log.Println(event) + marshal, _ := json.Marshal(event) + log.Println(string(marshal)) } request1.EventHandles = common.StringPtrs(handle) client.ConfirmEvents(request1)