From 1fa4511fb38237ef14a2e30e49df3c67ed83c12e Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:04:46 +0800 Subject: [PATCH] refactor: unified naming for module startup functions. --- docs/contrib/logging.md | 20 +++++++++--------- go.mod | 5 ++--- go.sum | 6 ++---- internal/api/auth.go | 2 +- internal/api/conversation.go | 2 +- internal/api/friend.go | 2 +- internal/api/group.go | 2 +- internal/api/msg.go | 13 ++++++------ internal/api/route.go | 14 ++++++------- internal/api/statistics.go | 2 +- internal/api/third.go | 6 +++--- internal/api/user.go | 8 +++---- internal/msggateway/callback.go | 2 +- internal/msggateway/client.go | 10 ++++----- internal/msggateway/compressor.go | 2 +- internal/msggateway/context.go | 2 +- internal/msggateway/encoder.go | 2 +- internal/msggateway/http_error.go | 2 +- internal/msggateway/hub_server.go | 8 +++---- internal/msggateway/init.go | 2 +- internal/msggateway/long_conn.go | 2 +- internal/msggateway/message_handler.go | 7 +++---- internal/msggateway/n_ws_server.go | 12 +++++------ internal/msggateway/user_map.go | 4 ++-- internal/msgtransfer/init.go | 6 +++--- .../msgtransfer/online_history_msg_handler.go | 8 +++---- .../online_msg_to_mongo_handler.go | 2 +- internal/push/callback.go | 4 ++-- internal/push/offlinepush/fcm/push.go | 3 +-- internal/push/offlinepush/getui/push.go | 9 ++++---- internal/push/push_handler.go | 4 ++-- internal/push/push_rpc_server.go | 6 +++--- internal/push/push_to_client.go | 8 +++---- internal/rpc/auth/auth.go | 10 ++++----- internal/rpc/conversation/conversaion.go | 10 ++++----- internal/rpc/friend/black.go | 2 +- internal/rpc/friend/callback.go | 2 +- internal/rpc/friend/friend.go | 8 +++---- internal/rpc/group/callback.go | 6 +++--- internal/rpc/group/db_map.go | 2 +- internal/rpc/group/group.go | 14 ++++++------- internal/rpc/group/statistics.go | 2 +- internal/rpc/group/super_group.go | 2 +- internal/rpc/msg/as_read.go | 7 +++---- internal/rpc/msg/callback.go | 6 +++--- internal/rpc/msg/delete.go | 4 ++-- internal/rpc/msg/message_interceptor.go | 2 +- internal/rpc/msg/msg_status.go | 2 +- internal/rpc/msg/revoke.go | 8 +++---- internal/rpc/msg/send.go | 8 +++---- internal/rpc/msg/server.go | 2 +- internal/rpc/msg/statistics.go | 2 +- internal/rpc/msg/sync_msg.go | 4 ++-- internal/rpc/msg/utils.go | 3 +-- internal/rpc/msg/verify.go | 6 +++--- internal/rpc/third/log.go | 6 +++--- internal/rpc/third/s3.go | 8 +++---- internal/rpc/third/third.go | 4 ++-- internal/rpc/third/tool.go | 4 ++-- internal/rpc/user/callback.go | 2 +- internal/rpc/user/statistics.go | 2 +- internal/rpc/user/user.go | 12 +++++------ internal/tools/conversation.go | 6 +++--- internal/tools/cron_task.go | 6 ++---- internal/tools/cron_task_test.go | 6 +----- internal/tools/msg.go | 13 ++++++------ internal/tools/msg_doc_convert.go | 4 ++-- pkg/authverify/token.go | 9 ++++---- pkg/callbackstruct/common.go | 2 +- pkg/common/cmd/root.go | 4 ++-- pkg/common/cmd/rpc.go | 4 ++-- pkg/common/config/config.go | 3 +-- pkg/common/config/parse.go | 3 +-- pkg/common/convert/conversation.go | 2 +- pkg/common/convert/friend.go | 2 +- pkg/common/db/cache/black.go | 3 +-- pkg/common/db/cache/conversation.go | 5 ++--- pkg/common/db/cache/friend.go | 5 ++--- pkg/common/db/cache/group.go | 7 +++---- pkg/common/db/cache/init_redis.go | 7 +++---- pkg/common/db/cache/meta_cache.go | 9 ++++---- pkg/common/db/cache/msg.go | 7 +++---- pkg/common/db/cache/user.go | 5 ++--- pkg/common/db/controller/auth.go | 6 ++---- pkg/common/db/controller/black.go | 6 +++--- pkg/common/db/controller/conversation.go | 8 +++---- pkg/common/db/controller/friend.go | 12 +++++------ pkg/common/db/controller/group.go | 8 +++---- pkg/common/db/controller/msg.go | 7 +++---- pkg/common/db/controller/msg_test.go | 2 +- pkg/common/db/controller/third.go | 2 +- pkg/common/db/controller/user.go | 8 +++---- pkg/common/db/mgo/black.go | 4 ++-- pkg/common/db/mgo/conversation.go | 6 +++--- pkg/common/db/mgo/friend.go | 4 ++-- pkg/common/db/mgo/friend_request.go | 4 ++-- pkg/common/db/mgo/group.go | 6 +++--- pkg/common/db/mgo/group_member.go | 6 +++--- pkg/common/db/mgo/group_request.go | 6 +++--- pkg/common/db/mgo/log.go | 4 ++-- pkg/common/db/mgo/object.go | 4 ++-- pkg/common/db/mgo/user.go | 6 +++--- pkg/common/db/s3/cont/controller.go | 4 ++-- pkg/common/db/s3/cos/cos.go | 3 +-- pkg/common/db/s3/minio/minio.go | 5 ++--- pkg/common/db/s3/minio/thumbnail.go | 5 ++--- pkg/common/db/s3/oss/oss.go | 2 +- pkg/common/db/table/relation/black.go | 2 +- pkg/common/db/table/relation/conversation.go | 2 +- pkg/common/db/table/relation/friend.go | 2 +- .../db/table/relation/friend_request.go | 2 +- pkg/common/db/table/relation/group.go | 2 +- pkg/common/db/table/relation/group_member.go | 2 +- pkg/common/db/table/relation/group_request.go | 2 +- pkg/common/db/table/relation/log.go | 2 +- pkg/common/db/table/relation/user.go | 2 +- pkg/common/db/table/relation/utils.go | 2 +- pkg/common/db/unrelation/mongo.go | 6 +++--- pkg/common/db/unrelation/msg.go | 4 ++-- pkg/common/db/unrelation/msg_convert.go | 2 +- pkg/common/db/unrelation/super_group.go | 2 +- pkg/common/db/unrelation/user.go | 2 +- .../direct/directResolver.go | 2 +- .../discoveryregister/direct/directconn.go | 2 +- .../discoveryregister/discoveryregister.go | 4 ++-- .../discoveryregister_test.go | 2 +- .../kubernetes/kubernetes.go | 4 ++-- .../discoveryregister/zookeeper/zookeeper.go | 21 ++++++++++--------- pkg/common/http/http_client.go | 4 ++-- pkg/common/kafka/consumer.go | 2 +- pkg/common/kafka/consumer_group.go | 4 ++-- pkg/common/kafka/producer.go | 6 +++--- pkg/common/startrpc/start.go | 10 ++++----- pkg/common/tls/tls.go | 2 +- pkg/msgprocessor/conversation.go | 2 +- pkg/rpccache/conversation.go | 5 ++--- pkg/rpccache/friend.go | 3 +-- pkg/rpccache/group.go | 5 ++--- pkg/rpccache/subscriber.go | 3 +-- pkg/rpccache/user.go | 5 ++--- pkg/rpcclient/auth.go | 2 +- pkg/rpcclient/conversation.go | 4 ++-- pkg/rpcclient/friend.go | 2 +- pkg/rpcclient/group.go | 6 +++--- pkg/rpcclient/grouphash/grouphash.go | 2 +- pkg/rpcclient/msg.go | 8 +++---- pkg/rpcclient/notification/friend.go | 2 +- pkg/rpcclient/notification/group.go | 8 +++---- pkg/rpcclient/push.go | 2 +- pkg/rpcclient/third.go | 2 +- pkg/rpcclient/user.go | 6 +++--- pkg/statistics/statistics.go | 2 +- pkg/util/genutil/genutil.go | 2 +- tools/component/component.go | 6 ++---- 154 files changed, 354 insertions(+), 399 deletions(-) diff --git a/docs/contrib/logging.md b/docs/contrib/logging.md index 49f41e09d..e25ac92c2 100644 --- a/docs/contrib/logging.md +++ b/docs/contrib/logging.md @@ -66,7 +66,7 @@ The `CodeError` interface is designed to provide a unified mechanism for error h ## Logging Standards and Code Examples -In the OpenIM project, we use the unified logging package `github.com/OpenIMSDK/tools/log` for logging to achieve efficient log management and analysis. This logging package supports structured logging formats, making it easier for developers to handle log information. +In the OpenIM project, we use the unified logging package `github.com/openimsdk/tools/log` for logging to achieve efficient log management and analysis. This logging package supports structured logging formats, making it easier for developers to handle log information. ### Logger Interface and Implementation @@ -96,7 +96,7 @@ func main() { ## Error Handling and Code Examples -We use the `github.com/OpenIMSDK/tools/errs` package for unified error handling and wrapping. +We use the `github.com/openimsdk/tools/errs` package for unified error handling and wrapping. ### CodeError Interface and Implementation @@ -121,7 +121,7 @@ package main import ( "fmt" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) func main() { @@ -164,7 +164,7 @@ More details") import ( "context" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" ) func main() { @@ -226,7 +226,7 @@ More details") package main import ( - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "context" ) @@ -401,7 +401,7 @@ More details") ### About WrapMsg Use ```go -// "github.com/OpenIMSDK/tools/errs" +// "github.com/openimsdk/tools/errs" func WrapMsg(err error, msg string, kv ...any) error { if len(kv) == 0 { if len(msg) == 0 { @@ -450,7 +450,7 @@ Next, let's demonstrate several ways to use the `WrapMsg` function: **Example 1: No Additional Information** ```go -// "github.com/OpenIMSDK/tools/errs" +// "github.com/openimsdk/tools/errs" err := errors.New("original error") wrappedErr := errs.WrapMsg(err, "") // wrappedErr will contain the original error and its call stack @@ -459,7 +459,7 @@ wrappedErr := errs.WrapMsg(err, "") **Example 2: Message Text Only** ```go -// "github.com/OpenIMSDK/tools/errs" +// "github.com/openimsdk/tools/errs" err := errors.New("original error") wrappedErr := errs.WrapMsg(err, "additional error information") // wrappedErr will contain the original error, call stack, and "additional error information" @@ -468,7 +468,7 @@ wrappedErr := errs.WrapMsg(err, "additional error information") **Example 3: Message Text and Key-Value Pairs** ```go -// "github.com/OpenIMSDK/tools/errs" +// "github.com/openimsdk/tools/errs" err := errors.New("original error") wrappedErr := errs.WrapMsg(err, "problem occurred", "code", 404, "url", "http://example.com") // wrappedErr will contain the original error, call stack, and "problem occurred code=404, url=http://example.com" @@ -477,7 +477,7 @@ wrappedErr := errs.WrapMsg(err, "problem occurred", "code", 404, "url", "http:// **Example 4: Key-Value Pairs Only** ```go -// "github.com/OpenIMSDK/tools/errs" +// "github.com/openimsdk/tools/errs" err := errors.New("original error") wrappedErr := errs.WrapMsg(err, "", "user", "john_doe", "action", "login") // wrappedErr will contain the original error, call stack, and "user=john_doe, action=login" diff --git a/go.mod b/go.mod index ed901fc04..ef7c37cd5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.19 require ( firebase.google.com/go v3.13.0+incompatible github.com/OpenIMSDK/protocol v0.0.56 - github.com/OpenIMSDK/tools v0.0.46-alpha.6 github.com/dtm-labs/rockscache v0.1.1 github.com/gin-gonic/gin v1.9.1 github.com/go-playground/validator/v10 v10.18.0 @@ -17,9 +16,9 @@ require ( github.com/minio/minio-go/v7 v7.0.67 github.com/mitchellh/mapstructure v1.5.0 github.com/openimsdk/localcache v0.0.1 + github.com/openimsdk/tools v0.0.46-alpha.7 github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.18.0 - github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/testify v1.8.4 go.mongodb.org/mongo-driver v1.14.0 @@ -27,7 +26,7 @@ require ( google.golang.org/api v0.165.0 google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.33.0 - gopkg.in/yaml.v3 v3.0.1 + gopkg.in/yaml.v3 v3.0.1 // indirect ) require github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 48634af45..65175153c 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,6 @@ github.com/IBM/sarama v1.42.2 h1:VoY4hVIZ+WQJ8G9KNY/SQlWguBQXQ9uvFPOnrcu8hEw= github.com/IBM/sarama v1.42.2/go.mod h1:FLPGUGwYqEs62hq2bVG6Io2+5n+pS6s/WOXVKWSLFtE= github.com/OpenIMSDK/protocol v0.0.56 h1:mbVFyDBachEsmJLfYW5AU1z2KL8AUEpoHG8RPCIxjgg= github.com/OpenIMSDK/protocol v0.0.56/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= -github.com/OpenIMSDK/tools v0.0.46-alpha.6 h1:QJ+IQh8s+Z7K7xx5wnjVU1VZY0qNy+zvqxGpUWOADl8= -github.com/OpenIMSDK/tools v0.0.46-alpha.6/go.mod h1:kGgLtr1egGJnnGaBsF7SNcylx7KB4Md5MyRqz+GUMS0= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= @@ -272,6 +270,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/openimsdk/tools v0.0.46-alpha.7 h1:vzN/KAYQtMnVn2zWjasGb3jYPBFG0M1ldX31CcytTKQ= +github.com/openimsdk/tools v0.0.46-alpha.7/go.mod h1:qSmmASQjl0TEXWrPLVugM/Mh2zpKWtv1kzjNeM+crUw= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= @@ -295,8 +295,6 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= -github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= diff --git a/internal/api/auth.go b/internal/api/auth.go index 0f7a3933b..7a3468f91 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -16,9 +16,9 @@ package api import ( "github.com/OpenIMSDK/protocol/auth" - "github.com/OpenIMSDK/tools/a2r" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" ) type AuthApi rpcclient.Auth diff --git a/internal/api/conversation.go b/internal/api/conversation.go index fe6c67001..18d4b3eef 100644 --- a/internal/api/conversation.go +++ b/internal/api/conversation.go @@ -16,9 +16,9 @@ package api import ( "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/a2r" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" ) type ConversationApi rpcclient.Conversation diff --git a/internal/api/friend.go b/internal/api/friend.go index 24bcbf899..b87c50fb5 100644 --- a/internal/api/friend.go +++ b/internal/api/friend.go @@ -16,9 +16,9 @@ package api import ( "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/a2r" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" ) type FriendApi rpcclient.Friend diff --git a/internal/api/group.go b/internal/api/group.go index 6cb302819..13788a098 100644 --- a/internal/api/group.go +++ b/internal/api/group.go @@ -16,9 +16,9 @@ package api import ( "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/tools/a2r" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" ) type GroupApi rpcclient.Group diff --git a/internal/api/msg.go b/internal/api/msg.go index ced610050..afb32d815 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -18,19 +18,18 @@ import ( "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/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/gin-gonic/gin" - "github.com/go-playground/validator/v10" "github.com/mitchellh/mapstructure" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) type MessageApi struct { diff --git a/internal/api/route.go b/internal/api/route.go index 51c735f8d..36521b528 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -27,15 +27,8 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mw" - "github.com/OpenIMSDK/tools/tokenverify" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -45,7 +38,12 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/tokenverify" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/api/statistics.go b/internal/api/statistics.go index 2b80a1585..5418712c2 100644 --- a/internal/api/statistics.go +++ b/internal/api/statistics.go @@ -16,9 +16,9 @@ package api import ( "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/a2r" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" ) type StatisticsApi rpcclient.User diff --git a/internal/api/third.go b/internal/api/third.go index d1fc93c1c..b92565032 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -20,11 +20,11 @@ import ( "strconv" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mcontext" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mcontext" ) type ThirdApi rpcclient.Third diff --git a/internal/api/user.go b/internal/api/user.go index 21920f223..42bb367c0 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -18,12 +18,12 @@ import ( "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/errs" - "github.com/OpenIMSDK/tools/log" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/a2r" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) type UserApi rpcclient.User diff --git a/internal/msggateway/callback.go b/internal/msggateway/callback.go index 1ed6c97bf..f2490418b 100644 --- a/internal/msggateway/callback.go +++ b/internal/msggateway/callback.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/mcontext" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/mcontext" ) func CallbackUserOnline(ctx context.Context, callback *config.Callback, userID string, platformID int, isAppBackground bool, connID string) error { diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index b87d88e44..579a45ae7 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -24,12 +24,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" ) diff --git a/internal/msggateway/compressor.go b/internal/msggateway/compressor.go index 9dde21254..52d315b79 100644 --- a/internal/msggateway/compressor.go +++ b/internal/msggateway/compressor.go @@ -20,7 +20,7 @@ import ( "io" "sync" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) var ( diff --git a/internal/msggateway/context.go b/internal/msggateway/context.go index ad679c1a1..952b9be68 100644 --- a/internal/msggateway/context.go +++ b/internal/msggateway/context.go @@ -21,7 +21,7 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/utils" ) type UserConnContext struct { diff --git a/internal/msggateway/encoder.go b/internal/msggateway/encoder.go index caf91deec..3af266374 100644 --- a/internal/msggateway/encoder.go +++ b/internal/msggateway/encoder.go @@ -18,7 +18,7 @@ import ( "bytes" "encoding/gob" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) type Encoder interface { diff --git a/internal/msggateway/http_error.go b/internal/msggateway/http_error.go index 03881cf27..4732680b2 100644 --- a/internal/msggateway/http_error.go +++ b/internal/msggateway/http_error.go @@ -14,7 +14,7 @@ package msggateway -import "github.com/OpenIMSDK/tools/apiresp" +import "github.com/openimsdk/tools/apiresp" func httpError(ctx *UserConnContext, err error) { apiresp.HttpError(ctx.RespWriter, err) diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index f92682fb4..85e86663c 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -19,14 +19,14 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" "google.golang.org/grpc" ) diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 0efeed708..5ccbbacc9 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -16,7 +16,7 @@ package msggateway import ( "context" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/config" diff --git a/internal/msggateway/long_conn.go b/internal/msggateway/long_conn.go index 152bdbc6c..51ad27497 100644 --- a/internal/msggateway/long_conn.go +++ b/internal/msggateway/long_conn.go @@ -19,8 +19,8 @@ import ( "net/http" "time" - "github.com/OpenIMSDK/tools/errs" "github.com/gorilla/websocket" + "github.com/openimsdk/tools/errs" ) type LongConn interface { diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index dbfed4bbe..5bcd0e76f 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -21,12 +21,11 @@ import ( "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/push" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/utils" - "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" ) diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index f7c090a85..924c20380 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -27,18 +27,16 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/tools/apiresp" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" - "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "golang.org/x/sync/errgroup" ) diff --git a/internal/msggateway/user_map.go b/internal/msggateway/user_map.go index 7d536b613..91a29a5bd 100644 --- a/internal/msggateway/user_map.go +++ b/internal/msggateway/user_map.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) type UserMap struct { diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 731ea418a..15bee8823 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -18,14 +18,12 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "net/http" "os" "os/signal" "syscall" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mw" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" @@ -34,6 +32,8 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mw" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 1fc355bc0..454d5b676 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -25,16 +25,16 @@ import ( "github.com/IBM/sarama" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/go-redis/redis" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" ) diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index cc9e4d077..e0dd927a3 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -19,11 +19,11 @@ import ( "github.com/IBM/sarama" pbmsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" kfk "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/tools/log" "google.golang.org/protobuf/proto" ) diff --git a/internal/push/callback.go b/internal/push/callback.go index 3ad1d1c98..bccdee470 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -19,11 +19,11 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) func callbackOfflinePush(ctx context.Context, callback *config.Callback, userIDs []string, msg *sdkws.MsgData, offlinePushUserIDs *[]string) error { diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go index 924a42684..88f85934c 100644 --- a/internal/push/offlinepush/fcm/push.go +++ b/internal/push/offlinepush/fcm/push.go @@ -21,11 +21,10 @@ import ( firebase "firebase.google.com/go" "firebase.google.com/go/messaging" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" "google.golang.org/api/option" ) diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go index 5a9a93ad1..df11572d3 100644 --- a/internal/push/offlinepush/getui/push.go +++ b/internal/push/offlinepush/getui/push.go @@ -23,15 +23,14 @@ import ( "sync" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils/splitter" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" http2 "github.com/openimsdk/open-im-server/v3/pkg/common/http" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/splitter" ) var ( diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index b53fb236f..955fd475e 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -21,10 +21,10 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbchat "github.com/OpenIMSDK/protocol/msg" pbpush "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" kfk "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" ) diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index cafef3e06..3e0d140aa 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -19,14 +19,14 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbpush "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index ee65a419a..f9094ee55 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -24,10 +24,6 @@ import ( "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/msggateway" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/dummy" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/fcm" @@ -40,6 +36,10 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" "golang.org/x/sync/errgroup" "google.golang.org/grpc" ) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 713f31ed5..7daa6d782 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -20,17 +20,17 @@ import ( pbauth "github.com/OpenIMSDK/protocol/auth" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" - "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/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "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" "google.golang.org/grpc" ) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 45fbbde21..9a79c8b99 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -22,11 +22,6 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbconversation "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -36,6 +31,11 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index cdddea682..01fd55f95 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -19,10 +19,10 @@ import ( "time" pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/mcontext" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/mcontext" ) func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbfriend.GetPaginationBlacksReq) (resp *pbfriend.GetPaginationBlacksResp, err error) { diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index bb1b3b416..3e0964d59 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -18,10 +18,10 @@ import ( "context" pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/utils" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/utils" ) func CallbackBeforeAddFriend(ctx context.Context, callback *config.Callback, req *pbfriend.ApplyToAddFriendReq) error { diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 03fd0d6c4..971297864 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -20,10 +20,6 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/protocol/sdkws" - registry "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" @@ -34,6 +30,10 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + registry "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 3ffd94b46..73a4b3523 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -22,14 +22,14 @@ import ( "github.com/OpenIMSDK/protocol/group" pbgroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) type GroupEventCallbackConfig struct { diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go index e4c18bb17..f55a24a36 100644 --- a/internal/rpc/group/db_map.go +++ b/internal/rpc/group/db_map.go @@ -20,7 +20,7 @@ import ( pbgroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/mcontext" + "github.com/openimsdk/tools/mcontext" ) func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[string]any { diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index e3a83595d..069c5c508 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -28,13 +28,6 @@ import ( pbgroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/mw/specialerror" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -48,6 +41,13 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/grouphash" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/mw/specialerror" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/internal/rpc/group/statistics.go b/internal/rpc/group/statistics.go index f40af4778..4c01215b4 100644 --- a/internal/rpc/group/statistics.go +++ b/internal/rpc/group/statistics.go @@ -19,7 +19,7 @@ import ( "time" "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) func (s *groupServer) GroupCreateCount(ctx context.Context, req *group.GroupCreateCountReq) (*group.GroupCreateCountResp, error) { diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index 1d3fd85a6..073fc2f31 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -19,7 +19,7 @@ import ( "errors" pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) func (s *groupServer) GetJoinedSuperGroupList(context.Context, *pbgroup.GetJoinedSuperGroupListReq) (*pbgroup.GetJoinedSuperGroupListResp, error) { diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 345d2916e..c5df3e89c 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -20,11 +20,10 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - utils2 "github.com/OpenIMSDK/tools/utils" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + utils2 "github.com/openimsdk/tools/utils" ) func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *msg.GetConversationsHasReadAndMaxSeqReq) (resp *msg.GetConversationsHasReadAndMaxSeqResp, err error) { diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index 31547c5d9..a8a6d56d7 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -20,12 +20,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbchat "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" ) diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index 5669550a0..d91bc9fad 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -21,9 +21,9 @@ import ( "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) func (m *msgServer) getMinSeqs(maxSeqs map[string]int64) map[string]int64 { diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index 97eac613d..4acaa18b6 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -20,8 +20,8 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" ) type MessageInterceptorFunc func(ctx context.Context, globalConfig *config.GlobalConfig, req *msg.SendMsgReq) (*sdkws.MsgData, error) diff --git a/internal/rpc/msg/msg_status.go b/internal/rpc/msg/msg_status.go index 80c5833a5..67355d505 100644 --- a/internal/rpc/msg/msg_status.go +++ b/internal/rpc/msg/msg_status.go @@ -19,7 +19,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbmsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/mcontext" + "github.com/openimsdk/tools/mcontext" ) func (m *msgServer) SetSendMsgStatus( diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index e27076eb9..b0167abcb 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -22,12 +22,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.RevokeMsgResp, error) { diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index 64aa0fce7..f910b3f8c 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -22,12 +22,12 @@ import ( pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) func (m *msgServer) SendMsg(ctx context.Context, req *pbmsg.SendMsgReq) (resp *pbmsg.SendMsgResp, error error) { diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 64e7be1b5..ea1a83273 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -19,13 +19,13 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/internal/rpc/msg/statistics.go b/internal/rpc/msg/statistics.go index e62954dea..5a89193f8 100644 --- a/internal/rpc/msg/statistics.go +++ b/internal/rpc/msg/statistics.go @@ -20,8 +20,8 @@ import ( "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/utils" ) func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) { diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go index 4b0103d2c..9766a947c 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -20,10 +20,10 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) { diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index 48665562a..c30bfa5b7 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -17,9 +17,8 @@ package msg import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/utils" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index 53510d058..8d9b268d4 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -23,10 +23,10 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) var ExcludeContentType = []int{constant.HasReadReceipt} diff --git a/internal/rpc/third/log.go b/internal/rpc/third/log.go index e4280935c..450633717 100644 --- a/internal/rpc/third/log.go +++ b/internal/rpc/third/log.go @@ -22,11 +22,11 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/utils" - utils2 "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils" + utils2 "github.com/openimsdk/tools/utils" ) func genLogID() string { diff --git a/internal/rpc/third/s3.go b/internal/rpc/third/s3.go index 2e639c98e..5886ab13d 100644 --- a/internal/rpc/third/s3.go +++ b/internal/rpc/third/s3.go @@ -24,14 +24,14 @@ import ( "time" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/google/uuid" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) func (t *thirdServer) PartLimit(ctx context.Context, req *third.PartLimitReq) (*third.PartLimitResp, error) { diff --git a/internal/rpc/third/third.go b/internal/rpc/third/third.go index d76920248..e38fd7f9b 100644 --- a/internal/rpc/third/third.go +++ b/internal/rpc/third/third.go @@ -21,8 +21,6 @@ import ( "time" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" @@ -33,6 +31,8 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" "google.golang.org/grpc" ) diff --git a/internal/rpc/third/tool.go b/internal/rpc/third/tool.go index 46207067d..ddeba8bc5 100644 --- a/internal/rpc/third/tool.go +++ b/internal/rpc/third/tool.go @@ -22,9 +22,9 @@ import ( "unicode/utf8" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mcontext" "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mcontext" ) func toPbMapArray(m map[string][]string) []*third.KeyValues { diff --git a/internal/rpc/user/callback.go b/internal/rpc/user/callback.go index 34f211973..45932901c 100644 --- a/internal/rpc/user/callback.go +++ b/internal/rpc/user/callback.go @@ -18,10 +18,10 @@ import ( "context" pbuser "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/utils" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/tools/utils" ) func CallbackBeforeUpdateUserInfo(ctx context.Context, globalConfig *config.GlobalConfig, req *pbuser.UpdateUserInfoReq) error { diff --git a/internal/rpc/user/statistics.go b/internal/rpc/user/statistics.go index 49129f52d..9464c9839 100644 --- a/internal/rpc/user/statistics.go +++ b/internal/rpc/user/statistics.go @@ -19,7 +19,7 @@ import ( "time" pbuser "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) func (s *userServer) UserRegisterCount( diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 6a5e4f0e0..43b6cc68f 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -24,12 +24,6 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" pbuser "github.com/OpenIMSDK/protocol/user" - registry "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" @@ -41,6 +35,12 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + registry "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index d272c4dc6..906351490 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -20,10 +20,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) // func (c *MsgTool) ConversationsDestructMsgs() { diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index cd92b6725..ff8c6b70c 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -16,17 +16,15 @@ package tools import ( "context" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "os" "os/signal" "syscall" "time" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/redis/go-redis/v9" - "github.com/robfig/cron/v3" + "github.com/openimsdk/tools/errs" ) func StartTask(ctx context.Context, config *config.GlobalConfig) error { diff --git a/internal/tools/cron_task_test.go b/internal/tools/cron_task_test.go index 4951420c0..fa2fad090 100644 --- a/internal/tools/cron_task_test.go +++ b/internal/tools/cron_task_test.go @@ -23,11 +23,7 @@ import ( "testing" "time" - "github.com/OpenIMSDK/tools/errs" - "gopkg.in/yaml.v3" - - "github.com/redis/go-redis/v9" - "github.com/robfig/cron/v3" + "github.com/openimsdk/tools/errs" "github.com/stretchr/testify/assert" "github.com/openimsdk/open-im-server/v3/pkg/common/config" diff --git a/internal/tools/msg.go b/internal/tools/msg.go index e9fb7e4f0..51dd12856 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -21,12 +21,6 @@ import ( "math/rand" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/mw" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" @@ -35,7 +29,12 @@ import ( kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/tools/msg_doc_convert.go b/internal/tools/msg_doc_convert.go index eea1b69e8..1968c4b67 100644 --- a/internal/tools/msg_doc_convert.go +++ b/internal/tools/msg_doc_convert.go @@ -16,9 +16,9 @@ package tools import ( "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" ) func (c *MsgTool) convertTools() { diff --git a/pkg/authverify/token.go b/pkg/authverify/token.go index 4a5d9b237..21feec59e 100644 --- a/pkg/authverify/token.go +++ b/pkg/authverify/token.go @@ -18,12 +18,11 @@ import ( "context" "fmt" - "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" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/tokenverify" + "github.com/openimsdk/tools/utils" ) func Secret(secret string) jwt.Keyfunc { diff --git a/pkg/callbackstruct/common.go b/pkg/callbackstruct/common.go index c58b9e415..b4c68d1e5 100644 --- a/pkg/callbackstruct/common.go +++ b/pkg/callbackstruct/common.go @@ -14,7 +14,7 @@ package callbackstruct -import "github.com/OpenIMSDK/tools/errs" +import "github.com/openimsdk/tools/errs" const ( Next = 1 diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 54be8ef2f..7a162b613 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -18,10 +18,10 @@ import ( "fmt" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/open-im-server/v3/pkg/common/config" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 2e593053e..ff5a4318a 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -19,11 +19,11 @@ import ( "errors" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" "github.com/spf13/cobra" "google.golang.org/grpc" ) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 673b3c87b..0acb86212 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -18,9 +18,8 @@ import ( "bytes" "time" - "github.com/OpenIMSDK/tools/discoveryregistry" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" - "gopkg.in/yaml.v3" + "github.com/openimsdk/tools/discoveryregistry" ) var Config GlobalConfig diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index 402a7c175..304169bd9 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -20,10 +20,9 @@ import ( "path/filepath" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" - "gopkg.in/yaml.v3" + "github.com/openimsdk/tools/errs" ) //go:embed version diff --git a/pkg/common/convert/conversation.go b/pkg/common/convert/conversation.go index b3f4913eb..e73499b39 100644 --- a/pkg/common/convert/conversation.go +++ b/pkg/common/convert/conversation.go @@ -16,8 +16,8 @@ package convert import ( "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/utils" ) func ConversationDB2Pb(conversationDB *relation.ConversationModel) *conversation.Conversation { diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go index ab89e6872..90fc7cc34 100644 --- a/pkg/common/convert/friend.go +++ b/pkg/common/convert/friend.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/utils" ) func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel { diff --git a/pkg/common/db/cache/black.go b/pkg/common/db/cache/black.go index a5304b4b0..166790f04 100644 --- a/pkg/common/db/cache/black.go +++ b/pkg/common/db/cache/black.go @@ -18,12 +18,11 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/log" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/log" ) const ( diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index 166fc7774..e1879b02b 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -20,13 +20,12 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) const ( diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index bcb6560ad..3835e0160 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -18,13 +18,12 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) const ( diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index b4e5e5a9a..b83be2028 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -20,14 +20,13 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" ) const ( diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go index c58647549..35b084256 100644 --- a/pkg/common/db/cache/init_redis.go +++ b/pkg/common/db/cache/init_redis.go @@ -18,15 +18,14 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "os" "strings" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mw/specialerror" "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mw/specialerror" ) var ( diff --git a/pkg/common/db/cache/meta_cache.go b/pkg/common/db/cache/meta_cache.go index 7173fc59b..ac5fc4d21 100644 --- a/pkg/common/db/cache/meta_cache.go +++ b/pkg/common/db/cache/meta_cache.go @@ -21,12 +21,11 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mw/specialerror" - "github.com/OpenIMSDK/tools/utils" "github.com/dtm-labs/rockscache" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mw/specialerror" + "github.com/openimsdk/tools/utils" ) const ( diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index a5b4817ef..acbf48d48 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -22,13 +22,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/gogo/protobuf/jsonpb" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "golang.org/x/sync/errgroup" ) diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 123788170..ea4a76a36 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -24,13 +24,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) const ( diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index ddb4d942e..9e764c64a 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -18,12 +18,10 @@ import ( "context" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/tokenverify" - "github.com/golang-jwt/jwt/v4" - "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/tokenverify" ) type AuthDatabase interface { diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index 427194ecd..d64a7dcfa 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -17,9 +17,9 @@ package controller import ( "context" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 34cd5109e..ab2a8a465 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 7d652b26a..8f2c38c4c 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -20,12 +20,12 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 2f2a972e4..0f82e6d21 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -19,14 +19,12 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" "github.com/dtm-labs/rockscache" - "github.com/redis/go-redis/v9" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" ) type GroupDatabase interface { diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 3f698f1a6..6c8680413 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -23,10 +23,9 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "go.mongodb.org/mongo-driver/mongo" "github.com/openimsdk/open-im-server/v3/pkg/common/config" diff --git a/pkg/common/db/controller/msg_test.go b/pkg/common/db/controller/msg_test.go index 4e64211e0..d66ef8aae 100644 --- a/pkg/common/db/controller/msg_test.go +++ b/pkg/common/db/controller/msg_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "go.mongodb.org/mongo-driver/bson" diff --git a/pkg/common/db/controller/third.go b/pkg/common/db/controller/third.go index 55c047bd6..a031244c6 100644 --- a/pkg/common/db/controller/third.go +++ b/pkg/common/db/controller/third.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 63528b513..8ff990e2d 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/pagination" - "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/pagination" + "github.com/openimsdk/tools/tx" + "github.com/openimsdk/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/mgo/black.go b/pkg/common/db/mgo/black.go index c555e0b77..d115cfb6e 100644 --- a/pkg/common/db/mgo/black.go +++ b/pkg/common/db/mgo/black.go @@ -17,9 +17,9 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/conversation.go b/pkg/common/db/mgo/conversation.go index 4b9de9154..23191bc32 100644 --- a/pkg/common/db/mgo/conversation.go +++ b/pkg/common/db/mgo/conversation.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/friend.go b/pkg/common/db/mgo/friend.go index aa7775ce0..3238909df 100644 --- a/pkg/common/db/mgo/friend.go +++ b/pkg/common/db/mgo/friend.go @@ -17,9 +17,9 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/friend_request.go b/pkg/common/db/mgo/friend_request.go index 3e0588a0b..19f0feb3e 100644 --- a/pkg/common/db/mgo/friend_request.go +++ b/pkg/common/db/mgo/friend_request.go @@ -17,9 +17,9 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/group.go b/pkg/common/db/mgo/group.go index 07c5394e2..7582e131a 100644 --- a/pkg/common/db/mgo/group.go +++ b/pkg/common/db/mgo/group.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/group_member.go b/pkg/common/db/mgo/group_member.go index 20671ead8..5a410e510 100644 --- a/pkg/common/db/mgo/group_member.go +++ b/pkg/common/db/mgo/group_member.go @@ -18,10 +18,10 @@ import ( "context" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/group_request.go b/pkg/common/db/mgo/group_request.go index 9aee0e960..94e4b7862 100644 --- a/pkg/common/db/mgo/group_request.go +++ b/pkg/common/db/mgo/group_request.go @@ -17,10 +17,10 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/log.go b/pkg/common/db/mgo/log.go index ca28d5964..8b760d749 100644 --- a/pkg/common/db/mgo/log.go +++ b/pkg/common/db/mgo/log.go @@ -18,9 +18,9 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/object.go b/pkg/common/db/mgo/object.go index e9d639f19..f97d287ad 100644 --- a/pkg/common/db/mgo/object.go +++ b/pkg/common/db/mgo/object.go @@ -17,9 +17,9 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/user.go b/pkg/common/db/mgo/user.go index 9ca2eb178..350c34662 100644 --- a/pkg/common/db/mgo/user.go +++ b/pkg/common/db/mgo/user.go @@ -19,10 +19,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mgoutil" - "github.com/OpenIMSDK/tools/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mgoutil" + "github.com/openimsdk/tools/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index 27abbc8e4..7eea22d18 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/google/uuid" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) func New(cache cache.S3Cache, impl s3.Interface) *Controller { diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go index 9852d2a98..1d1d94c25 100644 --- a/pkg/common/db/s3/cos/cos.go +++ b/pkg/common/db/s3/cos/cos.go @@ -29,9 +29,8 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" - "github.com/tencentyun/cos-go-sdk-v5" + "github.com/openimsdk/tools/errs" ) const ( diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 10526998f..7ff9df1a3 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -29,13 +29,12 @@ import ( "time" "unsafe" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/signer" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) const ( diff --git a/pkg/common/db/s3/minio/thumbnail.go b/pkg/common/db/s3/minio/thumbnail.go index f75281671..30252cd9f 100644 --- a/pkg/common/db/s3/minio/thumbnail.go +++ b/pkg/common/db/s3/minio/thumbnail.go @@ -28,11 +28,10 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/minio/minio-go/v7" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) func (m *Minio) getImageThumbnailURL(ctx context.Context, name string, expire time.Duration, opt *s3.Image) (string, error) { diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go index a43897b0d..5ca72fb47 100644 --- a/pkg/common/db/s3/oss/oss.go +++ b/pkg/common/db/s3/oss/oss.go @@ -30,9 +30,9 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/errs" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/tools/errs" ) const ( diff --git a/pkg/common/db/table/relation/black.go b/pkg/common/db/table/relation/black.go index 073a2f17e..ce890a7e3 100644 --- a/pkg/common/db/table/relation/black.go +++ b/pkg/common/db/table/relation/black.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type BlackModel struct { diff --git a/pkg/common/db/table/relation/conversation.go b/pkg/common/db/table/relation/conversation.go index 583e41c0f..455ab4663 100644 --- a/pkg/common/db/table/relation/conversation.go +++ b/pkg/common/db/table/relation/conversation.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type ConversationModel struct { diff --git a/pkg/common/db/table/relation/friend.go b/pkg/common/db/table/relation/friend.go index 73f7454df..af9e59b09 100644 --- a/pkg/common/db/table/relation/friend.go +++ b/pkg/common/db/table/relation/friend.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) // FriendModel represents the data structure for a friend relationship in MongoDB. diff --git a/pkg/common/db/table/relation/friend_request.go b/pkg/common/db/table/relation/friend_request.go index 8dceb0778..0959a5127 100644 --- a/pkg/common/db/table/relation/friend_request.go +++ b/pkg/common/db/table/relation/friend_request.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type FriendRequestModel struct { diff --git a/pkg/common/db/table/relation/group.go b/pkg/common/db/table/relation/group.go index 1f969cd4f..0d31c427f 100644 --- a/pkg/common/db/table/relation/group.go +++ b/pkg/common/db/table/relation/group.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type GroupModel struct { diff --git a/pkg/common/db/table/relation/group_member.go b/pkg/common/db/table/relation/group_member.go index e77d77e28..108de7c01 100644 --- a/pkg/common/db/table/relation/group_member.go +++ b/pkg/common/db/table/relation/group_member.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type GroupMemberModel struct { diff --git a/pkg/common/db/table/relation/group_request.go b/pkg/common/db/table/relation/group_request.go index 39999d799..0ef09bcfe 100644 --- a/pkg/common/db/table/relation/group_request.go +++ b/pkg/common/db/table/relation/group_request.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type GroupRequestModel struct { diff --git a/pkg/common/db/table/relation/log.go b/pkg/common/db/table/relation/log.go index ba63c0c2b..1b7f430ec 100644 --- a/pkg/common/db/table/relation/log.go +++ b/pkg/common/db/table/relation/log.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type LogModel struct { diff --git a/pkg/common/db/table/relation/user.go b/pkg/common/db/table/relation/user.go index 6c87372e9..cc0699c9b 100644 --- a/pkg/common/db/table/relation/user.go +++ b/pkg/common/db/table/relation/user.go @@ -19,7 +19,7 @@ import ( "time" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/pagination" + "github.com/openimsdk/tools/pagination" ) type UserModel struct { diff --git a/pkg/common/db/table/relation/utils.go b/pkg/common/db/table/relation/utils.go index 380f2410e..4599d6a98 100644 --- a/pkg/common/db/table/relation/utils.go +++ b/pkg/common/db/table/relation/utils.go @@ -15,7 +15,7 @@ package relation import ( - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/utils" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index d0f013c91..fa2c3c766 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -17,15 +17,15 @@ package unrelation import ( "context" "fmt" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "os" "strings" "time" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mw/specialerror" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mw/specialerror" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index 7a77db47a..22dc1aa0c 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -24,9 +24,9 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/unrelation/msg_convert.go b/pkg/common/db/unrelation/msg_convert.go index 30c74e927..7d90bab7c 100644 --- a/pkg/common/db/unrelation/msg_convert.go +++ b/pkg/common/db/unrelation/msg_convert.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/OpenIMSDK/tools/log" table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/log" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/pkg/common/db/unrelation/super_group.go b/pkg/common/db/unrelation/super_group.go index 64c44ed54..80b5ee1c3 100644 --- a/pkg/common/db/unrelation/super_group.go +++ b/pkg/common/db/unrelation/super_group.go @@ -22,7 +22,7 @@ package unrelation // "go.mongodb.org/mongo-driver/mongo" // "go.mongodb.org/mongo-driver/mongo/options" // -// "github.com/OpenIMSDK/tools/utils" +// "github.com/openimsdk/tools/utils" // // "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" //) diff --git a/pkg/common/db/unrelation/user.go b/pkg/common/db/unrelation/user.go index ea0688800..7d1662ee4 100644 --- a/pkg/common/db/unrelation/user.go +++ b/pkg/common/db/unrelation/user.go @@ -17,8 +17,8 @@ package unrelation import ( "context" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/discoveryregister/direct/directResolver.go b/pkg/common/discoveryregister/direct/directResolver.go index a706ce5e4..821378277 100644 --- a/pkg/common/discoveryregister/direct/directResolver.go +++ b/pkg/common/discoveryregister/direct/directResolver.go @@ -19,7 +19,7 @@ import ( "math/rand" "strings" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "google.golang.org/grpc/resolver" ) diff --git a/pkg/common/discoveryregister/direct/directconn.go b/pkg/common/discoveryregister/direct/directconn.go index bdf8b7622..c5ecd0ad5 100644 --- a/pkg/common/discoveryregister/direct/directconn.go +++ b/pkg/common/discoveryregister/direct/directconn.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" - "github.com/OpenIMSDK/tools/errs" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/pkg/common/discoveryregister/discoveryregister.go b/pkg/common/discoveryregister/discoveryregister.go index 17f45487b..f83aa49d2 100644 --- a/pkg/common/discoveryregister/discoveryregister.go +++ b/pkg/common/discoveryregister/discoveryregister.go @@ -18,12 +18,12 @@ import ( "errors" "os" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct" "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/kubernetes" "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/zookeeper" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" ) // NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type. diff --git a/pkg/common/discoveryregister/discoveryregister_test.go b/pkg/common/discoveryregister/discoveryregister_test.go index 08aa5d5d5..d9306331e 100644 --- a/pkg/common/discoveryregister/discoveryregister_test.go +++ b/pkg/common/discoveryregister/discoveryregister_test.go @@ -20,7 +20,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/OpenIMSDK/tools/discoveryregistry" + "github.com/openimsdk/tools/discoveryregistry" "github.com/stretchr/testify/assert" ) diff --git a/pkg/common/discoveryregister/kubernetes/kubernetes.go b/pkg/common/discoveryregister/kubernetes/kubernetes.go index 83af53db0..29a498b0b 100644 --- a/pkg/common/discoveryregister/kubernetes/kubernetes.go +++ b/pkg/common/discoveryregister/kubernetes/kubernetes.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/log" "github.com/stathat/consistent" "google.golang.org/grpc" ) diff --git a/pkg/common/discoveryregister/zookeeper/zookeeper.go b/pkg/common/discoveryregister/zookeeper/zookeeper.go index 93d959100..a3fa2aa81 100644 --- a/pkg/common/discoveryregister/zookeeper/zookeeper.go +++ b/pkg/common/discoveryregister/zookeeper/zookeeper.go @@ -15,14 +15,15 @@ package zookeeper import ( + "fmt" "os" "strings" "time" - "github.com/OpenIMSDK/tools/discoveryregistry" - openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/discoveryregistry" + openkeeper "github.com/openimsdk/tools/discoveryregistry/zookeeper" + "github.com/openimsdk/tools/errs" ) // NewZookeeperDiscoveryRegister creates a new instance of ZookeeperDR for Zookeeper service discovery and registration. @@ -42,13 +43,13 @@ func NewZookeeperDiscoveryRegister(zkConf *config.Zookeeper) (discoveryregistry. // openkeeper.WithLogger(log.NewZkLogger()), ) if err != nil { - //uriFormat := "address:%s, username:%s, password:%s, schema:%s." - //errInfo := fmt.Sprintf(uriFormat, - // zkConf.ZkAddr, - // zkConf.Username, - // zkConf.Password, - // zkConf.Schema) - return nil, errs.Wrap(err) + uriFormat := "address:%s, username:%s, password:%s, schema:%s." + errInfo := fmt.Sprintf(uriFormat, + zkConf.ZkAddr, + zkConf.Username, + zkConf.Password, + zkConf.Schema) + return nil, errs.WrapMsg(err, errInfo) } return zk, nil } diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index 511334b0e..f0c99e8e5 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -23,10 +23,10 @@ import ( "time" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) var ( diff --git a/pkg/common/kafka/consumer.go b/pkg/common/kafka/consumer.go index 6f64109d8..90d386911 100644 --- a/pkg/common/kafka/consumer.go +++ b/pkg/common/kafka/consumer.go @@ -18,8 +18,8 @@ import ( "sync" "github.com/IBM/sarama" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" ) type Consumer struct { diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go index 5489201f9..ce8d65ab9 100644 --- a/pkg/common/kafka/consumer_group.go +++ b/pkg/common/kafka/consumer_group.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/IBM/sarama" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) type MConsumerGroup struct { diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index 22afb0976..cab18263b 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -24,9 +24,9 @@ import ( "github.com/IBM/sarama" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" "google.golang.org/protobuf/proto" ) diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 6e521c2aa..910db18e7 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -18,7 +18,7 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" "net" "net/http" "os" @@ -28,11 +28,11 @@ import ( "syscall" "time" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/mw" - "github.com/OpenIMSDK/tools/network" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/network" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" diff --git a/pkg/common/tls/tls.go b/pkg/common/tls/tls.go index 4c257cd34..6c556f27f 100755 --- a/pkg/common/tls/tls.go +++ b/pkg/common/tls/tls.go @@ -21,7 +21,7 @@ import ( "errors" "os" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) // decryptPEM decrypts a PEM block using a password. diff --git a/pkg/msgprocessor/conversation.go b/pkg/msgprocessor/conversation.go index e3ea89fad..0db2cd9e3 100644 --- a/pkg/msgprocessor/conversation.go +++ b/pkg/msgprocessor/conversation.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rpccache/conversation.go b/pkg/rpccache/conversation.go index 027ef42fa..9fa2627ef 100644 --- a/pkg/rpccache/conversation.go +++ b/pkg/rpccache/conversation.go @@ -18,13 +18,12 @@ import ( "context" pbconversation "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) func NewConversationLocalCache(client rpcclient.ConversationRpcClient, cli redis.UniversalClient) *ConversationLocalCache { diff --git a/pkg/rpccache/friend.go b/pkg/rpccache/friend.go index 35122fff5..0815e8c62 100644 --- a/pkg/rpccache/friend.go +++ b/pkg/rpccache/friend.go @@ -17,12 +17,11 @@ package rpccache import ( "context" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/log" ) func NewFriendLocalCache(client rpcclient.FriendRpcClient, cli redis.UniversalClient) *FriendLocalCache { diff --git a/pkg/rpccache/group.go b/pkg/rpccache/group.go index 402f63185..9d238a64e 100644 --- a/pkg/rpccache/group.go +++ b/pkg/rpccache/group.go @@ -18,13 +18,12 @@ import ( "context" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) func NewGroupLocalCache(client rpcclient.GroupRpcClient, cli redis.UniversalClient) *GroupLocalCache { diff --git a/pkg/rpccache/subscriber.go b/pkg/rpccache/subscriber.go index cd65094e2..ca95e18e0 100644 --- a/pkg/rpccache/subscriber.go +++ b/pkg/rpccache/subscriber.go @@ -18,8 +18,7 @@ import ( "context" "encoding/json" - "github.com/OpenIMSDK/tools/log" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/log" ) func subscriberRedisDeleteCache(ctx context.Context, client redis.UniversalClient, channel string, del func(ctx context.Context, key ...string)) { diff --git a/pkg/rpccache/user.go b/pkg/rpccache/user.go index c48b05821..907a3d46e 100644 --- a/pkg/rpccache/user.go +++ b/pkg/rpccache/user.go @@ -18,13 +18,12 @@ import ( "context" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" - "github.com/redis/go-redis/v9" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" ) func NewUserLocalCache(client rpcclient.UserRpcClient, cli redis.UniversalClient) *UserLocalCache { diff --git a/pkg/rpcclient/auth.go b/pkg/rpcclient/auth.go index 3fceb6123..0e74eb69d 100644 --- a/pkg/rpcclient/auth.go +++ b/pkg/rpcclient/auth.go @@ -18,8 +18,8 @@ import ( "context" "github.com/OpenIMSDK/protocol/auth" - "github.com/OpenIMSDK/tools/discoveryregistry" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index 627388998..81c92c0e3 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -19,10 +19,10 @@ import ( "fmt" pbconversation "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/friend.go b/pkg/rpcclient/friend.go index 066766e89..41c15f00a 100644 --- a/pkg/rpcclient/friend.go +++ b/pkg/rpcclient/friend.go @@ -19,8 +19,8 @@ import ( "github.com/OpenIMSDK/protocol/friend" sdkws "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/group.go b/pkg/rpcclient/group.go index e5ae794cf..098f58ac7 100644 --- a/pkg/rpcclient/group.go +++ b/pkg/rpcclient/group.go @@ -21,10 +21,10 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/utils" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils" ) type Group struct { diff --git a/pkg/rpcclient/grouphash/grouphash.go b/pkg/rpcclient/grouphash/grouphash.go index dee47ad44..c9f066810 100644 --- a/pkg/rpcclient/grouphash/grouphash.go +++ b/pkg/rpcclient/grouphash/grouphash.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/tools/utils" ) func NewGroupHashFromGroupClient(x group.GroupClient) *GroupHash { diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index e201ef7fc..e965fd9da 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -22,12 +22,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rpcclient/notification/friend.go b/pkg/rpcclient/notification/friend.go index 59428e9ad..bef9a7043 100644 --- a/pkg/rpcclient/notification/friend.go +++ b/pkg/rpcclient/notification/friend.go @@ -20,12 +20,12 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/mcontext" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/mcontext" ) type FriendNotificationSender struct { diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index aec459003..052479b48 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -21,15 +21,15 @@ import ( "github.com/OpenIMSDK/protocol/constant" pbgroup "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils" ) func NewGroupNotificationSender(db controller.GroupDatabase, msgRpcClient *rpcclient.MessageRpcClient, userRpcClient *rpcclient.UserRpcClient, config *config.GlobalConfig, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender { diff --git a/pkg/rpcclient/push.go b/pkg/rpcclient/push.go index 27afb533c..9253093da 100644 --- a/pkg/rpcclient/push.go +++ b/pkg/rpcclient/push.go @@ -18,8 +18,8 @@ import ( "context" "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/tools/discoveryregistry" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 3bfd0ab82..8ce98b6df 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -18,8 +18,8 @@ import ( "context" "github.com/OpenIMSDK/protocol/third" - "github.com/OpenIMSDK/tools/discoveryregistry" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 0fd2b3003..cdfc8c69e 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -20,12 +20,12 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/user" - "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/utils" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/discoveryregistry" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils" "google.golang.org/grpc" ) diff --git a/pkg/statistics/statistics.go b/pkg/statistics/statistics.go index 6dfc8155c..222fd5cbd 100644 --- a/pkg/statistics/statistics.go +++ b/pkg/statistics/statistics.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/tools/log" ) type Statistics struct { diff --git a/pkg/util/genutil/genutil.go b/pkg/util/genutil/genutil.go index 1781e3f3c..5fb2443a6 100644 --- a/pkg/util/genutil/genutil.go +++ b/pkg/util/genutil/genutil.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/errs" ) // OutDir creates the absolute path name from path and checks if the path exists and is a directory. diff --git a/tools/component/component.go b/tools/component/component.go index aad05a5cd..4ecac5d97 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -24,12 +24,10 @@ import ( "time" "github.com/IBM/sarama" - "gopkg.in/yaml.v2" - "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" - "github.com/OpenIMSDK/tools/component" - "github.com/OpenIMSDK/tools/errs" + "github.com/openimsdk/tools/component" + "github.com/openimsdk/tools/errs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" )