From 186952ab46f44ede509b1a8104a248efbf824654 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Thu, 7 Sep 2023 19:04:36 +0800 Subject: [PATCH] refactor: change project module name. (#1038) * fix: to start im or chat, ZooKeeper must be started first. * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: go mod update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: get all userID Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: msggateway add online status call Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * chore: network mode change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * feat: add api of get server time Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * feat: remove go work sum Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: pull message add isRead field Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: check msg-transfer script Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: start don't kill old process Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: check component Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: pull message set isRead only message come from single. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: add ex field to update group info. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change * cicd: robot automated Change * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change --------- Signed-off-by: Gordon <1432970085@qq.com> Signed-off-by: withchao <993506633@qq.com> Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: withchao <993506633@qq.com> Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com> Co-authored-by: FGadvancer --- cmd/openim-api/main.go | 8 +++---- cmd/openim-cmdutils/main.go | 2 +- cmd/openim-crontask/main.go | 4 ++-- cmd/openim-msggateway/main.go | 2 +- cmd/openim-msgtransfer/main.go | 2 +- cmd/openim-push/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-auth/main.go | 6 ++--- .../openim-rpc-conversation/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-friend/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-group/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-msg/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-third/main.go | 6 ++--- cmd/openim-rpc/openim-rpc-user/main.go | 6 ++--- go.mod | 2 +- go.work | 1 + internal/api/auth.go | 2 +- internal/api/conversation.go | 2 +- internal/api/friend.go | 2 +- internal/api/group.go | 2 +- internal/api/msg.go | 9 ++++---- internal/api/route.go | 12 +++++----- internal/api/statistics.go | 2 +- internal/api/third.go | 2 +- internal/api/user.go | 4 ++-- internal/msggateway/callback.go | 6 ++--- internal/msggateway/client.go | 2 +- internal/msggateway/hub_server.go | 10 ++++----- internal/msggateway/init.go | 2 +- internal/msggateway/message_handler.go | 2 +- internal/msggateway/n_ws_server.go | 8 +++---- internal/msgtransfer/init.go | 16 +++++++------- .../msgtransfer/online_history_msg_handler.go | 10 ++++----- .../online_msg_to_mongo_handler.go | 6 ++--- .../msgtransfer/persistent_msg_handler.go | 6 ++--- internal/push/callback.go | 6 ++--- internal/push/consumer_init.go | 2 +- internal/push/offlinepush/fcm/push.go | 8 +++---- internal/push/offlinepush/fcm/push_test.go | 4 ++-- internal/push/offlinepush/getui/body.go | 2 +- internal/push/offlinepush/getui/push.go | 8 +++---- .../offlinepush/jpush/body/notification.go | 2 +- internal/push/offlinepush/jpush/push.go | 8 +++---- internal/push/push_handler.go | 4 ++-- internal/push/push_rpc_server.go | 8 +++---- internal/push/push_to_client.go | 22 +++++++++---------- internal/rpc/auth/auth.go | 10 ++++----- internal/rpc/conversation/conversaion.go | 16 +++++++------- internal/rpc/friend/black.go | 6 ++--- internal/rpc/friend/callback.go | 6 ++--- internal/rpc/friend/friend.go | 16 +++++++------- internal/rpc/group/cache.go | 2 +- internal/rpc/group/callback.go | 10 ++++----- internal/rpc/group/convert.go | 2 +- internal/rpc/group/fill.go | 2 +- internal/rpc/group/group.go | 20 ++++++++--------- internal/rpc/group/super_group.go | 6 ++--- internal/rpc/msg/callback.go | 6 ++--- internal/rpc/msg/delete.go | 2 +- internal/rpc/msg/message_interceptor.go | 2 +- internal/rpc/msg/revoke.go | 6 ++--- internal/rpc/msg/send.go | 4 ++-- internal/rpc/msg/server.go | 12 +++++----- internal/rpc/msg/statistics.go | 2 +- internal/rpc/msg/sync_msg.go | 4 ++-- internal/rpc/msg/utils.go | 2 +- internal/rpc/msg/verify.go | 2 +- internal/rpc/third/s3.go | 6 ++--- internal/rpc/third/third.go | 20 ++++++++--------- internal/rpc/third/tool.go | 2 +- internal/rpc/user/user.go | 20 ++++++++--------- internal/tools/cron_task.go | 2 +- internal/tools/msg.go | 14 ++++++------ internal/tools/msg_doc_convert.go | 2 +- pkg/authverify/token.go | 2 +- pkg/callbackstruct/group.go | 2 +- pkg/common/cmd/msg_gateway.go | 2 +- pkg/common/cmd/msg_transfer.go | 2 +- pkg/common/cmd/msg_utils.go | 2 +- pkg/common/cmd/root.go | 4 ++-- pkg/common/cmd/rpc.go | 2 +- pkg/common/config/parse.go | 2 +- pkg/common/convert/black.go | 2 +- pkg/common/convert/conversation.go | 2 +- pkg/common/convert/friend.go | 2 +- pkg/common/convert/group.go | 2 +- pkg/common/convert/msg.go | 2 +- pkg/common/convert/user.go | 2 +- pkg/common/db/cache/black.go | 2 +- pkg/common/db/cache/conversation.go | 4 ++-- pkg/common/db/cache/friend.go | 2 +- pkg/common/db/cache/group.go | 4 ++-- pkg/common/db/cache/init_redis.go | 2 +- pkg/common/db/cache/msg.go | 6 ++--- pkg/common/db/cache/user.go | 2 +- pkg/common/db/controller/auth.go | 4 ++-- pkg/common/db/controller/black.go | 4 ++-- pkg/common/db/controller/chatlog.go | 2 +- pkg/common/db/controller/conversation.go | 6 ++--- pkg/common/db/controller/friend.go | 4 ++-- pkg/common/db/controller/group.go | 10 ++++----- pkg/common/db/controller/msg.go | 14 ++++++------ pkg/common/db/controller/msg_test.go | 6 ++--- pkg/common/db/controller/push.go | 2 +- pkg/common/db/controller/s3.go | 6 ++--- pkg/common/db/controller/third.go | 2 +- pkg/common/db/controller/user.go | 6 ++--- pkg/common/db/localcache/conversation.go | 2 +- pkg/common/db/localcache/group.go | 2 +- pkg/common/db/relation/black_model.go | 2 +- pkg/common/db/relation/chat_log_model.go | 2 +- pkg/common/db/relation/conversation_model.go | 2 +- pkg/common/db/relation/friend_model.go | 2 +- .../db/relation/friend_request_model.go | 2 +- pkg/common/db/relation/group_member_model.go | 2 +- pkg/common/db/relation/group_model.go | 2 +- pkg/common/db/relation/group_request_model.go | 2 +- pkg/common/db/relation/mysql_init.go | 2 +- pkg/common/db/relation/object_model.go | 2 +- pkg/common/db/relation/user_model.go | 2 +- pkg/common/db/s3/cont/controller.go | 2 +- pkg/common/db/s3/cont/error.go | 2 +- pkg/common/db/s3/cont/structs.go | 2 +- pkg/common/db/s3/cos/cos.go | 4 ++-- pkg/common/db/s3/minio/minio.go | 4 ++-- pkg/common/db/s3/oss/oss.go | 4 ++-- pkg/common/db/unrelation/mongo.go | 4 ++-- pkg/common/db/unrelation/msg.go | 2 +- pkg/common/db/unrelation/msg_convert.go | 2 +- pkg/common/db/unrelation/super_group.go | 2 +- pkg/common/db/unrelation/user.go | 2 +- pkg/common/http/http_client.go | 4 ++-- pkg/common/kafka/consumer.go | 2 +- pkg/common/kafka/consumer_group.go | 2 +- pkg/common/kafka/producer.go | 4 ++-- pkg/common/kafka/util.go | 4 ++-- pkg/common/locker/message_locker.go | 2 +- pkg/common/prome/prometheus.go | 2 +- pkg/common/startrpc/start.go | 2 +- pkg/common/tls/tls.go | 2 +- pkg/rpcclient/auth.go | 2 +- pkg/rpcclient/conversation.go | 2 +- pkg/rpcclient/friend.go | 2 +- pkg/rpcclient/group.go | 2 +- pkg/rpcclient/msg.go | 2 +- pkg/rpcclient/notification/conevrsation.go | 2 +- pkg/rpcclient/notification/friend.go | 8 +++---- pkg/rpcclient/notification/group.go | 8 +++---- pkg/rpcclient/notification/msg.go | 2 +- pkg/rpcclient/notification/user.go | 6 ++--- pkg/rpcclient/push.go | 2 +- pkg/rpcclient/third.go | 2 +- pkg/rpcclient/user.go | 4 ++-- test/data-conversion/mysql-conversion.go | 2 +- tools/changelog/go.mod | 2 +- tools/component/component.go | 11 +++++----- tools/component/component_test.go | 2 +- tools/component/go.mod | 2 +- tools/imctl/go.mod | 2 +- tools/imctl/internal/imctl/cmd/color/color.go | 4 ++-- .../imctl/cmd/completion/completion.go | 2 +- tools/imctl/internal/imctl/cmd/info/info.go | 4 ++-- tools/infra/go.mod | 2 +- tools/ncpu/go.mod | 2 +- tools/openim-web/go.mod | 2 +- tools/versionchecker/go.mod | 2 +- tools/yamlfmt/go.mod | 2 +- 166 files changed, 369 insertions(+), 366 deletions(-) diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index 42bb7d1ac9..cf452450c5 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -28,10 +28,10 @@ import ( openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/internal/api" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/internal/api" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) func main() { diff --git a/cmd/openim-cmdutils/main.go b/cmd/openim-cmdutils/main.go index 64079c7e19..058aa2e29c 100644 --- a/cmd/openim-cmdutils/main.go +++ b/cmd/openim-cmdutils/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" ) func main() { diff --git a/cmd/openim-crontask/main.go b/cmd/openim-crontask/main.go index 6fbb0558a7..3bd0d882bc 100644 --- a/cmd/openim-crontask/main.go +++ b/cmd/openim-crontask/main.go @@ -15,8 +15,8 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/tools" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/internal/tools" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" ) func main() { diff --git a/cmd/openim-msggateway/main.go b/cmd/openim-msggateway/main.go index 2782e4fd3e..f6870694bd 100644 --- a/cmd/openim-msggateway/main.go +++ b/cmd/openim-msggateway/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" ) func main() { diff --git a/cmd/openim-msgtransfer/main.go b/cmd/openim-msgtransfer/main.go index aef3477934..722bf5960e 100644 --- a/cmd/openim-msgtransfer/main.go +++ b/cmd/openim-msgtransfer/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" ) func main() { diff --git a/cmd/openim-push/main.go b/cmd/openim-push/main.go index 03db8ae034..6ab2fedab5 100644 --- a/cmd/openim-push/main.go +++ b/cmd/openim-push/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/push" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/push" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-auth/main.go b/cmd/openim-rpc/openim-rpc-auth/main.go index 524804988e..d27a3f11bc 100644 --- a/cmd/openim-rpc/openim-rpc-auth/main.go +++ b/cmd/openim-rpc/openim-rpc-auth/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/auth" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/auth" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-conversation/main.go b/cmd/openim-rpc/openim-rpc-conversation/main.go index fec8226f8e..80a92de924 100644 --- a/cmd/openim-rpc/openim-rpc-conversation/main.go +++ b/cmd/openim-rpc/openim-rpc-conversation/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/conversation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/conversation" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-friend/main.go b/cmd/openim-rpc/openim-rpc-friend/main.go index fbd44038e8..c0c91e4dcf 100644 --- a/cmd/openim-rpc/openim-rpc-friend/main.go +++ b/cmd/openim-rpc/openim-rpc-friend/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/friend" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/friend" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-group/main.go b/cmd/openim-rpc/openim-rpc-group/main.go index 06baac155f..d2d4f727a4 100644 --- a/cmd/openim-rpc/openim-rpc-group/main.go +++ b/cmd/openim-rpc/openim-rpc-group/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/group" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/group" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-msg/main.go b/cmd/openim-rpc/openim-rpc-msg/main.go index 356081d338..0ac258d0cc 100644 --- a/cmd/openim-rpc/openim-rpc-msg/main.go +++ b/cmd/openim-rpc/openim-rpc-msg/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/msg" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/msg" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-third/main.go b/cmd/openim-rpc/openim-rpc-third/main.go index c070e6811b..913962b82c 100644 --- a/cmd/openim-rpc/openim-rpc-third/main.go +++ b/cmd/openim-rpc/openim-rpc-third/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/third" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/third" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/cmd/openim-rpc/openim-rpc-user/main.go b/cmd/openim-rpc/openim-rpc-user/main.go index 6d6d9008d4..f2ebc94db5 100644 --- a/cmd/openim-rpc/openim-rpc-user/main.go +++ b/cmd/openim-rpc/openim-rpc-user/main.go @@ -15,9 +15,9 @@ package main import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/rpc/user" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/rpc/user" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func main() { diff --git a/go.mod b/go.mod index 8e146b7cce..43251a4cfc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server +module github.com/openimsdk/open-im-server/v3 go 1.18 diff --git a/go.work b/go.work index c95cb7e934..fd19bde42d 100644 --- a/go.work +++ b/go.work @@ -10,4 +10,5 @@ use ( ./tools/openim-web ./tools/versionchecker ./tools/yamlfmt + ./tools/component ) diff --git a/internal/api/auth.go b/internal/api/auth.go index 9dcc8f7c76..44a97a013a 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/auth" "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type AuthApi rpcclient.Auth diff --git a/internal/api/conversation.go b/internal/api/conversation.go index 9f25b5427d..4e068b7753 100644 --- a/internal/api/conversation.go +++ b/internal/api/conversation.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type ConversationApi rpcclient.Conversation diff --git a/internal/api/friend.go b/internal/api/friend.go index 2f708901ee..23f337a9f3 100644 --- a/internal/api/friend.go +++ b/internal/api/friend.go @@ -18,7 +18,7 @@ import ( "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/gin-gonic/gin" ) diff --git a/internal/api/group.go b/internal/api/group.go index 1dbca31261..e525cd4959 100644 --- a/internal/api/group.go +++ b/internal/api/group.go @@ -18,7 +18,7 @@ import ( "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/gin-gonic/gin" ) diff --git a/internal/api/msg.go b/internal/api/msg.go index e5a49199f2..2777d88558 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -15,13 +15,14 @@ package api import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/tools/mcontext" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" "github.com/mitchellh/mapstructure" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" @@ -31,8 +32,8 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/apistruct" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type MessageApi struct { diff --git a/internal/api/route.go b/internal/api/route.go index a118092c4f..e1722523b3 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -23,9 +23,9 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/tokenverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" @@ -38,9 +38,9 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.UniversalClient) *gin.Engine { diff --git a/internal/api/statistics.go b/internal/api/statistics.go index 9db38af4a8..5750a73153 100644 --- a/internal/api/statistics.go +++ b/internal/api/statistics.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/user" "github.com/OpenIMSDK/tools/a2r" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type StatisticsApi rpcclient.User diff --git a/internal/api/third.go b/internal/api/third.go index 44a492fc4d..dfc82d3169 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -26,7 +26,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type ThirdApi rpcclient.Third diff --git a/internal/api/user.go b/internal/api/user.go index bfa1d0df79..0a5a126989 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -25,8 +25,8 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type UserApi rpcclient.User diff --git a/internal/msggateway/callback.go b/internal/msggateway/callback.go index b2999f385e..d7320a304d 100644 --- a/internal/msggateway/callback.go +++ b/internal/msggateway/callback.go @@ -21,9 +21,9 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/mcontext" - cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + 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" ) func callBackURL() string { diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index 9f612e0211..8121535adc 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -21,7 +21,7 @@ import ( "runtime/debug" "sync" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "google.golang.org/protobuf/proto" diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index 1ebbb5902d..ae12c04a37 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -19,12 +19,12 @@ import ( "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/tools/errs" "google.golang.org/grpc" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" @@ -32,9 +32,9 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" ) func (s *Server) InitServer(disCov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 03fe9f581e..7a4b6d6adf 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error { diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index 6c26e59067..a8de5e0b53 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -27,7 +27,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type Req struct { diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index 22e04b0114..f437f9d8c5 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -25,13 +25,13 @@ import ( "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/redis/go-redis/v9" diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index c532b3c071..db48ead70b 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -26,14 +26,14 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "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/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type MsgTransfer struct { diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 1fc7ca9a13..e83939a4c0 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/tools/errs" @@ -35,10 +35,10 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/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/rpcclient" ) const ( diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index ac7dc6662d..8099d39d75 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -23,9 +23,9 @@ import ( pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/openimsdk/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" ) type OnlineHistoryMongoConsumerHandler struct { diff --git a/internal/msgtransfer/persistent_msg_handler.go b/internal/msgtransfer/persistent_msg_handler.go index 088960e5c0..d1f27f48f0 100644 --- a/internal/msgtransfer/persistent_msg_handler.go +++ b/internal/msgtransfer/persistent_msg_handler.go @@ -22,9 +22,9 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/openimsdk/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/IBM/sarama" "google.golang.org/protobuf/proto" diff --git a/internal/push/callback.go b/internal/push/callback.go index 996341ac1e..c646df3e28 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -23,9 +23,9 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/openimsdk/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" ) func url() string { diff --git a/internal/push/consumer_init.go b/internal/push/consumer_init.go index 3c07ab284f..8595c16560 100644 --- a/internal/push/consumer_init.go +++ b/internal/push/consumer_init.go @@ -15,7 +15,7 @@ package push import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" ) type Consumer struct { diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go index ffa5db4286..27e7dab188 100644 --- a/internal/push/offlinepush/fcm/push.go +++ b/internal/push/offlinepush/fcm/push.go @@ -18,7 +18,7 @@ import ( "context" "path/filepath" - config2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" firebase "firebase.google.com/go" "firebase.google.com/go/messaging" @@ -27,9 +27,9 @@ import ( "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/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" ) const SinglePushCountLimit = 400 diff --git a/internal/push/offlinepush/fcm/push_test.go b/internal/push/offlinepush/fcm/push_test.go index 856b75e0b0..96d8ad3a34 100644 --- a/internal/push/offlinepush/fcm/push_test.go +++ b/internal/push/offlinepush/fcm/push_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) func Test_Push(t *testing.T) { diff --git a/internal/push/offlinepush/getui/body.go b/internal/push/offlinepush/getui/body.go index 915c6f603c..218ed67b4c 100644 --- a/internal/push/offlinepush/getui/body.go +++ b/internal/push/offlinepush/getui/body.go @@ -17,7 +17,7 @@ package getui import ( "fmt" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Resp struct { diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go index b784af029d..1fd65647d5 100644 --- a/internal/push/offlinepush/getui/push.go +++ b/internal/push/offlinepush/getui/push.go @@ -30,10 +30,10 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils/splitter" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/openimsdk/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/OpenIMSDK/tools/utils" ) diff --git a/internal/push/offlinepush/jpush/body/notification.go b/internal/push/offlinepush/jpush/body/notification.go index cec7257840..ddf3802afe 100644 --- a/internal/push/offlinepush/jpush/body/notification.go +++ b/internal/push/offlinepush/jpush/body/notification.go @@ -15,7 +15,7 @@ package body import ( - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Notification struct { diff --git a/internal/push/offlinepush/jpush/push.go b/internal/push/offlinepush/jpush/push.go index 64933db504..44de7ff655 100644 --- a/internal/push/offlinepush/jpush/push.go +++ b/internal/push/offlinepush/jpush/push.go @@ -19,10 +19,10 @@ import ( "encoding/base64" "fmt" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush/body" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/jpush/body" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + http2 "github.com/openimsdk/open-im-server/v3/pkg/common/http" ) type JPush struct{} diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index 2ddb178008..91363282f0 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -26,8 +26,8 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + kfk "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" ) type ConsumerHandler struct { diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index b86ec23743..6e9c560231 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -25,10 +25,10 @@ import ( "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "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/localcache" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type pushServer struct { diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 690cd37f8c..edd03ce989 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -19,7 +19,7 @@ import ( "encoding/json" "errors" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msggateway" @@ -29,16 +29,16 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/fcm" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/getui" - "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/fcm" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/getui" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/jpush" + "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/localcache" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type Pusher struct { diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index c1fa0d6e6e..9580ef8db3 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -17,7 +17,7 @@ package auth import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "google.golang.org/grpc" @@ -31,10 +31,10 @@ import ( "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "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/rpcclient" ) type authServer struct { diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 093bddc353..9f97c3c67a 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -17,7 +17,7 @@ package conversation import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "google.golang.org/grpc" @@ -29,13 +29,13 @@ import ( "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + "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/relation" + tablerelation "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" ) type conversationServer struct { diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index 176b9ef8e2..b1a5ea6b5a 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -18,13 +18,13 @@ import ( "context" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func (s *friendServer) GetPaginationBlacks( diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index f29867bb07..bb687773e9 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -22,9 +22,9 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mcontext" - cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + 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" ) func CallbackBeforeAddFriend(ctx context.Context, req *pbfriend.ApplyToAddFriendReq) error { diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 7b753faa51..1524a7f273 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -19,12 +19,12 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "google.golang.org/grpc" @@ -35,11 +35,11 @@ import ( "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "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/relation" + tablerelation "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" ) type friendServer struct { diff --git a/internal/rpc/group/cache.go b/internal/rpc/group/cache.go index 40be7a18f8..23c57ff891 100644 --- a/internal/rpc/group/cache.go +++ b/internal/rpc/group/cache.go @@ -19,7 +19,7 @@ import ( pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" ) func (s *groupServer) GetGroupInfoCache( diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index cb49d6f747..6d92cfde24 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -25,11 +25,11 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + "github.com/openimsdk/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" ) func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) (err error) { diff --git a/internal/rpc/group/convert.go b/internal/rpc/group/convert.go index 6f75234ffd..2ee7f50561 100644 --- a/internal/rpc/group/convert.go +++ b/internal/rpc/group/convert.go @@ -17,7 +17,7 @@ package group import ( "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func (s *groupServer) groupDB2PB(group *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo { diff --git a/internal/rpc/group/fill.go b/internal/rpc/group/fill.go index e4d03de369..cb47d9f6ee 100644 --- a/internal/rpc/group/fill.go +++ b/internal/rpc/group/fill.go @@ -19,7 +19,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func (s *groupServer) FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationtb.GroupMemberModel, error) { diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b09743759d..507d83d81e 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -26,18 +26,18 @@ import ( "strings" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" pbconversation "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/protocol/wrapperspb" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/OpenIMSDK/tools/mw/specialerror" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "google.golang.org/grpc" @@ -50,11 +50,11 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "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/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" ) func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index d60a55db99..6cd1a29439 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -25,9 +25,9 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) func (s *groupServer) GetJoinedSuperGroupList( diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index ab037f6c1f..68586ba853 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -27,9 +27,9 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" + 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" ) func cbURL() string { diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index ff258eaaec..b5c23bed6e 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -17,7 +17,7 @@ package msg import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/conversation" diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index 2b41ccb510..bcb97d7d24 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type MessageInterceptorFunc func(ctx context.Context, req *msg.SendMsgReq) (*sdkws.MsgData, error) diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index 8977e5995e..151d29fc11 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -19,7 +19,7 @@ import ( "encoding/json" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" @@ -29,8 +29,8 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) 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 7e20a91485..2add9c0d15 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -17,7 +17,7 @@ package msg import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/protocol/constant" pbconversation "github.com/OpenIMSDK/protocol/conversation" @@ -29,7 +29,7 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - promepkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + promepkg "github.com/openimsdk/open-im-server/v3/pkg/common/prome" ) 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 3aa4033d72..e8f80914f6 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -24,12 +24,12 @@ import ( "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "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/localcache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type ( diff --git a/internal/rpc/msg/statistics.go b/internal/rpc/msg/statistics.go index 8465805989..ac09e3f69c 100644 --- a/internal/rpc/msg/statistics.go +++ b/internal/rpc/msg/statistics.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) 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 5eba8ae143..aaafb45bb3 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -17,8 +17,8 @@ package msg import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/msg" diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index 9753a3e017..115df99463 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func isMessageHasReadEnabled(msgData *sdkws.MsgData) bool { diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index de85775d87..2837cb944c 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -26,7 +26,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) var ExcludeContentType = []int{constant.HasReadReceipt} diff --git a/internal/rpc/third/s3.go b/internal/rpc/third/s3.go index 943cd5d541..984af88e16 100644 --- a/internal/rpc/third/s3.go +++ b/internal/rpc/third/s3.go @@ -19,7 +19,7 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/errs" @@ -27,8 +27,8 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) 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 8a2f91f6f8..221004bd51 100644 --- a/internal/rpc/third/third.go +++ b/internal/rpc/third/third.go @@ -20,22 +20,22 @@ import ( "net/url" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cos" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/minio" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/oss" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cos" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/minio" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss" "google.golang.org/grpc" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/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/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { diff --git a/internal/rpc/third/tool.go b/internal/rpc/third/tool.go index f81a7ccf20..a65d882dd5 100644 --- a/internal/rpc/third/tool.go +++ b/internal/rpc/third/tool.go @@ -21,7 +21,7 @@ import ( "strings" "unicode/utf8" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/errs" diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 32a3e314b4..443f70cae6 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -26,19 +26,19 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/tx" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" registry "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "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" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation" + tablerelation "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" pbuser "github.com/OpenIMSDK/protocol/user" "github.com/OpenIMSDK/tools/utils" diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index 0bc8b00a3a..6702bc6c70 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func StartTask() error { diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 3cbaa455c8..93f5c3a8a9 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -32,13 +32,13 @@ import ( "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" + "github.com/openimsdk/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/relation" + "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" ) type MsgTool struct { diff --git a/internal/tools/msg_doc_convert.go b/internal/tools/msg_doc_convert.go index 75ae36eda6..aa24d385fe 100644 --- a/internal/tools/msg_doc_convert.go +++ b/internal/tools/msg_doc_convert.go @@ -19,7 +19,7 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" ) func (c *MsgTool) ConvertTools() { diff --git a/pkg/authverify/token.go b/pkg/authverify/token.go index e508c75cb0..a8e577fdea 100644 --- a/pkg/authverify/token.go +++ b/pkg/authverify/token.go @@ -24,7 +24,7 @@ import ( "github.com/OpenIMSDK/tools/utils" "github.com/golang-jwt/jwt/v4" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func Secret() jwt.Keyfunc { diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 8282b65467..11b33bf0a1 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -17,7 +17,7 @@ package callbackstruct import ( common "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" + "github.com/openimsdk/open-im-server/v3/pkg/apistruct" ) type CallbackCommand string diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index aae63351d8..dc02c1f16e 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/OpenIMSDK/Open-IM-Server/internal/msggateway" + "github.com/openimsdk/open-im-server/v3/internal/msggateway" //"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway". "github.com/spf13/cobra" diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index 5c9c3d0cb0..ae67ee9f79 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -17,7 +17,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/internal/msgtransfer" + "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" ) type MsgTransferCmd struct { diff --git a/pkg/common/cmd/msg_utils.go b/pkg/common/cmd/msg_utils.go index c4f202d2b5..cfaf631ecd 100644 --- a/pkg/common/cmd/msg_utils.go +++ b/pkg/common/cmd/msg_utils.go @@ -17,7 +17,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/internal/tools" + "github.com/openimsdk/open-im-server/v3/internal/tools" ) type MsgUtilsCmd struct { diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 96ecc20c34..508ef8377c 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -17,13 +17,13 @@ package cmd import ( "fmt" - config2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/log" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type RootCmd struct { diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 1f6fe16a56..a5fc1164cd 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc" + "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" ) type RpcCmd struct { diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index 8b7999b257..84cddf0dae 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -21,7 +21,7 @@ import ( "path/filepath" "runtime" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "gopkg.in/yaml.v3" diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go index f0f74fbcc8..50c270dcb0 100644 --- a/pkg/common/convert/black.go +++ b/pkg/common/convert/black.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" sdk "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func BlackDB2Pb( diff --git a/pkg/common/convert/conversation.go b/pkg/common/convert/conversation.go index 4c9a5ea4e3..165262b7f9 100644 --- a/pkg/common/convert/conversation.go +++ b/pkg/common/convert/conversation.go @@ -18,7 +18,7 @@ import ( "github.com/OpenIMSDK/protocol/conversation" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func ConversationDB2Pb(conversationDB *relation.ConversationModel) *conversation.Conversation { diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go index 255334840b..7003c8aa66 100644 --- a/pkg/common/convert/friend.go +++ b/pkg/common/convert/friend.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel { diff --git a/pkg/common/convert/group.go b/pkg/common/convert/group.go index 7562224d84..c13016b7eb 100644 --- a/pkg/common/convert/group.go +++ b/pkg/common/convert/group.go @@ -20,7 +20,7 @@ import ( pbgroup "github.com/OpenIMSDK/protocol/group" sdkws "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func Db2PbGroupInfo(m *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo { diff --git a/pkg/common/convert/msg.go b/pkg/common/convert/msg.go index d3d2d25e7d..56f71f0183 100644 --- a/pkg/common/convert/msg.go +++ b/pkg/common/convert/msg.go @@ -18,7 +18,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) func MsgPb2DB(msg *sdkws.MsgData) *unrelation.MsgDataModel { diff --git a/pkg/common/convert/user.go b/pkg/common/convert/user.go index 07989af1da..abb3a2144f 100644 --- a/pkg/common/convert/user.go +++ b/pkg/common/convert/user.go @@ -19,7 +19,7 @@ import ( "github.com/OpenIMSDK/protocol/sdkws" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) func UsersDB2Pb(users []*relationtb.UserModel) (result []*sdkws.UserInfo) { diff --git a/pkg/common/db/cache/black.go b/pkg/common/db/cache/black.go index b6ce091e8a..6da7d5d05b 100644 --- a/pkg/common/db/cache/black.go +++ b/pkg/common/db/cache/black.go @@ -21,7 +21,7 @@ import ( "github.com/dtm-labs/rockscache" "github.com/redis/go-redis/v9" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) const ( diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index 013afe19bc..d02b021e32 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -26,8 +26,8 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) const ( diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index 267e0e8333..fd8c1d3c06 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) const ( diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index 90e71ab121..7d4c2b0439 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -25,8 +25,8 @@ import ( "github.com/OpenIMSDK/tools/utils" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) const ( diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go index 61273f49f3..fd0aff4a71 100644 --- a/pkg/common/db/cache/init_redis.go +++ b/pkg/common/db/cache/init_redis.go @@ -25,7 +25,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mw/specialerror" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) const ( diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index fe0a1e2389..65b8d63de3 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -19,7 +19,7 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/dtm-labs/rockscache" @@ -32,8 +32,8 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" "github.com/redis/go-redis/v9" ) diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 2db5e21902..8c270c6e47 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -29,7 +29,7 @@ import ( "github.com/dtm-labs/rockscache" "github.com/redis/go-redis/v9" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) const ( diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index f442630760..17b4a440d4 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -17,7 +17,7 @@ package controller import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/golang-jwt/jwt/v4" @@ -25,7 +25,7 @@ import ( "github.com/OpenIMSDK/tools/tokenverify" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) type AuthDatabase interface { diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index a962df213d..70e942a779 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -20,8 +20,8 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type BlackDatabase interface { diff --git a/pkg/common/db/controller/chatlog.go b/pkg/common/db/controller/chatlog.go index 2b9a08ab66..def4902651 100644 --- a/pkg/common/db/controller/chatlog.go +++ b/pkg/common/db/controller/chatlog.go @@ -17,7 +17,7 @@ package controller import ( pbmsg "github.com/OpenIMSDK/protocol/msg" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ChatLogDatabase interface { diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 16eedbc2d4..806e093311 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -18,15 +18,15 @@ import ( "context" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ConversationDatabase interface { diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index a1cb547bf2..7816ef9350 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -27,8 +27,8 @@ import ( "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type FriendDatabase interface { diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 7ece8a07e8..f7ded8a2e0 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -28,11 +28,11 @@ import ( "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" ) type GroupDatabase interface { diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 781401c132..af678f92cf 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -24,13 +24,13 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + "github.com/openimsdk/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" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" + "github.com/openimsdk/open-im-server/v3/pkg/common/prome" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/controller/msg_test.go b/pkg/common/db/controller/msg_test.go index 9c2fffa3cc..80e2db122b 100644 --- a/pkg/common/db/controller/msg_test.go +++ b/pkg/common/db/controller/msg_test.go @@ -27,9 +27,9 @@ import ( "go.mongodb.org/mongo-driver/bson" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" ) func Test_BatchInsertChat2DB(t *testing.T) { diff --git a/pkg/common/db/controller/push.go b/pkg/common/db/controller/push.go index c4c7614571..76d8c3efb9 100644 --- a/pkg/common/db/controller/push.go +++ b/pkg/common/db/controller/push.go @@ -17,7 +17,7 @@ package controller import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) type PushDatabase interface { diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go index 1ced644c20..6ef3e73b3b 100644 --- a/pkg/common/db/controller/s3.go +++ b/pkg/common/db/controller/s3.go @@ -19,9 +19,9 @@ import ( "path/filepath" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "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" ) type S3Database interface { diff --git a/pkg/common/db/controller/third.go b/pkg/common/db/controller/third.go index 906b9b2e42..c5476e4900 100644 --- a/pkg/common/db/controller/third.go +++ b/pkg/common/db/controller/third.go @@ -17,7 +17,7 @@ package controller import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) type ThirdDatabase interface { diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 7c11bb9d3c..ab86cfd27a 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -20,14 +20,14 @@ import ( "github.com/OpenIMSDK/protocol/user" - unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type UserDatabase interface { diff --git a/pkg/common/db/localcache/conversation.go b/pkg/common/db/localcache/conversation.go index e1243e4c19..3ede6fd4c8 100644 --- a/pkg/common/db/localcache/conversation.go +++ b/pkg/common/db/localcache/conversation.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type ConversationLocalCache struct { diff --git a/pkg/common/db/localcache/group.go b/pkg/common/db/localcache/group.go index 093353c869..2e90d28bd1 100644 --- a/pkg/common/db/localcache/group.go +++ b/pkg/common/db/localcache/group.go @@ -21,7 +21,7 @@ import ( "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type GroupLocalCache struct { diff --git a/pkg/common/db/relation/black_model.go b/pkg/common/db/relation/black_model.go index 3946c8fc21..34123c7a30 100644 --- a/pkg/common/db/relation/black_model.go +++ b/pkg/common/db/relation/black_model.go @@ -25,7 +25,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type BlackGorm struct { diff --git a/pkg/common/db/relation/chat_log_model.go b/pkg/common/db/relation/chat_log_model.go index 929db8b87d..f183a543f3 100644 --- a/pkg/common/db/relation/chat_log_model.go +++ b/pkg/common/db/relation/chat_log_model.go @@ -25,7 +25,7 @@ import ( sdkws "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ChatLogGorm struct { diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index f58ac6e221..dcc18be17e 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ConversationGorm struct { diff --git a/pkg/common/db/relation/friend_model.go b/pkg/common/db/relation/friend_model.go index 4ab77132db..869254455e 100644 --- a/pkg/common/db/relation/friend_model.go +++ b/pkg/common/db/relation/friend_model.go @@ -21,7 +21,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type FriendGorm struct { diff --git a/pkg/common/db/relation/friend_request_model.go b/pkg/common/db/relation/friend_request_model.go index 689b316688..5678f7b7b2 100644 --- a/pkg/common/db/relation/friend_request_model.go +++ b/pkg/common/db/relation/friend_request_model.go @@ -21,7 +21,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type FriendRequestGorm struct { diff --git a/pkg/common/db/relation/group_member_model.go b/pkg/common/db/relation/group_member_model.go index 57b2d33e77..312e320546 100644 --- a/pkg/common/db/relation/group_member_model.go +++ b/pkg/common/db/relation/group_member_model.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/tools/ormutil" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) var _ relation.GroupMemberModelInterface = (*GroupMemberGorm)(nil) diff --git a/pkg/common/db/relation/group_model.go b/pkg/common/db/relation/group_model.go index 13e96b611a..7a8eee9f0b 100644 --- a/pkg/common/db/relation/group_model.go +++ b/pkg/common/db/relation/group_model.go @@ -26,7 +26,7 @@ import ( "github.com/OpenIMSDK/tools/ormutil" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) var _ relation.GroupModelInterface = (*GroupGorm)(nil) diff --git a/pkg/common/db/relation/group_request_model.go b/pkg/common/db/relation/group_request_model.go index 05f94c34b0..af3f277e81 100644 --- a/pkg/common/db/relation/group_request_model.go +++ b/pkg/common/db/relation/group_request_model.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type GroupRequestGorm struct { diff --git a/pkg/common/db/relation/mysql_init.go b/pkg/common/db/relation/mysql_init.go index 520f81297f..0e5ea5e43a 100644 --- a/pkg/common/db/relation/mysql_init.go +++ b/pkg/common/db/relation/mysql_init.go @@ -25,7 +25,7 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mw/specialerror" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/pkg/common/db/relation/object_model.go b/pkg/common/db/relation/object_model.go index 8a97a49d55..c5624a8d4d 100644 --- a/pkg/common/db/relation/object_model.go +++ b/pkg/common/db/relation/object_model.go @@ -21,7 +21,7 @@ import ( "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ObjectInfoGorm struct { diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index 758a620372..b04c298169 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -24,7 +24,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type UserGorm struct { diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index 891ecf38e1..6faa997a98 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -29,7 +29,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) func New(impl s3.Interface) *Controller { diff --git a/pkg/common/db/s3/cont/error.go b/pkg/common/db/s3/cont/error.go index be77bcb9ec..8225274d35 100644 --- a/pkg/common/db/s3/cont/error.go +++ b/pkg/common/db/s3/cont/error.go @@ -17,7 +17,7 @@ package cont import ( "fmt" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) type HashAlreadyExistsError struct { diff --git a/pkg/common/db/s3/cont/structs.go b/pkg/common/db/s3/cont/structs.go index 1ebbfcaed7..ff5ca79431 100644 --- a/pkg/common/db/s3/cont/structs.go +++ b/pkg/common/db/s3/cont/structs.go @@ -14,7 +14,7 @@ package cont -import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" +import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" type InitiateUploadResult struct { UploadID string `json:"uploadID"` // 上传ID diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go index 32f2131616..57a205cbea 100644 --- a/pkg/common/db/s3/cos/cos.go +++ b/pkg/common/db/s3/cos/cos.go @@ -26,8 +26,8 @@ import ( "github.com/tencentyun/cos-go-sdk-v5" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) const ( diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index bfe40a5942..937b9f78aa 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -41,8 +41,8 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/signer" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) const ( diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go index d84cad1c64..384ce8093f 100644 --- a/pkg/common/db/s3/oss/oss.go +++ b/pkg/common/db/s3/oss/oss.go @@ -26,8 +26,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) const ( diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index f08bb56a47..09e3e904e2 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -29,8 +29,8 @@ import ( "github.com/OpenIMSDK/tools/mw/specialerror" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) const ( diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index b480663492..9b461dd1f0 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -37,7 +37,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" - table "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) var ErrMsgListNotExist = errors.New("user not have msg in mongoDB") diff --git a/pkg/common/db/unrelation/msg_convert.go b/pkg/common/db/unrelation/msg_convert.go index a5cf2da4e8..810b4f4196 100644 --- a/pkg/common/db/unrelation/msg_convert.go +++ b/pkg/common/db/unrelation/msg_convert.go @@ -22,7 +22,7 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" - table "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) func (m *MsgMongoDriver) ConvertMsgsDocLen(ctx context.Context, conversationIDs []string) { diff --git a/pkg/common/db/unrelation/super_group.go b/pkg/common/db/unrelation/super_group.go index 5a9bfccc83..c762140a25 100644 --- a/pkg/common/db/unrelation/super_group.go +++ b/pkg/common/db/unrelation/super_group.go @@ -23,7 +23,7 @@ import ( "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) func NewSuperGroupMongoDriver(database *mongo.Database) unrelation.SuperGroupModelInterface { diff --git a/pkg/common/db/unrelation/user.go b/pkg/common/db/unrelation/user.go index 12b61b384a..777f27386d 100644 --- a/pkg/common/db/unrelation/user.go +++ b/pkg/common/db/unrelation/user.go @@ -23,7 +23,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" ) // prefixes and suffixes. diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index 7a0b7f037b..2d7c24c77e 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -27,8 +27,8 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) var client http.Client diff --git a/pkg/common/kafka/consumer.go b/pkg/common/kafka/consumer.go index 5aca865e72..98adfdcf19 100644 --- a/pkg/common/kafka/consumer.go +++ b/pkg/common/kafka/consumer.go @@ -17,7 +17,7 @@ package kafka import ( "sync" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/IBM/sarama" ) diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go index 2b669fe850..1eb7b522a8 100644 --- a/pkg/common/kafka/consumer_group.go +++ b/pkg/common/kafka/consumer_group.go @@ -19,7 +19,7 @@ import ( "github.com/OpenIMSDK/tools/log" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/IBM/sarama" ) diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index 44b88e602d..4a52d2befc 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -24,12 +24,12 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/IBM/sarama" "google.golang.org/protobuf/proto" - prome "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" + prome "github.com/openimsdk/open-im-server/v3/pkg/common/prome" ) const ( diff --git a/pkg/common/kafka/util.go b/pkg/common/kafka/util.go index 4495f983ae..7222058659 100644 --- a/pkg/common/kafka/util.go +++ b/pkg/common/kafka/util.go @@ -17,8 +17,8 @@ package kafka import ( "github.com/IBM/sarama" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tls" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/tls" ) // SetupTLSConfig set up the TLS config from config file. diff --git a/pkg/common/locker/message_locker.go b/pkg/common/locker/message_locker.go index 2631f19b1f..55241eb5fa 100644 --- a/pkg/common/locker/message_locker.go +++ b/pkg/common/locker/message_locker.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" ) const GlOBALLOCK = "GLOBAL_LOCK" diff --git a/pkg/common/prome/prometheus.go b/pkg/common/prome/prometheus.go index d66b1df701..254a6c9ea4 100644 --- a/pkg/common/prome/prometheus.go +++ b/pkg/common/prome/prometheus.go @@ -19,7 +19,7 @@ import ( "net/http" "strconv" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 59a53fa5a3..3ef6e569d4 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" diff --git a/pkg/common/tls/tls.go b/pkg/common/tls/tls.go index c473ca573c..3bf91beb9f 100644 --- a/pkg/common/tls/tls.go +++ b/pkg/common/tls/tls.go @@ -21,7 +21,7 @@ import ( "errors" "os" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func decryptPEM(data []byte, passphrase []byte) ([]byte, error) { diff --git a/pkg/rpcclient/auth.go b/pkg/rpcclient/auth.go index 69f21f38db..0ee021de1b 100644 --- a/pkg/rpcclient/auth.go +++ b/pkg/rpcclient/auth.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/auth" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry) *Auth { diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index 208bf53f77..60ca53351b 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -24,7 +24,7 @@ import ( "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Conversation struct { diff --git a/pkg/rpcclient/friend.go b/pkg/rpcclient/friend.go index 1bd004dd59..b84db40d4d 100644 --- a/pkg/rpcclient/friend.go +++ b/pkg/rpcclient/friend.go @@ -23,7 +23,7 @@ import ( sdkws "github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Friend struct { diff --git a/pkg/rpcclient/group.go b/pkg/rpcclient/group.go index d85321cbee..bf0efe60ca 100644 --- a/pkg/rpcclient/group.go +++ b/pkg/rpcclient/group.go @@ -27,7 +27,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Group struct { diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index 54577b6799..e3dad874ea 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -28,7 +28,7 @@ import ( "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" // "google.golang.org/protobuf/proto". ) diff --git a/pkg/rpcclient/notification/conevrsation.go b/pkg/rpcclient/notification/conevrsation.go index d92ee82a08..77fc623e4f 100644 --- a/pkg/rpcclient/notification/conevrsation.go +++ b/pkg/rpcclient/notification/conevrsation.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type ConversationNotificationSender struct { diff --git a/pkg/rpcclient/notification/friend.go b/pkg/rpcclient/notification/friend.go index 18e2fec73c..b061a24aeb 100644 --- a/pkg/rpcclient/notification/friend.go +++ b/pkg/rpcclient/notification/friend.go @@ -23,10 +23,10 @@ import ( pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/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" ) type FriendNotificationSender struct { diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index ee62f08b48..8e71f61c38 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/OpenIMSDK/protocol/constant" pbgroup "github.com/OpenIMSDK/protocol/group" @@ -28,9 +28,9 @@ import ( "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/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" ) func NewGroupNotificationSender( diff --git a/pkg/rpcclient/notification/msg.go b/pkg/rpcclient/notification/msg.go index 53e66fc7d9..60fa64f404 100644 --- a/pkg/rpcclient/notification/msg.go +++ b/pkg/rpcclient/notification/msg.go @@ -20,7 +20,7 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" ) type MsgNotificationSender struct { diff --git a/pkg/rpcclient/notification/user.go b/pkg/rpcclient/notification/user.go index f076ed2d19..4feebf7b9b 100644 --- a/pkg/rpcclient/notification/user.go +++ b/pkg/rpcclient/notification/user.go @@ -20,9 +20,9 @@ import ( "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" - relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" + "github.com/openimsdk/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" ) type UserNotificationSender struct { diff --git a/pkg/rpcclient/push.go b/pkg/rpcclient/push.go index 7b7adcfa59..6d08769728 100644 --- a/pkg/rpcclient/push.go +++ b/pkg/rpcclient/push.go @@ -22,7 +22,7 @@ import ( "github.com/OpenIMSDK/protocol/push" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Push struct { diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 015702a930..48a5371122 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -26,7 +26,7 @@ import ( "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/discoveryregistry" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type Third struct { diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 5ea7473814..6929b4fd9c 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -18,7 +18,7 @@ import ( "context" "strings" - "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/authverify" "google.golang.org/grpc" @@ -28,7 +28,7 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) // User represents a structure holding connection details for the User RPC client. diff --git a/test/data-conversion/mysql-conversion.go b/test/data-conversion/mysql-conversion.go index 58318cd3db..468f5f11dd 100644 --- a/test/data-conversion/mysql-conversion.go +++ b/test/data-conversion/mysql-conversion.go @@ -23,7 +23,7 @@ import ( "gorm.io/driver/mysql" "gorm.io/gorm" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) var ( diff --git a/tools/changelog/go.mod b/tools/changelog/go.mod index bc3f2192d1..924f6709a7 100644 --- a/tools/changelog/go.mod +++ b/tools/changelog/go.mod @@ -1,3 +1,3 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/changelog +module github.com/openimsdk/open-im-server/v3/tools/changelog go 1.18 diff --git a/tools/component/component.go b/tools/component/component.go index 1cd611c73e..692e7b6e2f 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -25,21 +25,22 @@ import ( "strings" "time" + "github.com/minio/minio-go/v7" + "github.com/redis/go-redis/v9" + "gopkg.in/yaml.v3" + "github.com/IBM/sarama" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" "github.com/go-zookeeper/zk" - "github.com/minio/minio-go/v7" - "github.com/redis/go-redis/v9" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/readpref" - "gopkg.in/yaml.v3" "gorm.io/driver/mysql" "gorm.io/gorm" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/minio/minio-go/v7/pkg/credentials" ) diff --git a/tools/component/component_test.go b/tools/component/component_test.go index eaf1394183..afa51ef2c9 100644 --- a/tools/component/component_test.go +++ b/tools/component/component_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func TestCheckMysql(t *testing.T) { diff --git a/tools/component/go.mod b/tools/component/go.mod index c38541ed72..8d5548ee82 100644 --- a/tools/component/go.mod +++ b/tools/component/go.mod @@ -1,3 +1,3 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/component +module github.com/openimsdk/open-im-server/v3/tools/component go 1.18 diff --git a/tools/imctl/go.mod b/tools/imctl/go.mod index 5b14e01689..60b06b45bf 100644 --- a/tools/imctl/go.mod +++ b/tools/imctl/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/imctl +module github.com/openimsdk/open-im-server/v3/tools/imctl go 1.18 diff --git a/tools/imctl/internal/imctl/cmd/color/color.go b/tools/imctl/internal/imctl/cmd/color/color.go index bbdd439cc9..bc54403e80 100644 --- a/tools/imctl/internal/imctl/cmd/color/color.go +++ b/tools/imctl/internal/imctl/cmd/color/color.go @@ -24,9 +24,9 @@ import ( "github.com/openim-sigs/component-base/util/stringutil" "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" ) // ColorOptions is an options struct to support color subcommands. diff --git a/tools/imctl/internal/imctl/cmd/completion/completion.go b/tools/imctl/internal/imctl/cmd/completion/completion.go index f0bfd5bd99..6e7d81afe6 100644 --- a/tools/imctl/internal/imctl/cmd/completion/completion.go +++ b/tools/imctl/internal/imctl/cmd/completion/completion.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" ) const defaultBoilerPlate = ` diff --git a/tools/imctl/internal/imctl/cmd/info/info.go b/tools/imctl/internal/imctl/cmd/info/info.go index 928d12bbbf..95bdbe3e3b 100644 --- a/tools/imctl/internal/imctl/cmd/info/info.go +++ b/tools/imctl/internal/imctl/cmd/info/info.go @@ -24,9 +24,9 @@ import ( "github.com/openim-sigs/component-base/util/iputil" "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" ) // Info defines the host information struct. diff --git a/tools/infra/go.mod b/tools/infra/go.mod index acac795089..6ee10304bd 100644 --- a/tools/infra/go.mod +++ b/tools/infra/go.mod @@ -1,3 +1,3 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/infra +module github.com/openimsdk/open-im-server/v3/tools/infra go 1.18 diff --git a/tools/ncpu/go.mod b/tools/ncpu/go.mod index 4173d306e0..dfccea27aa 100644 --- a/tools/ncpu/go.mod +++ b/tools/ncpu/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/ncpu +module github.com/openimsdk/open-im-server/v3/tools/ncpu go 1.18 diff --git a/tools/openim-web/go.mod b/tools/openim-web/go.mod index 27d658d3b1..6f30c673c0 100644 --- a/tools/openim-web/go.mod +++ b/tools/openim-web/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/openim-web +module github.com/openimsdk/open-im-server/v3/tools/openim-web go 1.18 diff --git a/tools/versionchecker/go.mod b/tools/versionchecker/go.mod index 1c189e604e..5858649e88 100644 --- a/tools/versionchecker/go.mod +++ b/tools/versionchecker/go.mod @@ -1,3 +1,3 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/versionchecker +module github.com/openimsdk/open-im-server/v3/tools/versionchecker go 1.18 diff --git a/tools/yamlfmt/go.mod b/tools/yamlfmt/go.mod index 223264de83..5b3581efc6 100644 --- a/tools/yamlfmt/go.mod +++ b/tools/yamlfmt/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server/tools/yamlfmt +module github.com/openimsdk/open-im-server/v3/tools/yamlfmt go 1.18