From 180c888ba73c4679c6eb1c30e04c32aa6d30ad49 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 11:46:43 +0800 Subject: [PATCH 01/29] cache --- pkg/common/db/controller/conversation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 4cdf2c22e..d34c1c890 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -265,5 +265,5 @@ func (c *conversationDatabase) GetUserAllHasReadSeqs(ctx context.Context, ownerU } func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationTb.ConversationModel, error) { - return c.cache.GetConversationsByConversationID(ctx, conversationIDs) + return c.conversationDB.GetConversationsByConversationID(ctx, conversationIDs) } From e8427ee33e786beaa017a4d02109fd28d470fb41 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 14:20:05 +0800 Subject: [PATCH 02/29] group --- internal/rpc/msg/verify.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index 6e0b2153c..f6903f9f9 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -89,6 +89,9 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe groupMemberInfo, err := m.Group.GetGroupMemberCache(ctx, data.MsgData.GroupID, data.MsgData.SendID) if err != nil { + if err == errs.ErrRecordNotFound { + return errs.ErrNotInGroupYet.Wrap(err.Error()) + } return err } if groupMemberInfo.RoleLevel == constant.GroupOwner { From 120101fdccb15f81344050de08df54cdc4e1f670 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 15 Jun 2023 15:13:45 +0800 Subject: [PATCH 03/29] fix: zap log panic --- pkg/common/log/zap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 389ebc4e8..e6fc8fae8 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -208,7 +208,7 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal if err != nil { keysAndValues = append(keysAndValues, "error", err.Error()) } - keysAndValues = append([]interface{}{constant.OperationID, mcontext.GetOperationID(ctx)}, keysAndValues...) + keysAndValues = l.kvAppend(ctx, keysAndValues) l.zap.Errorw(msg, keysAndValues...) } From e3615c6c9903586b0f0f719e1881c56daabcc89b Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 15 Jun 2023 17:42:33 +0800 Subject: [PATCH 04/29] test: log --- pkg/common/db/controller/msg.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 4cb1f0580..2f991f9ea 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -475,6 +475,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin if err != nil && errs.Unwrap(err) != redis.Nil { return 0, 0, nil, err } + log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq) if userMaxSeq != 0 { if userMaxSeq < maxSeq { maxSeq = userMaxSeq From 67cb0327fa4da7b794f44d05fea9f9b61ac29b2b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 18:12:47 +0800 Subject: [PATCH 05/29] fix group bug --- go.mod | 1 + go.sum | 4 ++++ internal/rpc/group/group.go | 3 +++ 3 files changed, 8 insertions(+) diff --git a/go.mod b/go.mod index d63ffd182..3519a4d6f 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,7 @@ require ( github.com/go-redis/redis v6.15.9+incompatible github.com/go-sql-driver/mysql v1.6.0 github.com/go-zookeeper/zk v1.0.3 + github.com/redis/go-redis/v9 v9.0.5 ) require ( diff --git a/go.sum b/go.sum index 5342cedd3..0d1fddfab 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= +github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -355,6 +357,8 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/redis/go-redis/v9 v9.0.5 h1:CuQcn5HIEeK7BgElubPP8CGtE0KakrnbBSTLjathl5o= +github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index d1a4dc1e4..2ddb92129 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -699,6 +699,9 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup if err := s.GroupDatabase.HandlerGroupRequest(ctx, req.GroupID, req.FromUserID, req.HandledMsg, req.HandleResult, member); err != nil { return nil, err } + if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.FromUserID}); err != nil { + return nil, err + } switch req.HandleResult { case constant.GroupResponseAgree: s.Notification.GroupApplicationAcceptedNotification(ctx, req) From 22e0df5c113cd6b891f50de8c491b7797ebad06c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 18:25:06 +0800 Subject: [PATCH 06/29] replace redis v8 2 v9 --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index 3519a4d6f..6fcc6b95b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/dtm-labs/rockscache v0.1.0 github.com/gin-gonic/gin v1.8.2 github.com/go-playground/validator/v10 v10.11.1 - github.com/go-redis/redis/v8 v8.11.5 github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v4 v4.4.2 github.com/golang/protobuf v1.5.3 From 2d0909631772c1a6cb6891c64eeab1aeb953a84c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 18:25:13 +0800 Subject: [PATCH 07/29] replace v8 2 v9 --- internal/api/route.go | 2 +- internal/msggateway/n_ws_server.go | 9 +++++---- internal/push/offlinepush/fcm/push.go | 2 +- internal/push/offlinepush/getui/push.go | 2 +- internal/rpc/msg/as_read.go | 2 +- internal/rpc/msg/utils.go | 2 +- pkg/common/db/cache/black.go | 2 +- pkg/common/db/cache/conversation.go | 2 +- pkg/common/db/cache/extend_msg_set.go | 2 +- pkg/common/db/cache/friend.go | 2 +- pkg/common/db/cache/group.go | 2 +- pkg/common/db/cache/init_redis.go | 2 +- pkg/common/db/cache/msg.go | 2 +- pkg/common/db/cache/user.go | 2 +- pkg/common/db/controller/group.go | 2 +- pkg/common/db/controller/msg.go | 2 +- pkg/common/mw/gin.go | 2 +- 17 files changed, 21 insertions(+), 20 deletions(-) diff --git a/internal/api/route.go b/internal/api/route.go index da478c5d3..5ea8f80f3 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -11,7 +11,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/validator/v10" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index b2adafc00..dcf183015 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -3,17 +3,18 @@ package msggateway import ( "context" "errors" - "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/db/cache" "net/http" "strconv" "sync" "sync/atomic" "time" + "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/db/cache" + "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" - redis "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify" diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go index 66bde4056..1d8478f31 100644 --- a/internal/push/offlinepush/fcm/push.go +++ b/internal/push/offlinepush/fcm/push.go @@ -10,7 +10,7 @@ import ( "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/db/cache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "google.golang.org/api/option" ) diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go index 4ef2cceb8..6eb0b0fdf 100644 --- a/internal/push/offlinepush/getui/push.go +++ b/internal/push/offlinepush/getui/push.go @@ -11,7 +11,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils/splitter" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "context" "crypto/sha256" diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 07a2e6592..b65554a6d 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -9,7 +9,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *msg.GetConversationsHasReadAndMaxSeqReq) (*msg.GetConversationsHasReadAndMaxSeqResp, error) { diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index c4790241b..468b1b617 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -5,7 +5,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "gorm.io/gorm" ) diff --git a/pkg/common/db/cache/black.go b/pkg/common/db/cache/black.go index cdd7fa9c1..18928567c 100644 --- a/pkg/common/db/cache/black.go +++ b/pkg/common/db/cache/black.go @@ -6,7 +6,7 @@ import ( relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index 64ae93598..bc2f86cae 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -11,7 +11,7 @@ import ( relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/extend_msg_set.go b/pkg/common/db/cache/extend_msg_set.go index d62e55272..c405a7567 100644 --- a/pkg/common/db/cache/extend_msg_set.go +++ b/pkg/common/db/cache/extend_msg_set.go @@ -6,7 +6,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index b8aa3f8ff..a3890bb58 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -7,7 +7,7 @@ import ( relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index 0783caef8..a27cce393 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -10,7 +10,7 @@ import ( unrelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go index 74c472f16..47dcc2adf 100644 --- a/pkg/common/db/cache/init_redis.go +++ b/pkg/common/db/cache/init_redis.go @@ -8,7 +8,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw/specialerror" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) func NewRedis() (redis.UniversalClient, error) { diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index ec6037ae7..48cb6203e 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -19,7 +19,7 @@ import ( "google.golang.org/protobuf/proto" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 614379f54..a9eae5035 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -6,7 +6,7 @@ import ( relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) const ( diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 7ddd75fb8..19ae3e87e 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -13,7 +13,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/dtm-labs/rockscache" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "go.mongodb.org/mongo-driver/mongo" "gorm.io/gorm" ) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 2f991f9ea..09592d650 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -20,7 +20,7 @@ import ( pbMsg "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/common/mw/gin.go b/pkg/common/mw/gin.go index 449afee71..430edbbd9 100644 --- a/pkg/common/mw/gin.go +++ b/pkg/common/mw/gin.go @@ -16,7 +16,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/gin-gonic/gin" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" ) type GinMwOptions func(*gin.RouterGroup) From fe0c549bf70c161df6d052c627dff7ad75eb22ef Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 18:26:06 +0800 Subject: [PATCH 08/29] redis --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 6fcc6b95b..52cd3c59d 100644 --- a/go.mod +++ b/go.mod @@ -63,6 +63,7 @@ require ( github.com/eapache/queue v1.1.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.3 // indirect From 1614ca1def4f8198ac7a2ddf6a3b92b2a5ff43dd Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 15 Jun 2023 18:37:47 +0800 Subject: [PATCH 09/29] update rc --- go.mod | 5 +++-- go.sum | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 52cd3c59d..87593d95d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/OpenIMSDK/open_utils v1.0.8 github.com/Shopify/sarama v1.32.0 github.com/bwmarrin/snowflake v0.3.0 - github.com/dtm-labs/rockscache v0.1.0 + github.com/dtm-labs/rockscache v0.1.1 github.com/gin-gonic/gin v1.8.2 github.com/go-playground/validator/v10 v10.11.1 github.com/gogo/protobuf v1.3.2 @@ -63,7 +63,6 @@ require ( github.com/eapache/queue v1.1.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.3 // indirect @@ -90,6 +89,8 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/gomega v1.18.1 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/go.sum b/go.sum index 0d1fddfab..4fc24fc57 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/dtm-labs/rockscache v0.1.0 h1:tjJuruAUo/3wzZgQBkdQ+Pgz7GhmQ6qt0BrHHyVy3eY= -github.com/dtm-labs/rockscache v0.1.0/go.mod h1:vJmJJmuBNxcio03abYk1QPLmmQo/Kg92jB+28QmLcgY= +github.com/dtm-labs/rockscache v0.1.1 h1:6S1vgaHvGqrLd8Ka4hRTKeKPV7v+tT0MSkTIX81LRyA= +github.com/dtm-labs/rockscache v0.1.1/go.mod h1:c76WX0kyIibmQ2ACxUXvDvaLykoPakivMqIxt+UzE7A= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q= @@ -104,7 +104,9 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.2 h1:UzKToD9/PoFj/V4rvlKqTRKnQYyz8Sc1MJlv4JHPtvY= @@ -131,12 +133,11 @@ github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJ github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= @@ -207,6 +208,7 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -227,7 +229,9 @@ github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2I github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= @@ -316,9 +320,20 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= @@ -384,6 +399,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -475,6 +491,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -497,6 +514,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -505,6 +523,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -536,6 +555,7 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -546,8 +566,11 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -568,6 +591,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -642,6 +666,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -743,9 +768,11 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 1c1e05a8eb3137f6b057065beb2029a3cd79e34a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:22:47 +0800 Subject: [PATCH 10/29] docker file 1 --- cmd/api/deploy.Dockerfile | 24 ++++++++++++++++++++++++ script/build_push_k8s_images.sh | 23 +++++++++++++++++++++++ script/path_info.cfg | 25 +++++++++++++++++++------ 3 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 cmd/api/deploy.Dockerfile create mode 100644 script/build_push_k8s_images.sh diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile new file mode 100644 index 000000000..8e005578f --- /dev/null +++ b/cmd/api/deploy.Dockerfile @@ -0,0 +1,24 @@ +FROM golang as build + +# go mod Installation source, container environment variable addition will override the default variable value +ENV GO111MODULE=on +ENV GOPROXY=https://goproxy.cn,direct + +COPY ../* ./Open-IM-Server +ENV WORKDIR /Open-IM-Server/cmd/api + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl + +RUN make build + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["${WORKDIR}/open_im_api","--port", "10002"] diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh new file mode 100644 index 000000000..a1b7f60d8 --- /dev/null +++ b/script/build_push_k8s_images.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +version=errcode +repository=${1} + +set +e +echo "repository: ${repository}" +source ./path_info.cfg +echo "start to build docker images" +currentPwd=${pwd} +i=0 +for path in ${service_source_root[*]} +do + image="${repository}/${image_names[${i}]}:$version" + echo ${image} + docker build -t $image . -f ${path}/deploy.Dockerfile + echo "build ${image} success" + docker push ${image} + echo "push ${image} success" + echo "==============================" + i=$((i + 1)) +done + +echo "build all images success" \ No newline at end of file diff --git a/script/path_info.cfg b/script/path_info.cfg index 5ada746df..75200e069 100644 --- a/script/path_info.cfg +++ b/script/path_info.cfg @@ -48,12 +48,11 @@ service_source_root=( ../cmd/rpc/conversation/ ../cmd/rpc/third/ ../cmd/crontask - ../cmd/cmdutils ${msg_gateway_source_root} ${msg_transfer_source_root/} ${msg_source_root} ${push_source_root} - ${sdk_server_source_root} + # ${sdk_server_source_root} ) #service filename service_names=( @@ -67,13 +66,27 @@ service_names=( open_im_conversation open_im_third open_im_cron_task - open_im_cmd_utils ${msg_gateway_name} ${msg_transfer_name} ${msg_name} ${push_name} - ${sdk_server_name} + # ${sdk_server_name} ) - - +image_names=( + #api service file + api + #rpc service file + user + friend + group + auth + conversation + third + cron_task + msg_gateway + msg_transfer + msg + push + # sdk_server +) \ No newline at end of file From e41c50d46147bf7e7dbf18e40a79e6d551cf997b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:28:49 +0800 Subject: [PATCH 11/29] docker file --- cmd/api/deploy.Dockerfile | 2 +- script/build_push_k8s_images.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 8e005578f..e97a97cb3 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -4,7 +4,7 @@ FROM golang as build ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct -COPY ../* ./Open-IM-Server +COPY ../* /Open-IM-Server ENV WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index a1b7f60d8..efd092c19 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash version=errcode repository=${1} +if [ -z ${repository} ] +exit 0 +fi set +e echo "repository: ${repository}" From 72f8c6841b1c5633785f400101c26435c548a9cc Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:33:41 +0800 Subject: [PATCH 12/29] script --- script/build_push_k8s_images.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index efd092c19..50c194dda 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash version=errcode repository=${1} -if [ -z ${repository} ] -exit 0 +if [[ -z ${repository} ]] +then + echo "repository is empty" + exit 0 fi set +e From ab0d8477b9fd41bcfdc32c998fdd1eb4de3883fa Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:36:29 +0800 Subject: [PATCH 13/29] docker file --- cmd/api/deploy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index e97a97cb3..4dbcca18f 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -4,7 +4,7 @@ FROM golang as build ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct -COPY ../* /Open-IM-Server +COPY ../../Open-IM-Server / ENV WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ From 66194cf6248cff9913bb90ecc83f0c3a76d74a6e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:44:13 +0800 Subject: [PATCH 14/29] docker file --- cmd/api/deploy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 4dbcca18f..3f49eff76 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -5,7 +5,7 @@ ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct COPY ../../Open-IM-Server / -ENV WORKDIR /Open-IM-Server/cmd/api +WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools From 9818cc08f44f5953cb2f242ce91505ae533c379c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:45:33 +0800 Subject: [PATCH 15/29] dockerfile --- cmd/api/deploy.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 3f49eff76..6d137c0bc 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -4,7 +4,8 @@ FROM golang as build ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct -COPY ../../Open-IM-Server / +RUN mkdir -p /Open-IM-Server +COPY ../* /Open-IM-Server WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ From f921793af768c87315b6f12d03116643df4fd975 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:51:01 +0800 Subject: [PATCH 16/29] docker --- cmd/api/deploy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 6d137c0bc..6a7e726ed 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -5,7 +5,7 @@ ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct RUN mkdir -p /Open-IM-Server -COPY ../* /Open-IM-Server +COPY * /Open-IM-Server WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ From 2acff68f4c37757a2f534be13bebcadd210757ba Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 11:53:58 +0800 Subject: [PATCH 17/29] docker --- cmd/api/deploy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 6a7e726ed..596832484 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -5,7 +5,7 @@ ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct RUN mkdir -p /Open-IM-Server -COPY * /Open-IM-Server +COPY . /Open-IM-Server WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ From 685511981ade557c519663fe8ab455c3500d9de7 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 12:14:30 +0800 Subject: [PATCH 18/29] update sh --- cmd/api/deploy.Dockerfile | 4 ++-- script/build_push_k8s_images.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 596832484..fe69a6319 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -5,7 +5,7 @@ ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct RUN mkdir -p /Open-IM-Server -COPY . /Open-IM-Server +COPY ../. /Open-IM-Server WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ @@ -17,7 +17,7 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl - +RUN echo pwd RUN make build VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index 50c194dda..c6b08ea2d 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -15,6 +15,8 @@ currentPwd=${pwd} i=0 for path in ${service_source_root[*]} do + cd ${path} + make build image="${repository}/${image_names[${i}]}:$version" echo ${image} docker build -t $image . -f ${path}/deploy.Dockerfile @@ -23,6 +25,8 @@ do echo "push ${image} success" echo "==============================" i=$((i + 1)) + rm -rf ${service_names[${i}]} + cd ${currentPwd} done echo "build all images success" \ No newline at end of file From 39fd6e540700d73d42a71e33076ee7fc55de09cd Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 12:23:54 +0800 Subject: [PATCH 19/29] sh --- script/build_push_k8s_images.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index c6b08ea2d..50c194dda 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -15,8 +15,6 @@ currentPwd=${pwd} i=0 for path in ${service_source_root[*]} do - cd ${path} - make build image="${repository}/${image_names[${i}]}:$version" echo ${image} docker build -t $image . -f ${path}/deploy.Dockerfile @@ -25,8 +23,6 @@ do echo "push ${image} success" echo "==============================" i=$((i + 1)) - rm -rf ${service_names[${i}]} - cd ${currentPwd} done echo "build all images success" \ No newline at end of file From 8891274ccd9a83fdd471fa5e7dcd87cf856a1d11 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Fri, 16 Jun 2023 12:23:39 +0800 Subject: [PATCH 20/29] feat: gitignore file Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- .gitignore | 1 + internal/msggateway/compressor.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 40ffa04f2..7c282c207 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ out-test .github .idea .exe +_output/ deploy/open_im_api deploy/open_im_msg_gateway diff --git a/internal/msggateway/compressor.go b/internal/msggateway/compressor.go index d518d6f6d..a37c74ccd 100644 --- a/internal/msggateway/compressor.go +++ b/internal/msggateway/compressor.go @@ -3,8 +3,9 @@ package msggateway import ( "bytes" "compress/gzip" - "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "io" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" ) type Compressor interface { @@ -29,6 +30,7 @@ func (g *GzipCompressor) Compress(rawData []byte) ([]byte, error) { } return gzipBuffer.Bytes(), nil } + func (g *GzipCompressor) DeCompress(compressedData []byte) ([]byte, error) { buff := bytes.NewBuffer(compressedData) reader, err := gzip.NewReader(buff) From fb35d550b15cf6c4bb3142a31cd477a0c7798b65 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 12:30:25 +0800 Subject: [PATCH 21/29] sh --- cmd/api/deploy.Dockerfile | 3 +-- script/build_push_k8s_images.sh | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index fe69a6319..90363d5c6 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -4,8 +4,7 @@ FROM golang as build ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct -RUN mkdir -p /Open-IM-Server -COPY ../. /Open-IM-Server +COPY ./Open-IM-Server / WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index 50c194dda..c55e83ac9 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -15,6 +15,8 @@ currentPwd=${pwd} i=0 for path in ${service_source_root[*]} do + mkdir ${path}/Open-IM-Server + cp -r ../* ${path}/Open-IM-Server image="${repository}/${image_names[${i}]}:$version" echo ${image} docker build -t $image . -f ${path}/deploy.Dockerfile @@ -23,6 +25,7 @@ do echo "push ${image} success" echo "==============================" i=$((i + 1)) + rm -rf ${path}/Open-IM-Server done echo "build all images success" \ No newline at end of file From b372451a76a32e74880bd84260e9b1b6162c0d73 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:16:20 +0800 Subject: [PATCH 22/29] docker file --- cmd/api/deploy.Dockerfile | 2 +- script/build_push_k8s_images.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 90363d5c6..97093c830 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -17,7 +17,7 @@ RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl RUN echo pwd -RUN make build +COPY ./open_im_api ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index c55e83ac9..7deaf476f 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -15,8 +15,8 @@ currentPwd=${pwd} i=0 for path in ${service_source_root[*]} do - mkdir ${path}/Open-IM-Server - cp -r ../* ${path}/Open-IM-Server + cd ${path} + make build image="${repository}/${image_names[${i}]}:$version" echo ${image} docker build -t $image . -f ${path}/deploy.Dockerfile @@ -25,7 +25,7 @@ do echo "push ${image} success" echo "==============================" i=$((i + 1)) - rm -rf ${path}/Open-IM-Server + cd ${currentPwd} done echo "build all images success" \ No newline at end of file From 94724ca44396ed560f904b522e6ce6b614e7ba0b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:20:45 +0800 Subject: [PATCH 23/29] dockerfile --- cmd/api/deploy.Dockerfile | 1 - script/build_push_k8s_images.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 97093c830..637c4629b 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -16,7 +16,6 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -RUN echo pwd COPY ./open_im_api ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index 7deaf476f..ec0d3b653 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -19,7 +19,7 @@ do make build image="${repository}/${image_names[${i}]}:$version" echo ${image} - docker build -t $image . -f ${path}/deploy.Dockerfile + docker build -t $image . -f ./deploy.Dockerfile echo "build ${image} success" docker push ${image} echo "push ${image} success" From 4e84153a5a303053cfcf357f54ebb199140d0c72 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:22:26 +0800 Subject: [PATCH 24/29] dockerfile --- cmd/api/deploy.Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 637c4629b..1a9f3e617 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -1,10 +1,5 @@ -FROM golang as build +FROM ubuntu -# go mod Installation source, container environment variable addition will override the default variable value -ENV GO111MODULE=on -ENV GOPROXY=https://goproxy.cn,direct - -COPY ./Open-IM-Server / WORKDIR /Open-IM-Server/cmd/api RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ From 66c384d9c8a71d8ab3528516bf565976615d3c85 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:30:35 +0800 Subject: [PATCH 25/29] dockerfile --- cmd/api/deploy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 1a9f3e617..02cdf347e 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -15,4 +15,4 @@ COPY ./open_im_api ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["${WORKDIR}/open_im_api","--port", "10002"] +CMD ["./open_im_api","--port", "10002"] From 55cc61d676b224fc1b70a59e730ae8557161e229 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:49:11 +0800 Subject: [PATCH 26/29] dockerfiles --- cmd/api/deploy.Dockerfile | 2 +- cmd/crontask/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/msggateway/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/msgtransfer/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/push/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/auth/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/conversation/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/friend/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/group/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/msg/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/third/deploy.Dockerfile | 18 ++++++++++++++++++ cmd/rpc/user/deploy.Dockerfile | 18 ++++++++++++++++++ 12 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 cmd/crontask/deploy.Dockerfile create mode 100644 cmd/msggateway/deploy.Dockerfile create mode 100644 cmd/msgtransfer/deploy.Dockerfile create mode 100644 cmd/push/deploy.Dockerfile create mode 100644 cmd/rpc/auth/deploy.Dockerfile create mode 100644 cmd/rpc/conversation/deploy.Dockerfile create mode 100644 cmd/rpc/friend/deploy.Dockerfile create mode 100644 cmd/rpc/group/deploy.Dockerfile create mode 100644 cmd/rpc/msg/deploy.Dockerfile create mode 100644 cmd/rpc/third/deploy.Dockerfile create mode 100644 cmd/rpc/user/deploy.Dockerfile diff --git a/cmd/api/deploy.Dockerfile b/cmd/api/deploy.Dockerfile index 02cdf347e..ad397ca23 100644 --- a/cmd/api/deploy.Dockerfile +++ b/cmd/api/deploy.Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu -WORKDIR /Open-IM-Server/cmd/api +WORKDIR /Open-IM-Server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools diff --git a/cmd/crontask/deploy.Dockerfile b/cmd/crontask/deploy.Dockerfile new file mode 100644 index 000000000..80ba5abf0 --- /dev/null +++ b/cmd/crontask/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_cron_task ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_cron_task"] diff --git a/cmd/msggateway/deploy.Dockerfile b/cmd/msggateway/deploy.Dockerfile new file mode 100644 index 000000000..bacb37b74 --- /dev/null +++ b/cmd/msggateway/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_msg_gateway ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_msg_gateway","--port", "10140" "--ws_port", "10001"， "--prometheus_port", "20240"] diff --git a/cmd/msgtransfer/deploy.Dockerfile b/cmd/msgtransfer/deploy.Dockerfile new file mode 100644 index 000000000..4e48f8e3d --- /dev/null +++ b/cmd/msgtransfer/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_msg_transfer ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_msg_transfer","--prometheus_port", "21400"] diff --git a/cmd/push/deploy.Dockerfile b/cmd/push/deploy.Dockerfile new file mode 100644 index 000000000..f474b9ab2 --- /dev/null +++ b/cmd/push/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_push ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_push", "--port", "10170", "--prometheus_port", "20170"] diff --git a/cmd/rpc/auth/deploy.Dockerfile b/cmd/rpc/auth/deploy.Dockerfile new file mode 100644 index 000000000..700e85d4f --- /dev/null +++ b/cmd/rpc/auth/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_auth ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_auth", "--port", "10160"] diff --git a/cmd/rpc/conversation/deploy.Dockerfile b/cmd/rpc/conversation/deploy.Dockerfile new file mode 100644 index 000000000..6b3a8ad40 --- /dev/null +++ b/cmd/rpc/conversation/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_conversation ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_conversation", "--port", "10230", "--prometheus_port","20230"] diff --git a/cmd/rpc/friend/deploy.Dockerfile b/cmd/rpc/friend/deploy.Dockerfile new file mode 100644 index 000000000..a57f9ccdc --- /dev/null +++ b/cmd/rpc/friend/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_friend ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_friend", "--port", "10120", "--prometheus_port","20120"] diff --git a/cmd/rpc/group/deploy.Dockerfile b/cmd/rpc/group/deploy.Dockerfile new file mode 100644 index 000000000..1d083c927 --- /dev/null +++ b/cmd/rpc/group/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_group ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_group", "--port", "10150", "--prometheus_port","20150"] diff --git a/cmd/rpc/msg/deploy.Dockerfile b/cmd/rpc/msg/deploy.Dockerfile new file mode 100644 index 000000000..9b5f4194d --- /dev/null +++ b/cmd/rpc/msg/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_msg ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_msg", "--port", "10130", "--prometheus_port","20130"] diff --git a/cmd/rpc/third/deploy.Dockerfile b/cmd/rpc/third/deploy.Dockerfile new file mode 100644 index 000000000..3c5b23120 --- /dev/null +++ b/cmd/rpc/third/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_third ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_third", "--port", "10200"] diff --git a/cmd/rpc/user/deploy.Dockerfile b/cmd/rpc/user/deploy.Dockerfile new file mode 100644 index 000000000..c0f0956e8 --- /dev/null +++ b/cmd/rpc/user/deploy.Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu + +WORKDIR /Open-IM-Server/bin + +RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ +&&apt-get install net-tools +#Non-interactive operation +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get install -y vim curl tzdata gawk +#Time zone adjusted to East eighth District +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata +RUN apt-get -qq update \ + && apt-get -qq install -y --no-install-recommends ca-certificates curl +COPY ./open_im_user ./ + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] + +CMD ["./open_im_user", "--port", "10110"] From 24c1f43b2b18b3a93cd2ad6fae53432f5c7cb593 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 13:58:12 +0800 Subject: [PATCH 27/29] sh --- script/build_push_k8s_images.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index ec0d3b653..563f588a9 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -12,6 +12,7 @@ echo "repository: ${repository}" source ./path_info.cfg echo "start to build docker images" currentPwd=${pwd} +echo ${currentPwd} i=0 for path in ${service_source_root[*]} do @@ -23,6 +24,7 @@ do echo "build ${image} success" docker push ${image} echo "push ${image} success" + cd ${currentPwd} echo "==============================" i=$((i + 1)) cd ${currentPwd} From eb91b83c836d25fa2b50253b9349cdb3f34f91a2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 16 Jun 2023 14:04:26 +0800 Subject: [PATCH 28/29] sh --- script/build_push_k8s_images.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/build_push_k8s_images.sh b/script/build_push_k8s_images.sh index 563f588a9..432457298 100644 --- a/script/build_push_k8s_images.sh +++ b/script/build_push_k8s_images.sh @@ -11,7 +11,7 @@ set +e echo "repository: ${repository}" source ./path_info.cfg echo "start to build docker images" -currentPwd=${pwd} +currentPwd=`pwd` echo ${currentPwd} i=0 for path in ${service_source_root[*]} @@ -24,7 +24,6 @@ do echo "build ${image} success" docker push ${image} echo "push ${image} success" - cd ${currentPwd} echo "==============================" i=$((i + 1)) cd ${currentPwd} From 710e67ff837dc9ff34c4e6fc3361dc1e4595a623 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 19 Jun 2023 10:19:01 +0800 Subject: [PATCH 29/29] hasReadSeq --- internal/rpc/msg/as_read.go | 13 +++++++++++++ pkg/rpcclient/conversation.go | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index b65554a6d..016937040 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -21,6 +21,16 @@ func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *m if err != nil { return nil, err } + conversations, err := m.Conversation.GetConversations(ctx, req.UserID, conversationIDs) + if err != nil { + return nil, err + } + var conversationMaxSeqMap = make(map[string]int64) + for _, conversation := range conversations { + if conversation.MaxSeq != 0 { + conversationMaxSeqMap[conversation.ConversationID] = conversation.MaxSeq + } + } maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs) if err != nil { return nil, err @@ -31,6 +41,9 @@ func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *m HasReadSeq: hasReadSeqs[conversarionID], MaxSeq: maxSeq, } + if v, ok := conversationMaxSeqMap[conversarionID]; ok { + resp.Seqs[conversarionID].MaxSeq = v + } } return resp, nil } diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index cbf972b7f..c0522f492 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -107,3 +107,15 @@ func (c *ConversationClient) GetConversationsByConversationID(ctx context.Contex } return resp.Conversations, nil } + +func (c *ConversationClient) GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*pbConversation.Conversation, error) { + cc, err := c.getConn(ctx) + if err != nil { + return nil, err + } + resp, err := pbConversation.NewConversationClient(cc).GetConversations(ctx, &pbConversation.GetConversationsReq{OwnerUserID: ownerUserID, ConversationIDs: conversationIDs}) + if err != nil { + return nil, err + } + return resp.Conversations, nil +}