From 5b85fa763a5c314d80a9d0982be330d6af395699 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:45:23 +0800 Subject: [PATCH] Feat: Refactor project's references to shared modules (#672) * fix: to start im or chat, ZooKeeper must be started first. * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: go mod update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> --------- Signed-off-by: Gordon <1432970085@qq.com> Signed-off-by: withchao <993506633@qq.com> Co-authored-by: withchao <993506633@qq.com> --- cmd/openim-api/main.go | 4 +- cmd/openim-push/main.go | 2 +- cmd/openim-rpc/openim-rpc-auth/main.go | 2 +- .../openim-rpc-conversation/main.go | 2 +- cmd/openim-rpc/openim-rpc-friend/main.go | 2 +- cmd/openim-rpc/openim-rpc-group/main.go | 2 +- cmd/openim-rpc/openim-rpc-msg/main.go | 2 +- cmd/openim-rpc/openim-rpc-third/main.go | 2 +- cmd/openim-rpc/openim-rpc-user/main.go | 2 +- docker-compose.yaml | 1 + go.mod | 6 +- go.sum | 8 +- internal/api/custom_validator.go | 2 +- internal/api/msg.go | 8 +- internal/api/route.go | 7 +- internal/api/user.go | 4 +- internal/msggateway/callback.go | 4 +- internal/msggateway/client.go | 7 +- internal/msggateway/context.go | 2 +- internal/msggateway/hub_server.go | 11 +- internal/msggateway/init.go | 12 +- internal/msggateway/n_ws_server.go | 8 +- internal/msgtransfer/init.go | 2 +- .../msgtransfer/online_history_msg_handler.go | 31 +- .../online_msg_to_mongo_handler.go | 2 +- .../msgtransfer/persistent_msg_handler.go | 4 +- internal/push/callback.go | 4 +- internal/push/offlinepush/fcm/push.go | 4 +- internal/push/offlinepush/getui/body.go | 2 +- internal/push/offlinepush/getui/push.go | 2 +- .../offlinepush/jpush/body/notification.go | 2 +- .../push/offlinepush/jpush/body/platform.go | 2 +- internal/push/offlinepush/jpush/push.go | 2 +- internal/push/push_handler.go | 4 +- internal/push/push_rpc_server.go | 2 +- internal/push/push_to_client.go | 9 +- internal/push/tools.go | 2 +- internal/rpc/auth/auth.go | 9 +- internal/rpc/conversation/conversaion.go | 5 +- internal/rpc/friend/black.go | 4 +- internal/rpc/friend/callback.go | 4 +- internal/rpc/friend/friend.go | 10 +- internal/rpc/group/callback.go | 4 +- internal/rpc/group/group.go | 35 +- internal/rpc/group/super_group.go | 2 +- internal/rpc/msg/as_read.go | 2 +- internal/rpc/msg/callback.go | 4 +- internal/rpc/msg/delete.go | 12 +- internal/rpc/msg/message_interceptor.go | 4 +- internal/rpc/msg/msg_status.go | 2 +- internal/rpc/msg/revoke.go | 10 +- internal/rpc/msg/send.go | 9 +- internal/rpc/msg/server.go | 2 +- internal/rpc/msg/sync_msg.go | 9 +- internal/rpc/msg/utils.go | 4 +- internal/rpc/msg/verify.go | 4 +- internal/rpc/third/third.go | 2 +- internal/rpc/third/tool.go | 4 +- internal/rpc/user/user.go | 15 +- internal/tools/cron_task.go | 2 +- internal/tools/msg.go | 2 +- internal/tools/msg_test.go | 355 ------------------ pkg/authverify/token.go | 62 +++ pkg/common/cmd/msg_gateway.go | 2 +- pkg/common/cmd/root.go | 6 +- pkg/common/cmd/rpc.go | 2 +- pkg/common/config/config.go | 333 ++++++++++++++++ pkg/common/config/parse.go | 27 +- pkg/common/db/cache/init_redis.go | 2 +- pkg/common/db/cache/msg.go | 11 +- pkg/common/db/controller/auth.go | 5 +- pkg/common/db/controller/conversation.go | 5 +- pkg/common/db/controller/friend.go | 2 +- pkg/common/db/controller/group.go | 2 +- pkg/common/db/controller/msg.go | 2 +- pkg/common/db/controller/msg_test.go | 4 +- pkg/common/db/relation/chat_log_model.go | 2 +- pkg/common/db/relation/conversation_model.go | 2 +- pkg/common/db/relation/group_member_model.go | 2 +- pkg/common/db/relation/group_model.go | 2 +- pkg/common/db/relation/mysql_init.go | 2 +- pkg/common/db/s3/cos/cos.go | 2 +- pkg/common/db/s3/minio/minio.go | 2 +- pkg/common/db/s3/oss/oss.go | 2 +- pkg/common/db/unrelation/mongo.go | 2 +- pkg/common/db/unrelation/msg.go | 2 +- pkg/common/http/http_client.go | 4 +- pkg/common/kafka/consumer.go | 2 +- pkg/common/kafka/producer.go | 4 +- pkg/common/prome/prometheus.go | 2 +- pkg/common/startrpc/start.go | 112 ++++++ pkg/msgprocessor/conversation.go | 158 ++++++++ pkg/msgprocessor/options.go | 181 +++++++++ pkg/rpcclient/auth.go | 2 +- pkg/rpcclient/conversation.go | 2 +- pkg/rpcclient/friend.go | 2 +- pkg/rpcclient/group.go | 4 +- pkg/rpcclient/msg.go | 4 +- pkg/rpcclient/notification/conevrsation.go | 2 +- pkg/rpcclient/notification/friend.go | 2 +- pkg/rpcclient/notification/group.go | 2 +- pkg/rpcclient/notification/msg.go | 2 +- pkg/rpcclient/push.go | 2 +- pkg/rpcclient/third.go | 2 +- pkg/rpcclient/user.go | 6 +- 105 files changed, 1088 insertions(+), 581 deletions(-) delete mode 100644 internal/tools/msg_test.go create mode 100644 pkg/authverify/token.go create mode 100644 pkg/common/config/config.go create mode 100644 pkg/common/startrpc/start.go create mode 100644 pkg/msgprocessor/conversation.go create mode 100644 pkg/msgprocessor/options.go diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index c967906e9..8350f4d05 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -28,9 +28,9 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/internal/api" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/discoveryregistry" openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" "github.com/OpenIMSDK/tools/log" diff --git a/cmd/openim-push/main.go b/cmd/openim-push/main.go index adc3a7cb7..03db8ae03 100644 --- a/cmd/openim-push/main.go +++ b/cmd/openim-push/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/push" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-auth/main.go b/cmd/openim-rpc/openim-rpc-auth/main.go index 62bb65fab..524804988 100644 --- a/cmd/openim-rpc/openim-rpc-auth/main.go +++ b/cmd/openim-rpc/openim-rpc-auth/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/auth" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-conversation/main.go b/cmd/openim-rpc/openim-rpc-conversation/main.go index 0465de868..fec8226f8 100644 --- a/cmd/openim-rpc/openim-rpc-conversation/main.go +++ b/cmd/openim-rpc/openim-rpc-conversation/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/conversation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-friend/main.go b/cmd/openim-rpc/openim-rpc-friend/main.go index 7a0631a20..fbd44038e 100644 --- a/cmd/openim-rpc/openim-rpc-friend/main.go +++ b/cmd/openim-rpc/openim-rpc-friend/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/friend" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-group/main.go b/cmd/openim-rpc/openim-rpc-group/main.go index af78868d2..06baac155 100644 --- a/cmd/openim-rpc/openim-rpc-group/main.go +++ b/cmd/openim-rpc/openim-rpc-group/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/group" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-msg/main.go b/cmd/openim-rpc/openim-rpc-msg/main.go index 6bdd4842d..356081d33 100644 --- a/cmd/openim-rpc/openim-rpc-msg/main.go +++ b/cmd/openim-rpc/openim-rpc-msg/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/msg" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-third/main.go b/cmd/openim-rpc/openim-rpc-third/main.go index 2136bc157..c070e6811 100644 --- a/cmd/openim-rpc/openim-rpc-third/main.go +++ b/cmd/openim-rpc/openim-rpc-third/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/third" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-user/main.go b/cmd/openim-rpc/openim-rpc-user/main.go index 16a24c812..6d6d9008d 100644 --- a/cmd/openim-rpc/openim-rpc-user/main.go +++ b/cmd/openim-rpc/openim-rpc-user/main.go @@ -17,7 +17,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/user" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func main() { diff --git a/docker-compose.yaml b/docker-compose.yaml index 23565c23a..cd80dbf19 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -110,6 +110,7 @@ services: - ./scripts:/Open-IM-Server/scripts restart: always depends_on: + - zookeeper - kafka - mysql - mongodb diff --git a/go.mod b/go.mod index db50056c4..7acda0e12 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.3 github.com/gorilla/websocket v1.4.2 - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/jinzhu/copier v0.3.5 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect github.com/minio/minio-go/v7 v7.0.59 @@ -37,8 +37,8 @@ require ( require github.com/google/uuid v1.3.0 require ( - github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9 - github.com/OpenIMSDK/tools v0.0.1 + github.com/OpenIMSDK/protocol v0.0.1 + github.com/OpenIMSDK/tools v0.0.4 github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible github.com/go-redis/redis v6.15.9+incompatible github.com/go-sql-driver/mysql v1.6.0 diff --git a/go.sum b/go.sum index 0c585411e..28b2c5c32 100644 --- a/go.sum +++ b/go.sum @@ -16,10 +16,10 @@ cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5og firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9 h1:ZtW+z2j2kjk51awH9OFRXbgNI5Vcfq0Lu9//ax86ktc= -github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= -github.com/OpenIMSDK/tools v0.0.1 h1:lxTzjv0vOCH890K9C5LxMq3UCvioDMw0ZZQQtioauuI= -github.com/OpenIMSDK/tools v0.0.1/go.mod h1:/iSkny1+7i4Z09yddGa4o4fTu9dzJdOLxxe4pWuqI1A= +github.com/OpenIMSDK/protocol v0.0.1 h1:Q6J1jCU00dfqmguxw2XI+IGcVfBAkb5Tz8LgvyeNkk0= +github.com/OpenIMSDK/protocol v0.0.1/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= +github.com/OpenIMSDK/tools v0.0.4 h1:aSC5FWO/0ccxuLHs+E1Eeyj+XWL/2CzLy1XGmQgpaU4= +github.com/OpenIMSDK/tools v0.0.4/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/Shopify/sarama v1.29.0 h1:ARid8o8oieau9XrHI55f/L3EoRAhm9px6sonbD7yuUE= github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU= diff --git a/internal/api/custom_validator.go b/internal/api/custom_validator.go index 7425ecb38..8c5890501 100644 --- a/internal/api/custom_validator.go +++ b/internal/api/custom_validator.go @@ -17,7 +17,7 @@ package api import ( "github.com/go-playground/validator/v10" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" ) func RequiredIf(fl validator.FieldLevel) bool { diff --git a/internal/api/msg.go b/internal/api/msg.go index d79be716b..8480ac7d3 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -15,6 +15,7 @@ package api import ( + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" "github.com/mitchellh/mapstructure" @@ -22,14 +23,13 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/a2r" "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -205,7 +205,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) { return } log.ZInfo(c, "SendMessage", "req", req) - if !tokenverify.IsAppManagerUid(c) { + if !authverify.IsAppManagerUid(c) { apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message")) return } @@ -245,7 +245,7 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) { return } log.ZInfo(c, "BatchSendMsg", "req", req) - if err := tokenverify.CheckAdmin(c); err != nil { + if err := authverify.CheckAdmin(c); err != nil { apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message")) return } diff --git a/internal/api/route.go b/internal/api/route.go index 453224263..262283019 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -16,10 +16,11 @@ package api import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/tokenverify" "net/http" @@ -31,9 +32,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw" @@ -210,7 +211,7 @@ func GinParseToken(rdb redis.UniversalClient) gin.HandlerFunc { c.Abort() return } - claims, err := tokenverify.GetClaimFromToken(token) + claims, err := tokenverify.GetClaimFromToken(token, authverify.Secret()) if err != nil { log.ZWarn(c, "jwt get token error", errs.ErrTokenUnknown.Wrap()) apiresp.GinError(c, errs.ErrTokenUnknown.Wrap()) diff --git a/internal/api/user.go b/internal/api/user.go index c7bcf7862..8595b3501 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -17,13 +17,13 @@ package api import ( "github.com/gin-gonic/gin" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" "github.com/OpenIMSDK/protocol/user" "github.com/OpenIMSDK/tools/a2r" "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" ) diff --git a/internal/msggateway/callback.go b/internal/msggateway/callback.go index 530c18102..5ede3c854 100644 --- a/internal/msggateway/callback.go +++ b/internal/msggateway/callback.go @@ -19,9 +19,9 @@ import ( "time" cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/mcontext" ) diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index bc5fa1511..096fd1463 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -18,14 +18,15 @@ import ( "context" "errors" "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "runtime/debug" "sync" "google.golang.org/protobuf/proto" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" @@ -241,9 +242,9 @@ func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, re func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error { var msg sdkws.PushMessages - conversationID := utils.GetConversationIDByMsg(msgData) + conversationID := msgprocessor.GetConversationIDByMsg(msgData) m := map[string]*sdkws.PullMsgs{conversationID: {Msgs: []*sdkws.MsgData{msgData}}} - if utils.IsNotification(conversationID) { + if msgprocessor.IsNotification(conversationID) { msg.NotificationMsgs = m } else { msg.Msgs = m diff --git a/internal/msggateway/context.go b/internal/msggateway/context.go index 672ba1dbe..601c28a34 100644 --- a/internal/msggateway/context.go +++ b/internal/msggateway/context.go @@ -19,7 +19,7 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/utils" ) diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index dc440a7c8..e9a53cbf7 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -16,20 +16,19 @@ package msggateway import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tokenverify" - "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/startrpc" "github.com/OpenIMSDK/tools/utils" ) @@ -84,7 +83,7 @@ func (s *Server) GetUsersOnlineStatus( ctx context.Context, req *msggateway.GetUsersOnlineStatusReq, ) (*msggateway.GetUsersOnlineStatusResp, error) { - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { return nil, errs.ErrNoPermission.Wrap("only app manager") } var resp msggateway.GetUsersOnlineStatusResp diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index b6d4d3b58..03fe9f581 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error { @@ -39,7 +39,11 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error { return err } hubServer := NewServer(rpcPort, longServer) - go hubServer.Start() - hubServer.LongConnServer.Run() - return nil + go func() { + err := hubServer.Start() + if err != nil { + panic(err.Error()) + } + }() + return hubServer.LongConnServer.Run() } diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index 9715f21b6..c324f8a22 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -17,15 +17,16 @@ package msggateway import ( "context" "errors" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "net/http" "strconv" "sync" "sync/atomic" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/redis/go-redis/v9" @@ -35,7 +36,6 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -338,7 +338,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) { httpError(connContext, errs.ErrConnArgsErr) return } - if err := tokenverify.WsVerifyToken(token, userID, platformID); err != nil { + if err := authverify.WsVerifyToken(token, userID, platformID); err != nil { httpError(connContext, err) return } diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 037564f7a..d54e81240 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -22,6 +22,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" @@ -29,7 +30,6 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" - "github.com/OpenIMSDK/tools/config" openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw" diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 19121334a..282f50119 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -16,6 +16,7 @@ package msgtransfer import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "strconv" "strings" "sync" @@ -27,12 +28,12 @@ import ( "github.com/go-redis/redis" "google.golang.org/protobuf/proto" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" @@ -141,8 +142,8 @@ func (och *OnlineHistoryRedisConsumerHandler) Run(channelID int) { "modifyMsgList", len(modifyMsgList), ) - conversationIDMsg := utils.GetChatConversationIDByMsg(ctxMsgList[0].message) - conversationIDNotification := utils.GetNotificationConversationID(ctxMsgList[0].message) + conversationIDMsg := msgprocessor.GetChatConversationIDByMsg(ctxMsgList[0].message) + conversationIDNotification := msgprocessor.GetNotificationConversationID(ctxMsgList[0].message) och.handleMsg(ctx, msgChannelValue.uniqueKey, conversationIDMsg, storageMsgList, notStorageMsgList) och.handleNotification( ctx, @@ -172,7 +173,7 @@ func (och *OnlineHistoryRedisConsumerHandler) getPushStorageMsgList( totalMsgs []*ContextMsg, ) (storageMsgList, notStorageMsgList, storageNotificatoinList, notStorageNotificationList, modifyMsgList []*sdkws.MsgData) { isStorage := func(msg *sdkws.MsgData) bool { - options2 := utils.Options(msg.Options) + options2 := msgprocessor.Options(msg.Options) if options2.IsHistory() { return true } else { @@ -183,28 +184,28 @@ func (och *OnlineHistoryRedisConsumerHandler) getPushStorageMsgList( } } for _, v := range totalMsgs { - options := utils.Options(v.message.Options) + options := msgprocessor.Options(v.message.Options) if !options.IsNotNotification() { // clone msg from notificationMsg if options.IsSendMsg() { msg := proto.Clone(v.message).(*sdkws.MsgData) // 消息 if v.message.Options != nil { - msg.Options = utils.NewMsgOptions() + msg.Options = msgprocessor.NewMsgOptions() } if options.IsOfflinePush() { - v.message.Options = utils.WithOptions( - utils.Options(v.message.Options), - utils.WithOfflinePush(false), + v.message.Options = msgprocessor.WithOptions( + v.message.Options, + msgprocessor.WithOfflinePush(false), ) - msg.Options = utils.WithOptions(utils.Options(msg.Options), utils.WithOfflinePush(true)) + msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithOfflinePush(true)) } if options.IsUnreadCount() { - v.message.Options = utils.WithOptions( - utils.Options(v.message.Options), - utils.WithUnreadCount(false), + v.message.Options = msgprocessor.WithOptions( + v.message.Options, + msgprocessor.WithUnreadCount(false), ) - msg.Options = utils.WithOptions(utils.Options(msg.Options), utils.WithUnreadCount(true)) + msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithUnreadCount(true)) } storageMsgList = append(storageMsgList, msg) } diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index 9ba4cb7b9..4a8b5e63e 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -20,10 +20,10 @@ import ( "github.com/Shopify/sarama" "google.golang.org/protobuf/proto" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" pbMsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/log" ) diff --git a/internal/msgtransfer/persistent_msg_handler.go b/internal/msgtransfer/persistent_msg_handler.go index 7256a3442..b67e07cc0 100644 --- a/internal/msgtransfer/persistent_msg_handler.go +++ b/internal/msgtransfer/persistent_msg_handler.go @@ -17,11 +17,11 @@ package msgtransfer import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/OpenIMSDK/protocol/constant" pbMsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" diff --git a/internal/push/callback.go b/internal/push/callback.go index bbc392a6e..d5e678301 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -18,10 +18,10 @@ import ( "context" "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go index 8f29f0258..cea90f865 100644 --- a/internal/push/offlinepush/fcm/push.go +++ b/internal/push/offlinepush/fcm/push.go @@ -25,9 +25,9 @@ import ( "google.golang.org/api/option" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" ) const SinglePushCountLimit = 400 diff --git a/internal/push/offlinepush/getui/body.go b/internal/push/offlinepush/getui/body.go index 43fcc84cc..915c6f603 100644 --- a/internal/push/offlinepush/getui/body.go +++ b/internal/push/offlinepush/getui/body.go @@ -17,7 +17,7 @@ package getui import ( "fmt" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) type Resp struct { diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go index b440ef71b..a2f887a41 100644 --- a/internal/push/offlinepush/getui/push.go +++ b/internal/push/offlinepush/getui/push.go @@ -26,9 +26,9 @@ import ( "github.com/go-redis/redis" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" diff --git a/internal/push/offlinepush/jpush/body/notification.go b/internal/push/offlinepush/jpush/body/notification.go index 85581cb1f..cec725784 100644 --- a/internal/push/offlinepush/jpush/body/notification.go +++ b/internal/push/offlinepush/jpush/body/notification.go @@ -15,7 +15,7 @@ package body import ( - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" ) type Notification struct { diff --git a/internal/push/offlinepush/jpush/body/platform.go b/internal/push/offlinepush/jpush/body/platform.go index c779c8bdc..9de2b8711 100644 --- a/internal/push/offlinepush/jpush/body/platform.go +++ b/internal/push/offlinepush/jpush/body/platform.go @@ -17,7 +17,7 @@ package body import ( "errors" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" ) const ( diff --git a/internal/push/offlinepush/jpush/push.go b/internal/push/offlinepush/jpush/push.go index d661daee9..64933db50 100644 --- a/internal/push/offlinepush/jpush/push.go +++ b/internal/push/offlinepush/jpush/push.go @@ -21,8 +21,8 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush/body" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" - "github.com/OpenIMSDK/tools/config" ) type JPush struct{} diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index f0a67faac..8e307c360 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -20,11 +20,11 @@ import ( "github.com/Shopify/sarama" "google.golang.org/protobuf/proto" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/OpenIMSDK/protocol/constant" pbChat "github.com/OpenIMSDK/protocol/msg" pbPush "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" ) diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index dfcf07469..965f890a5 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -24,8 +24,8 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" pbPush "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" ) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index de6b78782..b787268d0 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -18,20 +18,21 @@ import ( "context" "encoding/json" "errors" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/fcm" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/getui" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" @@ -82,7 +83,7 @@ func NewOfflinePusher(cache cache.MsgModel) offlinepush.OfflinePusher { } func (p *Pusher) DeleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error { - conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) + conevrsationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) maxSeq, err := p.msgRpcClient.GetConversationMaxSeq(ctx, conevrsationID) if err != nil { return err @@ -170,7 +171,7 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws }(groupID, kickedUsers) pushToUserIDs = append(pushToUserIDs, kickedUsers...) case constant.GroupDismissedNotification: - if utils.IsNotification(utils.GetConversationIDByMsg(msg)) { // 消息先到,通知后到 + if msgprocessor.IsNotification(msgprocessor.GetConversationIDByMsg(msg)) { // 消息先到,通知后到 var tips sdkws.GroupDismissedTips if p.UnmarshalNotificationElem(msg.Content, &tips) != nil { return err diff --git a/internal/push/tools.go b/internal/push/tools.go index ea8d160b1..2135c901e 100644 --- a/internal/push/tools.go +++ b/internal/push/tools.go @@ -1,8 +1,8 @@ package push import ( + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "google.golang.org/protobuf/proto" ) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 48e4e5922..1abfc9771 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -16,16 +16,17 @@ package auth import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" pbAuth "github.com/OpenIMSDK/protocol/auth" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" @@ -76,7 +77,7 @@ func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (* } func (s *authServer) parseToken(ctx context.Context, tokensString string) (claims *tokenverify.Claims, err error) { - claims, err = tokenverify.GetClaimFromToken(tokensString) + claims, err = tokenverify.GetClaimFromToken(tokensString, authverify.Secret()) if err != nil { return nil, utils.Wrap(err, "") } @@ -116,7 +117,7 @@ func (s *authServer) ParseToken( } func (s *authServer) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) { - if err := tokenverify.CheckAdmin(ctx); err != nil { + if err := authverify.CheckAdmin(ctx); err != nil { return nil, err } if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, mcontext.GetOperationID(ctx)); err != nil { diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index e27756749..753a45722 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -16,6 +16,7 @@ package conversation import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "google.golang.org/grpc" @@ -26,8 +27,8 @@ import ( tableRelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/OpenIMSDK/protocol/constant" pbConversation "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" @@ -197,7 +198,7 @@ func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req // create conversation without notification for msg redis transfer. func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbConversation.CreateSingleChatConversationsReq) (*pbConversation.CreateSingleChatConversationsResp, error) { var conversation tableRelation.ConversationModel - conversation.ConversationID = utils.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID) + conversation.ConversationID = msgprocessor.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID) conversation.ConversationType = constant.SingleChatType conversation.OwnerUserID = req.SendID conversation.UserID = req.RecvID diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index 6f7ed58dd..9df5abb33 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -16,13 +16,13 @@ package friend import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" pbFriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/tokenverify" ) func (s *friendServer) GetPaginationBlacks( @@ -76,7 +76,7 @@ func (s *friendServer) RemoveBlack( } func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) { - if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } _, err := s.userRpcClient.GetUsersInfo(ctx, []string{req.OwnerUserID, req.BlackUserID}) diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index d3a793a6f..bd7716090 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -18,10 +18,10 @@ import ( "context" cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/OpenIMSDK/protocol/constant" pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" ) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 5792fdb38..9ef38ef3c 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -16,6 +16,7 @@ package friend import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" @@ -28,11 +29,10 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/OpenIMSDK/protocol/constant" pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/constant" registry "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" ) @@ -95,7 +95,7 @@ func (s *friendServer) ApplyToAddFriend( ) (resp *pbfriend.ApplyToAddFriendResp, err error) { defer log.ZInfo(ctx, utils.GetFuncName()+" Return") resp = &pbfriend.ApplyToAddFriendResp{} - if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.FromUserID); err != nil { return nil, err } if req.ToUserID == req.FromUserID { @@ -127,7 +127,7 @@ func (s *friendServer) ImportFriends( req *pbfriend.ImportFriendReq, ) (resp *pbfriend.ImportFriendResp, err error) { defer log.ZInfo(ctx, utils.GetFuncName()+" Return") - if err := tokenverify.CheckAdmin(ctx); err != nil { + if err := authverify.CheckAdmin(ctx); err != nil { return nil, err } if _, err := s.userRpcClient.GetUsersInfo(ctx, append([]string{req.OwnerUserID}, req.FriendUserIDs...)); err != nil { @@ -154,7 +154,7 @@ func (s *friendServer) RespondFriendApply( ) (resp *pbfriend.RespondFriendApplyResp, err error) { defer log.ZInfo(ctx, utils.GetFuncName()+" Return") resp = &pbfriend.RespondFriendApplyResp{} - if err := tokenverify.CheckAccessV3(ctx, req.ToUserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.ToUserID); err != nil { return nil, err } diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 2f85a6674..72661d16b 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -20,12 +20,12 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 4c041e13a..bcadc61a3 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -17,6 +17,8 @@ package group import ( "context" "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "math/big" "math/rand" "strconv" @@ -39,14 +41,13 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "github.com/OpenIMSDK/protocol/constant" pbGroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -100,7 +101,7 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req * } func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error { - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, groupID, mcontext.GetOpUserID(ctx)) if err != nil { return err @@ -162,7 +163,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR if req.OwnerUserID == "" { return nil, errs.ErrArgs.Wrap("no group owner") } - if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } userIDs := append(append(req.MemberUserIDs, req.AdminUserIDs...), req.OwnerUserID) @@ -257,7 +258,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJoinedGroupListReq) (*pbGroup.GetJoinedGroupListResp, error) { resp := &pbGroup.GetJoinedGroupListResp{} - if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.FromUserID); err != nil { return nil, err } var pageNumber, showNumber int32 @@ -325,7 +326,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite } var groupMember *relationTb.GroupMemberModel var opUserID string - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { opUserID = mcontext.GetOpUserID(ctx) groupMembers, err := s.FindGroupMember(ctx, []string{req.GroupID}, []string{opUserID}, nil) if err != nil { @@ -337,7 +338,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite groupMember = groupMembers[0] } if group.NeedVerification == constant.AllNeedVerification { - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) { var requests []*relationTb.GroupRequestModel for _, userID := range req.InvitedUserIDs { @@ -480,7 +481,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou for i, member := range members { memberMap[member.UserID] = members[i] } - isAppManagerUid := tokenverify.IsAppManagerUid(ctx) + isAppManagerUid := authverify.IsAppManagerUid(ctx) opMember := memberMap[opUserID] for _, userID := range req.KickedUserIDs { member, ok := memberMap[userID] @@ -670,7 +671,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup if !utils.Contain(req.HandleResult, constant.GroupResponseAgree, constant.GroupResponseRefuse) { return nil, errs.ErrArgs.Wrap("HandleResult unknown") } - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx)) if err != nil { return nil, err @@ -829,7 +830,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) } func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error { - conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) + conevrsationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) maxSeq, err := s.msgRpcClient.GetConversationMaxSeq(ctx, conevrsationID) if err != nil { return err @@ -839,7 +840,7 @@ func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, gro func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) { var opMember *relationTb.GroupMemberModel - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { var err error opMember, err = s.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx)) if err != nil { @@ -889,7 +890,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf go func() { nctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(ctx)) conversation := &pbConversation.ConversationReq{ - ConversationID: utils.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID), + ConversationID: msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID), ConversationType: constant.SuperGroupChatType, GroupID: req.GroupInfoForSet.GroupID, } @@ -948,7 +949,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans if newOwner == nil { return nil, errs.ErrArgs.Wrap("NewOwnerUser not in group " + req.NewOwnerUserID) } - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { if !(mcontext.GetOpUserID(ctx) == oldOwner.UserID && oldOwner.RoleLevel == constant.GroupOwner) { return nil, errs.ErrNoPermission.Wrap("no permission transfer group owner") } @@ -1080,7 +1081,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou if err != nil { return nil, err } - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { if owner.UserID != mcontext.GetOpUserID(ctx) { return nil, errs.ErrNoPermission.Wrap("not group owner") } @@ -1131,7 +1132,7 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou if err != nil { return nil, err } - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { opMember, err := s.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx)) if err != nil { return nil, err @@ -1179,7 +1180,7 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca if err != nil { return nil, err } - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { opMember, err := s.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx)) if err != nil { return nil, err @@ -1263,7 +1264,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr memberMap := utils.SliceToMap(members, func(e *relationTb.GroupMemberModel) [2]string { return [...]string{e.GroupID, e.UserID} }) - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { opUserID := mcontext.GetOpUserID(ctx) for _, member := range req.Members { if member.RoleLevel != nil { diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index bdd810ba9..070e154bc 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -22,9 +22,9 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/OpenIMSDK/protocol/constant" pbGroup "github.com/OpenIMSDK/protocol/group" sdkws "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" ) diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index c2f07bd8e..d17b2b43a 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -19,9 +19,9 @@ import ( "github.com/redis/go-redis/v9" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" ) diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index 47bd1f0f1..5ed6a5f09 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -20,10 +20,10 @@ import ( "google.golang.org/protobuf/proto" cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/OpenIMSDK/protocol/constant" pbChat "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index 8c20a5bc3..cdee8bdb5 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -16,13 +16,13 @@ package msg import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -45,7 +45,7 @@ func (m *msgServer) ClearConversationsMsg( ctx context.Context, req *msg.ClearConversationsMsgReq, ) (*msg.ClearConversationsMsgResp, error) { - if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil { return nil, err } if err := m.clearConversation(ctx, req.ConversationIDs, req.UserID, req.DeleteSyncOpt); err != nil { @@ -58,7 +58,7 @@ func (m *msgServer) UserClearAllMsg( ctx context.Context, req *msg.UserClearAllMsgReq, ) (*msg.UserClearAllMsgResp, error) { - if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil { return nil, err } conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID) @@ -73,7 +73,7 @@ func (m *msgServer) UserClearAllMsg( } func (m *msgServer) DeleteMsgs(ctx context.Context, req *msg.DeleteMsgsReq) (*msg.DeleteMsgsResp, error) { - if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil { return nil, err } isSyncSelf, isSyncOther := m.validateDeleteSyncOpt(req.DeleteSyncOpt) @@ -121,7 +121,7 @@ func (m *msgServer) DeleteMsgPhysical( ctx context.Context, req *msg.DeleteMsgPhysicalReq, ) (*msg.DeleteMsgPhysicalResp, error) { - if err := tokenverify.CheckAdmin(ctx); err != nil { + if err := authverify.CheckAdmin(ctx); err != nil { return nil, err } remainTime := utils.GetCurrentTimestampBySecond() - req.Timestamp diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index 915a04ab1..3c8bf965d 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -17,10 +17,10 @@ package msg import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" ) diff --git a/internal/rpc/msg/msg_status.go b/internal/rpc/msg/msg_status.go index bd89d61f4..68d6d6d4e 100644 --- a/internal/rpc/msg/msg_status.go +++ b/internal/rpc/msg/msg_status.go @@ -17,8 +17,8 @@ package msg import ( "context" + "github.com/OpenIMSDK/protocol/constant" pbMsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/mcontext" ) diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index 5651e79e0..18066c1a2 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -17,15 +17,15 @@ package msg import ( "context" "encoding/json" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "time" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -40,7 +40,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg. if req.Seq < 0 { return nil, errs.ErrArgs.Wrap("seq is invalid") } - if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil { return nil, err } user, err := m.User.GetUserInfo(ctx, req.UserID) @@ -60,10 +60,10 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg. data, _ := json.Marshal(msgs[0]) log.ZInfo(ctx, "GetMsgBySeqs", "conversationID", req.ConversationID, "seq", req.Seq, "msg", string(data)) var role int32 - if !tokenverify.IsAppManagerUid(ctx) { + if !authverify.IsAppManagerUid(ctx) { switch msgs[0].SessionType { case constant.SingleChatType: - if err := tokenverify.CheckAccessV3(ctx, msgs[0].SendID); err != nil { + if err := authverify.CheckAccessV3(ctx, msgs[0].SendID); err != nil { return nil, err } role = user.AppMangerLevel diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index 2c5df6408..8ec54e7d8 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -16,13 +16,14 @@ package msg import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" promePkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + "github.com/OpenIMSDK/protocol/constant" pbConversation "github.com/OpenIMSDK/protocol/conversation" pbMsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" @@ -90,7 +91,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa ctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(nctx)) var atUserID []string conversation := &pbConversation.ConversationReq{ - ConversationID: utils.GetConversationIDByMsg(msg), + ConversationID: msgprocessor.GetConversationIDByMsg(msg), ConversationType: msg.SessionType, GroupID: msg.GroupID, } @@ -148,8 +149,8 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbMsg.SendMsgReq if err := m.messageVerification(ctx, req); err != nil { return nil, err } - var isSend bool = true - isNotification := utils.IsNotificationByMsg(req.MsgData) + var isSend = true + isNotification := msgprocessor.IsNotificationByMsg(req.MsgData) if !isNotification { isSend, err = m.modifyMessageByUserMessageReceiveOpt( ctx, diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 542f59d4b..fe795e0eb 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -25,9 +25,9 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go index edcb4ff89..e91138d6c 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -16,13 +16,14 @@ package msg import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -34,7 +35,7 @@ func (m *msgServer) PullMessageBySeqs( resp.Msgs = make(map[string]*sdkws.PullMsgs) resp.NotificationMsgs = make(map[string]*sdkws.PullMsgs) for _, seq := range req.SeqRanges { - if !utils.IsNotification(seq.ConversationID) { + if !msgprocessor.IsNotification(seq.ConversationID) { conversation, err := m.Conversation.GetConversation(ctx, req.UserID, seq.ConversationID) if err != nil { log.ZError(ctx, "GetConversation error", err, "conversationID", seq.ConversationID) @@ -85,7 +86,7 @@ func (m *msgServer) PullMessageBySeqs( } func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sdkws.GetMaxSeqResp, error) { - if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil { + if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil { return nil, err } conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID) diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index 48f7b03f3..1579bcbef 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -18,9 +18,9 @@ import ( "github.com/redis/go-redis/v9" "gorm.io/gorm" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/utils" ) diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index 32c05ec82..c588d6cf7 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -20,10 +20,10 @@ import ( "strconv" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" ) diff --git a/internal/rpc/third/third.go b/internal/rpc/third/third.go index 5db6c39e4..555e9371c 100644 --- a/internal/rpc/third/third.go +++ b/internal/rpc/third/third.go @@ -27,13 +27,13 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/internal/rpc/third/tool.go b/internal/rpc/third/tool.go index 5a7d1697b..3034de674 100644 --- a/internal/rpc/third/tool.go +++ b/internal/rpc/third/tool.go @@ -18,13 +18,13 @@ import ( "context" "errors" "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "strings" "unicode/utf8" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/tokenverify" ) func toPbMapArray(m map[string][]string) []*third.KeyValues { @@ -52,7 +52,7 @@ func checkUploadName(ctx context.Context, name string) error { if opUserID == "" { return errs.ErrNoPermission.Wrap("opUserID is empty") } - if !tokenverify.IsManagerUserID(opUserID) { + if !authverify.IsManagerUserID(opUserID) { if !strings.HasPrefix(name, opUserID+"/") { return errs.ErrNoPermission.Wrap(fmt.Sprintf("name must start with `%s/`", opUserID)) } diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 65e977274..f95e66c0d 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -17,11 +17,13 @@ package user import ( "context" "errors" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "strings" "time" "github.com/OpenIMSDK/tools/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" @@ -29,13 +31,11 @@ import ( tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" pbuser "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" registry "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/tx" "google.golang.org/grpc" @@ -50,6 +50,11 @@ type userServer struct { RegisterCenter registry.SvcDiscoveryRegistry } +func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbuser.SubscribeOrCancelUsersStatusReq) (*pbuser.SubscribeOrCancelUsersStatusResp, error) { + //TODO implement me + panic("implement me") +} + func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error { db, err := relation.NewGormDB() if err != nil { @@ -99,7 +104,7 @@ func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesig func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserInfoReq) (resp *pbuser.UpdateUserInfoResp, err error) { resp = &pbuser.UpdateUserInfoResp{} - err = tokenverify.CheckAccessV3(ctx, req.UserInfo.UserID) + err = authverify.CheckAccessV3(ctx, req.UserInfo.UserID) if err != nil { return nil, err } @@ -141,7 +146,7 @@ func (s *userServer) AccountCheck(ctx context.Context, req *pbuser.AccountCheckR if utils.Duplicate(req.CheckUserIDs) { return nil, errs.ErrArgs.Wrap("userID repeated") } - err = tokenverify.CheckAdmin(ctx) + err = authverify.CheckAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index 354682f8e..a7333a5d4 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -21,7 +21,7 @@ import ( "github.com/robfig/cron/v3" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/tools/log" ) diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 8e67bc350..972877516 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -24,13 +24,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" diff --git a/internal/tools/msg_test.go b/internal/tools/msg_test.go deleted file mode 100644 index f4ce4d054..000000000 --- a/internal/tools/msg_test.go +++ /dev/null @@ -1,355 +0,0 @@ -// Copyright © 2023 OpenIM. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tools - -import ( - "context" - "strconv" - - "go.mongodb.org/mongo-driver/bson" - - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/tools/constant" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" - - unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - - "testing" - "time" -) - -func GenMsgDoc(startSeq, stopSeq, delSeq, index int64, conversationID string) *unRelationTb.MsgDocModel { - msgDoc := &unRelationTb.MsgDocModel{DocID: conversationID + strconv.Itoa(int(index))} - for i := 0; i < 5000; i++ { - msgDoc.Msg = append(msgDoc.Msg, &unRelationTb.MsgInfoModel{}) - } - for i := startSeq; i <= stopSeq; i++ { - msg := &unRelationTb.MsgDataModel{ - SendID: "sendID1", - RecvID: "recvID1", - GroupID: "", - ClientMsgID: "xxx", - ServerMsgID: "xxx", - SenderPlatformID: 1, - SenderNickname: "testNickName", - SenderFaceURL: "testFaceURL", - SessionType: 1, - MsgFrom: 100, - ContentType: 101, - Content: "testContent", - Seq: i, - CreateTime: time.Now().Unix(), - Status: 1, - } - if i <= delSeq { - msg.SendTime = 10000 - } else { - msg.SendTime = utils.GetCurrentTimestampByMill() - } - msgDoc.Msg[i-1] = &unRelationTb.MsgInfoModel{Msg: msg} - } - return msgDoc -} - -func TestDeleteMongoMsgAndResetRedisSeq(t *testing.T) { - operationID := "test" - rdb, err := cache.NewRedis() - if err != nil { - return - } - mgo, err := unrelation.NewMongo() - if err != nil { - return - } - cacheModel := cache.NewMsgCacheModel(rdb) - mongoClient := mgo.GetDatabase().Collection(unRelationTb.MsgDocModel{}.TableName()) - ctx := context.Background() - ctx = mcontext.SetOperationID(ctx, operationID) - - testUID1 := "test_del_id1" - var conversationID string - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID1) - _, err = mongoClient.DeleteOne(ctx, bson.M{"doc_id": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("DeleteOne failed") - return - } - - err = cacheModel.SetMaxSeq(ctx, conversationID, 600) - if err != nil { - t.Error("SetUserMaxSeq failed") - } - msgDoc := GenMsgDoc(1, 600, 200, 0, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", conversationID) - } - - msgTools, err := InitMsgTool() - if err != nil { - t.Error("init failed") - return - } - msgTools.ClearConversationsMsg(ctx, []string{conversationID}) - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err := msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 201 { - t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201) - } - - /////// uid2 - - testUID2 := "test_del_id2" - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID2) - - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)}) - if err != nil { - t.Error("delete failed") - } - - err = cacheModel.SetMaxSeq(ctx, conversationID, 7000) - if err != nil { - t.Error("SetUserMaxSeq failed") - } - msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID) - msgDoc2 := GenMsgDoc(5000, 7000, 6000, 1, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", testUID1) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil { - t.Error("InsertOne failed", testUID1) - } - - msgTools.ClearConversationsMsg(ctx, []string{conversationID}) - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 6001 { - t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201) - } - - /////// uid3 - testUID3 := "test_del_id3" - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID3) - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("delete failed") - } - err = cacheModel.SetMaxSeq(ctx, conversationID, 4999) - if err != nil { - t.Error("SetUserMaxSeq failed") - } - msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", conversationID) - } - - msgTools.ClearConversationsMsg(ctx, []string{conversationID}) - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 5000 { - t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201) - } - - //// uid4 - testUID4 := "test_del_id4" - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID4) - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(2)}) - if err != nil { - t.Error("delete failed") - } - - err = cacheModel.SetMaxSeq(ctx, conversationID, 12000) - msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID) - msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID) - msgDoc3 := GenMsgDoc(10000, 12000, 11000, 2, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", conversationID) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil { - t.Error("InsertOne failed", conversationID) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil { - t.Error("InsertOne failed", conversationID) - } - - msgTools.ClearConversationsMsg(ctx, []string{conversationID}) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 5000 { - t.Error("test1 is not the same", "minSeq:", minSeqCache) - } - - testUID5 := "test_del_id5" - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID5) - - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)}) - if err != nil { - t.Error("delete failed") - } - err = cacheModel.SetMaxSeq(ctx, conversationID, 9999) - msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID) - msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", conversationID) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil { - t.Error("InsertOne failed", conversationID) - } - - msgTools.ClearConversationsMsg(ctx, []string{conversationID}) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 10000 { - t.Error("test1 is not the same", "minSeq:", minSeqCache) - } - - testUID6 := "test_del_id6" - conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID6) - - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(2)}) - if err != nil { - t.Error("delete failed") - } - _, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(3)}) - if err != nil { - t.Error("delete failed") - } - msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID) - msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID) - msgDoc3 = GenMsgDoc(10000, 14999, 13000, 2, conversationID) - msgDoc4 := GenMsgDoc(15000, 19999, 0, 3, conversationID) - if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil { - t.Error("InsertOne failed", testUID4) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil { - t.Error("InsertOne failed", testUID4) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil { - t.Error("InsertOne failed", testUID4) - } - if _, err := mongoClient.InsertOne(ctx, msgDoc4); err != nil { - t.Error("InsertOne failed", testUID4) - } - minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache( - ctx, - conversationID, - ) - if err != nil { - t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed") - return - } - if maxSeqCache != maxSeqMongo { - t.Error("checkMaxSeqWithMongo failed", conversationID) - } - if minSeqMongo != minSeqCache { - t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache) - } - if minSeqCache != 13001 { - t.Error("test1 is not the same", "minSeq:", minSeqCache) - } -} diff --git a/pkg/authverify/token.go b/pkg/authverify/token.go new file mode 100644 index 000000000..0d26b6b04 --- /dev/null +++ b/pkg/authverify/token.go @@ -0,0 +1,62 @@ +package authverify + +import ( + "context" + "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/tools/errs" + "github.com/OpenIMSDK/tools/mcontext" + "github.com/OpenIMSDK/tools/tokenverify" + "github.com/OpenIMSDK/tools/utils" + "github.com/golang-jwt/jwt/v4" +) + +func Secret() jwt.Keyfunc { + return func(token *jwt.Token) (interface{}, error) { + return []byte(config.Config.Secret), nil + } +} + +func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) { + opUserID := mcontext.GetOpUserID(ctx) + if utils.IsContain(opUserID, config.Config.Manager.UserID) { + return nil + } + if opUserID == ownerUserID { + return nil + } + return errs.ErrNoPermission.Wrap(utils.GetSelfFuncName()) +} + +func IsAppManagerUid(ctx context.Context) bool { + return utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID) +} + +func CheckAdmin(ctx context.Context) error { + if utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID) { + return nil + } + return errs.ErrNoPermission.Wrap(fmt.Sprintf("user %s is not admin userID", mcontext.GetOpUserID(ctx))) +} + +func ParseRedisInterfaceToken(redisToken interface{}) (*tokenverify.Claims, error) { + return tokenverify.GetClaimFromToken(string(redisToken.([]uint8)), Secret()) +} + +func IsManagerUserID(opUserID string) bool { + return utils.IsContain(opUserID, config.Config.Manager.UserID) +} + +func WsVerifyToken(token, userID string, platformID int) error { + claim, err := tokenverify.GetClaimFromToken(token, Secret()) + if err != nil { + return err + } + if claim.UserID != userID { + return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token uid %s != userID %s", claim.UserID, userID)) + } + if claim.PlatformID != platformID { + return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token platform %d != %d", claim.PlatformID, platformID)) + } + return nil +} diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index f7b7a03ea..aae63351d 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -19,7 +19,7 @@ import ( //"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway". "github.com/spf13/cobra" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" ) type MsgGatewayCmd struct { diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 718d9bf7b..39865b9f8 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/log" ) @@ -65,7 +65,7 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) { if cmdOpts.loggerPrefixName == "" { cmdOpts.loggerPrefixName = "OpenIM.log.all" } - if err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, config.Config.Log.RemainRotationCount); err != nil { + if err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime); err != nil { panic(err) } return nil diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index a2fbea34c..9a00353be 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/startrpc" ) type RpcCmd struct { diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go new file mode 100644 index 000000000..1e0bbba16 --- /dev/null +++ b/pkg/common/config/config.go @@ -0,0 +1,333 @@ +// Copyright © 2023 OpenIM. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package config + +import ( + "bytes" + "github.com/OpenIMSDK/tools/discoveryregistry" + "gopkg.in/yaml.v3" +) + +var Config configStruct + +const ConfKey = "conf" + +type CallBackConfig struct { + Enable bool `yaml:"enable"` + CallbackTimeOut int `yaml:"timeout"` + CallbackFailedContinue *bool `yaml:"failedContinue"` +} + +type NotificationConf struct { + IsSendMsg bool `yaml:"isSendMsg"` + ReliabilityLevel int `yaml:"reliabilityLevel"` // 1 online 2 persistent + UnreadCount bool `yaml:"unreadCount"` + OfflinePush POfflinePush `yaml:"offlinePush"` +} + +type POfflinePush struct { + Enable bool `yaml:"enable"` + Title string `yaml:"title"` + Desc string `yaml:"desc"` + Ext string `yaml:"ext"` +} + +type configStruct struct { + Zookeeper struct { + Schema string `yaml:"schema"` + ZkAddr []string `yaml:"address"` + Username string `yaml:"username"` + Password string `yaml:"password"` + } `yaml:"zookeeper"` + + Mysql struct { + Address []string `yaml:"address"` + Username string `yaml:"username"` + Password string `yaml:"password"` + Database string `yaml:"database"` + MaxOpenConn int `yaml:"maxOpenConn"` + MaxIdleConn int `yaml:"maxIdleConn"` + MaxLifeTime int `yaml:"maxLifeTime"` + LogLevel int `yaml:"logLevel"` + SlowThreshold int `yaml:"slowThreshold"` + } `yaml:"mysql"` + + Mongo struct { + Uri string `yaml:"uri"` + Address []string `yaml:"address"` + Database string `yaml:"database"` + Username string `yaml:"username"` + Password string `yaml:"password"` + MaxPoolSize int `yaml:"maxPoolSize"` + } `yaml:"mongo"` + + Redis struct { + Address []string `yaml:"address"` + Username string `yaml:"username"` + Password string `yaml:"password"` + } `yaml:"redis"` + + Kafka struct { + Username string `yaml:"username"` + Password string `yaml:"password"` + Addr []string `yaml:"addr"` + LatestMsgToRedis struct { + Topic string `yaml:"topic"` + } `yaml:"latestMsgToRedis"` + MsgToMongo struct { + Topic string `yaml:"topic"` + } `yaml:"offlineMsgToMongo"` + MsgToPush struct { + Topic string `yaml:"topic"` + } `yaml:"msgToPush"` + ConsumerGroupID struct { + MsgToRedis string `yaml:"msgToRedis"` + MsgToMongo string `yaml:"msgToMongo"` + MsgToMySql string `yaml:"msgToMySql"` + MsgToPush string `yaml:"msgToPush"` + } `yaml:"consumerGroupID"` + } `yaml:"kafka"` + + Rpc struct { + RegisterIP string `yaml:"registerIP"` + ListenIP string `yaml:"listenIP"` + } `yaml:"rpc"` + + Api struct { + OpenImApiPort []int `yaml:"openImApiPort"` + ListenIP string `yaml:"listenIP"` + } `yaml:"api"` + + Object struct { + Enable string `yaml:"enable"` + ApiURL string `yaml:"apiURL"` + Minio struct { + Bucket string `yaml:"bucket"` + Endpoint string `yaml:"endpoint"` + AccessKeyID string `yaml:"accessKeyID"` + SecretAccessKey string `yaml:"secretAccessKey"` + SessionToken string `yaml:"sessionToken"` + } `yaml:"minio"` + Cos struct { + BucketURL string `yaml:"bucketURL"` + SecretID string `yaml:"secretID"` + SecretKey string `yaml:"secretKey"` + SessionToken string `yaml:"sessionToken"` + } `yaml:"cos"` + Oss struct { + Endpoint string `yaml:"endpoint"` + Bucket string `yaml:"bucket"` + BucketURL string `yaml:"bucketURL"` + AccessKeyID string `yaml:"accessKeyID"` + AccessKeySecret string `yaml:"accessKeySecret"` + SessionToken string `yaml:"sessionToken"` + } `yaml:"oss"` + } `yaml:"object"` + + RpcPort struct { + OpenImUserPort []int `yaml:"openImUserPort"` + OpenImFriendPort []int `yaml:"openImFriendPort"` + OpenImMessagePort []int `yaml:"openImMessagePort"` + OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"` + OpenImGroupPort []int `yaml:"openImGroupPort"` + OpenImAuthPort []int `yaml:"openImAuthPort"` + OpenImPushPort []int `yaml:"openImPushPort"` + OpenImConversationPort []int `yaml:"openImConversationPort"` + OpenImRtcPort []int `yaml:"openImRtcPort"` + OpenImThirdPort []int `yaml:"openImThirdPort"` + } `yaml:"rpcPort"` + + RpcRegisterName struct { + OpenImUserName string `yaml:"openImUserName"` + OpenImFriendName string `yaml:"openImFriendName"` + OpenImMsgName string `yaml:"openImMsgName"` + OpenImPushName string `yaml:"openImPushName"` + OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"` + OpenImGroupName string `yaml:"openImGroupName"` + OpenImAuthName string `yaml:"openImAuthName"` + OpenImConversationName string `yaml:"openImConversationName"` + OpenImThirdName string `yaml:"openImThirdName"` + } `yaml:"rpcRegisterName"` + + Log struct { + StorageLocation string `yaml:"storageLocation"` + RotationTime uint `yaml:"rotationTime"` + RemainRotationCount uint `yaml:"remainRotationCount"` + RemainLogLevel int `yaml:"remainLogLevel"` + IsStdout bool `yaml:"isStdout"` + IsJson bool `yaml:"isJson"` + WithStack bool `yaml:"withStack"` + } `yaml:"log"` + + LongConnSvr struct { + OpenImWsPort []int `yaml:"openImWsPort"` + WebsocketMaxConnNum int `yaml:"websocketMaxConnNum"` + WebsocketMaxMsgLen int `yaml:"websocketMaxMsgLen"` + WebsocketTimeout int `yaml:"websocketTimeout"` + } `yaml:"longConnSvr"` + + Push struct { + Enable string `yaml:"enable"` + GeTui struct { + PushUrl string `yaml:"pushUrl"` + AppKey string `yaml:"appKey"` + Intent string `yaml:"intent"` + MasterSecret string `yaml:"masterSecret"` + ChannelID string `yaml:"channelID"` + ChannelName string `yaml:"channelName"` + } `yaml:"geTui"` + Fcm struct { + ServiceAccount string `yaml:"serviceAccount"` + } `yaml:"fcm"` + Jpns struct { + AppKey string `yaml:"appKey"` + MasterSecret string `yaml:"masterSecret"` + PushUrl string `yaml:"pushUrl"` + PushIntent string `yaml:"pushIntent"` + } `yaml:"jpns"` + } + Manager struct { + UserID []string `yaml:"userID"` + Nickname []string `yaml:"nickname"` + } `yaml:"manager"` + + MultiLoginPolicy int `yaml:"multiLoginPolicy"` + ChatPersistenceMysql bool `yaml:"chatPersistenceMysql"` + MsgCacheTimeout int `yaml:"msgCacheTimeout"` + GroupMessageHasReadReceiptEnable bool `yaml:"groupMessageHasReadReceiptEnable"` + SingleMessageHasReadReceiptEnable bool `yaml:"singleMessageHasReadReceiptEnable"` + RetainChatRecords int `yaml:"retainChatRecords"` + ChatRecordsClearTime string `yaml:"chatRecordsClearTime"` + MsgDestructTime string `yaml:"msgDestructTime"` + Secret string `yaml:"secret"` + TokenPolicy struct { + Expire int64 `yaml:"expire"` + } `yaml:"tokenPolicy"` + MessageVerify struct { + FriendVerify *bool `yaml:"friendVerify"` + } `yaml:"messageVerify"` + + IOSPush struct { + PushSound string `yaml:"pushSound"` + BadgeCount bool `yaml:"badgeCount"` + Production bool `yaml:"production"` + } `yaml:"iosPush"` + Callback struct { + CallbackUrl string `yaml:"url"` + CallbackBeforeSendSingleMsg CallBackConfig `yaml:"beforeSendSingleMsg"` + CallbackAfterSendSingleMsg CallBackConfig `yaml:"afterSendSingleMsg"` + CallbackBeforeSendGroupMsg CallBackConfig `yaml:"beforeSendGroupMsg"` + CallbackAfterSendGroupMsg CallBackConfig `yaml:"afterSendGroupMsg"` + CallbackMsgModify CallBackConfig `yaml:"msgModify"` + CallbackUserOnline CallBackConfig `yaml:"userOnline"` + CallbackUserOffline CallBackConfig `yaml:"userOffline"` + CallbackUserKickOff CallBackConfig `yaml:"userKickOff"` + CallbackOfflinePush CallBackConfig `yaml:"offlinePush"` + CallbackOnlinePush CallBackConfig `yaml:"onlinePush"` + CallbackBeforeSuperGroupOnlinePush CallBackConfig `yaml:"superGroupOnlinePush"` + CallbackBeforeAddFriend CallBackConfig `yaml:"beforeAddFriend"` + CallbackBeforeCreateGroup CallBackConfig `yaml:"beforeCreateGroup"` + CallbackBeforeMemberJoinGroup CallBackConfig `yaml:"beforeMemberJoinGroup"` + CallbackBeforeSetGroupMemberInfo CallBackConfig `yaml:"beforeSetGroupMemberInfo"` + } `yaml:"callback"` + + Prometheus struct { + Enable bool `yaml:"enable"` + UserPrometheusPort []int `yaml:"userPrometheusPort"` + FriendPrometheusPort []int `yaml:"friendPrometheusPort"` + MessagePrometheusPort []int `yaml:"messagePrometheusPort"` + MessageGatewayPrometheusPort []int `yaml:"messageGatewayPrometheusPort"` + GroupPrometheusPort []int `yaml:"groupPrometheusPort"` + AuthPrometheusPort []int `yaml:"authPrometheusPort"` + PushPrometheusPort []int `yaml:"pushPrometheusPort"` + ConversationPrometheusPort []int `yaml:"conversationPrometheusPort"` + RtcPrometheusPort []int `yaml:"rtcPrometheusPort"` + MessageTransferPrometheusPort []int `yaml:"messageTransferPrometheusPort"` + ThirdPrometheusPort []int `yaml:"thirdPrometheusPort"` + } `yaml:"prometheus"` + Notification notification `yaml:"notification"` +} + +type notification struct { + GroupCreated NotificationConf `yaml:"groupCreated"` + GroupInfoSet NotificationConf `yaml:"groupInfoSet"` + JoinGroupApplication NotificationConf `yaml:"joinGroupApplication"` + MemberQuit NotificationConf `yaml:"memberQuit"` + GroupApplicationAccepted NotificationConf `yaml:"groupApplicationAccepted"` + GroupApplicationRejected NotificationConf `yaml:"groupApplicationRejected"` + GroupOwnerTransferred NotificationConf `yaml:"groupOwnerTransferred"` + MemberKicked NotificationConf `yaml:"memberKicked"` + MemberInvited NotificationConf `yaml:"memberInvited"` + MemberEnter NotificationConf `yaml:"memberEnter"` + GroupDismissed NotificationConf `yaml:"groupDismissed"` + GroupMuted NotificationConf `yaml:"groupMuted"` + GroupCancelMuted NotificationConf `yaml:"groupCancelMuted"` + GroupMemberMuted NotificationConf `yaml:"groupMemberMuted"` + GroupMemberCancelMuted NotificationConf `yaml:"groupMemberCancelMuted"` + GroupMemberInfoSet NotificationConf `yaml:"groupMemberInfoSet"` + GroupMemberSetToAdmin NotificationConf `yaml:"groupMemberSetToAdmin"` + GroupMemberSetToOrdinary NotificationConf `yaml:"groupMemberSetToOrdinaryUser"` + GroupInfoSetAnnouncement NotificationConf `yaml:"groupInfoSetAnnouncement"` + GroupInfoSetName NotificationConf `yaml:"groupInfoSetName"` + ////////////////////////user/////////////////////// + UserInfoUpdated NotificationConf `yaml:"userInfoUpdated"` + //////////////////////friend/////////////////////// + FriendApplicationAdded NotificationConf `yaml:"friendApplicationAdded"` + FriendApplicationApproved NotificationConf `yaml:"friendApplicationApproved"` + FriendApplicationRejected NotificationConf `yaml:"friendApplicationRejected"` + FriendAdded NotificationConf `yaml:"friendAdded"` + FriendDeleted NotificationConf `yaml:"friendDeleted"` + FriendRemarkSet NotificationConf `yaml:"friendRemarkSet"` + BlackAdded NotificationConf `yaml:"blackAdded"` + BlackDeleted NotificationConf `yaml:"blackDeleted"` + FriendInfoUpdated NotificationConf `yaml:"friendInfoUpdated"` + //////////////////////conversation/////////////////////// + ConversationChanged NotificationConf `yaml:"conversationChanged"` + ConversationSetPrivate NotificationConf `yaml:"conversationSetPrivate"` +} + +func (c *configStruct) GetServiceNames() []string { + return []string{ + c.RpcRegisterName.OpenImUserName, + c.RpcRegisterName.OpenImFriendName, + c.RpcRegisterName.OpenImMsgName, + c.RpcRegisterName.OpenImPushName, + c.RpcRegisterName.OpenImMessageGatewayName, + c.RpcRegisterName.OpenImGroupName, + c.RpcRegisterName.OpenImAuthName, + c.RpcRegisterName.OpenImConversationName, + c.RpcRegisterName.OpenImThirdName, + } +} + +func (c *configStruct) RegisterConf2Registry(registry discoveryregistry.SvcDiscoveryRegistry) error { + data, err := yaml.Marshal(c) + if err != nil { + return err + } + return registry.RegisterConf2Registry(ConfKey, data) +} + +func (c *configStruct) GetConfFromRegistry(registry discoveryregistry.SvcDiscoveryRegistry) ([]byte, error) { + return registry.GetConfFromRegistry(ConfKey) +} + +func (c *configStruct) EncodeConfig() []byte { + buf := bytes.NewBuffer(nil) + if err := yaml.NewEncoder(buf).Encode(c); err != nil { + panic(err) + } + return buf.Bytes() +} diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index f31df39d2..e3fd99b9f 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -17,23 +17,18 @@ package config import ( _ "embed" "fmt" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "os" "path/filepath" "runtime" "gopkg.in/yaml.v3" - "github.com/OpenIMSDK/tools/constant" - "github.com/OpenIMSDK/tools/utils" + "github.com/OpenIMSDK/protocol/constant" ) //go:embed version -var version string - -func init() { - config.Version = version -} +var Version string var ( _, b, _, _ = runtime.Caller(0) @@ -47,20 +42,20 @@ const ( DefaultFolderPath = "../config/" ) -func GetOptionsByNotification(cfg config.NotificationConf) utils.Options { - opts := utils.NewOptions() +func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options { + opts := msgprocessor.NewOptions() if cfg.UnreadCount { - opts = utils.WithOptions(opts, utils.WithUnreadCount(true)) + opts = msgprocessor.WithOptions(opts, msgprocessor.WithUnreadCount(true)) } if cfg.OfflinePush.Enable { - opts = utils.WithOptions(opts, utils.WithOfflinePush(true)) + opts = msgprocessor.WithOptions(opts, msgprocessor.WithOfflinePush(true)) } switch cfg.ReliabilityLevel { case constant.UnreliableNotification: case constant.ReliableNotificationNoMsg: - opts = utils.WithOptions(opts, utils.WithHistory(true), utils.WithPersistent()) + opts = msgprocessor.WithOptions(opts, msgprocessor.WithHistory(true), msgprocessor.WithPersistent()) } - opts = utils.WithOptions(opts, utils.WithSendMsg(cfg.IsSendMsg)) + opts = msgprocessor.WithOptions(opts, msgprocessor.WithSendMsg(cfg.IsSendMsg)) return opts } @@ -92,11 +87,11 @@ func initConfig(config interface{}, configName, configFolderPath string) error { } func InitConfig(configFolderPath string) error { - err := initConfig(&config.Config, FileName, configFolderPath) + err := initConfig(&Config, FileName, configFolderPath) if err != nil { return err } - err = initConfig(&config.Config.Notification, NotificationFileName, configFolderPath) + err = initConfig(&Config.Notification, NotificationFileName, configFolderPath) if err != nil { return err } diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go index 307e40327..69bc0d484 100644 --- a/pkg/common/db/cache/init_redis.go +++ b/pkg/common/db/cache/init_redis.go @@ -22,7 +22,7 @@ import ( "github.com/redis/go-redis/v9" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mw/specialerror" ) diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index 66f3cacee..953396fbe 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -16,6 +16,7 @@ package cache import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "strconv" "time" @@ -25,10 +26,10 @@ import ( "github.com/gogo/protobuf/jsonpb" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" @@ -374,7 +375,7 @@ func (c *msgCache) GetMessagesBySeq( failedSeqs = append(failedSeqs, seqs[i]) } else { msg := sdkws.MsgData{} - err = utils.String2Pb(cmd.Val(), &msg) + err = msgprocessor.String2Pb(cmd.Val(), &msg) if err == nil { if msg.Status != constant.MsgDeleted { seqMsgs = append(seqMsgs, &msg) @@ -394,7 +395,7 @@ func (c *msgCache) SetMessageToCache(ctx context.Context, conversationID string, var failedMsgs []*sdkws.MsgData for _, msg := range msgs { key := c.getMessageCacheKey(conversationID, msg.Seq) - s, err := utils.Pb2String(msg) + s, err := msgprocessor.Pb2String(msg) if err != nil { return 0, errs.Wrap(err) } @@ -535,7 +536,7 @@ func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []in return err } msg.Status = constant.MsgDeleted - s, err := utils.Pb2String(&msg) + s, err := msgprocessor.Pb2String(&msg) if err != nil { return errs.Wrap(err) } diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index 491a1394b..d864e078b 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -16,11 +16,12 @@ package controller import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/golang-jwt/jwt/v4" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -60,7 +61,7 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI } var deleteTokenKey []string for k, v := range tokens { - _, err = tokenverify.GetClaimFromToken(k) + _, err = tokenverify.GetClaimFromToken(k, authverify.Secret()) if err != nil || v != constant.NormalToken { deleteTokenKey = append(deleteTokenKey, k) } diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 0f3403084..2829f963e 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -16,11 +16,12 @@ package controller import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" @@ -236,7 +237,7 @@ func (c *conversationDatabase) FindRecvMsgNotNotifyUserIDs(ctx context.Context, func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context, groupID string, userIDs []string) error { cache := c.cache.NewCache() - conversationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) + conversationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID) if err := c.tx.Transaction(func(tx any) error { existConversationUserIDs, err := c.conversationDB.FindUserID(ctx, userIDs, []string{conversationID}) if err != nil { diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 3c8d61a40..c44c1662e 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/tx" diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index ad0b4e548..af97d87ca 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -29,7 +29,7 @@ import ( relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" ) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 555828c22..7c03eb8b6 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -21,13 +21,13 @@ import ( "github.com/redis/go-redis/v9" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" diff --git a/pkg/common/db/controller/msg_test.go b/pkg/common/db/controller/msg_test.go index e322e6218..73226fa1b 100644 --- a/pkg/common/db/controller/msg_test.go +++ b/pkg/common/db/controller/msg_test.go @@ -27,9 +27,9 @@ import ( "go.mongodb.org/mongo-driver/bson" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/tools/config" ) func Test_BatchInsertChat2DB(t *testing.T) { @@ -203,7 +203,7 @@ func Test_Revoke(t *testing.T) { } func Test_FindBySeq(t *testing.T) { - if err := log.InitFromConfig("", "", 6, true, false, "", 2); err != nil { + if err := log.InitFromConfig("", "", 6, true, false, "", 2, 1); err != nil { t.Fatal(err) } db := GetDB() diff --git a/pkg/common/db/relation/chat_log_model.go b/pkg/common/db/relation/chat_log_model.go index 056295e15..76ed9be62 100644 --- a/pkg/common/db/relation/chat_log_model.go +++ b/pkg/common/db/relation/chat_log_model.go @@ -21,9 +21,9 @@ import ( "gorm.io/gorm" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/OpenIMSDK/protocol/constant" pbMsg "github.com/OpenIMSDK/protocol/msg" sdkws "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/utils" ) diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index 716d2cbe4..0efca79aa 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -20,7 +20,7 @@ import ( "gorm.io/gorm" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/utils" ) diff --git a/pkg/common/db/relation/group_member_model.go b/pkg/common/db/relation/group_member_model.go index 7c2ded83f..da6a58398 100644 --- a/pkg/common/db/relation/group_member_model.go +++ b/pkg/common/db/relation/group_member_model.go @@ -20,7 +20,7 @@ import ( "gorm.io/gorm" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/ormutil" "github.com/OpenIMSDK/tools/utils" ) diff --git a/pkg/common/db/relation/group_model.go b/pkg/common/db/relation/group_model.go index c95d51861..697427e04 100644 --- a/pkg/common/db/relation/group_model.go +++ b/pkg/common/db/relation/group_model.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "gorm.io/gorm" diff --git a/pkg/common/db/relation/mysql_init.go b/pkg/common/db/relation/mysql_init.go index 29873cc89..9b8188ac4 100644 --- a/pkg/common/db/relation/mysql_init.go +++ b/pkg/common/db/relation/mysql_init.go @@ -21,7 +21,7 @@ import ( mysqlDriver "github.com/go-sql-driver/mysql" "gorm.io/driver/mysql" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw/specialerror" diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go index 29d74ceb4..cfdaaa5e4 100644 --- a/pkg/common/db/s3/cos/cos.go +++ b/pkg/common/db/s3/cos/cos.go @@ -26,8 +26,8 @@ import ( "github.com/tencentyun/cos-go-sdk-v5" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" - "github.com/OpenIMSDK/tools/config" ) const ( diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index d5ac7de40..bb6e6ce24 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -29,8 +29,8 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/signer" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" - "github.com/OpenIMSDK/tools/config" ) const ( diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go index ee4d19464..774150389 100644 --- a/pkg/common/db/s3/oss/oss.go +++ b/pkg/common/db/s3/oss/oss.go @@ -26,8 +26,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" - "github.com/OpenIMSDK/tools/config" ) const ( diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index 44077a838..b580f4dbd 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -24,8 +24,8 @@ import ( "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mw/specialerror" "github.com/OpenIMSDK/tools/utils" diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index 2f4a166e9..27f7cf5ce 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/protocol/constant" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index 46d5f23c3..a646f774e 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -25,8 +25,8 @@ import ( "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" ) diff --git a/pkg/common/kafka/consumer.go b/pkg/common/kafka/consumer.go index e04abe944..67bc3977b 100644 --- a/pkg/common/kafka/consumer.go +++ b/pkg/common/kafka/consumer.go @@ -17,7 +17,7 @@ package kafka import ( "sync" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/Shopify/sarama" ) diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index 8eeaa6825..754f2166d 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -19,8 +19,8 @@ import ( "errors" "time" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" log "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" diff --git a/pkg/common/prome/prometheus.go b/pkg/common/prome/prometheus.go index 26efb9dae..d66b1df70 100644 --- a/pkg/common/prome/prometheus.go +++ b/pkg/common/prome/prometheus.go @@ -19,7 +19,7 @@ import ( "net/http" "strconv" - "github.com/OpenIMSDK/tools/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go new file mode 100644 index 000000000..d78aa1ff4 --- /dev/null +++ b/pkg/common/startrpc/start.go @@ -0,0 +1,112 @@ +// Copyright © 2023 OpenIM. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package startrpc + +import ( + "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "net" + "strconv" + "time" + + grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" + + "github.com/OpenIMSDK/tools/discoveryregistry" + "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" + "github.com/OpenIMSDK/tools/log" + "github.com/OpenIMSDK/tools/mw" + "github.com/OpenIMSDK/tools/network" + "github.com/OpenIMSDK/tools/prome" + "github.com/OpenIMSDK/tools/utils" +) + +func Start( + rpcPort int, + rpcRegisterName string, + prometheusPort int, + rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, + options ...grpc.ServerOption, +) error { + fmt.Println( + "start", + rpcRegisterName, + "server, port: ", + rpcPort, + "prometheusPort:", + prometheusPort, + ", OpenIM version: ", + config.Version, + ) + listener, err := net.Listen( + "tcp", + net.JoinHostPort(network.GetListenIP(config.Config.Rpc.ListenIP), strconv.Itoa(rpcPort)), + ) + if err != nil { + return err + } + defer listener.Close() + zkClient, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema, + zookeeper.WithFreq(time.Hour), zookeeper.WithUserNameAndPassword( + config.Config.Zookeeper.Username, + config.Config.Zookeeper.Password, + ), zookeeper.WithRoundRobin(), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger())) + if err != nil { + return utils.Wrap1(err) + } + defer zkClient.CloseZK() + zkClient.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials())) + registerIP, err := network.GetRpcRegisterIP(config.Config.Rpc.RegisterIP) + if err != nil { + return err + } + // ctx 中间件 + if config.Config.Prometheus.Enable { + prome.NewGrpcRequestCounter() + prome.NewGrpcRequestFailedCounter() + prome.NewGrpcRequestSuccessCounter() + unaryInterceptor := mw.InterceptChain(grpcPrometheus.UnaryServerInterceptor, mw.RpcServerInterceptor) + options = append(options, []grpc.ServerOption{ + grpc.StreamInterceptor(grpcPrometheus.StreamServerInterceptor), + grpc.UnaryInterceptor(unaryInterceptor), + }...) + } else { + options = append(options, mw.GrpcServer()) + } + srv := grpc.NewServer(options...) + defer srv.GracefulStop() + err = rpcFn(zkClient, srv) + if err != nil { + return utils.Wrap1(err) + } + err = zkClient.Register( + rpcRegisterName, + registerIP, + rpcPort, + grpc.WithTransportCredentials(insecure.NewCredentials()), + ) + if err != nil { + return utils.Wrap1(err) + } + go func() { + if config.Config.Prometheus.Enable && prometheusPort != 0 { + if err := prome.StartPrometheusSrv(prometheusPort); err != nil { + panic(err.Error()) + } + } + }() + return utils.Wrap1(srv.Serve(listener)) +} diff --git a/pkg/msgprocessor/conversation.go b/pkg/msgprocessor/conversation.go new file mode 100644 index 000000000..b24794af8 --- /dev/null +++ b/pkg/msgprocessor/conversation.go @@ -0,0 +1,158 @@ +package msgprocessor + +import ( + "github.com/OpenIMSDK/protocol/constant" + "github.com/OpenIMSDK/protocol/sdkws" + "google.golang.org/protobuf/proto" + "sort" + "strings" +) + +func GetNotificationConversationID(msg *sdkws.MsgData) string { + switch msg.SessionType { + case constant.SingleChatType: + l := []string{msg.SendID, msg.RecvID} + sort.Strings(l) + return "n_" + strings.Join(l, "_") + case constant.GroupChatType: + return "n_" + msg.GroupID + case constant.SuperGroupChatType: + return "n_" + msg.GroupID + case constant.NotificationChatType: + return "n_" + msg.SendID + "_" + msg.RecvID + } + return "" +} + +func GetChatConversationIDByMsg(msg *sdkws.MsgData) string { + switch msg.SessionType { + case constant.SingleChatType: + l := []string{msg.SendID, msg.RecvID} + sort.Strings(l) + return "si_" + strings.Join(l, "_") + case constant.GroupChatType: + return "g_" + msg.GroupID + case constant.SuperGroupChatType: + return "sg_" + msg.GroupID + case constant.NotificationChatType: + return "sn_" + msg.SendID + "_" + msg.RecvID + } + return "" +} + +func GenConversationUniqueKey(msg *sdkws.MsgData) string { + switch msg.SessionType { + case constant.SingleChatType, constant.NotificationChatType: + l := []string{msg.SendID, msg.RecvID} + sort.Strings(l) + return strings.Join(l, "_") + case constant.SuperGroupChatType: + return msg.GroupID + } + return "" +} + +func GetConversationIDByMsg(msg *sdkws.MsgData) string { + options := Options(msg.Options) + switch msg.SessionType { + case constant.SingleChatType: + l := []string{msg.SendID, msg.RecvID} + sort.Strings(l) + if !options.IsNotNotification() { + return "n_" + strings.Join(l, "_") + } + return "si_" + strings.Join(l, "_") // single chat + case constant.GroupChatType: + if !options.IsNotNotification() { + return "n_" + msg.GroupID // group chat + } + return "g_" + msg.GroupID // group chat + case constant.SuperGroupChatType: + if !options.IsNotNotification() { + return "n_" + msg.GroupID // super group chat + } + return "sg_" + msg.GroupID // super group chat + case constant.NotificationChatType: + if !options.IsNotNotification() { + return "n_" + msg.SendID + "_" + msg.RecvID // super group chat + } + return "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat + } + return "" +} + +func GetConversationIDBySessionType(sessionType int, ids ...string) string { + sort.Strings(ids) + if len(ids) > 2 || len(ids) < 1 { + return "" + } + switch sessionType { + case constant.SingleChatType: + return "si_" + strings.Join(ids, "_") // single chat + case constant.GroupChatType: + return "g_" + ids[0] // group chat + case constant.SuperGroupChatType: + return "sg_" + ids[0] // super group chat + case constant.NotificationChatType: + return "sn_" + ids[0] // server notification chat + } + return "" +} + +func IsNotification(conversationID string) bool { + return strings.HasPrefix(conversationID, "n_") +} + +func IsNotificationByMsg(msg *sdkws.MsgData) bool { + return !Options(msg.Options).IsNotNotification() +} + +func ParseConversationID(msg *sdkws.MsgData) (isNotification bool, conversationID string) { + options := Options(msg.Options) + switch msg.SessionType { + case constant.SingleChatType: + l := []string{msg.SendID, msg.RecvID} + sort.Strings(l) + if !options.IsNotNotification() { + return true, "n_" + strings.Join(l, "_") + } + return false, "si_" + strings.Join(l, "_") // single chat + case constant.SuperGroupChatType: + if !options.IsNotNotification() { + return true, "n_" + msg.GroupID // super group chat + } + return false, "sg_" + msg.GroupID // super group chat + case constant.NotificationChatType: + if !options.IsNotNotification() { + return true, "n_" + msg.SendID + "_" + msg.RecvID // super group chat + } + return false, "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat + } + return false, "" +} + +type MsgBySeq []*sdkws.MsgData + +func (s MsgBySeq) Len() int { + return len(s) +} + +func (s MsgBySeq) Less(i, j int) bool { + return s[i].Seq < s[j].Seq +} + +func (s MsgBySeq) Swap(i, j int) { + s[i], s[j] = s[j], s[i] +} + +func Pb2String(pb proto.Message) (string, error) { + s, err := proto.Marshal(pb) + if err != nil { + return "", err + } + return string(s), nil +} + +func String2Pb(s string, pb proto.Message) error { + return proto.Unmarshal([]byte(s), pb) +} diff --git a/pkg/msgprocessor/options.go b/pkg/msgprocessor/options.go new file mode 100644 index 000000000..920a6a2ea --- /dev/null +++ b/pkg/msgprocessor/options.go @@ -0,0 +1,181 @@ +// Copyright © 2023 OpenIM. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package msgprocessor + +import "github.com/OpenIMSDK/protocol/constant" + +type Options map[string]bool +type OptionsOpt func(Options) + +func NewOptions(opts ...OptionsOpt) Options { + options := make(map[string]bool, 11) + options[constant.IsNotNotification] = false + options[constant.IsSendMsg] = false + options[constant.IsHistory] = false + options[constant.IsPersistent] = false + options[constant.IsOfflinePush] = false + options[constant.IsUnreadCount] = false + options[constant.IsConversationUpdate] = false + options[constant.IsSenderSync] = false + options[constant.IsNotPrivate] = false + options[constant.IsSenderConversationUpdate] = false + options[constant.IsSenderNotificationPush] = false + options[constant.IsReactionFromCache] = false + for _, opt := range opts { + opt(options) + } + return options +} + +func NewMsgOptions() Options { + options := make(map[string]bool, 11) + options[constant.IsOfflinePush] = false + return make(map[string]bool) +} + +func WithOptions(options Options, opts ...OptionsOpt) Options { + for _, opt := range opts { + opt(options) + } + return options +} + +func WithNotNotification(b bool) OptionsOpt { + return func(options Options) { + options[constant.IsNotNotification] = b + } +} + +func WithSendMsg(b bool) OptionsOpt { + return func(options Options) { + options[constant.IsSendMsg] = b + } +} + +func WithHistory(b bool) OptionsOpt { + return func(options Options) { + options[constant.IsHistory] = b + } +} + +func WithPersistent() OptionsOpt { + return func(options Options) { + options[constant.IsPersistent] = true + } +} + +func WithOfflinePush(b bool) OptionsOpt { + return func(options Options) { + options[constant.IsOfflinePush] = b + } +} + +func WithUnreadCount(b bool) OptionsOpt { + return func(options Options) { + options[constant.IsUnreadCount] = b + } +} + +func WithConversationUpdate() OptionsOpt { + return func(options Options) { + options[constant.IsConversationUpdate] = true + } +} + +func WithSenderSync() OptionsOpt { + return func(options Options) { + options[constant.IsSenderSync] = true + } +} + +func WithNotPrivate() OptionsOpt { + return func(options Options) { + options[constant.IsNotPrivate] = true + } +} + +func WithSenderConversationUpdate() OptionsOpt { + return func(options Options) { + options[constant.IsSenderConversationUpdate] = true + } +} + +func WithSenderNotificationPush() OptionsOpt { + return func(options Options) { + options[constant.IsSenderNotificationPush] = true + } +} + +func WithReactionFromCache() OptionsOpt { + return func(options Options) { + options[constant.IsReactionFromCache] = true + } +} + +func (o Options) Is(notification string) bool { + v, ok := o[notification] + if !ok || v { + return true + } + return false +} + +func (o Options) IsNotNotification() bool { + return o.Is(constant.IsNotNotification) +} + +func (o Options) IsSendMsg() bool { + return o.Is(constant.IsSendMsg) +} + +func (o Options) IsHistory() bool { + return o.Is(constant.IsHistory) +} + +func (o Options) IsPersistent() bool { + return o.Is(constant.IsPersistent) +} + +func (o Options) IsOfflinePush() bool { + return o.Is(constant.IsOfflinePush) +} + +func (o Options) IsUnreadCount() bool { + return o.Is(constant.IsUnreadCount) +} + +func (o Options) IsConversationUpdate() bool { + return o.Is(constant.IsConversationUpdate) +} + +func (o Options) IsSenderSync() bool { + return o.Is(constant.IsSenderSync) +} + +func (o Options) IsNotPrivate() bool { + return o.Is(constant.IsNotPrivate) +} + +func (o Options) IsSenderConversationUpdate() bool { + return o.Is(constant.IsSenderConversationUpdate) +} + +func (o Options) IsSenderNotificationPush() bool { + return o.Is(constant.IsSenderNotificationPush) +} + +func (o Options) IsReactionFromCache() bool { + return o.Is(constant.IsReactionFromCache) +} diff --git a/pkg/rpcclient/auth.go b/pkg/rpcclient/auth.go index 9d667f1ad..cbf1324e0 100644 --- a/pkg/rpcclient/auth.go +++ b/pkg/rpcclient/auth.go @@ -19,8 +19,8 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/auth" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index d4116e9f9..2b7d2c392 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -20,8 +20,8 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" pbConversation "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" ) diff --git a/pkg/rpcclient/friend.go b/pkg/rpcclient/friend.go index c27f4ef3f..f1aaaa319 100644 --- a/pkg/rpcclient/friend.go +++ b/pkg/rpcclient/friend.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/friend" sdkws "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/pkg/rpcclient/group.go b/pkg/rpcclient/group.go index ce624a085..57dcd0fa5 100644 --- a/pkg/rpcclient/group.go +++ b/pkg/rpcclient/group.go @@ -20,10 +20,10 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index bfc7bf73f..8e9416af9 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -21,10 +21,10 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/proto" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/config" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" diff --git a/pkg/rpcclient/notification/conevrsation.go b/pkg/rpcclient/notification/conevrsation.go index ac40eb887..9c8066d00 100644 --- a/pkg/rpcclient/notification/conevrsation.go +++ b/pkg/rpcclient/notification/conevrsation.go @@ -18,8 +18,8 @@ import ( "context" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" ) type ConversationNotificationSender struct { diff --git a/pkg/rpcclient/notification/friend.go b/pkg/rpcclient/notification/friend.go index 05c2b1e6f..ddce86c8c 100644 --- a/pkg/rpcclient/notification/friend.go +++ b/pkg/rpcclient/notification/friend.go @@ -23,9 +23,9 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" pbFriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" ) type FriendNotificationSender struct { diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index e70bf38e1..fdf77500f 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -21,9 +21,9 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" pbGroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" diff --git a/pkg/rpcclient/notification/msg.go b/pkg/rpcclient/notification/msg.go index f9cf68bcb..ba5aef684 100644 --- a/pkg/rpcclient/notification/msg.go +++ b/pkg/rpcclient/notification/msg.go @@ -18,8 +18,8 @@ import ( "context" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/constant" ) type MsgNotificationSender struct { diff --git a/pkg/rpcclient/push.go b/pkg/rpcclient/push.go index a4b122a29..4401221c3 100644 --- a/pkg/rpcclient/push.go +++ b/pkg/rpcclient/push.go @@ -19,8 +19,8 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 9822f48fa..c01ab4d0c 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -23,8 +23,8 @@ import ( "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" ) diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 7e5079f8c..1ce4fd53c 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -16,16 +16,16 @@ package rpcclient import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "strings" "google.golang.org/grpc" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/config" "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" ) @@ -144,7 +144,7 @@ func (u *UserRpcClient) Access(ctx context.Context, ownerUserID string) error { if err != nil { return err } - return tokenverify.CheckAccessV3(ctx, ownerUserID) + return authverify.CheckAccessV3(ctx, ownerUserID) } func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumber int32) ([]string, error) {