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 1/6] 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 42bb7d1ac..cf452450c 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 64079c7e1..058aa2e29 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 6fbb0558a..3bd0d882b 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 2782e4fd3..f6870694b 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 aef347793..722bf5960 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 03db8ae03..6ab2fedab 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 524804988..d27a3f11b 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 fec8226f8..80a92de92 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 fbd44038e..c0c91e4dc 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 06baac155..d2d4f727a 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 356081d33..0ac258d0c 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 c070e6811..913962b82 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 6d6d9008d..f2ebc94db 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 8e146b7cc..43251a4cf 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 c95cb7e93..fd19bde42 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 9dcc8f7c7..44a97a013 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 9f25b5427..4e068b775 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 2f708901e..23f337a9f 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 1dbca3126..e525cd495 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 e5a49199f..2777d8855 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 a118092c4..e1722523b 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 9db38af4a..5750a7315 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 44a492fc4..dfc82d316 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 bfa1d0df7..0a5a12698 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 b2999f385..d7320a304 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 9f612e021..8121535ad 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 1ebbb5902..ae12c04a3 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 03fe9f581..7a4b6d6ad 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 6c26e5906..a8de5e0b5 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 22e04b011..f437f9d8c 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 c532b3c07..db48ead70 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 1fc7ca9a1..e83939a4c 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 ac7dc6662..8099d39d7 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 088960e5c..d1f27f48f 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 996341ac1..c646df3e2 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 3c07ab284..8595c1656 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 ffa5db428..27e7dab18 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 856b75e0b..96d8ad3a3 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 915c6f603..218ed67b4 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 b784af029..1fd65647d 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 cec725784..ddf3802af 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 64933db50..44de7ff65 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 2ddb17800..91363282f 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 b86ec2374..6e9c56023 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 690cd37f8..edd03ce98 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 c1fa0d6e6..9580ef8db 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 093bddc35..9f97c3c67 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 176b9ef8e..b1a5ea6b5 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 f29867bb0..bb687773e 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 7b753faa5..1524a7f27 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 40be7a18f..23c57ff89 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 cb49d6f74..6d92cfde2 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 6f75234ff..2ee7f5056 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 e4d03de36..cb47d9f6e 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 b09743759..507d83d81 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 d60a55db9..6cd1a2943 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 ab037f6c1..68586ba85 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 ff258eaae..b5c23bed6 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 2b41ccb51..bcb97d7d2 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 8977e5995..151d29fc1 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 7e20a9148..2add9c0d1 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 3aa4033d7..e8f80914f 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 846580598..ac09e3f69 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 5eba8ae14..aaafb45bb 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 9753a3e01..115df9946 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 de85775d8..2837cb944 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 943cd5d54..984af88e1 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 8a2f91f6f..221004bd5 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 f81a7ccf2..a65d882dd 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 32a3e314b..443f70cae 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 0bc8b00a3..6702bc6c7 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 3cbaa455c..93f5c3a8a 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 75ae36eda..aa24d385f 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 e508c75cb..a8e577fde 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 8282b6546..11b33bf0a 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 aae63351d..dc02c1f16 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 5c9c3d0cb..ae67ee9f7 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 c4f202d2b..cfaf631ec 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 96ecc20c3..508ef8377 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 1f6fe16a5..a5fc1164c 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 8b7999b25..84cddf0da 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 f0f74fbcc..50c270dcb 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 4c9a5ea4e..165262b7f 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 255334840..7003c8aa6 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 7562224d8..c13016b7e 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 d3d2d25e7..56f71f018 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 07989af1d..abb3a2144 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 b6ce091e8..6da7d5d05 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 013afe19b..d02b021e3 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 267e0e833..fd8c1d3c0 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 90e71ab12..7d4c2b043 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 61273f49f..fd0aff4a7 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 fe0a1e238..65b8d63de 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 2db5e2190..8c270c6e4 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 f44263076..17b4a440d 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 a962df213..70e942a77 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 2b9a08ab6..def490265 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 16eedbc2d..806e09331 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 a1cb547bf..7816ef935 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 7ece8a07e..f7ded8a2e 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 781401c13..af678f92c 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 9c2fffa3c..80e2db122 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 c4c761457..76d8c3efb 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 1ced644c2..6ef3e73b3 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 906b9b2e4..c5476e490 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 7c11bb9d3..ab86cfd27 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 e1243e4c1..3ede6fd4c 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 093353c86..2e90d28bd 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 3946c8fc2..34123c7a3 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 929db8b87..f183a543f 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 f58ac6e22..dcc18be17 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 4ab77132d..869254455 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 689b31668..5678f7b7b 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 57b2d33e7..312e32054 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 13e96b611..7a8eee9f0 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 05f94c34b..af3f277e8 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 520f81297..0e5ea5e43 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 8a97a49d5..c5624a8d4 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 758a62037..b04c29816 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 891ecf38e..6faa997a9 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 be77bcb9e..8225274d3 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 1ebbfcaed..ff5ca7943 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 32f213161..57a205cbe 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 bfe40a594..937b9f78a 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 d84cad1c6..384ce8093 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 f08bb56a4..09e3e904e 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 b48066349..9b461dd1f 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 a5cf2da4e..810b4f419 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 5a9bfccc8..c762140a2 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 12b61b384..777f27386 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 7a0b7f037..2d7c24c77 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 5aca865e7..98adfdcf1 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 2b669fe85..1eb7b522a 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 44b88e602..4a52d2bef 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 4495f983a..722205865 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 2631f19b1..55241eb5f 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 d66b1df70..254a6c9ea 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 59a53fa5a..3ef6e569d 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 c473ca573..3bf91beb9 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 69f21f38d..0ee021de1 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 208bf53f7..60ca53351 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 1bd004dd5..b84db40d4 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 d85321cbe..bf0efe60c 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 54577b679..e3dad874e 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 d92ee82a0..77fc623e4 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 18e2fec73..b061a24ae 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 ee62f08b4..8e71f61c3 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 53e66fc7d..60fa64f40 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 f076ed2d1..4feebf7b9 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 7b7adcfa5..6d0876972 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 015702a93..48a537112 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 5ea747381..6929b4fd9 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 58318cd3d..468f5f11d 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 bc3f2192d..924f6709a 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 1cd611c73..692e7b6e2 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 eaf139418..afa51ef2c 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 c38541ed7..8d5548ee8 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 5b14e0168..60b06b45b 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 bbdd439cc..bc54403e8 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 f0bfd5bd9..6e7d81afe 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 928d12bbb..95bdbe3e3 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 acac79508..6ee10304b 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 4173d306e..dfccea27a 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 27d658d3b..6f30c673c 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 1c189e604..5858649e8 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 223264de8..5b3581efc 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 From aa729a24b6aa99e860021de952c853f9f00edd88 Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751@qq.com> Date: Fri, 8 Sep 2023 15:20:30 +0800 Subject: [PATCH 2/6] feat: set docs openim-server url address fix (#1043) * feat: set docs openim-server url address fix Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: add openim code fix Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .env | 14 ++++ .github/workflows/auto-gh-pr.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .gitignore | 1 + .golangci.yml | 4 +- CHANGELOG/.chglog/config.yml | 2 +- CHANGELOG/CHANGELOG-1.0.md | 14 ++-- CHANGELOG/CHANGELOG-2.0.md | 24 +++--- CHANGELOG/CHANGELOG-2.1.md | 4 +- CHANGELOG/CHANGELOG-2.2.md | 4 +- CHANGELOG/CHANGELOG-2.3.md | 12 +-- CHANGELOG/CHANGELOG-2.9.md | 14 ++-- CHANGELOG/CHANGELOG-3.0.md | 54 ++++++------ CHANGELOG/CHANGELOG-3.1.md | 71 ++++------------ CHANGELOG/CHANGELOG-3.2.md | 36 ++++++-- CHANGELOG/CHANGELOG.md | 4 +- CONTRIBUTING.md | 32 +++---- Makefile | 8 +- README-zh_CN.md | 60 +++++++------- README.md | 70 ++++++++-------- build/goreleaser.yaml | 10 +-- config/config.yaml | 6 +- deployments/README.md | 2 +- deployments/templates/init/openim-api.service | 2 +- .../templates/init/openim-cmdutils.service | 2 +- .../templates/init/openim-crontask.service | 2 +- .../templates/init/openim-msggateway.service | 2 +- .../templates/init/openim-msgtransfer.service | 2 +- .../templates/init/openim-push.service | 2 +- deployments/templates/init/openim-rpc.service | 2 +- docker-compose.yml | 4 +- docs/README.md | 60 +++++++------- docs/contrib/code_conventions.md | 2 +- docs/contrib/development.md | 2 +- docs/contrib/environment.md | 83 ++++++++++++++++++- docs/contrib/git_cherry-pick.md | 10 +-- docs/contrib/git_workflow.md | 8 +- docs/contrib/offline-deployment.md | 8 +- docs/contrib/util_go.md | 2 +- docs/conversions/github-workflow.md | 2 +- docs/conversions/logging.md | 2 +- docs/conversions/version.md | 16 ++-- install.sh | 8 +- install_guide.sh | 2 +- pkg/apistruct/doc.go | 2 +- pkg/authverify/doc.go | 2 +- pkg/callbackstruct/doc.go | 2 +- pkg/common/cmd/doc.go | 2 +- pkg/common/cmd/msg_gateway.go | 2 +- pkg/common/config/doc.go | 2 +- pkg/common/convert/doc.go | 2 +- pkg/common/db/cache/doc.go | 2 +- pkg/common/db/controller/doc.go | 2 +- pkg/common/db/localcache/doc.go | 2 +- pkg/common/db/relation/doc.go | 2 +- pkg/common/db/s3/cont/doc.go | 2 +- pkg/common/db/s3/cos/doc.go | 2 +- pkg/common/db/s3/doc.go | 2 +- pkg/common/db/s3/minio/doc.go | 2 +- pkg/common/db/s3/oss/doc.go | 2 +- pkg/common/db/table/relation/doc.go | 2 +- pkg/common/db/table/unrelation/doc.go | 2 +- pkg/common/db/unrelation/doc.go | 2 +- pkg/common/http/doc.go | 2 +- pkg/common/kafka/doc.go | 2 +- pkg/common/locker/doc.go | 2 +- pkg/common/prome/doc.go | 2 +- pkg/common/startrpc/doc.go | 2 +- pkg/msgprocessor/doc.go | 2 +- pkg/rpcclient/doc.go | 2 +- pkg/rpcclient/notification/doc.go | 2 +- pkg/statistics/doc.go | 2 +- scripts/advertise.sh | 2 +- scripts/check-all.sh | 4 +- scripts/cherry-pick.sh | 6 +- scripts/genconfig.sh | 2 +- scripts/gendoc.sh | 2 +- scripts/init-config.sh | 2 +- scripts/install/environment.sh | 18 ++-- scripts/install/openim-msggateway.sh | 4 +- scripts/install/openim-msgtransfer.sh | 2 +- scripts/lib/util.sh | 2 +- scripts/make-rules/golang.mk | 2 +- scripts/make-rules/image.mk | 2 +- scripts/verify-typecheck.sh | 2 +- test/typecheck/go.mod | 2 +- tools/README.md | 2 +- tools/changelog/changelog.go | 2 +- tools/component/component.go | 2 +- tools/imctl/README.md | 2 +- tools/imctl/cmd/imctl/imctl.go | 2 +- tools/imctl/internal/imctl/cmd/cmd.go | 38 ++++----- tools/imctl/internal/imctl/cmd/color/color.go | 6 +- .../imctl/cmd/completion/completion.go | 4 +- tools/imctl/internal/imctl/cmd/info/info.go | 6 +- tools/imctl/internal/imctl/cmd/new/new.go | 30 +++---- .../internal/imctl/cmd/options/options.go | 2 +- .../internal/imctl/cmd/version/version.go | 6 +- 98 files changed, 476 insertions(+), 407 deletions(-) diff --git a/.env b/.env index 145d7e917..b2252cc9c 100644 --- a/.env +++ b/.env @@ -1,3 +1,17 @@ +# Copyright © 2023 OpenIM. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # ====================================== # ========= Basic Configuration ======== # ====================================== diff --git a/.github/workflows/auto-gh-pr.yml b/.github/workflows/auto-gh-pr.yml index f76a0c70a..98e4d83ff 100644 --- a/.github/workflows/auto-gh-pr.yml +++ b/.github/workflows/auto-gh-pr.yml @@ -51,7 +51,7 @@ jobs: # git checkout -b bot/merge-to-release-$ISSUEID # git push origin bot/merge-to-release-$ISSUEID # gh pr create --base release --head bot/merge-to-release-$ISSUEID --title "Merge main to release" --body "" - # gh pr create --base main --head feat/auto-release-pr-624 --title "The bug is fixed" --body "$x" --repo OpenIMSDK/Open-IM-Server --reviewer "cubxxw" + # gh pr create --base main --head feat/auto-release-pr-624 --title "The bug is fixed" --body "$x" --repo openimsdk/open-im-server --reviewer "cubxxw" continue-on-error: true env: GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9f3062fb2..d3a35e65d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -114,7 +114,7 @@ jobs: - [ ] Disenchanter can connect and issue actions This is an automated PR. @ ${{ github.actor }} - [workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml). + [workflow](https://github.com/openimsdk/open-im-server/blob/main/.github/workflows/pull-request.yml). base: main labels: | kind/documentation diff --git a/.gitignore b/.gitignore index 92408fa56..2d8f1e002 100644 --- a/.gitignore +++ b/.gitignore @@ -160,6 +160,7 @@ flycheck_*.el # Dependency directories (remove the comment below to include it) vendor/ +tools/imctl # Go workspace file # go.work diff --git a/.golangci.yml b/.golangci.yml index 3d50e109b..d588695dd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -176,7 +176,7 @@ linters-settings: # put imports beginning with prefix after 3rd-party packages; # only support one prefix # if not set, use goimports.local-prefixes - prefix: github.com/OpenIMSDK/Open-IM-Server + prefix: github.com/openimsdk/open-im-server gocognit: # minimal code complexity to report, 30 by default (but we recommend 10-20) min-complexity: 30 @@ -333,7 +333,7 @@ linters-settings: goimports: # put imports beginning with prefix after 3rd-party packages; # it's a comma-separated list of prefixes - local-prefixes: github.com/OpenIMSDK/Open-IM-Server + local-prefixes: github.com/openimsdk/open-im-server gomnd: settings: diff --git a/CHANGELOG/.chglog/config.yml b/CHANGELOG/.chglog/config.yml index 296ca2eb7..2a45bc26a 100644 --- a/CHANGELOG/.chglog/config.yml +++ b/CHANGELOG/.chglog/config.yml @@ -3,7 +3,7 @@ style: github template: CHANGELOG.tpl.md info: title: CHANGELOG - repository_url: https://github.com/OpenIMSDK/Open-IM-Server + repository_url: https://github.com/openimsdk/open-im-server options: tag_filter_pattern: '^v' sort: "date" diff --git a/CHANGELOG/CHANGELOG-1.0.md b/CHANGELOG/CHANGELOG-1.0.md index 04980fbd4..bed425943 100644 --- a/CHANGELOG/CHANGELOG-1.0.md +++ b/CHANGELOG/CHANGELOG-1.0.md @@ -47,10 +47,10 @@ - update -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...HEAD -[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7 -[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6 -[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5 -[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4 -[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3 -[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v1.0.7...HEAD +[v1.0.7]: https://github.com/openimsdk/open-im-server/compare/v1.0.6...v1.0.7 +[v1.0.6]: https://github.com/openimsdk/open-im-server/compare/v1.0.5...v1.0.6 +[v1.0.5]: https://github.com/openimsdk/open-im-server/compare/v1.0.4...v1.0.5 +[v1.0.4]: https://github.com/openimsdk/open-im-server/compare/v1.0.3...v1.0.4 +[v1.0.3]: https://github.com/openimsdk/open-im-server/compare/v1.0.1...v1.0.3 +[v1.0.1]: https://github.com/openimsdk/open-im-server/compare/v1.0.0...v1.0.1 diff --git a/CHANGELOG/CHANGELOG-2.0.md b/CHANGELOG/CHANGELOG-2.0.md index b89ddeadc..8902f1814 100644 --- a/CHANGELOG/CHANGELOG-2.0.md +++ b/CHANGELOG/CHANGELOG-2.0.md @@ -14,7 +14,7 @@ ## [v2.0.9] - 2022-04-29 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' @@ -74,14 +74,14 @@ - update -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...HEAD -[v2.0.10]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...v2.0.10 -[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.8...v2.0.9 -[v2.0.8]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.8 -[v2.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7 -[v2.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6 -[v2.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5 -[v2.04]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04 -[v2.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3 -[v2.0.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2 -[v2.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.0.10...HEAD +[v2.0.10]: https://github.com/openimsdk/open-im-server/compare/v2.0.9...v2.0.10 +[v2.0.9]: https://github.com/openimsdk/open-im-server/compare/v2.0.8...v2.0.9 +[v2.0.8]: https://github.com/openimsdk/open-im-server/compare/v2.0.7...v2.0.8 +[v2.0.7]: https://github.com/openimsdk/open-im-server/compare/v2.0.6...v2.0.7 +[v2.0.6]: https://github.com/openimsdk/open-im-server/compare/v2.0.5...v2.0.6 +[v2.0.5]: https://github.com/openimsdk/open-im-server/compare/v2.04...v2.0.5 +[v2.04]: https://github.com/openimsdk/open-im-server/compare/v2.0.3...v2.04 +[v2.0.3]: https://github.com/openimsdk/open-im-server/compare/v2.0.2...v2.0.3 +[v2.0.2]: https://github.com/openimsdk/open-im-server/compare/v2.0.1...v2.0.2 +[v2.0.1]: https://github.com/openimsdk/open-im-server/compare/v2.0.0...v2.0.1 diff --git a/CHANGELOG/CHANGELOG-2.1.md b/CHANGELOG/CHANGELOG-2.1.md index 32effd64d..7eef06f08 100644 --- a/CHANGELOG/CHANGELOG-2.1.md +++ b/CHANGELOG/CHANGELOG-2.1.md @@ -21,7 +21,7 @@ ## v2.1.0 - 2022-06-17 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) - friend modify - update @@ -47,4 +47,4 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...HEAD +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.1.0...HEAD diff --git a/CHANGELOG/CHANGELOG-2.2.md b/CHANGELOG/CHANGELOG-2.2.md index e00204316..8afb24b29 100644 --- a/CHANGELOG/CHANGELOG-2.2.md +++ b/CHANGELOG/CHANGELOG-2.2.md @@ -21,7 +21,7 @@ ## v2.2.0 - 2022-07-01 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) - friend modify - update @@ -47,4 +47,4 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...HEAD +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.2.0...HEAD diff --git a/CHANGELOG/CHANGELOG-2.3.md b/CHANGELOG/CHANGELOG-2.3.md index c33b81a9a..e14745f30 100644 --- a/CHANGELOG/CHANGELOG-2.3.md +++ b/CHANGELOG/CHANGELOG-2.3.md @@ -37,7 +37,7 @@ ## v2.3.0-rc0 - 2022-07-15 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) - friend modify - update @@ -63,8 +63,8 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...HEAD -[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3 -[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2 -[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2 -[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.3.3...HEAD +[v2.3.3]: https://github.com/openimsdk/open-im-server/compare/v2.3.2...v2.3.3 +[v2.3.2]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc2...v2.3.2 +[v2.3.0-rc2]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc1...v2.3.0-rc2 +[v2.3.0-rc1]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc0...v2.3.0-rc1 diff --git a/CHANGELOG/CHANGELOG-2.9.md b/CHANGELOG/CHANGELOG-2.9.md index b51212ba8..b921eb51b 100644 --- a/CHANGELOG/CHANGELOG-2.9.md +++ b/CHANGELOG/CHANGELOG-2.9.md @@ -38,15 +38,15 @@ ## v2.9.0 - 2023-07-04 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.839643f...HEAD -[v2.9.0+1.839643f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f -[v2.9.0+2.35f07fe]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe -[v2.9.0+1.b5072b1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1 -[v2.9.0+3.2667a3a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a -[v2.9.0+7.04818ca]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...v2.9.0+7.04818ca +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.9.0+1.839643f...HEAD +[v2.9.0+1.839643f]: https://github.com/openimsdk/open-im-server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f +[v2.9.0+2.35f07fe]: https://github.com/openimsdk/open-im-server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe +[v2.9.0+1.b5072b1]: https://github.com/openimsdk/open-im-server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1 +[v2.9.0+3.2667a3a]: https://github.com/openimsdk/open-im-server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a +[v2.9.0+7.04818ca]: https://github.com/openimsdk/open-im-server/compare/v2.9.0...v2.9.0+7.04818ca diff --git a/CHANGELOG/CHANGELOG-3.0.md b/CHANGELOG/CHANGELOG-3.0.md index cf1aa4b62..1b99e7e34 100644 --- a/CHANGELOG/CHANGELOG-3.0.md +++ b/CHANGELOG/CHANGELOG-3.0.md @@ -47,7 +47,7 @@ ## [v2.9.0] - 2023-07-04 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' @@ -85,7 +85,7 @@ ## [v2.0.9] - 2022-04-29 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' @@ -161,28 +161,28 @@ - update -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...HEAD -[v2.9.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...v2.9.0 -[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3 -[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2 -[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2 -[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1 -[v2.3.0-rc0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...v2.3.0-rc0 -[v2.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0 -[v2.1.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0 -[v2.0.10]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...v2.0.10 -[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.9 -[v2.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7 -[v2.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6 -[v2.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5 -[v2.04]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04 -[v2.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3 -[v2.0.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2 -[v2.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1 -[v2.0.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...v2.0.0 -[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7 -[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6 -[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5 -[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4 -[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3 -[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v2.9.0...HEAD +[v2.9.0]: https://github.com/openimsdk/open-im-server/compare/v2.3.3...v2.9.0 +[v2.3.3]: https://github.com/openimsdk/open-im-server/compare/v2.3.2...v2.3.3 +[v2.3.2]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc2...v2.3.2 +[v2.3.0-rc2]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc1...v2.3.0-rc2 +[v2.3.0-rc1]: https://github.com/openimsdk/open-im-server/compare/v2.3.0-rc0...v2.3.0-rc1 +[v2.3.0-rc0]: https://github.com/openimsdk/open-im-server/compare/v2.2.0...v2.3.0-rc0 +[v2.2.0]: https://github.com/openimsdk/open-im-server/compare/v2.1.0...v2.2.0 +[v2.1.0]: https://github.com/openimsdk/open-im-server/compare/v2.0.10...v2.1.0 +[v2.0.10]: https://github.com/openimsdk/open-im-server/compare/v2.0.9...v2.0.10 +[v2.0.9]: https://github.com/openimsdk/open-im-server/compare/v2.0.7...v2.0.9 +[v2.0.7]: https://github.com/openimsdk/open-im-server/compare/v2.0.6...v2.0.7 +[v2.0.6]: https://github.com/openimsdk/open-im-server/compare/v2.0.5...v2.0.6 +[v2.0.5]: https://github.com/openimsdk/open-im-server/compare/v2.04...v2.0.5 +[v2.04]: https://github.com/openimsdk/open-im-server/compare/v2.0.3...v2.04 +[v2.0.3]: https://github.com/openimsdk/open-im-server/compare/v2.0.2...v2.0.3 +[v2.0.2]: https://github.com/openimsdk/open-im-server/compare/v2.0.1...v2.0.2 +[v2.0.1]: https://github.com/openimsdk/open-im-server/compare/v2.0.0...v2.0.1 +[v2.0.0]: https://github.com/openimsdk/open-im-server/compare/v1.0.7...v2.0.0 +[v1.0.7]: https://github.com/openimsdk/open-im-server/compare/v1.0.6...v1.0.7 +[v1.0.6]: https://github.com/openimsdk/open-im-server/compare/v1.0.5...v1.0.6 +[v1.0.5]: https://github.com/openimsdk/open-im-server/compare/v1.0.4...v1.0.5 +[v1.0.4]: https://github.com/openimsdk/open-im-server/compare/v1.0.3...v1.0.4 +[v1.0.3]: https://github.com/openimsdk/open-im-server/compare/v1.0.1...v1.0.3 +[v1.0.1]: https://github.com/openimsdk/open-im-server/compare/v1.0.0...v1.0.1 diff --git a/CHANGELOG/CHANGELOG-3.1.md b/CHANGELOG/CHANGELOG-3.1.md index c51eb2098..8d64c5ef7 100644 --- a/CHANGELOG/CHANGELOG-3.1.md +++ b/CHANGELOG/CHANGELOG-3.1.md @@ -2,31 +2,18 @@ -- [Version logging for OpenIM](#version-logging-for-openim) - - [Unreleased](#unreleased) - - [v3.1.2-beta.3 - 2023-08-09](#v312-beta3---2023-08-09) - - [v3.1.2-beta.2 - 2023-08-09](#v312-beta2---2023-08-09) - - [v3.1.2-beta.1 - 2023-08-09](#v312-beta1---2023-08-09) - - [v3.1.2-beta.0 - 2023-08-08](#v312-beta0---2023-08-08) - - [v3.1.2.beta.0 - 2023-08-08](#v312beta0---2023-08-08) - - [v3.1.1-beta.4 - 2023-08-07](#v311-beta4---2023-08-07) - - [v3.1.1-beta.3 - 2023-08-05](#v311-beta3---2023-08-05) - - [v3.1.1-beta.2 - 2023-08-04](#v311-beta2---2023-08-04) - - [v3.1.1-beta.1 - 2023-08-04](#v311-beta1---2023-08-04) - - [v3.1.1-alpha.3 - 2023-08-03](#v311-alpha3---2023-08-03) - - [v3.1.1-alpha.2 - 2023-08-03](#v311-alpha2---2023-08-03) - - [v3.1.1-alpha.1 - 2023-08-02](#v311-alpha1---2023-08-02) - - [v3.1.0 - 2023-07-28](#v310---2023-07-28) - - [Reverts](#reverts) - - [Pull Requests](#pull-requests) - - ## [Unreleased] + +## [v3.1.3-beta.1] - 2023-08-14 + + +## [v3.1.3] - 2023-08-14 + ## [v3.1.2-beta.3] - 2023-08-09 @@ -39,49 +26,19 @@ ## [v3.1.2-beta.0] - 2023-08-08 - -## [v3.1.2.beta.0] - 2023-08-08 - - -## [v3.1.1-beta.4] - 2023-08-07 - - -## [v3.1.1-beta.3] - 2023-08-05 - - -## [v3.1.1-beta.2] - 2023-08-04 - - -## [v3.1.1-beta.1] - 2023-08-04 - - -## [v3.1.1-alpha.3] - 2023-08-03 - - -## [v3.1.1-alpha.2] - 2023-08-03 - - -## [v3.1.1-alpha.1] - 2023-08-02 - ## v3.1.0 - 2023-07-28 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.2-beta.3...HEAD -[v3.1.2-beta.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.2-beta.2...v3.1.2-beta.3 -[v3.1.2-beta.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.2-beta.1...v3.1.2-beta.2 -[v3.1.2-beta.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.2-beta.0...v3.1.2-beta.1 -[v3.1.2-beta.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.2.beta.0...v3.1.2-beta.0 -[v3.1.2.beta.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-beta.4...v3.1.2.beta.0 -[v3.1.1-beta.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-beta.3...v3.1.1-beta.4 -[v3.1.1-beta.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-beta.2...v3.1.1-beta.3 -[v3.1.1-beta.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-beta.1...v3.1.1-beta.2 -[v3.1.1-beta.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-alpha.3...v3.1.1-beta.1 -[v3.1.1-alpha.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-alpha.2...v3.1.1-alpha.3 -[v3.1.1-alpha.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.1-alpha.1...v3.1.1-alpha.2 -[v3.1.1-alpha.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.1.0...v3.1.1-alpha.1 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.1.3-beta.1...HEAD +[v3.1.3-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.3...v3.1.3-beta.1 +[v3.1.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.3...v3.1.3 +[v3.1.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.2...v3.1.2-beta.3 +[v3.1.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.1...v3.1.2-beta.2 +[v3.1.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.1.2-beta.0...v3.1.2-beta.1 +[v3.1.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.1.0...v3.1.2-beta.0 diff --git a/CHANGELOG/CHANGELOG-3.2.md b/CHANGELOG/CHANGELOG-3.2.md index 0074a7e88..f7823d119 100644 --- a/CHANGELOG/CHANGELOG-3.2.md +++ b/CHANGELOG/CHANGELOG-3.2.md @@ -8,6 +8,21 @@ ## [Unreleased] + +## [v3.2.2] - 2023-09-03 + + +## [v3.2.3] - 2023-09-03 + + +## [v3.2.1] - 2023-09-03 + + +## [v3.2.2-beta.4] - 2023-08-28 + + +## [v3.2.2-alpha.0] - 2023-08-25 + ## [v3.2.2-beta.3] - 2023-08-22 @@ -29,16 +44,21 @@ ## v3.2.0-alpha.0 - 2023-08-16 ### Reverts -- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) +- update etcd to v3.5.2 ([#206](https://github.com/openimsdk/open-im-server/issues/206)) ### Pull Requests - Merge branch 'tuoyun' -[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.3...HEAD -[v3.2.2-beta.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.2...v3.2.2-beta.3 -[v3.2.2-beta.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.1...v3.2.2-beta.2 -[v3.2.2-beta.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0...v3.2.2-beta.1 -[v3.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0-rc.0...v3.2.0 -[v3.2.0-rc.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.0...v3.2.0-rc.0 -[v3.2.2-beta.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0-alpha.0...v3.2.2-beta.0 +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.2.2...HEAD +[v3.2.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.3...v3.2.2 +[v3.2.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.1...v3.2.3 +[v3.2.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.4...v3.2.1 +[v3.2.2-beta.4]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-alpha.0...v3.2.2-beta.4 +[v3.2.2-alpha.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.3...v3.2.2-alpha.0 +[v3.2.2-beta.3]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.2...v3.2.2-beta.3 +[v3.2.2-beta.2]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.1...v3.2.2-beta.2 +[v3.2.2-beta.1]: https://github.com/openimsdk/open-im-server/compare/v3.2.0...v3.2.2-beta.1 +[v3.2.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-rc.0...v3.2.0 +[v3.2.0-rc.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.2-beta.0...v3.2.0-rc.0 +[v3.2.2-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.2.0-alpha.0...v3.2.2-beta.0 diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md index 6ca4d08b2..41df11bba 100644 --- a/CHANGELOG/CHANGELOG.md +++ b/CHANGELOG/CHANGELOG.md @@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file. -+ [https://github.com/OpenIMSDK/Open-IM-Server/releases](https://github.com/OpenIMSDK/Open-IM-Server/releases) ++ [https://github.com/openimsdk/open-im-server/releases](https://github.com/openimsdk/open-im-server/releases) ## OpenIM versioning policy @@ -44,7 +44,7 @@ $ git-chglog --init **Options** -- What is the URL of your repository?: https://github.com/OpenIMSDK/Open-IM-Server +- What is the URL of your repository?: https://github.com/openimsdk/open-im-server - What is your favorite style?: github - Choose the format of your favorite commit message: (): -- feat(core): Add new feature - What is your favorite template style?: standard diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a3ee8b8a6..80cdf66c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ The [Makefile](./Makefile) is for every developer, even if you don't know how to #### Code and doc contribution -Every action to make project Open-IM-Server better is encouraged. On GitHub, every improvement for Open-IM-Server could be via a [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls) (short for pull request). +Every action to make project Open-IM-Server better is encouraged. On GitHub, every improvement for Open-IM-Server could be via a [PR](https://github.com/openimsdk/open-im-server/pulls) (short for pull request). + If you find a typo, try to fix it! + If you find a bug, try to fix it! @@ -61,14 +61,14 @@ Every action to make project Open-IM-Server better is encouraged. On GitHub, eve #### Where should I start? -+ If you are new to the project, don't know how to contribute Open-IM-Server, please check out the [good first issue](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label. -+ You should be good at filtering the Open-IM-Server issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Afeature) proposals, and [bug](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Abug+) fixes. -+ If you are looking for something to work on, check out our [open issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc). -+ If you have an idea for a new feature, please [open an issue](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose), and we can discuss it. ++ If you are new to the project, don't know how to contribute Open-IM-Server, please check out the [good first issue](https://github.com/openimsdk/open-im-server/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label. ++ You should be good at filtering the Open-IM-Server issue tags and finding the ones you like, such as [RFC](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+label%3Afeature) proposals, and [bug](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+label%3Abug+) fixes. ++ If you are looking for something to work on, check out our [open issues](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc). ++ If you have an idea for a new feature, please [open an issue](https://github.com/openimsdk/open-im-server/issues/new/choose), and we can discuss it. #### Design documents -For any substantial design, there should be a well-crafted design document. This document is not just a simple record, but also a detailed description and manifestation, which can help team members better understand the design thinking and grasp the design direction. In the process of writing the design document, we can choose to use tools such as `Google Docs` or `Notion`, and even mark RFC in [issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) or [discussions](https://github.com/OpenIMSDK/Open-IM-Server/discussions) for better collaboration. Of course, after completing the design document, we should also add it to our [Shared Drive](https://drive.google.com/drive/) and notify the appropriate working group to let everyone know of its existence. Only by doing so can we maximize the effectiveness of the design document and provide strong support for the smooth progress of the project. +For any substantial design, there should be a well-crafted design document. This document is not just a simple record, but also a detailed description and manifestation, which can help team members better understand the design thinking and grasp the design direction. In the process of writing the design document, we can choose to use tools such as `Google Docs` or `Notion`, and even mark RFC in [issues](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) or [discussions](https://github.com/openimsdk/open-im-server/discussions) for better collaboration. Of course, after completing the design document, we should also add it to our [Shared Drive](https://drive.google.com/drive/) and notify the appropriate working group to let everyone know of its existence. Only by doing so can we maximize the effectiveness of the design document and provide strong support for the smooth progress of the project. Anybody can access the shared Drive for reading. To get access to comment. Once you've done that, head to the [shared Drive](https://drive.google.com/) and behold all the docs. @@ -95,10 +95,10 @@ To propose PR for the Open-IM-Server item, we assume you have registered a GitHu 2. **CLONE** your own repository to main locally. Use `git clone https://github.com//Open-IM-Server.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make. -3. **Set Remote** upstream to be `https://github.com/OpenIMSDK/Open-IM-Server.git` using the following two commands: +3. **Set Remote** upstream to be `https://github.com/openimsdk/open-im-server.git` using the following two commands: ```bash - ❯ git remote add upstream https://github.com/OpenIMSDK/Open-IM-Server.git + ❯ git remote add upstream https://github.com/openimsdk/open-im-server.git ❯ git remote set-url --push upstream no-pushing ``` @@ -108,7 +108,7 @@ To propose PR for the Open-IM-Server item, we assume you have registered a GitHu ❯ git remote -v origin https://github.com//Open-IM-Server.git (fetch) origin https://github.com//Open-IM-Server.git (push) - upstream https://github.com/OpenIMSDK/Open-IM-Server.git (fetch) + upstream https://github.com/openimsdk/open-im-server.git (fetch) upstream no-pushing (push) ``` @@ -174,7 +174,7 @@ To propose PR for the Open-IM-Server item, we assume you have registered a GitHu # then create pull request, and merge ``` -7. **Open a pull request** to `OpenIMSDK/Open-IM-Server:main` +7. **Open a pull request** to `openimsdk/open-im-server:main` It is recommended to review your changes before filing a pull request. Check if your code doesn't conflict with the main branch and no redundant code is included. @@ -190,7 +190,7 @@ Instead we encourage you to send us a private email to winxu81@gmail.com to repo #### Reporting general issues -To be honest, we regard every user of Open-IM-Serveras a very kind contributor. After experiencing Open-IM-Server, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose). +To be honest, we regard every user of Open-IM-Serveras a very kind contributor. After experiencing Open-IM-Server, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://github.com/openimsdk/open-im-server/issues/new/choose). Since we collaborate project Open-IM-Server in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one. @@ -258,7 +258,7 @@ An example for this could be: PR is the only way to make change to Open-IM-Server project files. To help reviewers better get your purpose, PR description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/.github/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request. -You can find some very formal PR in [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them. +You can find some very formal PR in [RFC](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them. **📖 Opening PRs:** @@ -307,8 +307,8 @@ git() { The documentation for Open-IM-Server includes: -+ [README.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/README.md): This file includes the basic information and instructions for getting started with Open-IM-Server. -+ [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to Open-IM-Server's codebase, such as how to submit issues, pull requests, and code reviews. ++ [README.md](https://github.com/openimsdk/open-im-server/blob/main/README.md): This file includes the basic information and instructions for getting started with Open-IM-Server. ++ [CONTRIBUTING.md](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to Open-IM-Server's codebase, such as how to submit issues, pull requests, and code reviews. + [Official Documentation](https://doc.rentsoft.cn/): This is the official documentation for Open-IM-Server, which includes comprehensive information on all of its features, configuration options, and troubleshooting tips. Please obey the following rules to better format the docs, which would greatly improve the reading experience. @@ -324,9 +324,9 @@ Please obey the following rules to better format the docs, which would greatly i We choose GitHub as the primary place for Open-IM-Server to collaborate. So the latest updates of Open-IM-Server are always here. Although contributions via PR is an explicit way to help, we still call for any other ways. -+ reply to other's [issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) if you could; ++ reply to other's [issues](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) if you could; + help solve other user's problems; -+ help review other's [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design; ++ help review other's [PR](https://github.com/openimsdk/open-im-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design; + discuss about Open-IM-Server to make things clearer; + advocate [Open-IM-Server](https://google.com/search?q=Open-IM-Server) technology beyond GitHub; + write blogs on Open-IM-Server and so on. diff --git a/Makefile b/Makefile index e869ec111..ff7878108 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ all: tidy gen add-copyright verify lint cover restart # ============================================================================== # Build set -ROOT_PACKAGE=github.com/OpenIMSDK/Open-IM-Server -# TODO: This is version control for the future https://github.com/OpenIMSDK/Open-IM-Server/issues/574 -VERSION_PACKAGE=github.com/OpenIMSDK/Open-IM-Server/pkg/version +ROOT_PACKAGE=github.com/openimsdk/open-im-server +# TODO: This is version control for the future https://github.com/openimsdk/open-im-server/issues/574 +VERSION_PACKAGE=github.com/openimsdk/open-im-server/v3/pkg/version # ============================================================================== # Includes @@ -112,7 +112,7 @@ install: check: @$(MAKE) go.check -## check-component +## check-component: Check OpenIM component deployment ✨ .PHONY: check-component check-component: @$(MAKE) go.check-component diff --git a/README-zh_CN.md b/README-zh_CN.md index 3d9eea319..37a4dd410 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -10,11 +10,11 @@

-A+ -good first - +A+ +good first + - +

@@ -99,9 +99,9 @@ Open-IM-Server 不仅仅是一个即时消息服务器；它是将实时网络 9. **终极部署体验 🤖** - ✅ 支持 [集群部署](https://github.com/OpenIMSDK/Open-IM-Server/edit/main/deployments/README.md) + ✅ 支持 [集群部署](https://github.com/openimsdk/open-im-server/edit/main/deployments/README.md) - ✅ 支持多架构镜像，我们的 Docker 镜像不仅托管在 GitHub 上，而且还在阿里云和 Docker Hub 上支持多个架构。请访问 [我们的 GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) 并阅读我们的 [版本管理文档](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) 以获取更多信息。 + ✅ 支持多架构镜像，我们的 Docker 镜像不仅托管在 GitHub 上，而且还在阿里云和 Docker Hub 上支持多个架构。请访问 [我们的 GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) 并阅读我们的 [版本管理文档](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) 以获取更多信息。 10. **开源社区的大生态系统 🤲** @@ -118,10 +118,10 @@ Open-IM-Server 不仅仅是一个即时消息服务器；它是将实时网络 ``` # 选择您需要的 BRANCH=release-v3.1 -git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build +git clone -b $BRANCH https://github.com/openimsdk/open-im-server openim && export openim=$(pwd)/openim && cd $openim && make build ``` -> **注意** 阅读我们的发布策略：https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md +> **注意** 阅读我们的发布策略：https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md 1. 修改 `.env` @@ -149,27 +149,27 @@ make install make check ``` -![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png) +![https://github.com/openimsdk/open-im-server/blob/main/docs/images/docker_build.png](https://github.com/openimsdk/open-im-server/blob/main/docs/images/docker_build.png)
从源码编译 您需要 `Go 1.18` 或更高版本，以及 `make`。 -版本详情：https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md +版本详情：https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md ``` # 选择您需要的 BRANCH=release-v3.1 -git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build +git clone -b $BRANCH https://github.com/openimsdk/open-im-server openim && export openim=$(pwd)/openim && cd $openim && make build ``` -阅读关于 [OpenIM 版本策略](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) +阅读关于 [OpenIM 版本策略](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) 使用 `make help` 来查看 OpenIM 支持的指令。 如图所示，所有服务已成功构建 -![成功编译](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/build.png) +![成功编译](https://github.com/openimsdk/open-im-server/blob/main/docs/images/build.png)
组件配置说明 @@ -302,30 +302,30 @@ config/config.yaml 文件为存储组件提供了详细的配置说明。 OpenIM 不仅仅是一个开源的即时消息组件，它是您的应用程序生态系统的一个不可分割的部分。查看此图表以了解 AppServer、AppClient、Open-IM-Server 和 Open-IM-SDK 如何互动。 -![App-OpenIM 关系](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/open-im-server.png) +![App-OpenIM 关系](https://github.com/openimsdk/open-im-server/blob/main/docs/images/open-im-server.png) ## :building_construction: 总体架构 深入了解 Open-IM-Server 的功能与我们的架构图。 -![总体架构](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Architecture.jpg) +![总体架构](https://github.com/openimsdk/open-im-server/blob/main/docs/images/Architecture.jpg) ## :hammer_and_wrench: 开始开发 OpenIM OpenIM 我们的目标是建立一个顶级的开源社区。我们有一套标准，在 [Community repository](https://github.com/OpenIMSDK/community) 中。 -如果您想为这个 Open-IM-Server 仓库做贡献，请阅读我们的 [贡献者文档](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md)。 +如果您想为这个 Open-IM-Server 仓库做贡献，请阅读我们的 [贡献者文档](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md)。 -在您开始之前，请确保您的更改是需要的。最好的方法是创建一个 [新的讨论](https://github.com/OpenIMSDK/Open-IM-Server/discussions/new/choose) 或 [Slack 通讯](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)，或者如果您发现一个问题，首先 [报告它](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose)。 +在您开始之前，请确保您的更改是需要的。最好的方法是创建一个 [新的讨论](https://github.com/openimsdk/open-im-server/discussions/new/choose) 或 [Slack 通讯](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)，或者如果您发现一个问题，首先 [报告它](https://github.com/openimsdk/open-im-server/issues/new/choose)。 -- [代码标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/go_code.md) -- [Docker 图像标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) -- [目录标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/directory.md) -- [提交标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/commit.md) -- [版本控制标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) -- [接口标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/api.md) -- [日志标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/) -- [错误代码标准](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/error_code.md) +- [代码标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/go_code.md) +- [Docker 图像标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) +- [目录标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/directory.md) +- [提交标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/commit.md) +- [版本控制标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) +- [接口标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/api.md) +- [日志标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/) +- [错误代码标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md) ## :busts_in_silhouette: 社区 @@ -340,18 +340,18 @@ OpenIM 我们的目标是建立一个顶级的开源社区。我们有一套标 我们的会议在 [OpenIM Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q) 🎯，然后您可以搜索 Open-IM-Server 管道加入。 -我们在 [GitHub 讨论](https://github.com/OpenIMSDK/Open-IM-Server/discussions/categories/meeting) 中记下每次 [双周会议](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) 的笔记，我们的历史会议记录以及会议回放都可在 [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing) 中找到。 +我们在 [GitHub 讨论](https://github.com/openimsdk/open-im-server/discussions/categories/meeting) 中记下每次 [双周会议](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) 的笔记，我们的历史会议记录以及会议回放都可在 [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing) 中找到。 ## :eyes: 谁在使用 OpenIM -查看我们的 [用户案例研究](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) 页面以获取项目用户列表。不要犹豫，留下一个 [📝评论](https://github.com/OpenIMSDK/Open-IM-Server/issues/379) 并分享您的使用案例。 +查看我们的 [用户案例研究](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) 页面以获取项目用户列表。不要犹豫，留下一个 [📝评论](https://github.com/openimsdk/open-im-server/issues/379) 并分享您的使用案例。 ## :page_facing_up: 许可证 -OpenIM 根据 Apache 2.0 许可证授权。请查看 [LICENSE](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/LICENSE) 以获取完整的许可证文本。 +OpenIM 根据 Apache 2.0 许可证授权。请查看 [LICENSE](https://github.com/openimsdk/open-im-server/tree/main/LICENSE) 以获取完整的许可证文本。 -OpenIM logo，包括其变体和动画版本，在此存储库 [OpenIM](https://github.com/OpenIMSDK/Open-IM-Server) 下的 [assets/logo](./assets/logo) 和 [assets/logo-gif](./assets/logo-gif) 目录中显示，受版权法保护。 +OpenIM logo，包括其变体和动画版本，在此存储库 [OpenIM](https://github.com/openimsdk/open-im-server) 下的 [assets/logo](./assets/logo) 和 [assets/logo-gif](./assets/logo-gif) 目录中显示，受版权法保护。 ## 🔮 感谢我们的贡献者！ - \ No newline at end of file + \ No newline at end of file diff --git a/README.md b/README.md index 8e02b1a5d..504dcd012 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@

-A+ -good first - +A+ +good first + - +

@@ -99,9 +99,9 @@ Further enhancing your experience, we also provide an SDK client, wherein most c 9. **The ultimate deployment experience 🤖** - ✅ Supports [cluster deployment](https://github.com/OpenIMSDK/Open-IM-Server/edit/main/deployments/README.md) + ✅ Supports [cluster deployment](https://github.com/openimsdk/open-im-server/edit/main/deployments/README.md) - ✅ Supports multi-architecture mirroring, our Docker images are hosted not only on GitHub but also on Alibaba Cloud and Docker Hub supporting multiple architectures. Visit [our GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) and read our [version management document](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) for more information. + ✅ Supports multi-architecture mirroring, our Docker images are hosted not only on GitHub but also on Alibaba Cloud and Docker Hub supporting multiple architectures. Visit [our GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) and read our [version management document](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) for more information. 11. **A large ecosystem of open source communities 🤲** @@ -132,7 +132,7 @@ git clone -b main https://github.com/openim-sigs/openim-docker openim/openim-doc ``` > **Note** -> If you don't know OpenIM's versioning policy, 📚Read our release policy: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md +> If you don't know OpenIM's versioning policy, 📚Read our release policy: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md **2. Configure the config file** @@ -152,7 +152,7 @@ cat scripts/install/environment.sh ```bash export PASSWORD="openIM123" # Set password export USER="root" # Set username -# Choose chat version and server version https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md, eg: main, release-v*.* +# Choose chat version and server version https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md, eg: main, release-v*.* export CHAT_BRANCH="main" export SERVER_BRANCH="main" #... Other environment variables @@ -166,7 +166,7 @@ export DOCKER_BRIDGE_SUBNET="172.28.0.0/16" export API_URL="http://127.0.0.1:10002" ``` -If you wish to use more custom features, read our [config documentation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/environment.md). +If you wish to use more custom features, read our [config documentation](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md). Next, update the configuration using make init: @@ -189,20 +189,20 @@ Ur need `Go 1.18` or higher version, and `make`. go version && make --version || echo "Error: One of the commands failed." ``` -Version Details: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md +Version Details: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md -You can get the version number from the command below or from [github releases](https://github.com/OpenIMSDK/Open-IM-Server/tags). +You can get the version number from the command below or from [github releases](https://github.com/openimsdk/open-im-server/tags). ```bash -$ curl --silent "https://api.github.com/repos/OpenIMSDK/Open-IM-Server/releases" | jq -r '.[].tag_name' +$ curl --silent "https://api.github.com/repos/openimsdk/open-im-server/releases" | jq -r '.[].tag_name' ``` -We have our own version management policy, if you are interested in our version management, I recommend reading [📚 OpenIM Version](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md), We recommend using stable versions such as `v3.3.0` and `v3.2.0` whenever possible. `v3.1.1-alpha.3` as well as `v3.3.0-beta.0` and `v3.2.0-rc.0` are pre-release or beta versions and are not recommended. +We have our own version management policy, if you are interested in our version management, I recommend reading [📚 OpenIM Version](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md), We recommend using stable versions such as `v3.3.0` and `v3.2.0` whenever possible. `v3.1.1-alpha.3` as well as `v3.3.0-beta.0` and `v3.2.0-rc.0` are pre-release or beta versions and are not recommended. Set `OPENIM_VERSION` environment variables for the latest `OPENIM_VERSION` number, or replace the `OPENIM_VERSION` for you to install the OpenIM-Server `OPENIM_VERSION`: ```bash -$ OPENIM_VERSION=`curl -s https://api.github.com/repos/OpenIMSDK/Open-IM-Server/releases/latest | grep -oE '"tag_name": "[^"]+"' | head -n1 | cut -d'"' -f4` +$ OPENIM_VERSION=`curl -s https://api.github.com/repos/openimsdk/open-im-server/releases/latest | grep -oE '"tag_name": "[^"]+"' | head -n1 | cut -d'"' -f4` # OPENIM_VERSION=v3.3.0 ``` @@ -210,7 +210,7 @@ Deploy basic components at the click of a command: ```bash # install openim dependency -$ git clone https://github.com/OpenIMSDK/Open-IM-Server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION +$ git clone https://github.com/openimsdk/open-im-server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION $ curl https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml -o basic-openim-server-dependency.yml && make init && docker compose -f basic-openim-server-dependency.yml up -d && make start ``` @@ -228,7 +228,7 @@ You can use the `make help-all` see OpenIM in action.
Component Configuration Instructions -Read: Configuration center document：https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/environment.md +Read: Configuration center document：https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md
@@ -236,7 +236,7 @@ Read: Configuration center document：https://github.com/OpenIMSDK/Open-IM-Serve
Deployed with kubernetes -Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployments/README.md +Read: https://github.com/openimsdk/open-im-server/blob/main/deployments/README.md
@@ -268,30 +268,30 @@ Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployments/README.m OpenIM isn't just an open-source instant messaging component, it's an integral part of your application ecosystem. Check out this diagram to understand how AppServer, AppClient, Open-IM-Server, and Open-IM-SDK interact. -![App-OpenIM Relationship](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/open-im-server.png) +![App-OpenIM Relationship](https://github.com/openimsdk/open-im-server/blob/main/docs/images/open-im-server.png) ## :building_construction: Overall Architecture Delve into the heart of Open-IM-Server's functionality with our architecture diagram. -![Overall Architecture](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Architecture.jpg) +![Overall Architecture](https://github.com/openimsdk/open-im-server/blob/main/docs/images/Architecture.jpg) ## :hammer_and_wrench: To start developing OpenIM OpenIM Our goal is to build a top-level open source community. We have a set of standards, in the [Community repository](https://github.com/OpenIMSDK/community). -If you'd like to contribute to this Open-IM-Server repository, please read our [contributor documentation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md). +If you'd like to contribute to this Open-IM-Server repository, please read our [contributor documentation](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md). -Before you start, please make sure your changes are in demand. The best for that is to create a [new discussion](https://github.com/OpenIMSDK/Open-IM-Server/discussions/new/choose) OR [Slack Communication](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q), or if you find an issue, [report it](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose) first. +Before you start, please make sure your changes are in demand. The best for that is to create a [new discussion](https://github.com/openimsdk/open-im-server/discussions/new/choose) OR [Slack Communication](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q), or if you find an issue, [report it](https://github.com/openimsdk/open-im-server/issues/new/choose) first. -- [Code Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/go_code.md) -- [Docker Images Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) -- [Directory Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/directory.md) -- [Commit Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/commit.md) -- [Versioning Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) -- [Interface Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/api.md) -- [Log Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/logging.md) -- [Error Code Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/error_code.md) +- [Code Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/go_code.md) +- [Docker Images Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) +- [Directory Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/directory.md) +- [Commit Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/commit.md) +- [Versioning Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) +- [Interface Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/api.md) +- [Log Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/logging.md) +- [Error Code Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md) ## :busts_in_silhouette: Community @@ -306,20 +306,20 @@ We want anyone to get involved in our community and contributing code, we offer Our conference is in the [OpenIM Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q) 🎯, then you can search the Open-IM-Server pipeline to join -We take notes of each [biweekly meeting](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) in [GitHub discussions](https://github.com/OpenIMSDK/Open-IM-Server/discussions/categories/meeting), Our historical meeting notes, as well as replays of the meetings are available at [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing). +We take notes of each [biweekly meeting](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) in [GitHub discussions](https://github.com/openimsdk/open-im-server/discussions/categories/meeting), Our historical meeting notes, as well as replays of the meetings are available at [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing). ## :eyes: Who are using OpenIM -Check out our [user case studies](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) page for a list of the project users. Don't hesitate to leave a [📝comment](https://github.com/OpenIMSDK/Open-IM-Server/issues/379) and share your use case. +Check out our [user case studies](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) page for a list of the project users. Don't hesitate to leave a [📝comment](https://github.com/openimsdk/open-im-server/issues/379) and share your use case. ## :page_facing_up: License -OpenIM is licensed under the Apache 2.0 license. See [LICENSE](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/LICENSE) for the full license text. +OpenIM is licensed under the Apache 2.0 license. See [LICENSE](https://github.com/openimsdk/open-im-server/tree/main/LICENSE) for the full license text. -The OpenIM logo, including its variations and animated versions, displayed in this repository [OpenIM](https://github.com/OpenIMSDK/Open-IM-Server) under the [assets/logo](./assets/logo) and [assets/logo-gif](assets/logo-gif) directories, are protected by copyright laws. +The OpenIM logo, including its variations and animated versions, displayed in this repository [OpenIM](https://github.com/openimsdk/open-im-server) under the [assets/logo](./assets/logo) and [assets/logo-gif](assets/logo-gif) directories, are protected by copyright laws. ## 🔮 Thanks to our contributors! - - + + diff --git a/build/goreleaser.yaml b/build/goreleaser.yaml index ecd031921..d4e28fc2a 100644 --- a/build/goreleaser.yaml +++ b/build/goreleaser.yaml @@ -484,8 +484,8 @@ changelog: # use: buildx # build_flag_templates: # - "--pull" -# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md" -# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png" +# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/openimsdk/open-im-server/main/README.md" +# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/openimsdk/open-im-server/blob/main/assets/logo/openim-logo-green.png" # - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' # - "--label=io.artifacthub.package.license=Apace-2.0" # - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" @@ -504,8 +504,8 @@ changelog: # use: buildx # build_flag_templates: # - "--pull" -# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md" -# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png" +# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/openimsdk/open-im-server/main/README.md" +# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/openimsdk/open-im-server/blob/main/assets/logo/openim-logo-green.png" # - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' # - "--label=io.artifacthub.package.license=Apace-2.0" # - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" @@ -555,7 +555,7 @@ nfpms: - openim-rpc-user # Your app's vendor. vendor: OpenIMSDK - homepage: https://github.com/OpenIMSDK/Open-IM-Server + homepage: https://github.com/openimsdk/open-im-server maintainer: kubbot description: |- Auto sync github labels diff --git a/config/config.yaml b/config/config.yaml index c8c994c36..c1059581b 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -132,14 +132,14 @@ api: # minio.signEndpoint is minio public network address object: enable: "minio" - apiURL: "http://14.153.6.114:10002" + apiURL: "http://172.28.0.1:10002" minio: bucket: "openim" endpoint: "http://172.28.0.1:10005" accessKeyID: "root" secretAccessKey: "openIM123" sessionToken: '' - signEndpoint: "http://14.153.6.114:10005" + signEndpoint: "http://172.28.0.1:10005" cos: bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com secretID: '' @@ -194,7 +194,7 @@ rpcRegisterName: # Whether to output in json format # Whether to include stack trace in logs log: - storageLocation: ../logs + storageLocation: /root/workspaces/openim/openim-server/logs/ rotationTime: 24 remainRotationCount: 2 remainLogLevel: 6 diff --git a/deployments/README.md b/deployments/README.md index 7e3d47854..1dfb87217 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -7,7 +7,7 @@ OpenIM 支持很多种集群化部署方式，包括但不限于 helm, sealos, k 目前各个贡献者，以及之前的官方有出过一些可以参考的方案： - https://github.com/OpenIMSDK/k8s-jenkins -- https://github.com/OpenIMSDK/Open-IM-Server-k8s-deploy +- https://github.com/openimsdk/open-im-server-k8s-deploy - https://github.com/OpenIMSDK/openim-charts - https://github.com/showurl/deploy-openim diff --git a/deployments/templates/init/openim-api.service b/deployments/templates/init/openim-api.service index dba018b89..aed0e9b2d 100644 --- a/deployments/templates/init/openim-api.service +++ b/deployments/templates/init/openim-api.service @@ -1,7 +1,7 @@ [Unit] Description=OPENIM OPENIM API Documentation=Control interface for the OpenIM API service. -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-api diff --git a/deployments/templates/init/openim-cmdutils.service b/deployments/templates/init/openim-cmdutils.service index f96976a89..0e1058483 100644 --- a/deployments/templates/init/openim-cmdutils.service +++ b/deployments/templates/init/openim-cmdutils.service @@ -1,7 +1,7 @@ [Unit] Description=OPENIM OPENIM CMDUTILS Documentation=Utility toolkit for common OpenIM command-line operations. -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-cmdutils diff --git a/deployments/templates/init/openim-crontask.service b/deployments/templates/init/openim-crontask.service index 9f1a60898..30ebe997e 100644 --- a/deployments/templates/init/openim-crontask.service +++ b/deployments/templates/init/openim-crontask.service @@ -1,7 +1,7 @@ [Unit] Description=OPENIM OPENIM CRONTASK Documentation=Manages the OpenIM CronTask service, with both direct and systemctl installation methods. -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-crontask diff --git a/deployments/templates/init/openim-msggateway.service b/deployments/templates/init/openim-msggateway.service index 4e280dd86..e0a322492 100644 --- a/deployments/templates/init/openim-msggateway.service +++ b/deployments/templates/init/openim-msggateway.service @@ -1,6 +1,6 @@ [Unit] Description=OPENIM OPENIM MSGGATEWAY -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-msggateway diff --git a/deployments/templates/init/openim-msgtransfer.service b/deployments/templates/init/openim-msgtransfer.service index bd805a0ba..7e20c4c92 100644 --- a/deployments/templates/init/openim-msgtransfer.service +++ b/deployments/templates/init/openim-msgtransfer.service @@ -1,6 +1,6 @@ [Unit] Description=OPENIM OPENIM MSGTRANSFER -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-msgtransfer diff --git a/deployments/templates/init/openim-push.service b/deployments/templates/init/openim-push.service index b2fdc237c..efcc88e89 100644 --- a/deployments/templates/init/openim-push.service +++ b/deployments/templates/init/openim-push.service @@ -1,7 +1,7 @@ [Unit] Description=OPENIM OPENIM PUSH Documentation=Interface for controlling the OpenIM Push Notification service. -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-push diff --git a/deployments/templates/init/openim-rpc.service b/deployments/templates/init/openim-rpc.service index 15671602a..026e3ebe2 100644 --- a/deployments/templates/init/openim-rpc.service +++ b/deployments/templates/init/openim-rpc.service @@ -1,6 +1,6 @@ [Unit] Description=OPENIM OPENIM RPC AUTH -Documentation=https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md [Service] WorkingDirectory=${OPENIM_DATA_DIR}/openim-rpc-auth diff --git a/docker-compose.yml b/docker-compose.yml index b08c12097..126409d3d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -#fixme Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git +#fixme Clone openIM Server project before using docker-compose,project address：https://github.com/openimsdk/open-im-server.git version: '3' networks: @@ -140,7 +140,7 @@ services: - "9090:9090" container_name: minio volumes: - - minio_data:/data + - minio_data:/data - minio_config:/root/.minio environment: MINIO_ROOT_USER: "${MINIO_ACCESS_KEY}" diff --git a/docs/README.md b/docs/README.md index e1d8c5d58..f9d045c49 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,8 +4,8 @@ Welcome to the OpenIM Documentation hub! This center provides a comprehensive ra ## Table of Contents -1. [Contrib](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib) - Guidance on contributing and configurations for developers -2. [Conversions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions) - Coding conventions, logging policies, and other transformation tools +1. [Contrib](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib) - Guidance on contributing and configurations for developers +2. [Conversions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions) - Coding conventions, logging policies, and other transformation tools ------ @@ -13,34 +13,34 @@ Welcome to the OpenIM Documentation hub! This center provides a comprehensive ra This section offers developers a detailed guide on how to contribute code, set up their environment, and follow the associated processes. -- [Code Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/code_conventions.md) - Rules and conventions for writing code in OpenIM. -- [Development Guide](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/development.md) - A guide on how to carry out development within OpenIM. -- [Git Cherry Pick](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/git_cherry-pick.md) - Guidelines on cherry-picking operations. -- [Git Workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/git_workflow.md) - The git workflow in OpenIM. -- [Initialization Configurations](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md) - Guidance on setting up and initializing OpenIM. -- [Docker Installation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/install_docker.md) - How to install Docker on your machine. -- [Linux Development Environment](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/linux_development.md) - Guide to set up the development environment on Linux. -- [Local Actions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/local_actions.md) - Guidelines on how to carry out certain common actions locally. -- [Offline Deployment](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/offline-deployment.md) - Methods of deploying OpenIM offline. -- [Protoc Tools](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/protoc_tools.md) - Guide on using protoc tools. -- [Go Tools](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/util_go.md) - Tools and libraries in OpenIM for Go. -- [Makefile Tools](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/util_makefile.md) - Best practices and tools for Makefile. -- [Script Tools](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/util_scripts.md) - Best practices and tools for scripts. +- [Code Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/code_conventions.md) - Rules and conventions for writing code in OpenIM. +- [Development Guide](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/development.md) - A guide on how to carry out development within OpenIM. +- [Git Cherry Pick](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/git_cherry-pick.md) - Guidelines on cherry-picking operations. +- [Git Workflow](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/git_workflow.md) - The git workflow in OpenIM. +- [Initialization Configurations](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md) - Guidance on setting up and initializing OpenIM. +- [Docker Installation](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/install_docker.md) - How to install Docker on your machine. +- [Linux Development Environment](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/linux_development.md) - Guide to set up the development environment on Linux. +- [Local Actions](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/local_actions.md) - Guidelines on how to carry out certain common actions locally. +- [Offline Deployment](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/offline-deployment.md) - Methods of deploying OpenIM offline. +- [Protoc Tools](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/protoc_tools.md) - Guide on using protoc tools. +- [Go Tools](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/util_go.md) - Tools and libraries in OpenIM for Go. +- [Makefile Tools](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/util_makefile.md) - Best practices and tools for Makefile. +- [Script Tools](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/util_scripts.md) - Best practices and tools for scripts. ## Conversions This section introduces various conventions and policies within OpenIM, encompassing code, logs, versions, and more. -- [API Conversions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/api.md) - Guidelines and methods for API conversions. -- [Logging Policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/bash_log.md) - Logging policies and conventions in OpenIM. -- [CI/CD Actions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/cicd_actions.md) - Procedures and conventions for CI/CD. -- [Commit Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/commit.md) - Conventions for code commits in OpenIM. -- [Directory Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/directory.md) - Directory structure and conventions within OpenIM. -- [Error Codes](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/error_code.md) - List and descriptions of error codes. -- [Go Code Conversions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/go_code.md) - Conventions and conversions for Go code. -- [Docker Image Strategy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) - Management strategies for OpenIM Docker images, spanning multiple architectures and image repositories. -- [Logging Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/logging.md) - Further detailed conventions on logging. -- [Version Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) - Naming and management strategies for OpenIM versions. +- [API Conversions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/api.md) - Guidelines and methods for API conversions. +- [Logging Policy](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/bash_log.md) - Logging policies and conventions in OpenIM. +- [CI/CD Actions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/cicd_actions.md) - Procedures and conventions for CI/CD. +- [Commit Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/commit.md) - Conventions for code commits in OpenIM. +- [Directory Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/directory.md) - Directory structure and conventions within OpenIM. +- [Error Codes](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md) - List and descriptions of error codes. +- [Go Code Conversions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/go_code.md) - Conventions and conversions for Go code. +- [Docker Image Strategy](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) - Management strategies for OpenIM Docker images, spanning multiple architectures and image repositories. +- [Logging Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/logging.md) - Further detailed conventions on logging. +- [Version Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) - Naming and management strategies for OpenIM versions. ## For Developers, Contributors, and Community Maintainers @@ -49,19 +49,19 @@ This section introduces various conventions and policies within OpenIM, encompas If you're a developer or someone keen on contributing: -- Familiarize yourself with our [Code Conventions](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/code_conventions.md) and [Git Workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/git_workflow.md) to ensure smooth contributions. -- Dive into the [Development Guide](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/development.md) to get a hang of the development practices in OpenIM. +- Familiarize yourself with our [Code Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/code_conventions.md) and [Git Workflow](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/git_workflow.md) to ensure smooth contributions. +- Dive into the [Development Guide](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/development.md) to get a hang of the development practices in OpenIM. ### Community Maintainers As a community maintainer: - Ensure that contributions align with the standards outlined in our documentation. -- Regularly review the [Logging Policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/bash_log.md) and [Error Codes](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/error_code.md) to stay updated. +- Regularly review the [Logging Policy](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/bash_log.md) and [Error Codes](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md) to stay updated. ## For Users Users should pay particular attention to: -- [Docker Installation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/install_docker.md) - Necessary if you're planning to use Docker images of OpenIM. -- [Docker Image Strategy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) - To understand the different images available and how to choose the right one for your architecture. \ No newline at end of file +- [Docker Installation](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/install_docker.md) - Necessary if you're planning to use Docker images of OpenIM. +- [Docker Image Strategy](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) - To understand the different images available and how to choose the right one for your architecture. \ No newline at end of file diff --git a/docs/contrib/code_conventions.md b/docs/contrib/code_conventions.md index 94478e6ff..39bec1114 100644 --- a/docs/contrib/code_conventions.md +++ b/docs/contrib/code_conventions.md @@ -35,4 +35,4 @@ ## Testing conventions -Please refer to [TESTING.md](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/test/readme) document. +Please refer to [TESTING.md](https://github.com/openimsdk/open-im-server/tree/main/test/readme) document. diff --git a/docs/contrib/development.md b/docs/contrib/development.md index a8c640570..45039304a 100644 --- a/docs/contrib/development.md +++ b/docs/contrib/development.md @@ -61,7 +61,7 @@ OpenIM build and test processes development require Docker to run certain steps. ### Vagrant -As described in the [Testing documentation](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/test/readme), all the smoke tests are run in virtual machines managed by Vagrant. To install Vagrant in the development environment, [follow the instructions from the Hashicorp website](https://www.vagrantup.com/downloads), alongside any of the following hypervisors: +As described in the [Testing documentation](https://github.com/openimsdk/open-im-server/tree/main/test/readme), all the smoke tests are run in virtual machines managed by Vagrant. To install Vagrant in the development environment, [follow the instructions from the Hashicorp website](https://www.vagrantup.com/downloads), alongside any of the following hypervisors: - [VirtualBox](https://www.virtualbox.org/) - [libvirt](https://libvirt.org/) and the [vagrant-libvirt plugin](https://github.com/vagrant-libvirt/vagrant-libvirt#installation) diff --git a/docs/contrib/environment.md b/docs/contrib/environment.md index 51baa5ae0..d539b961b 100644 --- a/docs/contrib/environment.md +++ b/docs/contrib/environment.md @@ -13,7 +13,7 @@ Three ways to modify the configuration: ```bash export PASSWORD="openIM123" # Set password export USER="root" # Set username -# Choose chat version and server version https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md, eg: main, release-v*.* +# Choose chat version and server version https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md, eg: main, release-v*.* export CHAT_BRANCH="main" export SERVER_BRANCH="main" #... Other environment variables @@ -48,9 +48,76 @@ make init The `config/config.yaml` file has detailed configuration instructions for the storage components. -The config file is available via [environment.sh](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/scripts/install/environment.sh) configuration [openim.yaml](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployments/templates/openim.yaml) template, and then through the `make init` to automatically generate a new configuration. +The config file is available via [environment.sh](https://github.com/openimsdk/open-im-server/blob/main/scripts/install/environment.sh) configuration [openim.yaml](https://github.com/openimsdk/open-im-server/blob/main/deployments/templates/openim.yaml) template, and then through the `make init` to automatically generate a new configuration. +## Environment variable + +By setting the environment variable below, You can then refresh the configuration using `make init` or `./scripts/init-config.sh` + +##### MINIO + ++ [MINIO DOCS](https://min.io/docs/minio/kubernetes/upstream/index.html) + +apiURL is the address of the api, the access address of the app, use s3 must be configured + +#### Overview + +MinIO is an object storage server that is API compatible with Amazon S3. It's best suited for storing unstructured data such as photos, videos, log files, backups, and container/VM images. In this guide, we'll walk through the process of configuring MinIO with custom settings. + +#### Default Configuration + +Configuration can be achieved by modifying the default variables in the `./scripts/install/environment.sh` file. However, for more flexibility and dynamic adjustments, setting environment variables is recommended. + +#### Setting Up the Environment Variables + +##### IP Configuration + +By default, the system generates the public IP of the machine. To manually set a public or local IP address, use: + +```bash +export IP=127.0.0.1 +``` + +##### API URL + +This is the address your application uses to communicate with MinIO. By default, it uses the public IP. However, you can adjust it to a public domain or another IP. + +```bash +export API_URL=127.0.0.1:10002 +``` + +##### MinIO Endpoint Configuration + +This is the primary address MinIO uses for communications: + +```bash +export MINIO_ENDPOINT="127.0.0.1" +``` + +##### MinIO Sign Endpoint + +For direct external access to stored content: + +```bash +export MINIO_SIGN_ENDPOINT=127.0.0.1:10005 +``` + +##### Modifying MinIO's Port + +If you need to adjust MinIO's port from the default: + +```bash +export MINIO_PORT="10005" +``` + +#### Applying the Configuration + +After setting your desired environment variables, restart the MinIO server to apply the changes. + +#### Verification + +It's crucial to verify the configurations by checking the connectivity between your application and MinIO using the set API URL and ensuring that the data can be directly accessed using the `signEndpoint`. ## Configuration Details @@ -133,6 +200,16 @@ The config file is available via [environment.sh](https://github.com/OpenIMSDK/O + + ## Config options -... \ No newline at end of file +... + +## Use the default values + +A method to revert to the default value: + +```bash +export IP=127.0.0.1 +``` diff --git a/docs/contrib/git_cherry-pick.md b/docs/contrib/git_cherry-pick.md index 9afb9c232..010685d65 100644 --- a/docs/contrib/git_cherry-pick.md +++ b/docs/contrib/git_cherry-pick.md @@ -27,8 +27,8 @@ Ensuring this strategy's success extends beyond just documentation; it hinges on - [Contributor License Agreement](https://github.com/openim-sigs/cla) is considered implicit for all code within cherry pick pull requests, **unless there is a large conflict**. - A pull request merged against the `main` branch. -- The release branch exists (example: [`release-1.18`](https://github.com/OpenIMSDK/Open-IM-Server/tree/release-v3.1)) -- The normal git and GitHub configured shell environment for pushing to your openim-server `origin` fork on GitHub and making a pull request against a configured remote `upstream` that tracks `https://github.com/OpenIMSDK/Open-IM-Server.git`, including `GITHUB_USER`. +- The release branch exists (example: [`release-1.18`](https://github.com/openimsdk/open-im-server/tree/release-v3.1)) +- The normal git and GitHub configured shell environment for pushing to your openim-server `origin` fork on GitHub and making a pull request against a configured remote `upstream` that tracks `https://github.com/openimsdk/open-im-server.git`, including `GITHUB_USER`. - Have GitHub CLI (`gh`) installed following [installation instructions](https://github.com/cli/cli#installation). - A github personal access token which has permissions "repo" and "read:org". Permissions are required for [gh auth login](https://cli.github.com/manual/gh_auth_login) and not used for anything unrelated to cherry-pick creation process (creating a branch and initiating PR). @@ -65,7 +65,7 @@ It is critical that our full community is actively engaged on enhancements in th ### Steps -- Run the [cherry pick script](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/scripts/cherry-pick.sh) +- Run the [cherry pick script](https://github.com/openimsdk/open-im-server/tree/main/scripts/cherry-pick.sh) This example applies a main branch PR #98765 to the remote branch `upstream/release-v3.1`: @@ -75,9 +75,9 @@ It is critical that our full community is actively engaged on enhancements in th - Be aware the cherry pick script assumes you have a git remote called `upstream` that points at the openim-server github org. - Please see our [recommended Git workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contributors/github-workflow.md#workflow). + Please see our [recommended Git workflow](https://github.com/openimsdk/open-im-server/blob/main/docs/contributors/github-workflow.md#workflow). - - You will need to run the cherry pick script separately for each patch release you want to cherry pick to. Cherry picks should be applied to all [active](https://github.com/OpenIMSDK/Open-IM-Server/releases) release branches where the fix is applicable. + - You will need to run the cherry pick script separately for each patch release you want to cherry pick to. Cherry picks should be applied to all [active](https://github.com/openimsdk/open-im-server/releases) release branches where the fix is applicable. - If `GITHUB_TOKEN` is not set you will be asked for your github password: provide the github [personal access token](https://github.com/settings/tokens) rather than your actual github password. If you can securely set the environment variable `GITHUB_TOKEN` to your personal access token then you can avoid an interactive prompt. Refer [mislav/hub#2655 (comment)](https://github.com/mislav/hub/issues/2655#issuecomment-735836048) diff --git a/docs/contrib/git_workflow.md b/docs/contrib/git_workflow.md index 1d21f9cdd..32257e941 100644 --- a/docs/contrib/git_workflow.md +++ b/docs/contrib/git_workflow.md @@ -18,7 +18,7 @@ OpenIM project uses the [GitHub flow](https://docs.github.com/en/get-started/qui ### Branch naming conventions -Every forked repository works independently, meaning that any contributor can create branches with the name they see fit. However, it is worth noting that OpenIM mirrors [OpenIM version skew policy](https://github.com/OpenIMSDK/Open-IM-Server/releases) by maintaining release branches for the most recent three minor releases. The only exception is that the main branch mirrors the latest OpenIM release (3.10) instead of using a `release-` prefixed one. +Every forked repository works independently, meaning that any contributor can create branches with the name they see fit. However, it is worth noting that OpenIM mirrors [OpenIM version skew policy](https://github.com/openimsdk/open-im-server/releases) by maintaining release branches for the most recent three minor releases. The only exception is that the main branch mirrors the latest OpenIM release (3.10) instead of using a `release-` prefixed one. ```text main -------------------------------------------. (OpenIM 3.10) @@ -39,7 +39,7 @@ There are everyday tasks related to git that every contributor needs to perform, Creating a OpenIM fork, cloning it, and setting its upstream remote can be summarized on: -1. Visit +1. Visit 2. Click the `Fork` button (top right) to establish a cloud-based fork 3. Clone fork to local storage 4. Add to your fork OpenIM remote as upstream @@ -54,8 +54,8 @@ git clone https://github.com/$user/OpenIM.git ## Add OpenIM as upstream to your fork cd OpenIM -git remote add upstream https://github.com/OpenIMSDK/Open-IM-Server.git -# or: git remote add upstream git@github.com:OpenIMSDK/Open-IM-Server.git +git remote add upstream https://github.com/openimsdk/open-im-server.git +# or: git remote add upstream git@github.com:openimsdk/open-im-server.git ## Ensure to never push to upstream directly git remote set-url --push upstream no_push diff --git a/docs/contrib/offline-deployment.md b/docs/contrib/offline-deployment.md index 6272c7499..f5083ad12 100644 --- a/docs/contrib/offline-deployment.md +++ b/docs/contrib/offline-deployment.md @@ -26,11 +26,11 @@ docker pull minio/minio ## 2. OpenIM & Chat Images -**For detailed understanding of version management and storage of OpenIM and Chat**: [version.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) +**For detailed understanding of version management and storage of OpenIM and Chat**: [version.md](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) ### OpenIM Image -- Get image version info: [images.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) +- Get image version info: [images.md](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) - Depending on the required version, execute the following command: ```bash @@ -111,6 +111,6 @@ docker-compose ps ## 6. Reference Links -- [OpenIMSDK Issue #432](https://github.com/OpenIMSDK/Open-IM-Server/issues/432) +- [OpenIMSDK Issue #432](https://github.com/openimsdk/open-im-server/issues/432) - [Notion Link](https://nsddd.notion.site/435ee747c0bc44048da9300a2d745ad3?pvs=25) -- [OpenIMSDK Issue #474](https://github.com/OpenIMSDK/Open-IM-Server/issues/474) \ No newline at end of file +- [OpenIMSDK Issue #474](https://github.com/openimsdk/open-im-server/issues/474) \ No newline at end of file diff --git a/docs/contrib/util_go.md b/docs/contrib/util_go.md index 4126aa97c..ca7b26ad1 100644 --- a/docs/contrib/util_go.md +++ b/docs/contrib/util_go.md @@ -1,6 +1,6 @@ # utils go -+ [toold readme](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/tools) ++ [toold readme](https://github.com/openimsdk/open-im-server/tree/main/tools) about scripts fix: ``` diff --git a/docs/conversions/github-workflow.md b/docs/conversions/github-workflow.md index 013495e5e..64b530740 100644 --- a/docs/conversions/github-workflow.md +++ b/docs/conversions/github-workflow.md @@ -83,7 +83,7 @@ You may now edit files on the `myfeature` branch. ### Building open-im-server -This workflow is process-specific. For quick-start build instructions for [openimsdk/open-im-server](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/util_makefile.md) +This workflow is process-specific. For quick-start build instructions for [openimsdk/open-im-server](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/util_makefile.md) ## 4. Keep your branch in sync diff --git a/docs/conversions/logging.md b/docs/conversions/logging.md index 82f74c9aa..fd9e883ef 100644 --- a/docs/conversions/logging.md +++ b/docs/conversions/logging.md @@ -2,7 +2,7 @@ ### Log Standards -- The unified log package `github.com/OpenIMSDK/Open-IM-Server/internal/pkg/log` should be used for all logging; +- The unified log package `github.com/openimsdk/open-im-server/internal/pkg/log` should be used for all logging; - Use structured logging formats: `log.Infow`, `log.Warnw`, `log.Errorw`, etc. For example: `log.Infow("Update post function called")`; - All logs should start with an uppercase letter and should not end with a `.`. For example: `log.Infow("Update post function called")`; - Use past tense. For example, use `Could not delete B` instead of `Cannot delete B`; diff --git a/docs/conversions/version.md b/docs/conversions/version.md index 0e6a26988..0980eaa27 100644 --- a/docs/conversions/version.md +++ b/docs/conversions/version.md @@ -27,15 +27,15 @@ In the OpenIM repository, version identification strictly complies with the `MAJ ## Main Branch: The Heart of OpenIM Development -The `main` branch is the operational heart of our development process. Housing the most recent and advanced features, this branch serves as the nerve center for all enhancements and updates. It encapsulates the freshest, though possibly unstable, facets of the software. Visit our `main` branch [here](https://github.com/OpenIMSDK/Open-IM-Server/tree/main). +The `main` branch is the operational heart of our development process. Housing the most recent and advanced features, this branch serves as the nerve center for all enhancements and updates. It encapsulates the freshest, though possibly unstable, facets of the software. Visit our `main` branch [here](https://github.com/openimsdk/open-im-server/tree/main). ## Release Branch: The Beacon of Stability -For every major release, we curate a corresponding `release` branch, e.g., `release-v3.1`. This branch symbolizes an embodiment of stability and ensures an updated version of the software, providing a dependable option for users favoring stability over nascent, yet possibly unstable, features. Visit the `release-v3.1` branch [here](https://github.com/OpenIMSDK/Open-IM-Server/tree/release-v3.1). +For every major release, we curate a corresponding `release` branch, e.g., `release-v3.1`. This branch symbolizes an embodiment of stability and ensures an updated version of the software, providing a dependable option for users favoring stability over nascent, yet possibly unstable, features. Visit the `release-v3.1` branch [here](https://github.com/openimsdk/open-im-server/tree/release-v3.1). ## Tag Management: The Cornerstone of Version Control -In OpenIM's version control system, the role of `tags` stands paramount. Owing to their immutable nature, tags can be effectively utilized to retrieve a specific version of the software. Explore our library of tags [here](https://github.com/OpenIMSDK/Open-IM-Server/tags). +In OpenIM's version control system, the role of `tags` stands paramount. Owing to their immutable nature, tags can be effectively utilized to retrieve a specific version of the software. Explore our library of tags [here](https://github.com/openimsdk/open-im-server/tags). Our Docker image versions are intimately entwined with these tripartite components. For instance, a Docker image tag may correspond to `ghcr.io/openimsdk/openim-server:v3.1.0`, a release to `ghcr.io/openimsdk/openim-server:release-v3.0`, and the main branch to `ghcr.io/openimsdk/openim-server:main` or `ghcr.io/openimsdk/openim-server:latest`. @@ -55,7 +55,7 @@ Whenever a project undergoes a partial functional addition, the minor version nu ## Release Management: A Guided Tour -Our GitHub repository at https://github.com/OpenIMSDK/Open-IM-Server/releases associates a release with each tag, with a distinction between Pre-release and Latest, determined by the branch source. Every significant feature launch prompts the issue of a `release` branch, such as `release-v3.2`, as a beacon of stability and Latest release. +Our GitHub repository at https://github.com/openimsdk/open-im-server/releases associates a release with each tag, with a distinction between Pre-release and Latest, determined by the branch source. Every significant feature launch prompts the issue of a `release` branch, such as `release-v3.2`, as a beacon of stability and Latest release. Pre-releases correspond to releases from the `main` branch, denoting tags with Version modifiers such as `v3.2.1-beta.0`, `v3.2.1-rc.1`, etc. If you are seeking the most recent, albeit possibly unstable, release with new features, these tags, originating from the latest `main` branch code, are your go-to. @@ -65,9 +65,9 @@ Conversely, if stability is your primary concern, you should opt for the release **About:** -+ [OpenIM Milestones](https://github.com/OpenIMSDK/Open-IM-Server/milestones) -+ [OpenIM Tags](https://github.com/OpenIMSDK/Open-IM-Server/tags) -+ [OpenIM Branches](https://github.com/OpenIMSDK/Open-IM-Server/branches) ++ [OpenIM Milestones](https://github.com/openimsdk/open-im-server/milestones) ++ [OpenIM Tags](https://github.com/openimsdk/open-im-server/tags) ++ [OpenIM Branches](https://github.com/openimsdk/open-im-server/branches) We create a new branch, such as `release-v3.1`, for each significant milestone (e.g., v3.1.0), housing all relevant code for that release. All enhancements and bug fixes targeting the subsequent version (e.g., v3.2.0) are integrated into this branch. @@ -120,4 +120,4 @@ Throughout this process, active communication within the team is pivotal to main ## Docker Images Version Management -For more details on managing Docker image versions, visit [OpenIM Docker Images Administration](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md). +For more details on managing Docker image versions, visit [OpenIM Docker Images Administration](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md). diff --git a/install.sh b/install.sh index 7dba0a39e..d43767362 100755 --- a/install.sh +++ b/install.sh @@ -103,9 +103,9 @@ function check_git_repo() { # Inside a git repository for remote in $(git remote); do repo_url=$(git remote get-url $remote) - if [[ $repo_url == "https://github.com/OpenIMSDK/Open-IM-Server.git" || \ - $repo_url == "https://github.com/OpenIMSDK/Open-IM-Server" || \ - $repo_url == "git@github.com:OpenIMSDK/Open-IM-Server.git" ]]; then + if [[ $repo_url == "https://github.com/openimsdk/open-im-server.git" || \ + $repo_url == "https://github.com/openimsdk/open-im-server" || \ + $repo_url == "git@github.com:openimsdk/open-im-server.git" ]]; then # If it's OpenIMSDK repository info "Current directory is OpenIMSDK git repository." info "Executing installation directly." @@ -515,7 +515,7 @@ O:::::::OOO:::::::O p:::::ppppp:::::::pe::::::::e n::::n n::::nII: ' 0.0001 # Display product URL - print_with_delay "Discover more and contribute at: https://github.com/OpenIMSDK/Open-IM-Server" 0.01 + print_with_delay "Discover more and contribute at: https://github.com/openimsdk/open-im-server" 0.01 # Reset text color back to normal echo -e "\033[0m" diff --git a/install_guide.sh b/install_guide.sh index c6532feb8..f42e65b9d 100755 --- a/install_guide.sh +++ b/install_guide.sh @@ -91,7 +91,7 @@ install_docker_compose() { fi rm -rf ./Open-IM-Server set -e - git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive; + git clone https://github.com/openimsdk/open-im-server.git --recursive; set +e cd ./Open-IM-Server git checkout errcode diff --git a/pkg/apistruct/doc.go b/pkg/apistruct/doc.go index d99eab7b6..2f1404584 100644 --- a/pkg/apistruct/doc.go +++ b/pkg/apistruct/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package apistruct // import "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" +package apistruct // import "github.com/openimsdk/open-im-server/v3/pkg/apistruct" diff --git a/pkg/authverify/doc.go b/pkg/authverify/doc.go index e07d69614..f9173a708 100644 --- a/pkg/authverify/doc.go +++ b/pkg/authverify/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package authverify // import "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" +package authverify // import "github.com/openimsdk/open-im-server/v3/pkg/authverify" diff --git a/pkg/callbackstruct/doc.go b/pkg/callbackstruct/doc.go index d9d9cd8d0..c3445c60e 100644 --- a/pkg/callbackstruct/doc.go +++ b/pkg/callbackstruct/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package callbackstruct // import "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct" +package callbackstruct // import "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" diff --git a/pkg/common/cmd/doc.go b/pkg/common/cmd/doc.go index 75da58c57..991a85eb9 100644 --- a/pkg/common/cmd/doc.go +++ b/pkg/common/cmd/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package cmd // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd" +package cmd // import "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index dc02c1f16..34a9f3b4e 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -16,7 +16,7 @@ package cmd import ( "github.com/openimsdk/open-im-server/v3/internal/msggateway" - //"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway". + //"github.com/openimsdk/open-im-server/internal/msggateway". "github.com/spf13/cobra" "github.com/OpenIMSDK/protocol/constant" diff --git a/pkg/common/config/doc.go b/pkg/common/config/doc.go index a58dd1b8f..4b76cb9fa 100644 --- a/pkg/common/config/doc.go +++ b/pkg/common/config/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package config // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" +package config // import "github.com/openimsdk/open-im-server/v3/pkg/common/config" diff --git a/pkg/common/convert/doc.go b/pkg/common/convert/doc.go index 0789adc3f..29c1144c1 100644 --- a/pkg/common/convert/doc.go +++ b/pkg/common/convert/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package convert // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" +package convert // import "github.com/openimsdk/open-im-server/v3/pkg/common/convert" diff --git a/pkg/common/db/cache/doc.go b/pkg/common/db/cache/doc.go index e02c5b9ba..77651e3de 100644 --- a/pkg/common/db/cache/doc.go +++ b/pkg/common/db/cache/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package cache // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" +package cache // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" diff --git a/pkg/common/db/controller/doc.go b/pkg/common/db/controller/doc.go index d54b689a6..72316f128 100644 --- a/pkg/common/db/controller/doc.go +++ b/pkg/common/db/controller/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package controller // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller" +package controller // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" diff --git a/pkg/common/db/localcache/doc.go b/pkg/common/db/localcache/doc.go index 40afac0ba..d349373ee 100644 --- a/pkg/common/db/localcache/doc.go +++ b/pkg/common/db/localcache/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package localcache // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache" +package localcache // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/localcache" diff --git a/pkg/common/db/relation/doc.go b/pkg/common/db/relation/doc.go index a3ac7243f..41135ac97 100644 --- a/pkg/common/db/relation/doc.go +++ b/pkg/common/db/relation/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package relation // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" +package relation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/relation" diff --git a/pkg/common/db/s3/cont/doc.go b/pkg/common/db/s3/cont/doc.go index bdba8501b..45737bc7c 100644 --- a/pkg/common/db/s3/cont/doc.go +++ b/pkg/common/db/s3/cont/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package cont // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont" +package cont // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" diff --git a/pkg/common/db/s3/cos/doc.go b/pkg/common/db/s3/cos/doc.go index bf405d0fc..592f90ee2 100644 --- a/pkg/common/db/s3/cos/doc.go +++ b/pkg/common/db/s3/cos/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package cos // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cos" +package cos // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cos" diff --git a/pkg/common/db/s3/doc.go b/pkg/common/db/s3/doc.go index 0a3cfe521..a43710676 100644 --- a/pkg/common/db/s3/doc.go +++ b/pkg/common/db/s3/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package s3 // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" +package s3 // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" diff --git a/pkg/common/db/s3/minio/doc.go b/pkg/common/db/s3/minio/doc.go index 704e12202..42e898c15 100644 --- a/pkg/common/db/s3/minio/doc.go +++ b/pkg/common/db/s3/minio/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package minio // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/minio" +package minio // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/minio" diff --git a/pkg/common/db/s3/oss/doc.go b/pkg/common/db/s3/oss/doc.go index 9520a7ed8..d2e2c91af 100644 --- a/pkg/common/db/s3/oss/doc.go +++ b/pkg/common/db/s3/oss/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package oss // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/oss" +package oss // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss" diff --git a/pkg/common/db/table/relation/doc.go b/pkg/common/db/table/relation/doc.go index fe78a700d..32185c8c7 100644 --- a/pkg/common/db/table/relation/doc.go +++ b/pkg/common/db/table/relation/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package relation // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" +package relation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" diff --git a/pkg/common/db/table/unrelation/doc.go b/pkg/common/db/table/unrelation/doc.go index 1c0eab222..7596206a0 100644 --- a/pkg/common/db/table/unrelation/doc.go +++ b/pkg/common/db/table/unrelation/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package unrelation // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" +package unrelation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" diff --git a/pkg/common/db/unrelation/doc.go b/pkg/common/db/unrelation/doc.go index b36a2406f..1a15e42c4 100644 --- a/pkg/common/db/unrelation/doc.go +++ b/pkg/common/db/unrelation/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package unrelation // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation" +package unrelation // import "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" diff --git a/pkg/common/http/doc.go b/pkg/common/http/doc.go index 33a0d5e5d..e6fd3ec1e 100644 --- a/pkg/common/http/doc.go +++ b/pkg/common/http/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package http // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http" +package http // import "github.com/openimsdk/open-im-server/v3/pkg/common/http" diff --git a/pkg/common/kafka/doc.go b/pkg/common/kafka/doc.go index c796db138..0f0c69a76 100644 --- a/pkg/common/kafka/doc.go +++ b/pkg/common/kafka/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package kafka // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka" +package kafka // import "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" diff --git a/pkg/common/locker/doc.go b/pkg/common/locker/doc.go index c94581aa9..8b9378f90 100644 --- a/pkg/common/locker/doc.go +++ b/pkg/common/locker/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package locker // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/locker" +package locker // import "github.com/openimsdk/open-im-server/v3/pkg/common/locker" diff --git a/pkg/common/prome/doc.go b/pkg/common/prome/doc.go index 0b82aa7bf..7058c711c 100644 --- a/pkg/common/prome/doc.go +++ b/pkg/common/prome/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prome // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" +package prome // import "github.com/openimsdk/open-im-server/v3/pkg/common/prome" diff --git a/pkg/common/startrpc/doc.go b/pkg/common/startrpc/doc.go index 571fd971a..1d5fd6787 100644 --- a/pkg/common/startrpc/doc.go +++ b/pkg/common/startrpc/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package startrpc // import "github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc" +package startrpc // import "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" diff --git a/pkg/msgprocessor/doc.go b/pkg/msgprocessor/doc.go index 2f1d0cb44..d1e24ce30 100644 --- a/pkg/msgprocessor/doc.go +++ b/pkg/msgprocessor/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package msgprocessor // import "github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor" +package msgprocessor // import "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" diff --git a/pkg/rpcclient/doc.go b/pkg/rpcclient/doc.go index f32f4f322..0fdfacc60 100644 --- a/pkg/rpcclient/doc.go +++ b/pkg/rpcclient/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package rpcclient // import "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" +package rpcclient // import "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" diff --git a/pkg/rpcclient/notification/doc.go b/pkg/rpcclient/notification/doc.go index eea54e59c..2d409bdc9 100644 --- a/pkg/rpcclient/notification/doc.go +++ b/pkg/rpcclient/notification/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package notification // import "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" +package notification // import "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" diff --git a/pkg/statistics/doc.go b/pkg/statistics/doc.go index 4dabe2058..8051c4c71 100644 --- a/pkg/statistics/doc.go +++ b/pkg/statistics/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package statistics // import "github.com/OpenIMSDK/Open-IM-Server/pkg/statistics" +package statistics // import "github.com/openimsdk/open-im-server/v3/pkg/statistics" diff --git a/scripts/advertise.sh b/scripts/advertise.sh index fbb68b4cc..9c8c284ad 100755 --- a/scripts/advertise.sh +++ b/scripts/advertise.sh @@ -78,7 +78,7 @@ O:::::::OOO:::::::O p:::::ppppp:::::::pe::::::::e n::::n n::::nII: ' 0.0001 # Display product URL - print_with_delay "Discover more and contribute at: https://github.com/OpenIMSDK/Open-IM-Server" 0.01 + print_with_delay "Discover more and contribute at: https://github.com/openimsdk/open-im-server" 0.01 # Reset text color back to normal echo -e "\033[0m" diff --git a/scripts/check-all.sh b/scripts/check-all.sh index d40e5a479..defc030f8 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -17,7 +17,7 @@ # # Usage: `scripts/check-all.sh`. # Encapsulated as: `make check`. -# READ: https://github.com/OpenIMSDK/Open-IM-Server/tree/main/scripts/install/environment.sh +# READ: https://github.com/openimsdk/open-im-server/tree/main/scripts/install/environment.sh set -o errexit set -o nounset @@ -71,7 +71,7 @@ fi if [[ $? -ne 0 ]]; then openim::log::error_exit "The service does not start properly, please check the port, query variable definition!" - echo "+++ https://github.com/OpenIMSDK/Open-IM-Server/tree/main/scripts/install/environment.sh +++" + echo "+++ https://github.com/openimsdk/open-im-server/tree/main/scripts/install/environment.sh +++" else echo "++++ Check all dependent service ports successfully !" fi diff --git a/scripts/cherry-pick.sh b/scripts/cherry-pick.sh index 8b81b3401..200ee8ed8 100755 --- a/scripts/cherry-pick.sh +++ b/scripts/cherry-pick.sh @@ -14,7 +14,7 @@ # limitations under the License. -# Usage Instructions: https://github.com/OpenIMSDK/Open-IM-Server/tree/main/docs/contrib/git_cherry-pick.md +# Usage Instructions: https://github.com/openimsdk/open-im-server/tree/main/docs/contrib/git_cherry-pick.md # Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How # meta.) Assumes you care about pulls from remote "upstream" and @@ -68,7 +68,7 @@ if [[ "$#" -lt 2 ]]; then echo " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)" echo " to override the default remote names to what you have locally." echo - echo " For merge process info, see https://github.com/OpenIMSDK/Open-IM-Server/tree/main/docs/contrib/git_cherry-pick.md" + echo " For merge process info, see https://github.com/openimsdk/open-im-server/tree/main/docs/contrib/git_cherry-pick.md" exit 2 fi @@ -145,7 +145,7 @@ Cherry pick of ${PULLSUBJ} on ${rel}. ${numandtitle} -For details on the cherry pick process, see the [cherry pick requests](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/docs/contrib/git_cherry-pick.md) page. +For details on the cherry pick process, see the [cherry pick requests](https://github.com/openimsdk/open-im-server/tree/main/docs/contrib/git_cherry-pick.md) page. \`\`\`release-note diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index fef411446..030c31faf 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -15,7 +15,7 @@ # 本脚本功能：根据 scripts/environment.sh 配置，生成 OPENIM 组件 YAML 配置文件。 # 示例：./scripts/genconfig.sh scripts/install/environment.sh scripts/template/config.yaml -# Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md +# Read: https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md env_file="$1" template_file="$2" diff --git a/scripts/gendoc.sh b/scripts/gendoc.sh index 1d381483f..c948fcdf9 100755 --- a/scripts/gendoc.sh +++ b/scripts/gendoc.sh @@ -17,7 +17,7 @@ DEFAULT_DIRS=( "pkg" "internal/pkg" ) -BASE_URL="github.com/OpenIMSDK/Open-IM-Server" +BASE_URL="github.com/openimsdk/open-im-server" usage() { echo "Usage: $0 [OPTIONS]" diff --git a/scripts/init-config.sh b/scripts/init-config.sh index db77e7e76..6d8bef806 100755 --- a/scripts/init-config.sh +++ b/scripts/init-config.sh @@ -14,7 +14,7 @@ # limitations under the License. # This script automatically initializes the various configuration files -# Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md +# Read: https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md set -o errexit set -o nounset diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh index 57a8d0400..080e95042 100755 --- a/scripts/install/environment.sh +++ b/scripts/install/environment.sh @@ -15,9 +15,9 @@ # This is a file that initializes variables for the automation script that initializes the config file # You need to supplement the script according to the specification. -# Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md +# Read: https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md # 格式化 bash 注释：https://tool.lu/shell/ -# 配置中心文档：https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/environment.md +# 配置中心文档：https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md OPENIM_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" @@ -26,7 +26,7 @@ LOCAL_OUTPUT_ROOT=""${OPENIM_ROOT}"/${OUT_DIR:-_output}" source "${OPENIM_ROOT}/scripts/lib/init.sh" #TODO: Access to the IP networks outside, or you want to use the IP network -# IP=http://127.0.0.1 +# IP=127.0.0.1 if [ -z "${IP}" ]; then IP=$(openim::util::get_server_ip) fi @@ -42,9 +42,6 @@ function def() { eval "readonly $var_name=\"\${$var_name:-$(printf '%q' "$default_value")}\"" } -# app要能访问到此ip和端口或域名 -readonly API_URL=${API_URL:-"http://${IP}:10002"} - # OpenIM Docker Compose 数据存储的默认路径 def "DATA_DIR" "${OPENIM_ROOT}" @@ -109,7 +106,7 @@ LAST_OCTET=$((LAST_OCTET + 1)) GRAFANA_NETWORK_ADDRESS=$(generate_ip) ###################### openim 配置 ###################### -# read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md +# read: https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md def "OPENIM_DATA_DIR" "/data/openim" def "OPENIM_INSTALL_DIR" "/opt/openim" def "OPENIM_CONFIG_DIR" "/etc/openim" @@ -174,9 +171,12 @@ def "MONGO_PASSWORD" "${PASSWORD}" # MongoDB的密码 def "MONGO_MAX_POOL_SIZE" "100" # 最大连接池大小 ###################### Object 配置信息 ###################### +# app要能访问到此ip和端口或域名 +readonly API_URL=${API_URL:-"http://${IP}:${API_OPENIM_PORT}"} + def "OBJECT_ENABLE" "minio" # 对象是否启用 # 对象的API地址 -readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${IP}:10002"} +readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${API_URL}"} def "MINIO_BUCKET" "openim" # MinIO的存储桶名称 def "MINIO_PORT" "10005" # MinIO的端口 # MinIO的端点URL @@ -185,7 +185,7 @@ readonly MINIO_ENDPOINT=${MINIO_ENDPOINT:-"http://${MINIO_ADDRESS}:${MINIO_PORT} def "MINIO_ACCESS_KEY" "${USER}" # MinIO的访问密钥ID def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥 def "MINIO_SESSION_TOKEN" # MinIO的会话令牌 -readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # MinIO的会话令牌 +readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # 腾讯云COS的存储桶URL def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com" def "COS_SECRET_ID" # 腾讯云COS的密钥ID diff --git a/scripts/install/openim-msggateway.sh b/scripts/install/openim-msggateway.sh index 1010fbbec..c51c20646 100755 --- a/scripts/install/openim-msggateway.sh +++ b/scripts/install/openim-msggateway.sh @@ -30,12 +30,12 @@ function openim::msggateway::start() openim::log::info "Start OpenIM Msggateway, binary root: ${SERVER_NAME}" openim::log::status "Start OpenIM Msggateway, path: ${OPENIM_MSGGATEWAY_BINARY}" - openim::util::stop_services_with_name ${SERVER_NAME} + openim::util::stop_services_with_name ${OPENIM_MSGGATEWAY_BINARY} # OpenIM message gateway service port OPENIM_MESSAGE_GATEWAY_PORTS=$(openim::util::list-to-string ${OPENIM_MESSAGE_GATEWAY_PORT} ) read -a OPENIM_MSGGATEWAY_PORTS_ARRAY <<< ${OPENIM_MESSAGE_GATEWAY_PORTS} - + openim::util::stop_services_on_ports ${OPENIM_MSGGATEWAY_PORTS_ARRAY[*]} # OpenIM WS port OPENIM_WS_PORTS=$(openim::util::list-to-string ${OPENIM_WS_PORT} ) read -a OPENIM_WS_PORTS_ARRAY <<< ${OPENIM_WS_PORTS} diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh index 612acd738..428f6b64e 100755 --- a/scripts/install/openim-msgtransfer.sh +++ b/scripts/install/openim-msgtransfer.sh @@ -30,7 +30,7 @@ function openim::msgtransfer::start() openim::log::info "Start OpenIM Msggateway, binary root: ${SERVER_NAME}" openim::log::status "Start OpenIM Msggateway, path: ${OPENIM_MSGTRANSFER_BINARY}" - openim::util::stop_services_with_name ${SERVER_NAME} + openim::util::stop_services_with_name ${OPENIM_MSGTRANSFER_BINARY} # Message Transfer Prometheus port list MSG_TRANSFER_PROM_PORTS=(openim::util::list-to-string ${MSG_TRANSFER_PROM_PORT} ) diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index 6825797e1..2455f91dc 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -635,7 +635,7 @@ openim::util::remove-gen-docs() { # repo, e.g. "upstream" or "origin". openim::util::git_upstream_remote_name() { git remote -v | grep fetch |\ - grep -E 'github.com[/:]OpenIMSDK/Open-IM-Server|openim.cc/server' |\ + grep -E 'github.com[/:]openimsdk/open-im-server|openim.cc/server' |\ head -n 1 | awk '{print $1}' } diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index 26fe721cc..0614bdf6f 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -73,7 +73,7 @@ ifeq ($(strip $(BINS)),) endif # TODO: EXCLUDE_TESTS variable, which contains the name of the package to be excluded from the test -EXCLUDE_TESTS=github.com/OpenIMSDK/Open-IM-Server/test github.com/OpenIMSDK/Open-IM-Server/pkg/log github.com/OpenIMSDK/Open-IM-Server/db github.com/OpenIMSDK/Open-IM-Server/scripts github.com/OpenIMSDK/Open-IM-Server/config +EXCLUDE_TESTS=github.com/openimsdk/open-im-server/test github.com/openimsdk/open-im-server/v3/pkg/log github.com/openimsdk/open-im-server/db github.com/openimsdk/open-im-server/scripts github.com/openimsdk/open-im-server/config # ============================================================================== # ❯ tree -L 1 cmd diff --git a/scripts/make-rules/image.mk b/scripts/make-rules/image.mk index 8320bc023..bb353034f 100644 --- a/scripts/make-rules/image.mk +++ b/scripts/make-rules/image.mk @@ -23,7 +23,7 @@ DOCKER := docker DOCKER_SUPPORTED_API_VERSION ?= 1.32|1.40|1.41 -# read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md +# read: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md REGISTRY_PREFIX ?= ghcr.io/openimsdk BASE_IMAGE ?= ghcr.io/openim-sigs/openim-bash-image diff --git a/scripts/verify-typecheck.sh b/scripts/verify-typecheck.sh index 0aa79482a..a0b818135 100755 --- a/scripts/verify-typecheck.sh +++ b/scripts/verify-typecheck.sh @@ -36,6 +36,6 @@ scripts/run-in-gopath.sh \ go run test/typecheck/typecheck.go "$@" "--serial=$TYPECHECK_SERIAL" || ret=$? if [[ $ret -ne 0 ]]; then openim::log::error "Type Check has failed. This may cause cross platform build failures." >&2 - openim::log::error "Please see https://github.com/OpenIMSDK/Open-IM-Server/tree/main/test/typecheck for more information." >&2 + openim::log::error "Please see https://github.com/openimsdk/open-im-server/tree/main/test/typecheck for more information." >&2 exit 1 fi diff --git a/test/typecheck/go.mod b/test/typecheck/go.mod index 253c4641e..f644c5b25 100644 --- a/test/typecheck/go.mod +++ b/test/typecheck/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenIMSDK/Open-IM-Server/test/typecheck +module github.com/openimsdk/open-im-server/test/typecheck go 1.18 diff --git a/tools/README.md b/tools/README.md index 45c66564d..bd16a84d1 100644 --- a/tools/README.md +++ b/tools/README.md @@ -18,7 +18,7 @@ export OPENIM_TOOLS_NAME= # copy and paste to create a new CRD and Controller mkdir tools/${OPENIM_TOOLS_NAME} cd tools/${OPENIM_TOOLS_NAME} -go mod init github.com/OpenIMSDK/Open-IM-Server/tools/${OPENIM_TOOLS_NAME} +go mod init github.com/openimsdk/open-im-server/tools/${OPENIM_TOOLS_NAME} go mod tidy go work use -r . cd ../.. diff --git a/tools/changelog/changelog.go b/tools/changelog/changelog.go index 9a25826b1..17a9e5404 100644 --- a/tools/changelog/changelog.go +++ b/tools/changelog/changelog.go @@ -299,7 +299,7 @@ func sortAndUniq(lines []string) []string { func upstreamLinkify(line string) string { if m := upstreamKube.FindStringSubmatch(line); len(m) > 0 { - return fmt.Sprintf("UPSTREAM: [#%s](https://github.com/OpenIMSDK/Open-IM-Server/pull/%s):%s", m[1], m[1], m[2]) + return fmt.Sprintf("UPSTREAM: [#%s](https://github.com/openimsdk/open-im-server/pull/%s):%s", m[1], m[1], m[2]) } if m := upstreamRepo.FindStringSubmatch(line); len(m) > 0 { return fmt.Sprintf("UPSTREAM: [%s#%s](https://github.com/%s/pull/%s):%s", m[1], m[2], m[1], m[2], m[3]) diff --git a/tools/component/component.go b/tools/component/component.go index 692e7b6e2..04c6ba9a5 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -206,7 +206,7 @@ func checkMinio() error { } } if exactIP(config.Config.Object.ApiURL) == "127.0.0.1" || exactIP(config.Config.Object.Minio.SignEndpoint) == "127.0.0.1" { - return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1.") + return ErrConfig.Wrap("apiURL or Minio SignEndpoint endpoint contain 127.0.0.1") } } return nil diff --git a/tools/imctl/README.md b/tools/imctl/README.md index 520df6421..28df87e26 100644 --- a/tools/imctl/README.md +++ b/tools/imctl/README.md @@ -8,7 +8,7 @@ - Status: Draft - RFC Pull Request: (leave blank) - OpenIMSDK Pull Request: (leave blank) -- OpenIMSDK Issue: https://github.com/OpenIMSDK/Open-IM-Server/issues/924 +- OpenIMSDK Issue: https://github.com/openimsdk/open-im-server/issues/924 - Supersedes: N/A ## 📇Topics diff --git a/tools/imctl/cmd/imctl/imctl.go b/tools/imctl/cmd/imctl/imctl.go index d72fee927..04032c64c 100644 --- a/tools/imctl/cmd/imctl/imctl.go +++ b/tools/imctl/cmd/imctl/imctl.go @@ -18,7 +18,7 @@ package main import ( "os" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd" + "github.com/openimsdk/open-im-server/v3/tools/imctl/internal/imctl/cmd" ) func main() { diff --git a/tools/imctl/internal/imctl/cmd/cmd.go b/tools/imctl/internal/imctl/cmd/cmd.go index 24b8a2c8e..ced641fd6 100644 --- a/tools/imctl/internal/imctl/cmd/cmd.go +++ b/tools/imctl/internal/imctl/cmd/cmd.go @@ -23,24 +23,24 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" - - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/inernal/iamctl/cmd/util" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/color" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/completion" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/info" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/jwt" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/new" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/options" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/policy" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/secret" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/set" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/user" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/validate" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/version" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - genericapiserver "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/pkg/server" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" + + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/inernal/iamctl/cmd/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/color" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/completion" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/info" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/jwt" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/new" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/options" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/policy" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/secret" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/set" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/user" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/validate" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/cmd/version" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + genericapiserver "github.com/openimsdk/open-im-server/tools/imctl/internal/pkg/server" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" ) // NewDefaultIAMCtlCommand creates the `imctl` command with default arguments. @@ -59,7 +59,7 @@ func NewIMCtlCommand(in io.Reader, out, err io.Writer) *cobra.Command { Find more information at: // TODO: add link to docs, from auto scripts and gendocs - https://github.com/OpenIMSDK/Open-IM-Server/tree/main/docs`), + https://github.com/openimsdk/open-im-server/tree/main/docs`), Run: runHelp, // Hook before and after Run initialize and write profiles to disk, // respectively. diff --git a/tools/imctl/internal/imctl/cmd/color/color.go b/tools/imctl/internal/imctl/cmd/color/color.go index bc54403e8..551ec379c 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" - 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" + 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 6e7d81afe..6242dbd45 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" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util" - "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 95bdbe3e3..a51c2f4de 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" - 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" + 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/imctl/internal/imctl/cmd/new/new.go b/tools/imctl/internal/imctl/cmd/new/new.go index 6ac0667fc..95ec853b1 100644 --- a/tools/imctl/internal/imctl/cmd/new/new.go +++ b/tools/imctl/internal/imctl/cmd/new/new.go @@ -28,9 +28,9 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" ) const ( @@ -68,9 +68,9 @@ import ( "github.com/spf13/cobra" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" ) const ( @@ -205,9 +205,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" ) const maxStringLength = 17 @@ -253,9 +253,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" ) const ( @@ -386,9 +386,9 @@ import ( "github.com/spf13/cobra" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" ) // SubCmd2Options is an options struct to support subcmd2 subcommands. diff --git a/tools/imctl/internal/imctl/cmd/options/options.go b/tools/imctl/internal/imctl/cmd/options/options.go index 9dfee06c9..52e236d13 100644 --- a/tools/imctl/internal/imctl/cmd/options/options.go +++ b/tools/imctl/internal/imctl/cmd/options/options.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/util/templates" ) var optionsExample = templates.Examples(` diff --git a/tools/imctl/internal/imctl/cmd/version/version.go b/tools/imctl/internal/imctl/cmd/version/version.go index 851f9b28d..c2636bfd2 100644 --- a/tools/imctl/internal/imctl/cmd/version/version.go +++ b/tools/imctl/internal/imctl/cmd/version/version.go @@ -25,9 +25,9 @@ import ( "github.com/openim-sigs/component-base/pkg/version" "github.com/spf13/cobra" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/util/templates" - "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions" - cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util" + "github.com/openimsdk/open-im-server/tools/imctl/internal/imctl/util/templates" + "github.com/openimsdk/open-im-server/tools/imctl/pkg/cli/genericclioptions" + cmdutil "github.com/openimsdk/open-im-server/tools/imctl/pkg/util" ) // Version is a struct for version information. From f3939793ab51b6f44a4e81d409fa9c5e92830181 Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751@qq.com> Date: Sat, 9 Sep 2023 11:06:50 +0800 Subject: [PATCH 3/6] fix: openim logs release v3.3 (#1048) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 126409d3d..0fa2d0093 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -180,7 +180,7 @@ services: # retries: 5 # volumes: # - ./logs:/openim/openim-server/logs -# - ./_output:/openim/openim-server/_output +# - ./_output/logs:/openim/openim-server/_output/logs # - ./config:/openim/openim-server/config # - ./scripts:/openim/openim-server/scripts # restart: always From 72e5c4a0bfbd783251444a9ff47841430d2c4737 Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751@qq.com> Date: Sat, 9 Sep 2023 14:26:24 +0800 Subject: [PATCH 4/6] fix: set openim volume (#1051) * fix: fix openim web port Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: fix openim web port Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: set openim volume --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/build-openim-web-image.yml | 4 +- CHANGELOG/CHANGELOG.md | 11 +- Dockerfile | 4 +- docker-compose.yml | 143 ++++++------------- scripts/install/openim-push.sh | 2 +- 5 files changed, 53 insertions(+), 111 deletions(-) diff --git a/.github/workflows/build-openim-web-image.yml b/.github/workflows/build-openim-web-image.yml index 471d7688e..6e8e7d823 100644 --- a/.github/workflows/build-openim-web-image.yml +++ b/.github/workflows/build-openim-web-image.yml @@ -84,7 +84,7 @@ jobs: id: meta2 uses: docker/metadata-action@v4.6.0 with: - images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server + images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web - name: Log in to AliYun Docker Hub uses: docker/login-action@v2 @@ -117,7 +117,7 @@ jobs: id: meta3 uses: docker/metadata-action@v4.6.0 with: - images: ghcr.io/openimsdk/openim-server + images: ghcr.io/openimsdk/openim-web - name: Log in to GitHub Container Registry uses: docker/login-action@v2 diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md index 41df11bba..2358b5fb8 100644 --- a/CHANGELOG/CHANGELOG.md +++ b/CHANGELOG/CHANGELOG.md @@ -89,9 +89,9 @@ $ git-chglog --config custom/dir/config.yml ## create next tag ```bash -git-chglog --next-tag 2.0.0 -o CHANGELOG.md -git commit -am "release 2.0.0" -git tag 2.0.0 +$ git-chglog --next-tag 2.0.0 -o CHANGELOG.md +$ git commit -am "release 2.0.0" +$ git tag 2.0.0 ``` | Query | Description | Example | @@ -112,6 +112,9 @@ git tag 2.0.0 + [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md) + [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md) + [OpenIM CHANGELOG-V3.1](CHANGELOG-3.1.md) ++ [OpenIM CHANGELOG-V3.2](CHANGELOG-3.2.md) ++ [OpenIM CHANGELOG-V3.3](CHANGELOG-3.3.md) + ## Introduction @@ -121,7 +124,7 @@ In both the open-source and closed-source software development communities, it i The most common format for version numbers is as follows: -``` +```bash major.minor[.patch[.build]] ``` diff --git a/Dockerfile b/Dockerfile index 5bd3930e0..f738d4457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR ${SERVER_WORKDIR} # Copy scripts and binary files to the production image COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin -COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts -COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config +# COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts +# COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config CMD ["/openim/openim-server/scripts/docker-start-all.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 0fa2d0093..543d5558f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -#fixme Clone openIM Server project before using docker-compose,project address：https://github.com/openimsdk/open-im-server.git +#fixme Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git version: '3' networks: @@ -10,29 +10,6 @@ networks: - subnet: '${DOCKER_BRIDGE_SUBNET}' gateway: '${DOCKER_BRIDGE_GATEWAY}' -volumes: - mysql_data: - mongodb_data: - mongodb_logs: - mongodb_config: - redis_data: - redis_config: - kafka_data: - minio_data: - minio_config: - openim_server_logs: - openim_server_output: - openim_server_config: - openim_server_scripts: - openim_chat_logs: - openim_chat_output: - openim_chat_config: - openim_chat_scripts: - openim_server_prometheus_config: - openim_server_grafana_datasource: - openim_server_grafana_config: - openim_server_grafana_dashboard: - services: mysql: image: mysql:5.7 @@ -40,7 +17,7 @@ services: - "${MYSQL_PORT}:3306" container_name: mysql volumes: - - mysql_data:/var/lib/mysql + - "${DATA_DIR}/components/mysql/data:/var/lib/mysql" - "/etc/localtime:/etc/localtime" environment: MYSQL_ROOT_PASSWORD: "${MYSQL_PASSWORD}" @@ -56,10 +33,10 @@ services: container_name: mongo command: --wiredTigerCacheSizeGB 1 --auth volumes: - - mongodb_data:/data/db - - mongodb_logs:/data/logs - - mongodb_config:/etc/mongo - - "./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro" + - "${DATA_DIR}/components/mongodb/data/db:/data/db" + - "${DATA_DIR}/components/mongodb/data/logs:/data/logs" + - "${DATA_DIR}/components/mongodb/data/conf:/etc/mongo" + - ./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro" environment: - TZ=Asia/Shanghai - wiredTigerCacheSizeGB=1 @@ -77,8 +54,8 @@ services: ports: - "${REDIS_PORT}:6379" volumes: - - redis_data:/data - - redis_config:/usr/local/redis/config/redis.conf + - "${DATA_DIR}/components/redis/data:/data" + - "${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf" environment: TZ: Asia/Shanghai restart: always @@ -118,8 +95,6 @@ services: bash -c " /opt/bitnami/scripts/kafka/run.sh & sleep 5; /opt/bitnami/kafka/create_topic.sh; wait " - extra_hosts: - - "host.docker.internal:host-gateway" environment: - TZ=Asia/Shanghai - KAFKA_CFG_NODE_ID=0 @@ -140,8 +115,8 @@ services: - "9090:9090" container_name: minio volumes: - - minio_data:/data - - minio_config:/root/.minio + - "${DATA_DIR}/components/mnt/data:/data" + - "${DATA_DIR}/components/mnt/config:/root/.minio" environment: MINIO_ROOT_USER: "${MINIO_ACCESS_KEY}" MINIO_ROOT_PASSWORD: "${MINIO_SECRET_KEY}" @@ -153,6 +128,8 @@ services: openim-web: image: ghcr.io/openimsdk/openim-web:latest + # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web:latest + # image: openim/openim-web:latest container_name: openim-web environment: - OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH} @@ -165,8 +142,8 @@ services: ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS} # openim-server: -# # image: ghcr.io/openimsdk/openim-server:main -# image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main +# image: ghcr.io/openimsdk/openim-server:main +# # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main # # image: openim/openim-server:main # # build: . # container_name: openim-server @@ -199,69 +176,31 @@ services: # server: # ipv4_address: ${OPENIM_SERVER_NETWORK_ADDRESS} - # openim-chat: - # # image: ghcr.io/openimsdk/openim-chat:main - # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-chat:main - # # image: ghcr.io/openimsdk/openim-chat:main - # container_name: openim-chat - # healthcheck: - # test: ["CMD", "/openim/openim-chat/scripts/check_all.sh"] - # interval: 300s - # timeout: 10s - # retries: 5 - # ports: - # - ${OPENIM_CHAT_API_PORT}:10008 - # - ${OPENIM_ADMIN_API_PORT}:10009 - # volumes: - # - openim_chat_logs:/openim/openim-chat/logs - # - openim_chat_output:/openim/openim-chat/_output - # - openim_chat_config:/openim/openim-chat/config - # - openim_chat_scripts:/openim/openim-chat/scripts - # restart: always - # user: root:root - # depends_on: - # - mysql - # - mongodb - # - redis - # - minio - # - server - # logging: - # driver: json-file - # options: - # max-size: "1g" - # max-file: "2" - # networks: - # server: - # ipv4_address: ${OPENIM_CHAT_NETWORK_ADDRESS} - - # prometheus: - # image: prom/prometheus - # volumes: - # - openim_server_prometheus_config:/etc/prometheus - # container_name: prometheus - # ports: - # - ${PROMETHEUS_PORT}:9091 - # command: --web.listen-address=:9091 --config.file="/etc/prometheus" - # networks: - # server: - # ipv4_address: ${PROMETHEUS_NETWORK_ADDRESS} - - # grafana: - # image: grafana/grafana - # volumes: - # - openim_server_grafana_datasource:/etc/grafana/provisioning/datasources - # - openim_server_grafana_config:/etc/grafana - # - openim_server_grafana_dashboard:/var/lib/grafana/dashboards - # container_name: grafana - # ports: - # - ${GRAFANA_PORT}:3000 - # networks: - # server: - # ipv4_address: ${GRAFANA_NETWORK_ADDRESS} +# prometheus: +# image: prom/prometheus +# volumes: +# - ./.docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml +# container_name: prometheus +# ports: +# - ${PROMETHEUS_PORT}:9091 +# depends_on: +# - openim-server +# command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml" +# networks: +# openim-server: +# ipv4_address: ${PROMETHEUS_NETWORK_ADDRESS} - # node-exporter: - # image: quay.io/prometheus/node-exporter - # container_name: node-exporter - # restart: always - # ports: - # - "9100:9100" +# grafana: +# image: grafana/grafana +# volumes: +# - ./.docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml +# - ./.docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini +# - ./.docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json +# container_name: grafana +# ports: +# - ${GRAFANA_PORT}:3000 +# depends_on: +# - prometheus +# networks: +# openim-server: +# ipv4_address: ${GRAFANA_NETWORK_ADDRESS} \ No newline at end of file diff --git a/scripts/install/openim-push.sh b/scripts/install/openim-push.sh index e57edfaf6..aa5ebe7d4 100755 --- a/scripts/install/openim-push.sh +++ b/scripts/install/openim-push.sh @@ -71,7 +71,7 @@ function openim::push::start() for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}" - nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 & + nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 & done openim::util::check_process_names ${SERVER_NAME} From 2628874a2668bdac411de467646ca4aec6663dca Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751@qq.com> Date: Sat, 9 Sep 2023 15:57:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=8E=AF=20Optimize=20the=20deployment?= =?UTF-8?q?=20scheme=20to=20provide=20kubernetes=20deployment=20strategy?= =?UTF-8?q?=20(#1050)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fix openim web port Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: fix openim web port Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: github gh images Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: github gh images Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: go mod package Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .env | 2 +- README.md | 73 +++++++--------------------------------------- config/config.yaml | 4 +-- scripts/demo.sh | 23 +++++++++++++-- 4 files changed, 34 insertions(+), 68 deletions(-) diff --git a/.env b/.env index b2252cc9c..2f2766ef6 100644 --- a/.env +++ b/.env @@ -30,7 +30,7 @@ MINIO_ENDPOINT=http://172.28.0.1:10005 # Base URL for the application programming interface (API). # Default: API_URL=http://172.28.0.1:10002 -API_URL=http://172.28.0.1:10002 +API_URL=http://127.0.0.1:10002 # Directory path for storing data files or related information. # Default: DATA_DIR=./ diff --git a/README.md b/README.md index 504dcd012..d1af632bf 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ +Go Reference

@@ -81,7 +82,7 @@ Further enhancing your experience, we also provide an SDK client, wherein most c 5. **Open Source :open_hands:** - ✅ The code of OpenIM is open source, self-controlled data, aimed at building a globally leading IM open source community, including client SDK and server + ✅ The code of OpenIM is open source, self-controlled data, aimed at building a globally leading [IM open source community](https://github.com/OpenIMSDK), including [client SDK](https://github.com/openimsdk/openim-sdk-core) and server ✅ Based on open source Server, many excellent open source projects have been developed, such as [OpenKF](https://github.com/OpenIMSDK/OpenKF) (Open source AI customer service system) @@ -111,7 +112,7 @@ Further enhancing your experience, we also provide an SDK client, wherein most c ## :rocket: Quick Start -You can quickly learn OpenIM engineering solutions, all it takes is one simple command: +You can quickly learn OpenIM engineering solutions, all it takes is one simple command: ```bash $ make demo @@ -119,64 +120,18 @@ $ make demo 🤲 In order to facilitate the user experience, we have provided a variety of deployment solutions, you can choose your own deployment method according to the list below: -
Deploying with Docker Compose +
Deploying with Docker Compose +It is recommended to use Docker Compose for deployment, which can easily and quickly deploy the entire OpenIM service on a single node -> docker compose will not be maintained in future versions, but it is still the easiest and most convenient way to organize docker compose deployments into a separate project https://github.com/openim-sigs/openim-docker to maintain. ++ [https://github.com/openimsdk/openim-docker](https://github.com/openimsdk/openim-docker) -**1. Clone the project** - - -```bash -git clone -b main https://github.com/openim-sigs/openim-docker openim/openim-docker && export openim=$(pwd)/openim && cd $openim/openim-docker && ./scripts/init-config.sh && docker-compose up -d -``` > **Note** +> > If you don't know OpenIM's versioning policy, 📚Read our release policy: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md -**2. Configure the config file** - -If you tried to get started quickly with `make demo`, then you know that our config file is generated by automation. - -You can use `make init` to quickly initialize a configuration file - -Modify the automation script: - -```bash -cat scripts/install/environment.sh -``` - -1. Recommended using environment variables: - -```bash -export PASSWORD="openIM123" # Set password -export USER="root" # Set username -# Choose chat version and server version https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md, eg: main, release-v*.* -export CHAT_BRANCH="main" -export SERVER_BRANCH="main" -#... Other environment variables -# MONGO_USERNAME: This sets the MongoDB username -# MONGO_PASSWORD: Set the MongoDB password -# MONGO_DATABASE: Sets the MongoDB database name -# MINIO_ENDPOINT: set the MinIO service address -# DOCKER_BRIDGE_SUBNET: set the docker bridge network address -export DOCKER_BRIDGE_SUBNET="172.28.0.0/16" -# API_URL: under network environment, set OpenIM Server API address -export API_URL="http://127.0.0.1:10002" -``` - -If you wish to use more custom features, read our [config documentation](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md). - - -Next, update the configuration using make init: - -```bash -$ make init -$ git diff -``` - -
Compile from Source @@ -211,16 +166,11 @@ Deploy basic components at the click of a command: ```bash # install openim dependency $ git clone https://github.com/openimsdk/open-im-server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION -$ curl https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml -o basic-openim-server-dependency.yml && make init && docker compose -f basic-openim-server-dependency.yml up -d && make start +$ make init && docker compose -f basic-openim-server-dependency.yml up -d && make start && make check ``` > `make help` to help you see the instructions supported by OpenIM. -Use `make check` to check all component starts - -```bash -$ make check -``` You can use the `make help-all` see OpenIM in action. @@ -240,8 +190,9 @@ Read: https://github.com/openimsdk/open-im-server/blob/main/deployments/README.m
-
Open IM Ports +
Open IM and Chat Ports ++ oepnim-server warehouse: https://github.com/openimsdk/open-im-server | TCP Port | Description | Operation | | --------- | ------------------------------------------------------------ | ----------------------------------------------------- | @@ -249,10 +200,6 @@ Read: https://github.com/openimsdk/open-im-server/blob/main/deployments/README.m | TCP:10002 | api port, such as user, friend, group, message interfaces. | Port release or nginx reverse proxy, and firewall off | | TCP:10005 | Required when choosing minio storage (openIM uses minio storage by default) | Port release or nginx reverse proxy, and firewall off | -
- -
Open Chat Ports - + chat warehouse: https://github.com/OpenIMSDK/chat diff --git a/config/config.yaml b/config/config.yaml index c1059581b..9d6b3c335 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -132,14 +132,14 @@ api: # minio.signEndpoint is minio public network address object: enable: "minio" - apiURL: "http://172.28.0.1:10002" + apiURL: "http://http://127.0.0.1:10002" minio: bucket: "openim" endpoint: "http://172.28.0.1:10005" accessKeyID: "root" secretAccessKey: "openIM123" sessionToken: '' - signEndpoint: "http://172.28.0.1:10005" + signEndpoint: "http://127.0.0.1:10005" cos: bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com secretID: '' diff --git a/scripts/demo.sh b/scripts/demo.sh index 51a8a7aa7..329e04f0f 100755 --- a/scripts/demo.sh +++ b/scripts/demo.sh @@ -13,6 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. +if ! command -v pv &> /dev/null +then + echo "pv not found, installing..." + if [ -e /etc/debian_version ]; then + sudo apt-get update + sudo apt-get install -y pv + elif [ -e /etc/redhat-release ]; then + sudo yum install -y pv + else + echo "Unsupported OS, please install pv manually." + exit 1 + fi +fi + readonly t_reset=$(tput sgr0) readonly green=$(tput bold; tput setaf 2) readonly yellow=$(tput bold; tput setaf 3) @@ -58,8 +72,11 @@ clear openim::util::desc "========> Start the basic openim docker components" openim::util::desc "========> You can use docker-compose ps to check the status of the container" -openim::util::run "curl https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml -o basic-openim-server-dependency.yml" -openim::util::run "docker compose up --f basic-openim-server-dependency.yml up -d" +openim::util::run "docker compose up -d" +clear + +openim::util::desc "========> Use make init-githooks Initialize git hooks " +openim::util::run "make init-githooks" clear openim::util::desc "The specification is pretty high, you need to be bound on your branch name, as well as commit messages" @@ -133,3 +150,5 @@ clear openim::util::desc "Add copyright" openim::util::run "make add-copyright" clear + +exit 0 From 3e1b147160d8bf210aa3cf9ad35929be681d3428 Mon Sep 17 00:00:00 2001 From: withchao <48119764+withchao@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:03:07 +0800 Subject: [PATCH 6/6] feat: choose whether to push group messages offline based on the user's session option settings (#1054) * fix: repeated modification session notification * fix: repeated modification session notification * fix: jpush return a nil pointer panic * fix: push redis pkg * fix: OANotification * feat: add rpc GetConversationNeedOfflinePushUserIDs * update pkg * cicd: robot automated Change * offlinePushMsg * conversation * conversation * cicd: robot automated Change * conversation * cicd: robot automated Change * conversation --------- Co-authored-by: withchao --- go.mod | 2 +- go.sum | 4 +-- internal/api/conversation.go | 4 +++ internal/api/route.go | 1 + internal/push/push_to_client.go | 23 ++++++++++++----- internal/rpc/conversation/conversaion.go | 27 ++++++++++++++++++++ pkg/common/db/cache/conversation.go | 27 ++++++++++++++++++++ pkg/common/db/controller/conversation.go | 20 ++++++++++++--- pkg/common/db/relation/conversation_model.go | 23 +++++++++++++++++ pkg/common/db/table/relation/conversation.go | 1 + 10 files changed, 119 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 43251a4cf..7e3af7de2 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require github.com/google/uuid v1.3.1 require ( github.com/IBM/sarama v1.41.1 - github.com/OpenIMSDK/protocol v0.0.18 + github.com/OpenIMSDK/protocol v0.0.21 github.com/OpenIMSDK/tools v0.0.14 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible github.com/go-redis/redis v6.15.9+incompatible diff --git a/go.sum b/go.sum index e94b507ae..5b180156e 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIw github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/IBM/sarama v1.41.1 h1:B4/TdHce/8Ipza+qrLIeNJ9D1AOxZVp/3uDv6H/dp2M= github.com/IBM/sarama v1.41.1/go.mod h1:JFCPURVskaipJdKRFkiE/OZqQHw7jqliaJmRwXCmSSw= -github.com/OpenIMSDK/protocol v0.0.18 h1:hXukFiDMLZx7s+hDCQePIK9ABiHyNlobNL4MppvOuMY= -github.com/OpenIMSDK/protocol v0.0.18/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= +github.com/OpenIMSDK/protocol v0.0.21 h1:5H6H+hJ9d/VgRqttvxD/zfK9Asd+4M8Eknk5swSbUVY= +github.com/OpenIMSDK/protocol v0.0.21/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ= github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= diff --git a/internal/api/conversation.go b/internal/api/conversation.go index 4e068b775..e422de677 100644 --- a/internal/api/conversation.go +++ b/internal/api/conversation.go @@ -44,3 +44,7 @@ func (o *ConversationApi) GetConversations(c *gin.Context) { func (o *ConversationApi) SetConversations(c *gin.Context) { a2r.Call(conversation.ConversationClient.SetConversations, o.Client, c) } + +func (o *ConversationApi) GetConversationOfflinePushUserIDs(c *gin.Context) { + a2r.Call(conversation.ConversationClient.GetConversationOfflinePushUserIDs, o.Client, c) +} diff --git a/internal/api/route.go b/internal/api/route.go index e1722523b..221e180a1 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -198,6 +198,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive conversationGroup.POST("/get_conversation", c.GetConversation) conversationGroup.POST("/get_conversations", c.GetConversations) conversationGroup.POST("/set_conversations", c.SetConversations) + conversationGroup.POST("/get_conversation_offline_push_user_ids", c.GetConversationOfflinePushUserIDs) } statisticsGroup := r.Group("/statistics", ParseToken) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index edd03ce98..66b003eaa 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -19,6 +19,8 @@ import ( "encoding/json" "errors" + "github.com/OpenIMSDK/protocol/conversation" + "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/OpenIMSDK/protocol/constant" @@ -117,7 +119,6 @@ func (p *Pusher) Push2User(ctx context.Context, userIDs []string, msg *sdkws.Msg if err != nil { return err } - break } } } @@ -234,15 +235,23 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws if len(offlinePushUserIDs) > 0 { needOfflinePushUserIDs = offlinePushUserIDs } - err = p.offlinePushMsg(ctx, groupID, msg, offlinePushUserIDs) + resp, err := p.conversationRpcClient.Client.GetConversationOfflinePushUserIDs( + ctx, + &conversation.GetConversationOfflinePushUserIDsReq{ConversationID: utils.GenGroupConversationID(groupID), UserIDs: needOfflinePushUserIDs}, + ) if err != nil { - log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg) return err } - _, err := p.GetConnsAndOnlinePush(ctx, msg, utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs)) - if err != nil { - log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg, "userIDs", utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs)) - return err + if len(resp.UserIDs) > 0 { + err = p.offlinePushMsg(ctx, groupID, msg, resp.UserIDs) + if err != nil { + log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg) + return err + } + if _, err := p.GetConnsAndOnlinePush(ctx, msg, utils.IntersectString(resp.UserIDs, WebAndPcBackgroundUserIDs)); err != nil { + log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg, "userIDs", utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs)) + return err + } } } } diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 9f97c3c67..4b5b43fe8 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -300,3 +300,30 @@ func (c *conversationServer) GetConversationsByConversationID( } return &pbconversation.GetConversationsByConversationIDResp{Conversations: convert.ConversationsDB2Pb(conversations)}, nil } + +func (c *conversationServer) GetConversationOfflinePushUserIDs( + ctx context.Context, + req *pbconversation.GetConversationOfflinePushUserIDsReq, +) (*pbconversation.GetConversationOfflinePushUserIDsResp, error) { + if req.ConversationID == "" { + return nil, errs.ErrArgs.Wrap("conversationID is empty") + } + if len(req.UserIDs) == 0 { + return &pbconversation.GetConversationOfflinePushUserIDsResp{}, nil + } + userIDs, err := c.conversationDatabase.GetConversationNotReceiveMessageUserIDs(ctx, req.ConversationID) + if err != nil { + return nil, err + } + if len(userIDs) == 0 { + return &pbconversation.GetConversationOfflinePushUserIDsResp{UserIDs: req.UserIDs}, nil + } + userIDSet := make(map[string]struct{}) + for _, userID := range req.UserIDs { + userIDSet[userID] = struct{}{} + } + for _, userID := range userIDs { + delete(userIDSet, userID) + } + return &pbconversation.GetConversationOfflinePushUserIDsResp{UserIDs: utils.Keys(userIDSet)}, nil +} diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index d02b021e3..083cf6d0b 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -38,6 +38,7 @@ const ( recvMsgOptKey = "RECV_MSG_OPT:" superGroupRecvMsgNotNotifyUserIDsKey = "SUPER_GROUP_RECV_MSG_NOT_NOTIFY_USER_IDS:" superGroupRecvMsgNotNotifyUserIDsHashKey = "SUPER_GROUP_RECV_MSG_NOT_NOTIFY_USER_IDS_HASH:" + conversationNotReceiveMessageUserIDsKey = "CONVERSATION_NOT_RECEIVE_MESSAGE_USER_IDS:" conversationExpireTime = time.Second * 60 * 60 * 12 ) @@ -83,6 +84,8 @@ type ConversationCache interface { conversationIDs []string, ) ([]*relationtb.ConversationModel, error) DelConversationByConversationID(conversationIDs ...string) ConversationCache + GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) + DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache } func NewConversationRedis( @@ -153,6 +156,10 @@ func (c *ConversationRedisCache) getConversationHasReadSeqKey(ownerUserID, conve return conversationHasReadSeqKey + ownerUserID + ":" + conversationID } +func (c *ConversationRedisCache) getConversationNotReceiveMessageUserIDsKey(conversationID string) string { + return conversationNotReceiveMessageUserIDsKey + conversationID +} + func (c *ConversationRedisCache) GetUserConversationIDs(ctx context.Context, ownerUserID string) ([]string, error) { return getCache( ctx, @@ -432,3 +439,23 @@ func (c *ConversationRedisCache) GetConversationsByConversationID( func (c *ConversationRedisCache) DelConversationByConversationID(conversationIDs ...string) ConversationCache { panic("implement me") } + +func (c *ConversationRedisCache) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) { + return getCache( + ctx, + c.rcClient, + c.getConversationNotReceiveMessageUserIDsKey(conversationID), + c.expireTime, + func(ctx context.Context) ([]string, error) { + return c.conversationDB.GetConversationNotReceiveMessageUserIDs(ctx, conversationID) + }, + ) +} + +func (c *ConversationRedisCache) DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache { + cache := c.NewCache() + for _, conversationID := range conversationIDs { + cache.AddKeys(c.getConversationNotReceiveMessageUserIDsKey(conversationID)) + } + return cache +} diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 806e09331..c3dd6980e 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -53,6 +53,7 @@ type ConversationDatabase interface { GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error) + GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) } func NewConversationDatabase(conversation relationtb.ConversationModelInterface, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase { @@ -88,6 +89,9 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context, cache = cache.DelUserAllHasReadSeqs(userID, conversation.ConversationID) } } + if _, ok := filedMap["recv_msg_opt"]; ok { + cache = cache.DelConversationNotReceiveMessageUserIDs(conversation.ConversationID) + } } NotUserIDs := utils.DifferenceString(haveUserIDs, userIDs) log.ZDebug(ctx, "SetUsersConversationFiledTx", "NotUserIDs", NotUserIDs, "haveUserIDs", haveUserIDs, "userIDs", userIDs) @@ -121,7 +125,12 @@ func (c *conversationDatabase) UpdateUsersConversationFiled(ctx context.Context, if err != nil { return err } - return c.cache.DelUsersConversation(conversationID, userIDs...).ExecDel(ctx) + cache := c.cache.NewCache() + cache = cache.DelUsersConversation(conversationID, userIDs...) + if _, ok := args["recv_msg_opt"]; ok { + cache = cache.DelConversationNotReceiveMessageUserIDs(conversationID) + } + return cache.ExecDel(ctx) } func (c *conversationDatabase) CreateConversation(ctx context.Context, conversations []*relationtb.ConversationModel) error { @@ -132,6 +141,7 @@ func (c *conversationDatabase) CreateConversation(ctx context.Context, conversat cache := c.cache.NewCache() for _, conversation := range conversations { cache = cache.DelConversations(conversation.OwnerUserID, conversation.ConversationID) + cache = cache.DelConversationNotReceiveMessageUserIDs(conversation.ConversationID) userIDs = append(userIDs, conversation.OwnerUserID) } return cache.DelConversationIDs(userIDs...).DelUserConversationIDsHash(userIDs...).ExecDel(ctx) @@ -224,7 +234,7 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs if err != nil { return err } - cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID) + cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID).DelConversationNotReceiveMessageUserIDs(utils.Slice(notExistConversations, func(e *relationtb.ConversationModel) string { return e.ConversationID })...) } return nil }); err != nil { @@ -250,7 +260,7 @@ func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context, for _, v := range notExistUserIDs { conversation := relationtb.ConversationModel{ConversationType: constant.SuperGroupChatType, GroupID: groupID, OwnerUserID: v, ConversationID: conversationID} conversations = append(conversations, &conversation) - cache = cache.DelConversations(v, conversationID) + cache = cache.DelConversations(v, conversationID).DelConversationNotReceiveMessageUserIDs(conversationID) } cache = cache.DelConversationIDs(notExistUserIDs...).DelUserConversationIDsHash(notExistUserIDs...) if len(conversations) > 0 { @@ -296,3 +306,7 @@ func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Cont func (c *conversationDatabase) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error) { return c.conversationDB.GetConversationIDsNeedDestruct(ctx) } + +func (c *conversationDatabase) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) { + return c.cache.GetConversationNotReceiveMessageUserIDs(ctx, conversationID) +} diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index dcc18be17..d5ca92ec2 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -17,6 +17,8 @@ package relation import ( "context" + "github.com/OpenIMSDK/tools/errs" + "gorm.io/gorm" "github.com/OpenIMSDK/protocol/constant" @@ -214,3 +216,24 @@ func (c *ConversationGorm) GetConversationIDsNeedDestruct( "", ) } + +func (c *ConversationGorm) GetConversationRecvMsgOpt(ctx context.Context, userID string, conversationID string) (int32, error) { + var recvMsgOpt int32 + return recvMsgOpt, errs.Wrap( + c.db(ctx). + Model(&relation.ConversationModel{}). + Where("conversation_id = ? and owner_user_id in ?", conversationID, userID). + Pluck("recv_msg_opt", &recvMsgOpt). + Error, + ) +} + +func (c *ConversationGorm) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) { + var userIDs []string + return userIDs, errs.Wrap( + c.db(ctx). + Model(&relation.ConversationModel{}). + Where("conversation_id = ? and recv_msg_opt <> ?", conversationID, constant.ReceiveMessage). + Pluck("owner_user_id", &userIDs).Error, + ) +} diff --git a/pkg/common/db/table/relation/conversation.go b/pkg/common/db/table/relation/conversation.go index 99c01e5b7..7e6c6bdf8 100644 --- a/pkg/common/db/table/relation/conversation.go +++ b/pkg/common/db/table/relation/conversation.go @@ -66,5 +66,6 @@ type ConversationModelInterface interface { GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (hashReadSeqs map[string]int64, err error) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*ConversationModel, error) GetConversationIDsNeedDestruct(ctx context.Context) ([]*ConversationModel, error) + GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) NewTx(tx any) ConversationModelInterface }