From 3613787a6b4d0a63b7af0280ff5e7311d8895878 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 16:26:02 +0800 Subject: [PATCH 1/7] third --- internal/api/route.go | 2 +- pkg/common/db/controller/storage.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/api/route.go b/internal/api/route.go index 823778bca..553637a46 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -110,7 +110,7 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal authRouterGroupChildToken.POST("/force_logout", a.ForceLogout) //1 } ////Third service - thirdGroup := r.Group("/third") + thirdGroup := r.Group("/responseresponse") { t := NewThird(zk) thirdGroup.Use(mw.GinParseToken(rdb)) diff --git a/pkg/common/db/controller/storage.go b/pkg/common/db/controller/storage.go index 5ab516de6..844b943ed 100644 --- a/pkg/common/db/controller/storage.go +++ b/pkg/common/db/controller/storage.go @@ -259,7 +259,7 @@ func (c *s3Database) ConfirmPut(ctx context.Context, req *third.ConfirmPutReq) ( return &third.ConfirmPutResp{ Url: c.urlName(o.Name), }, nil - } else if c.isNotFound(err) { + } else if !c.isNotFound(err) { return nil, err } src := make([]obj.BucketObject, pack) @@ -342,15 +342,15 @@ func (c *s3Database) ConfirmPut(ctx context.Context, req *third.ConfirmPutReq) ( Name: dst.Name, CreateTime: time.Now(), } + if err := c.hash.Create(ctx, []*relation.ObjectHashModel{h}); err != nil { + return nil, err + } o := &relation.ObjectInfoModel{ Name: put.Name, Hash: put.Hash, ExpirationTime: put.ExpirationTime, CreateTime: time.Now(), } - if err := c.hash.Create(ctx, []*relation.ObjectHashModel{h}); err != nil { - return nil, err - } if err := c.info.SetObject(ctx, o); err != nil { return nil, err } From e7e287b6c1395b1d84802e28007710fa6b7d42d6 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 16:33:22 +0800 Subject: [PATCH 2/7] third --- internal/api/route.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/route.go b/internal/api/route.go index 553637a46..823778bca 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -110,7 +110,7 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal authRouterGroupChildToken.POST("/force_logout", a.ForceLogout) //1 } ////Third service - thirdGroup := r.Group("/responseresponse") + thirdGroup := r.Group("/third") { t := NewThird(zk) thirdGroup.Use(mw.GinParseToken(rdb)) From 102072ef243aab02b9626ce4ea6506cdf17bd289 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 17:01:27 +0800 Subject: [PATCH 3/7] third --- internal/api/route.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/route.go b/internal/api/route.go index 823778bca..53d2a6de0 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -122,8 +122,8 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal thirdGroup.POST("/apply_put", t.ApplyPut) thirdGroup.POST("/get_put", t.GetPut) thirdGroup.POST("/confirm_put", t.ConfirmPut) + thirdGroup.POST("/get_url", t.GetURL) thirdGroup.GET("/get_url", t.GetURL) - thirdGroup.GET("/object", t.GetURL) } ////Message msgGroup := r.Group("/msg") From 8c5970e527c7c943b46be5ac91baca56d7ff4e3c Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 17:03:52 +0800 Subject: [PATCH 4/7] third --- internal/api/third.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/api/third.go b/internal/api/third.go index dbff5b720..1336998ef 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -2,6 +2,7 @@ package api import ( "context" + "fmt" "github.com/OpenIMSDK/Open-IM-Server/pkg/a2r" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" @@ -9,6 +10,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third" "github.com/gin-gonic/gin" "net/http" + "strconv" ) var _ context.Context // 解决goland编辑器bug @@ -67,12 +69,17 @@ func (o *Third) GetURL(c *gin.Context) { c.String(http.StatusBadRequest, "name is empty") return } + expires, err := strconv.ParseInt(c.Query("expires"), 10, 64) + if err != nil { + c.String(http.StatusBadRequest, fmt.Sprintf("expires is invalid: %s", err.Error())) + return + } client, err := o.client() if err != nil { c.String(http.StatusInternalServerError, err.Error()) return } - resp, err := client.GetUrl(c, &third.GetUrlReq{Name: name}) + resp, err := client.GetUrl(c, &third.GetUrlReq{Name: name, Expires: expires}) if err != nil { if errs.ErrArgs.Is(err) { c.String(http.StatusBadRequest, err.Error()) From 18156980d9404f3879699a69d00782ff6fb86300 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 17:04:34 +0800 Subject: [PATCH 5/7] third --- internal/api/route.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/route.go b/internal/api/route.go index 53d2a6de0..dcd663109 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -122,8 +122,8 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal thirdGroup.POST("/apply_put", t.ApplyPut) thirdGroup.POST("/get_put", t.GetPut) thirdGroup.POST("/confirm_put", t.ConfirmPut) - thirdGroup.POST("/get_url", t.GetURL) - thirdGroup.GET("/get_url", t.GetURL) + thirdGroup.POST("/object", t.GetURL) + thirdGroup.GET("/object", t.GetURL) } ////Message msgGroup := r.Group("/msg") From ff65eeddba143abce29db8b2edeb2882b8f72190 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Tue, 28 Mar 2023 17:11:04 +0800 Subject: [PATCH 6/7] third --- internal/api/third.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/api/third.go b/internal/api/third.go index 1336998ef..952c1614c 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -5,6 +5,8 @@ import ( "fmt" "github.com/OpenIMSDK/Open-IM-Server/pkg/a2r" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third" @@ -64,6 +66,11 @@ func (o *Third) GetURL(c *gin.Context) { a2r.Call(third.ThirdClient.GetUrl, o.client, c) return } + operationID := c.Query("operationID") + if operationID == "" { + c.String(http.StatusBadRequest, "operationID is empty") + return + } name := c.Query("name") if name == "" { c.String(http.StatusBadRequest, "name is empty") @@ -79,7 +86,8 @@ func (o *Third) GetURL(c *gin.Context) { c.String(http.StatusInternalServerError, err.Error()) return } - resp, err := client.GetUrl(c, &third.GetUrlReq{Name: name, Expires: expires}) + c.Set(constant.OperationID, operationID) + resp, err := client.GetUrl(mcontext.SetOperationID(c, operationID), &third.GetUrlReq{Name: name, Expires: expires}) if err != nil { if errs.ErrArgs.Is(err) { c.String(http.StatusBadRequest, err.Error()) From d1875af9be83cb1d3975e6498cdc75b03c9a4bf1 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 28 Mar 2023 19:08:33 +0800 Subject: [PATCH 7/7] msg add permission judge --- internal/api/msg.go | 4 ---- internal/api/route.go | 1 - 2 files changed, 5 deletions(-) diff --git a/internal/api/msg.go b/internal/api/msg.go index 95e90a0da..322e365c7 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -233,7 +233,3 @@ func (m *Message) CheckMsgIsSendSuccess(c *gin.Context) { func (m *Message) GetUsersOnlineStatus(c *gin.Context) { a2r.Call(msg.MsgClient.GetSendMsgStatus, m.client, c) } - -func (m *Message) AccountCheck(c *gin.Context) { - a2r.Call(msg.MsgClient.GetSendMsgStatus, m.client, c) -} diff --git a/internal/api/route.go b/internal/api/route.go index dcd663109..9758f59e6 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -140,7 +140,6 @@ func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry, rdb redis.Universal msgGroup.POST("/batch_send_msg", m.ManagementBatchSendMsg) msgGroup.POST("/check_msg_is_send_success", m.CheckMsgIsSendSuccess) msgGroup.POST("/get_users_online_status", m.GetUsersOnlineStatus) - msgGroup.POST("/account_check", m.AccountCheck) //msgGroup.POST("/set_message_reaction_extensions", msg.SetMessageReactionExtensions) //msgGroup.POST("/get_message_list_reaction_extensions", msg.GetMessageListReactionExtensions) //msgGroup.POST("/add_message_reaction_extensions", msg.AddMessageReactionExtensions)