From 2dd52d5274b51c9c74e5c3332f230873b48a18a0 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Thu, 28 Mar 2024 00:09:36 +0800 Subject: [PATCH] feat: add oepnim make lint format all code --- .golangci.yml | 40 ++++++-- cmd/openim-api/main.go | 3 +- internal/api/route.go | 11 +-- internal/msggateway/client.go | 2 +- internal/msggateway/context.go | 6 +- internal/msggateway/hub_server.go | 4 +- internal/msggateway/init.go | 2 +- internal/msggateway/message_handler.go | 4 +- internal/msggateway/n_ws_server.go | 6 +- internal/msggateway/user_map.go | 2 +- internal/msgtransfer/init.go | 6 +- .../msgtransfer/online_history_msg_handler.go | 4 +- internal/push/callback.go | 2 +- internal/push/offlinepush/getui/push.go | 2 +- internal/push/offlinepush/jpush/push.go | 2 +- internal/push/push_handler.go | 4 +- internal/push/push_rpc_server.go | 4 +- internal/push/push_to_client.go | 8 +- internal/rpc/auth/auth.go | 4 +- internal/rpc/conversation/conversaion.go | 6 +- internal/rpc/friend/callback.go | 2 +- internal/rpc/friend/friend.go | 6 +- internal/rpc/group/callback.go | 2 +- internal/rpc/group/group.go | 12 +-- internal/rpc/msg/as_read.go | 2 +- internal/rpc/msg/callback.go | 2 +- internal/rpc/msg/delete.go | 2 +- internal/rpc/msg/message_interceptor.go | 2 +- internal/rpc/msg/revoke.go | 6 +- internal/rpc/msg/send.go | 8 +- internal/rpc/msg/server.go | 1 + internal/rpc/msg/statistics.go | 3 +- internal/rpc/msg/sync_msg.go | 6 +- internal/rpc/msg/verify.go | 8 +- internal/rpc/third/log.go | 6 +- internal/rpc/third/s3.go | 4 +- internal/rpc/third/third.go | 6 +- internal/rpc/user/callback.go | 2 +- internal/rpc/user/user.go | 6 +- internal/tools/conversation.go | 4 +- internal/tools/cron_task.go | 2 +- internal/tools/msg.go | 5 +- pkg/authverify/token.go | 4 +- pkg/common/cmd/api.go | 1 + pkg/common/cmd/cron_task.go | 1 + pkg/common/cmd/msg_gateway.go | 4 +- pkg/common/cmd/msg_transfer.go | 4 +- pkg/common/cmd/msg_utils.go | 1 + pkg/common/cmd/rpc.go | 2 +- pkg/common/config/config.go | 6 +- pkg/common/config/parse.go | 4 +- pkg/common/convert/friend.go | 4 +- pkg/common/db/cache/conversation.go | 10 +- pkg/common/db/cache/friend.go | 2 +- pkg/common/db/cache/group.go | 8 +- pkg/common/db/cache/init_redis.go | 4 +- pkg/common/db/cache/meta_cache.go | 2 +- pkg/common/db/cache/msg.go | 2 +- pkg/common/db/cache/token.go | 1 + pkg/common/db/controller/black.go | 7 +- pkg/common/db/controller/conversation.go | 14 +-- pkg/common/db/controller/friend.go | 11 +-- pkg/common/db/controller/group.go | 6 +- pkg/common/db/controller/msg.go | 22 ++--- pkg/common/db/controller/s3.go | 3 +- pkg/common/db/controller/third.go | 2 +- pkg/common/db/controller/user.go | 19 ++-- pkg/common/db/mgo/conversation.go | 3 +- pkg/common/db/mgo/friend.go | 2 +- pkg/common/db/mgo/friend_request.go | 2 +- pkg/common/db/mgo/group.go | 19 ++-- pkg/common/db/mgo/group_member.go | 2 +- pkg/common/db/mgo/group_request.go | 2 +- pkg/common/db/mgo/log.go | 2 +- pkg/common/db/mgo/msg.go | 3 +- pkg/common/db/mgo/subscribe.go | 2 +- pkg/common/db/mgo/user.go | 2 +- pkg/common/db/s3/minio/thumbnail.go | 2 +- pkg/common/db/unrelation/mongo.go | 2 +- .../discoveryregister/zookeeper/zookeeper.go | 2 +- pkg/common/http/http_client.go | 3 +- pkg/common/kafka/consumer_group.go | 1 + pkg/common/kafka/producer.go | 1 + pkg/common/prommetrics/prommetrics.go | 5 +- pkg/common/startrpc/start.go | 16 ++-- pkg/rpcclient/auth.go | 1 + pkg/rpcclient/conversation.go | 2 +- pkg/rpcclient/friend.go | 2 +- pkg/rpcclient/group.go | 6 +- pkg/rpcclient/grouphash/grouphash.go | 2 +- pkg/rpcclient/msg.go | 8 +- pkg/rpcclient/notification/group.go | 6 +- pkg/rpcclient/push.go | 4 +- pkg/rpcclient/third.go | 3 +- pkg/rpcclient/user.go | 6 +- tools/component/component.go | 90 +----------------- tools/component/config/config.go | 1 - tools/component/util/env.go | 95 +++++++++++++++++++ tools/component/util/print.go | 0 tools/versionchecker/versionchecker.go | 4 +- 100 files changed, 349 insertions(+), 315 deletions(-) create mode 100644 tools/component/util/env.go create mode 100644 tools/component/util/print.go diff --git a/.golangci.yml b/.golangci.yml index f272d4229..c6d65f2cf 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -162,6 +162,7 @@ linters-settings: # consider enums only in package scopes, not in inner scopes package-scope-only: false + forbidigo: # # Forbid the following identifiers (identifiers are written using regexp): forbid: @@ -179,6 +180,7 @@ linters-settings: # - ginkgo\\.F.* # these are used just for local development # # Exclude godoc examples from forbidigo checks. Default is true. # exclude_godoc_examples: false + funlen: lines: 220 statements: 80 @@ -438,14 +440,25 @@ linters-settings: disable: - shadow disable-all: false - # depguard: - # list-type: blacklist - # include-go-root: false - # packages: - # - github.com/Sirupsen/logrus - # packages-with-error-message: - # # specify an error message to output when a blacklisted package is used - # - github.com/Sirupsen/logrus: "logging is allowed only by logutils.Log" + + depguard: + rules: + prevent_unmaintained_packages: + list-mode: lax # allow unless explicitely denied + files: + - $all + - "!$test" + allow: + - $gostd + deny: + - pkg: io/ioutil + desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil" + - pkg: github.com/OpenIMSDK + desc: "The OpenIM organization has been replaced with lowercase, please do not use uppercase organization name, you will use openimsdk" + - pkg: log + desc: "We have a wrapped log package at openim, we recommend you to use our wrapped log package, https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/logging.md" + - pkg: errors + desc: "We have a wrapped errors package at openim, we recommend you to use our wrapped errors package, https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/error-code.md" importas: # if set to `true`, force to use alias. @@ -577,6 +590,16 @@ linters-settings: rules: - name: indent-error-flow severity: warning + - name: exported + severity: warning + - name: var-naming + arguments: [ ["ID", "HTTP", "URL", "URI", "URL", "URI", "API", "APIKey", "Token", "TokenID", "TokenSecret", "TokenKey", "TokenSecret", "JWT", "JWTToken", "JWTTokenID", "JWTTokenSecret", "JWTTokenKey", "JWTTokenSecret", "OAuth", "OAuthToken", "OAuth" ] ] + - name: atomic + - name: line-length-limit + severity: error + arguments: [80] + - name: unhandled-error + arguments : ["fmt.Printf", "myFunction"] staticcheck: # Select the Go version to target. The default is '1.13'. @@ -598,7 +621,6 @@ linters-settings: # https://staticcheck.io/docs/options#http_status_code_whitelist http-status-code-whitelist: [ "200", "400", "404", "500" ] - tagliatelle: # check the struck tag name case case: diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index 442bcd07c..b4c746edc 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -15,9 +15,10 @@ package main import ( + _ "net/http/pprof" + "github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/tools/system/program" - _ "net/http/pprof" ) func main() { diff --git a/internal/api/route.go b/internal/api/route.go index 4df3554bf..bd361288d 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -18,9 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/system/program" "net" "net/http" "os" @@ -29,11 +26,9 @@ import ( "syscall" "time" - "github.com/go-playground/validator/v10" - "github.com/redis/go-redis/v9" - "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -41,13 +36,17 @@ import ( kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" ginprom "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/system/program" "github.com/openimsdk/tools/tokenverify" + "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index babf9567a..26f1c3dc8 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/tools/utils/stringutil" "runtime/debug" "sync" "sync/atomic" @@ -30,6 +29,7 @@ import ( "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/stringutil" "google.golang.org/protobuf/proto" ) diff --git a/internal/msggateway/context.go b/internal/msggateway/context.go index 7139f9e9c..c3e6f5014 100644 --- a/internal/msggateway/context.go +++ b/internal/msggateway/context.go @@ -15,15 +15,15 @@ package msggateway import ( - "github.com/openimsdk/tools/utils/encrypt" - "github.com/openimsdk/tools/utils/stringutil" - "github.com/openimsdk/tools/utils/timeutil" "net/http" "net/url" "strconv" "time" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/utils/encrypt" + "github.com/openimsdk/tools/utils/stringutil" + "github.com/openimsdk/tools/utils/timeutil" ) type UserConnContext struct { diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index 0cff7f4ef..c4db01b33 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -16,11 +16,11 @@ package msggateway import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msggateway" @@ -124,7 +124,7 @@ func (s *Server) GetUsersOnlineStatus( } func (s *Server) OnlineBatchPushOneMsg(ctx context.Context, req *msggateway.OnlineBatchPushOneMsgReq) (*msggateway.OnlineBatchPushOneMsgResp, error) { - //todo implement + // todo implement return nil, nil } diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 77d99845a..4fcb4b201 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -16,10 +16,10 @@ package msggateway import ( "context" - "github.com/openimsdk/tools/log" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/log" ) // Start run ws server. diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index e64eecb52..d568aeb3e 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -16,8 +16,6 @@ package msggateway import ( "context" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/utils/jsonutil" "sync" "github.com/go-playground/validator/v10" @@ -26,7 +24,9 @@ import ( "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/push" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils/jsonutil" "google.golang.org/protobuf/proto" ) diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index ea1085d99..e07913627 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -19,9 +19,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/utils/stringutil" "net/http" "strconv" "sync" @@ -33,12 +30,15 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msggateway" "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/stringutil" "github.com/redis/go-redis/v9" "golang.org/x/sync/errgroup" ) diff --git a/internal/msggateway/user_map.go b/internal/msggateway/user_map.go index 23fd3c385..79cc53d1b 100644 --- a/internal/msggateway/user_map.go +++ b/internal/msggateway/user_map.go @@ -16,10 +16,10 @@ package msggateway import ( "context" - "github.com/openimsdk/tools/utils/datautil" "sync" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" ) type UserMap struct { diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 9e6b866ec..cebbe67ea 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -18,9 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" - "github.com/openimsdk/tools/log" - "github.com/openimsdk/tools/system/program" "net/http" "os" "os/signal" @@ -29,12 +26,15 @@ import ( "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/mgo" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/system/program" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 4e9d66bcc..5a59ddeb0 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -16,8 +16,6 @@ package msgtransfer import ( "context" - "github.com/openimsdk/tools/utils/idutil" - "github.com/openimsdk/tools/utils/stringutil" "strconv" "strings" "sync" @@ -36,6 +34,8 @@ import ( "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/idutil" + "github.com/openimsdk/tools/utils/stringutil" "google.golang.org/protobuf/proto" ) diff --git a/internal/push/callback.go b/internal/push/callback.go index 37e57dc61..bd72cfec7 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -16,7 +16,6 @@ package push import ( "context" - "github.com/openimsdk/tools/utils/datautil" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -24,6 +23,7 @@ import ( "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" ) func callbackOfflinePush(ctx context.Context, callback *config.Callback, userIDs []string, msg *sdkws.MsgData, offlinePushUserIDs *[]string) error { diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go index 792f5865e..74bf07f07 100644 --- a/internal/push/offlinepush/getui/push.go +++ b/internal/push/offlinepush/getui/push.go @@ -19,7 +19,6 @@ import ( "crypto/sha256" "encoding/hex" "errors" - "github.com/openimsdk/tools/utils/httputil" "strconv" "sync" "time" @@ -30,6 +29,7 @@ import ( "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/httputil" "github.com/openimsdk/tools/utils/splitter" "github.com/redis/go-redis/v9" ) diff --git a/internal/push/offlinepush/jpush/push.go b/internal/push/offlinepush/jpush/push.go index 6d94d93b8..e3f2e8ae7 100644 --- a/internal/push/offlinepush/jpush/push.go +++ b/internal/push/offlinepush/jpush/push.go @@ -18,11 +18,11 @@ import ( "context" "encoding/base64" "fmt" - "github.com/openimsdk/tools/utils/httputil" "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" + "github.com/openimsdk/tools/utils/httputil" ) type JPush struct { diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index abdb7ba89..9df2199de 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -16,8 +16,6 @@ package push import ( "context" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/timeutil" "github.com/IBM/sarama" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -26,6 +24,8 @@ import ( pbchat "github.com/openimsdk/protocol/msg" pbpush "github.com/openimsdk/protocol/push" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/timeutil" "google.golang.org/protobuf/proto" ) diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index c56e8ba78..9881aa76a 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -16,8 +16,6 @@ package push import ( "context" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/utils/datautil" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -26,7 +24,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/constant" pbpush "github.com/openimsdk/protocol/push" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/grpc" ) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 49b4cd501..b53fd23a2 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -18,10 +18,6 @@ import ( "context" "encoding/json" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/jsonutil" - "github.com/openimsdk/tools/utils/stringutil" "sync" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" @@ -36,6 +32,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/protocol/msggateway" @@ -43,6 +40,9 @@ import ( "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/jsonutil" + "github.com/openimsdk/tools/utils/stringutil" "golang.org/x/sync/errgroup" "google.golang.org/grpc" ) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index f339dd44c..57dad178a 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -16,18 +16,18 @@ package auth import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/discovery" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" pbauth "github.com/openimsdk/protocol/auth" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msggateway" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 276287f8a..e3dd6ee24 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -17,9 +17,6 @@ package conversation import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/db/mongoutil" - "github.com/openimsdk/tools/utils/datautil" "sort" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -29,14 +26,17 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" tablerelation "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/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/openimsdk/protocol/constant" pbconversation "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/db/mongoutil" "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/grpc" ) diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index 333bee21c..4800f73fb 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -16,12 +16,12 @@ package friend import ( "context" - "github.com/openimsdk/tools/utils/datautil" 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" pbfriend "github.com/openimsdk/protocol/friend" + "github.com/openimsdk/tools/utils/datautil" ) func CallbackBeforeAddFriend(ctx context.Context, callback *config.Callback, req *pbfriend.ApplyToAddFriendReq) error { diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 46e172850..16848e16c 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -16,9 +16,6 @@ package friend import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/db/mongoutil" - "github.com/openimsdk/tools/utils/datautil" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -28,13 +25,16 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" tablerelation "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/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/openimsdk/protocol/constant" pbfriend "github.com/openimsdk/protocol/friend" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/db/mongoutil" "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/grpc" ) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 4d4b6c8cc..0d70f48a7 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,7 +16,6 @@ package group import ( "context" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" @@ -29,6 +28,7 @@ import ( pbgroup "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index ff0c27576..b7aaafb89 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -17,12 +17,6 @@ package group import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/db/mongoutil" - "github.com/openimsdk/tools/db/redisutil" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/encrypt" "math/big" "math/rand" "strconv" @@ -36,6 +30,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/grouphash" @@ -44,10 +39,15 @@ import ( pbconversation "github.com/openimsdk/protocol/conversation" pbgroup "github.com/openimsdk/protocol/group" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/redisutil" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/mw/specialerror" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/encrypt" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 248c8c09d..42d60b242 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -16,7 +16,6 @@ package msg import ( "context" - "github.com/openimsdk/tools/utils/datautil" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/protocol/constant" @@ -24,6 +23,7 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "github.com/redis/go-redis/v9" ) diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index eb733847b..49f1003ad 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -16,7 +16,6 @@ package msg import ( "context" - "github.com/openimsdk/tools/utils/datautil" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -26,6 +25,7 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/protobuf/proto" ) diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index 98ffd3c54..a818df332 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -16,7 +16,6 @@ package msg import ( "context" - "github.com/openimsdk/tools/utils/timeutil" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/protocol/constant" @@ -24,6 +23,7 @@ import ( "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/timeutil" ) func (m *msgServer) getMinSeqs(maxSeqs map[string]int64) map[string]int64 { diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index 7c13a3666..a169e70ec 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -16,9 +16,9 @@ package msg import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index 608d977db..d190ddcb3 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -17,18 +17,18 @@ package msg import ( "context" "encoding/json" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" ) 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 5eca938dc..255555242 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -16,13 +16,11 @@ package msg import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/stringutil" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" "github.com/openimsdk/protocol/constant" pbconversation "github.com/openimsdk/protocol/conversation" pbmsg "github.com/openimsdk/protocol/msg" @@ -30,6 +28,8 @@ import ( "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/stringutil" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 8e913f9d2..dfd1abce0 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -16,6 +16,7 @@ package msg import ( "context" + "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" diff --git a/internal/rpc/msg/statistics.go b/internal/rpc/msg/statistics.go index 8d9456d23..fc97e72eb 100644 --- a/internal/rpc/msg/statistics.go +++ b/internal/rpc/msg/statistics.go @@ -16,11 +16,12 @@ package msg import ( "context" + "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/utils/datautil" - "time" ) 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 bdb2c0911..409988497 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -16,16 +16,16 @@ package msg import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/timeutil" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/timeutil" ) func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) { diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index 6680faaa6..e03ad0d01 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -16,19 +16,19 @@ package msg import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/encrypt" - "github.com/openimsdk/tools/utils/timeutil" "math/rand" "strconv" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/encrypt" + "github.com/openimsdk/tools/utils/timeutil" ) var ExcludeContentType = []int{constant.HasReadReceipt} diff --git a/internal/rpc/third/log.go b/internal/rpc/third/log.go index e9df513aa..249031b7c 100644 --- a/internal/rpc/third/log.go +++ b/internal/rpc/third/log.go @@ -18,16 +18,16 @@ import ( "context" "crypto/rand" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/stringutil" "time" "github.com/openimsdk/open-im-server/v3/pkg/authverify" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/stringutil" ) func genLogID() string { diff --git a/internal/rpc/third/s3.go b/internal/rpc/third/s3.go index 9c97f0af6..18af41840 100644 --- a/internal/rpc/third/s3.go +++ b/internal/rpc/third/s3.go @@ -19,8 +19,6 @@ import ( "encoding/base64" "encoding/hex" "encoding/json" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" "path" "strconv" "time" @@ -29,10 +27,12 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" ) 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 30f83beab..063f03b63 100644 --- a/internal/rpc/third/third.go +++ b/internal/rpc/third/third.go @@ -17,9 +17,6 @@ package third import ( "context" "fmt" - "github.com/openimsdk/tools/db/mongoutil" - "github.com/openimsdk/tools/db/redisutil" - "github.com/openimsdk/tools/discovery" "net/url" "time" @@ -33,6 +30,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/third" + "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/redisutil" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "google.golang.org/grpc" ) diff --git a/internal/rpc/user/callback.go b/internal/rpc/user/callback.go index 128ca7cb3..347c3a9b4 100644 --- a/internal/rpc/user/callback.go +++ b/internal/rpc/user/callback.go @@ -16,12 +16,12 @@ package user import ( "context" - "github.com/openimsdk/tools/utils/datautil" 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" pbuser "github.com/openimsdk/protocol/user" + "github.com/openimsdk/tools/utils/datautil" ) func CallbackBeforeUpdateUserInfo(ctx context.Context, globalConfig *config.GlobalConfig, req *pbuser.UpdateUserInfoReq) error { diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 177b2b5c9..190275b61 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -17,9 +17,6 @@ package user import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/db/mongoutil" - "github.com/openimsdk/tools/utils/datautil" "math/rand" "strings" "time" @@ -33,15 +30,18 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" tablerelation "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/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/sdkws" pbuser "github.com/openimsdk/protocol/user" + "github.com/openimsdk/tools/db/mongoutil" "github.com/openimsdk/tools/db/pagination" registry "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/grpc" ) diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index fa41c63bd..099c984a6 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -16,8 +16,6 @@ package tools import ( "context" - "github.com/openimsdk/tools/utils/idutil" - "github.com/openimsdk/tools/utils/stringutil" "math/rand" "time" @@ -25,6 +23,8 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/idutil" + "github.com/openimsdk/tools/utils/stringutil" ) // func (c *MsgTool) ConversationsDestructMsgs() { diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index 87ea64534..19a5b283f 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -16,7 +16,6 @@ package tools import ( "context" - "github.com/openimsdk/tools/log" "os" "os/signal" "syscall" @@ -25,6 +24,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/redis/go-redis/v9" "github.com/robfig/cron/v3" ) diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 6050287ab..aa1e2e3cb 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -17,6 +17,9 @@ package tools import ( "context" "fmt" + "math" + "math/rand" + "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" @@ -36,8 +39,6 @@ import ( "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "math" - "math/rand" ) type MsgTool struct { diff --git a/pkg/authverify/token.go b/pkg/authverify/token.go index e545cda64..0eb71e2d0 100644 --- a/pkg/authverify/token.go +++ b/pkg/authverify/token.go @@ -17,13 +17,13 @@ package authverify import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" "github.com/golang-jwt/jwt/v4" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/tokenverify" + "github.com/openimsdk/tools/utils/datautil" ) func Secret(secret string) jwt.Keyfunc { diff --git a/pkg/common/cmd/api.go b/pkg/common/cmd/api.go index 701cc05c1..a0a297211 100644 --- a/pkg/common/cmd/api.go +++ b/pkg/common/cmd/api.go @@ -16,6 +16,7 @@ package cmd import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/api" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/protocol/constant" diff --git a/pkg/common/cmd/cron_task.go b/pkg/common/cmd/cron_task.go index 9183c0d8f..98c4ffa4c 100644 --- a/pkg/common/cmd/cron_task.go +++ b/pkg/common/cmd/cron_task.go @@ -16,6 +16,7 @@ package cmd import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/tools" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/tools/system/program" diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index 2ad88bc1a..58410c1b3 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -16,12 +16,12 @@ package cmd import ( "context" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/openimsdk/tools/system/program" "log" "github.com/openimsdk/open-im-server/v3/internal/msggateway" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/system/program" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index e5cc55cc4..973fa8cad 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -16,11 +16,11 @@ package cmd import ( "context" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/openimsdk/tools/system/program" "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/system/program" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/msg_utils.go b/pkg/common/cmd/msg_utils.go index 5e2a67343..b5b76c7f6 100644 --- a/pkg/common/cmd/msg_utils.go +++ b/pkg/common/cmd/msg_utils.go @@ -16,6 +16,7 @@ package cmd import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/tools" "github.com/openimsdk/tools/system/program" "github.com/spf13/cobra" diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index 8d511a7d5..c8446eb6b 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -17,13 +17,13 @@ package cmd import ( "context" "errors" - "github.com/openimsdk/tools/system/program" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/system/program" "github.com/spf13/cobra" "google.golang.org/grpc" ) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index c4fb61d5c..d719ef0d0 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -16,14 +16,14 @@ package config import ( "bytes" + "time" + "github.com/openimsdk/tools/db/mongoutil" "github.com/openimsdk/tools/db/redisutil" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/mq/kafka" "github.com/openimsdk/tools/system/program" "gopkg.in/yaml.v3" - "time" - - "github.com/openimsdk/tools/discovery" ) var Config GlobalConfig diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index 9860644a1..e1bcb2d96 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -16,14 +16,14 @@ package config import ( _ "embed" - "github.com/openimsdk/tools/field" - "gopkg.in/yaml.v3" "os" "path/filepath" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/field" + "gopkg.in/yaml.v3" ) //go:embed version diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go index a227c5a57..ad8f9071e 100644 --- a/pkg/common/convert/friend.go +++ b/pkg/common/convert/friend.go @@ -17,11 +17,11 @@ package convert import ( "context" "fmt" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/timeutil" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/timeutil" ) func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel { diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index bef0522c7..a0a745e6c 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -16,8 +16,6 @@ package cache import ( "context" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/encrypt" "math/big" "strings" "time" @@ -27,6 +25,8 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/encrypt" "github.com/redis/go-redis/v9" ) @@ -35,9 +35,9 @@ const ( // conversationIDsKey = "CONVERSATION_IDS:" // conversationIDsHashKey = "CONVERSATION_IDS_HASH:" // conversationHasReadSeqKey = "CONVERSATION_HAS_READ_SEQ:" - //recvMsgOptKey = "RECV_MSG_OPT:" - //superGroupRecvMsgNotNotifyUserIDsKey = "SUPER_GROUP_RECV_MSG_NOT_NOTIFY_USER_IDS:" - //superGroupRecvMsgNotNotifyUserIDsHashKey = "SUPER_GROUP_RECV_MSG_NOT_NOTIFY_USER_IDS_HASH:" + // 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 diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index 60f347e1b..a8413c979 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -16,7 +16,6 @@ package cache import ( "context" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/dtm-labs/rockscache" @@ -24,6 +23,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "github.com/redis/go-redis/v9" ) diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index dfafd623f..ed303e135 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -17,7 +17,6 @@ package cache import ( "context" "fmt" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/dtm-labs/rockscache" @@ -27,6 +26,7 @@ import ( "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" "github.com/redis/go-redis/v9" ) @@ -36,9 +36,9 @@ const ( // groupMemberIDsKey = "GROUP_MEMBER_IDS:" // groupMembersHashKey = "GROUP_MEMBERS_HASH2:" // groupMemberInfoKey = "GROUP_MEMBER_INFO:" - //joinedGroupsKey = "JOIN_GROUPS_KEY:" - //groupMemberNumKey = "GROUP_MEMBER_NUM_CACHE:" - //groupRoleLevelMemberIDsKey = "GROUP_ROLE_LEVEL_MEMBER_IDS:". + // joinedGroupsKey = "JOIN_GROUPS_KEY:" + // groupMemberNumKey = "GROUP_MEMBER_NUM_CACHE:" + // groupRoleLevelMemberIDsKey = "GROUP_ROLE_LEVEL_MEMBER_IDS:". ) type GroupHash interface { diff --git a/pkg/common/db/cache/init_redis.go b/pkg/common/db/cache/init_redis.go index cb4ca3f05..35a83cf9b 100644 --- a/pkg/common/db/cache/init_redis.go +++ b/pkg/common/db/cache/init_redis.go @@ -18,15 +18,15 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/tools/log" - "github.com/redis/go-redis/v9" "os" "strings" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw/specialerror" + "github.com/redis/go-redis/v9" ) var ( diff --git a/pkg/common/db/cache/meta_cache.go b/pkg/common/db/cache/meta_cache.go index 11911864b..cd4cddf95 100644 --- a/pkg/common/db/cache/meta_cache.go +++ b/pkg/common/db/cache/meta_cache.go @@ -19,13 +19,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/dtm-labs/rockscache" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw/specialerror" + "github.com/openimsdk/tools/utils/datautil" "github.com/redis/go-redis/v9" ) diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index 9d09b255a..5b258ea8a 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -17,7 +17,6 @@ package cache import ( "context" "errors" - "github.com/openimsdk/tools/utils/stringutil" "strconv" "time" @@ -28,6 +27,7 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/stringutil" "github.com/redis/go-redis/v9" "golang.org/x/sync/errgroup" ) diff --git a/pkg/common/db/cache/token.go b/pkg/common/db/cache/token.go index b4af9b27e..88580e932 100644 --- a/pkg/common/db/cache/token.go +++ b/pkg/common/db/cache/token.go @@ -2,6 +2,7 @@ package cache import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/utils/stringutil" diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index 056962837..5991a9dfe 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -16,13 +16,12 @@ package controller import ( "context" - "github.com/openimsdk/tools/utils/datautil" - - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/log" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" ) type BlackDatabase interface { diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 0cf453f19..f6647ad20 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -16,17 +16,17 @@ package controller import ( "context" - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/db/tx" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/stringutil" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/db/tx" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/stringutil" ) type ConversationDatabase interface { @@ -63,8 +63,8 @@ type ConversationDatabase interface { GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error) // GetConversationNotReceiveMessageUserIDs gets user IDs for users in a conversation who have not received messages. GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) - //GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) - //FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error) + // GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) + // FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error) } func NewConversationDatabase(conversation relationtb.ConversationModelInterface, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase { @@ -253,7 +253,7 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs }) } -//func (c *conversationDatabase) FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error) { +// func (c *conversationDatabase) FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error) { // return c.cache.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID) //} diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 7e4ed659d..654cefe3d 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -17,18 +17,17 @@ package controller import ( "context" "fmt" - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/db/tx" - "github.com/openimsdk/tools/utils/datautil" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/db/tx" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" - - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/utils/datautil" ) type FriendDatabase interface { diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index cddc22a7e..8839044ea 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -16,15 +16,15 @@ package controller import ( "context" - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/db/tx" - "github.com/openimsdk/tools/utils/datautil" "time" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/db/tx" + "github.com/openimsdk/tools/utils/datautil" "github.com/redis/go-redis/v9" ) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 5702daeca..ea0c3f138 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -18,15 +18,13 @@ import ( "context" "encoding/json" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/timeutil" "time" "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/mgo" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/protocol/constant" @@ -34,6 +32,8 @@ import ( "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/timeutil" "github.com/redis/go-redis/v9" "go.mongodb.org/mongo-driver/mongo" ) @@ -532,7 +532,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin if userMinSeq > minSeq { minSeq = userMinSeq } - //"minSeq" represents the startSeq value that the user can retrieve. + // "minSeq" represents the startSeq value that the user can retrieve. if minSeq > end { log.ZInfo(ctx, "minSeq > end", "minSeq", minSeq, "end", end) return 0, 0, nil, nil @@ -547,7 +547,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin maxSeq = userMaxSeq } } - //"maxSeq" represents the endSeq value that the user can retrieve. + // "maxSeq" represents the endSeq value that the user can retrieve. if begin < minSeq { begin = minSeq @@ -555,7 +555,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin if end > maxSeq { end = maxSeq } - //"begin" and "end" represent the actual startSeq and endSeq values that the user can retrieve. + // "begin" and "end" represent the actual startSeq and endSeq values that the user can retrieve. if end < begin { return 0, 0, nil, errs.ErrArgs.WrapMsg("seq end < begin") } @@ -570,11 +570,11 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin } } - //167 178 10 - //if end-num < { + // 167 178 10 + // if end-num < { // //} - //var seqs []int64 + // var seqs []int64 //for i := end; i > end-num; i-- { // if i >= begin { // seqs = append([]int64{i}, seqs...) @@ -748,7 +748,7 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string break } index++ - //&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli() + // && msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli() if len(msgDocModel.Msg) > 0 { i := 0 var over bool diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go index 95505de41..e847c9c8f 100644 --- a/pkg/common/db/controller/s3.go +++ b/pkg/common/db/controller/s3.go @@ -19,12 +19,11 @@ import ( "path/filepath" "time" - "github.com/redis/go-redis/v9" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/redis/go-redis/v9" ) type S3Database interface { diff --git a/pkg/common/db/controller/third.go b/pkg/common/db/controller/third.go index 40385f623..2e7940a0d 100644 --- a/pkg/common/db/controller/third.go +++ b/pkg/common/db/controller/third.go @@ -16,11 +16,11 @@ package controller import ( "context" - "github.com/openimsdk/tools/db/pagination" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/tools/db/pagination" ) type ThirdDatabase interface { diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 8c218bebb..326b6127b 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -16,16 +16,15 @@ package controller import ( "context" - "github.com/openimsdk/tools/db/pagination" - "github.com/openimsdk/tools/db/tx" - "github.com/openimsdk/tools/utils/datautil" "time" - "github.com/openimsdk/protocol/user" - "github.com/openimsdk/tools/errs" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/user" + "github.com/openimsdk/tools/db/pagination" + "github.com/openimsdk/tools/db/tx" + "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/utils/datautil" ) type UserDatabase interface { @@ -40,12 +39,12 @@ type UserDatabase interface { // Create Insert multiple external guarantees that the userID is not repeated and does not exist in the db Create(ctx context.Context, users []*relation.UserModel) (err error) // Update update (non-zero value) external guarantee userID exists - //Update(ctx context.Context, user *relation.UserModel) (err error) + // Update(ctx context.Context, user *relation.UserModel) (err error) // UpdateByMap update (zero value) external guarantee userID exists UpdateByMap(ctx context.Context, userID string, args map[string]any) (err error) // FindUser PageFindUser(ctx context.Context, level1 int64, level2 int64, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) - //FindUser with keyword + // FindUser with keyword PageFindUserWithKeyword(ctx context.Context, level1 int64, level2 int64, userID string, nickName string, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) // Page If not found, no error is returned Page(ctx context.Context, pagination pagination.Pagination) (count int64, users []*relation.UserModel, err error) @@ -74,7 +73,7 @@ type UserDatabase interface { // SetUserStatus Set the user status and store the user status in redis SetUserStatus(ctx context.Context, userID string, status, platformID int32) error - //CRUD user command + // CRUD user command AddUserCommand(ctx context.Context, userID string, Type int32, UUID string, value string, ex string) error DeleteUserCommand(ctx context.Context, userID string, Type int32, UUID string) error UpdateUserCommand(ctx context.Context, userID string, Type int32, UUID string, val map[string]any) error @@ -160,7 +159,7 @@ func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel) } //// Update (non-zero value) externally guarantees that userID exists. -//func (u *userDatabase) Update(ctx context.Context, user *relation.SubscribeUserModel) (err error) { +// func (u *userDatabase) Update(ctx context.Context, user *relation.SubscribeUserModel) (err error) { // if err := u.userDB.Update(ctx, user); err != nil { // return err // } diff --git a/pkg/common/db/mgo/conversation.go b/pkg/common/db/mgo/conversation.go index fd70a715d..d10bda39b 100644 --- a/pkg/common/db/mgo/conversation.go +++ b/pkg/common/db/mgo/conversation.go @@ -16,14 +16,13 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/tools/errs" - "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/friend.go b/pkg/common/db/mgo/friend.go index 14bc288e9..269bb594a 100644 --- a/pkg/common/db/mgo/friend.go +++ b/pkg/common/db/mgo/friend.go @@ -16,10 +16,10 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/friend_request.go b/pkg/common/db/mgo/friend_request.go index 8026cd4ab..704b68126 100644 --- a/pkg/common/db/mgo/friend_request.go +++ b/pkg/common/db/mgo/friend_request.go @@ -16,10 +16,10 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/group.go b/pkg/common/db/mgo/group.go index 430c5bcc8..0169c2339 100644 --- a/pkg/common/db/mgo/group.go +++ b/pkg/common/db/mgo/group.go @@ -16,12 +16,12 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" @@ -70,16 +70,15 @@ func (g *GroupMgo) Take(ctx context.Context, groupID string) (group *relation.Gr } func (g *GroupMgo) Search(ctx context.Context, keyword string, pagination pagination.Pagination) (total int64, groups []*relation.GroupModel, err error) { - // Define the sorting options - opts := options.Find().SetSort(bson.D{{Key: "created_at", Value: -1}}) - - // Perform the search with pagination and sorting - return mongoutil.FindPage[*relation.GroupModel](ctx, g.coll, bson.M{ - "group_name": bson.M{"$regex": keyword}, - "status": bson.M{"$ne": constant.GroupStatusDismissed}, - }, pagination, opts) -} + // Define the sorting options + opts := options.Find().SetSort(bson.D{{Key: "created_at", Value: -1}}) + // Perform the search with pagination and sorting + return mongoutil.FindPage[*relation.GroupModel](ctx, g.coll, bson.M{ + "group_name": bson.M{"$regex": keyword}, + "status": bson.M{"$ne": constant.GroupStatusDismissed}, + }, pagination, opts) +} func (g *GroupMgo) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) { if before == nil { diff --git a/pkg/common/db/mgo/group_member.go b/pkg/common/db/mgo/group_member.go index 589b5c8eb..29d69d0f0 100644 --- a/pkg/common/db/mgo/group_member.go +++ b/pkg/common/db/mgo/group_member.go @@ -16,11 +16,11 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/mgo/group_request.go b/pkg/common/db/mgo/group_request.go index 67fd4e1ba..17cbeab17 100644 --- a/pkg/common/db/mgo/group_request.go +++ b/pkg/common/db/mgo/group_request.go @@ -16,10 +16,10 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/mgo/log.go b/pkg/common/db/mgo/log.go index b837e9783..36a0bbbc5 100644 --- a/pkg/common/db/mgo/log.go +++ b/pkg/common/db/mgo/log.go @@ -16,11 +16,11 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/db/mgo/msg.go b/pkg/common/db/mgo/msg.go index 0b4598bb4..697d3a065 100644 --- a/pkg/common/db/mgo/msg.go +++ b/pkg/common/db/mgo/msg.go @@ -3,6 +3,8 @@ package mgo import ( "context" "fmt" + "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/msg" @@ -15,7 +17,6 @@ import ( "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "time" ) func NewMsgMongo(db *mongo.Database) (relation.MsgDocModelInterface, error) { diff --git a/pkg/common/db/mgo/subscribe.go b/pkg/common/db/mgo/subscribe.go index d3077f109..f2057dc45 100644 --- a/pkg/common/db/mgo/subscribe.go +++ b/pkg/common/db/mgo/subscribe.go @@ -16,8 +16,8 @@ package mgo import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/mgo/user.go b/pkg/common/db/mgo/user.go index 9be3f808e..696479871 100644 --- a/pkg/common/db/mgo/user.go +++ b/pkg/common/db/mgo/user.go @@ -16,12 +16,12 @@ package mgo import ( "context" - "github.com/openimsdk/tools/db/pagination" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/db/mongoutil" + "github.com/openimsdk/tools/db/pagination" "github.com/openimsdk/tools/errs" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/pkg/common/db/s3/minio/thumbnail.go b/pkg/common/db/s3/minio/thumbnail.go index d12418451..a6eed4bb5 100644 --- a/pkg/common/db/s3/minio/thumbnail.go +++ b/pkg/common/db/s3/minio/thumbnail.go @@ -19,7 +19,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "image" "image/gif" "image/jpeg" @@ -32,6 +31,7 @@ import ( "github.com/minio/minio-go/v7" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/tools/log" ) diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index dff69d3c3..4d6653a53 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -17,13 +17,13 @@ package unrelation import ( "context" "fmt" - "github.com/openimsdk/tools/log" "os" "strings" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw/specialerror" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/common/discoveryregister/zookeeper/zookeeper.go b/pkg/common/discoveryregister/zookeeper/zookeeper.go index ec7076661..32c71bd39 100644 --- a/pkg/common/discoveryregister/zookeeper/zookeeper.go +++ b/pkg/common/discoveryregister/zookeeper/zookeeper.go @@ -15,12 +15,12 @@ package zookeeper import ( - "github.com/openimsdk/tools/discovery" "os" "strings" "time" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/discovery/zookeeper" ) diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index 203f7e158..6f8c412bc 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -17,12 +17,13 @@ package http import ( "context" "encoding/json" + "net/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/servererrs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils/httputil" - "net/http" ) var ( diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go index ecb6b1f7b..6f8e67e3f 100644 --- a/pkg/common/kafka/consumer_group.go +++ b/pkg/common/kafka/consumer_group.go @@ -17,6 +17,7 @@ package kafka import ( "context" "errors" + "github.com/IBM/sarama" "github.com/openimsdk/tools/log" kfk "github.com/openimsdk/tools/mq/kafka" diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index eedc17202..be806aa5f 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -17,6 +17,7 @@ package kafka import ( "context" "errors" + "github.com/IBM/sarama" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" diff --git a/pkg/common/prommetrics/prommetrics.go b/pkg/common/prommetrics/prommetrics.go index 6553eaaad..33d4c2b40 100644 --- a/pkg/common/prommetrics/prommetrics.go +++ b/pkg/common/prommetrics/prommetrics.go @@ -16,11 +16,10 @@ package prommetrics import ( gp "github.com/grpc-ecosystem/go-grpc-prometheus" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/collectors" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/collectors" ) func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *gp.ServerMetrics, error) { diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 32a052383..d1a942cef 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -17,8 +17,6 @@ package startrpc import ( "context" "fmt" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/system/program" "net" "net/http" "os" @@ -28,21 +26,21 @@ import ( "syscall" "time" - "github.com/openimsdk/tools/log" - grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" + "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mw" + "github.com/openimsdk/tools/system/program" "github.com/openimsdk/tools/utils/network" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - - "github.com/openimsdk/open-im-server/v3/pkg/common/config" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" - "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" ) // Start rpc server. diff --git a/pkg/rpcclient/auth.go b/pkg/rpcclient/auth.go index 97ace08f9..b10359c52 100644 --- a/pkg/rpcclient/auth.go +++ b/pkg/rpcclient/auth.go @@ -16,6 +16,7 @@ package rpcclient import ( "context" + "github.com/openimsdk/protocol/auth" "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/system/program" diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index 9c15b78ff..c750665a7 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -17,12 +17,12 @@ package rpcclient import ( "context" "fmt" - "github.com/openimsdk/tools/system/program" "github.com/openimsdk/open-im-server/v3/pkg/common/config" pbconversation "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/system/program" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/friend.go b/pkg/rpcclient/friend.go index 404e8d427..5543afe4f 100644 --- a/pkg/rpcclient/friend.go +++ b/pkg/rpcclient/friend.go @@ -16,11 +16,11 @@ package rpcclient import ( "context" - "github.com/openimsdk/tools/system/program" "github.com/openimsdk/protocol/friend" sdkws "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discovery" + "github.com/openimsdk/tools/system/program" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/group.go b/pkg/rpcclient/group.go index ed5a4ee57..30d0b3288 100644 --- a/pkg/rpcclient/group.go +++ b/pkg/rpcclient/group.go @@ -16,15 +16,15 @@ package rpcclient import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/system/program" - "github.com/openimsdk/tools/utils/datautil" "strings" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/group" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discovery" + "github.com/openimsdk/tools/system/program" + "github.com/openimsdk/tools/utils/datautil" ) type Group struct { diff --git a/pkg/rpcclient/grouphash/grouphash.go b/pkg/rpcclient/grouphash/grouphash.go index 6fda8e063..5015b88c8 100644 --- a/pkg/rpcclient/grouphash/grouphash.go +++ b/pkg/rpcclient/grouphash/grouphash.go @@ -19,10 +19,10 @@ import ( "crypto/md5" "encoding/binary" "encoding/json" - "github.com/openimsdk/tools/utils/datautil" "github.com/openimsdk/protocol/group" "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/tools/utils/datautil" ) func NewGroupHashFromGroupClient(x group.GroupClient) *GroupHash { diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index f3a017c68..d382f4315 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -18,10 +18,6 @@ import ( "context" "encoding/json" "fmt" - "github.com/openimsdk/tools/system/program" - "github.com/openimsdk/tools/utils/idutil" - "github.com/openimsdk/tools/utils/jsonutil" - "github.com/openimsdk/tools/utils/timeutil" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/protocol/constant" @@ -30,6 +26,10 @@ import ( "github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" + "github.com/openimsdk/tools/system/program" + "github.com/openimsdk/tools/utils/idutil" + "github.com/openimsdk/tools/utils/jsonutil" + "github.com/openimsdk/tools/utils/timeutil" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index 70c1223f0..7900d0274 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -17,14 +17,12 @@ package notification import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/utils/datautil" - "github.com/openimsdk/tools/utils/stringutil" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/protocol/constant" pbgroup "github.com/openimsdk/protocol/group" @@ -32,6 +30,8 @@ import ( "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" + "github.com/openimsdk/tools/utils/datautil" + "github.com/openimsdk/tools/utils/stringutil" ) func NewGroupNotificationSender(db controller.GroupDatabase, msgRpcClient *rpcclient.MessageRpcClient, userRpcClient *rpcclient.UserRpcClient, config *config.GlobalConfig, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender { diff --git a/pkg/rpcclient/push.go b/pkg/rpcclient/push.go index 0cac9db98..c549e454a 100644 --- a/pkg/rpcclient/push.go +++ b/pkg/rpcclient/push.go @@ -16,10 +16,10 @@ package rpcclient import ( "context" - "github.com/openimsdk/tools/discovery" - "github.com/openimsdk/tools/system/program" "github.com/openimsdk/protocol/push" + "github.com/openimsdk/tools/discovery" + "github.com/openimsdk/tools/system/program" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 6c28aa443..4c71dff6a 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -17,10 +17,9 @@ package rpcclient import ( "context" - "github.com/openimsdk/tools/system/program" - "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/discovery" + "github.com/openimsdk/tools/system/program" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 1c0e6289a..88c67c03d 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -16,16 +16,16 @@ package rpcclient import ( "context" - "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" - "github.com/openimsdk/tools/system/program" - "github.com/openimsdk/tools/utils/datautil" "strings" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/discovery" + "github.com/openimsdk/tools/system/program" + "github.com/openimsdk/tools/utils/datautil" "google.golang.org/grpc" ) diff --git a/tools/component/component.go b/tools/component/component.go index 8a6781f64..b17960399 100644 --- a/tools/component/component.go +++ b/tools/component/component.go @@ -19,12 +19,13 @@ import ( "errors" "flag" "fmt" - kfk "github.com/openimsdk/tools/mq/kafka" "os" - "strconv" "strings" "time" + "github.com/OpenIMSDK/tools/component" + kfk "github.com/openimsdk/tools/mq/kafka" + "gopkg.in/yaml.v2" "github.com/openimsdk/tools/errs" @@ -233,40 +234,6 @@ func isTopicPresent(topic string, topics []string) bool { return false } -func configGetEnv(config *config.GlobalConfig) error { - config.Mongo.Uri = getEnv("MONGO_URI", config.Mongo.Uri) - config.Mongo.Username = getEnv("MONGO_OPENIM_USERNAME", config.Mongo.Username) - config.Mongo.Password = getEnv("MONGO_OPENIM_PASSWORD", config.Mongo.Password) - config.Mongo.Address = getArrEnv("MONGO_ADDRESS", "MONGO_PORT", config.Mongo.Address) - config.Mongo.Database = getEnv("MONGO_DATABASE", config.Mongo.Database) - maxPoolSize, err := getEnvInt("MONGO_MAX_POOL_SIZE", config.Mongo.MaxPoolSize) - if err != nil { - return errs.WrapMsg(err, "MONGO_MAX_POOL_SIZE") - } - config.Mongo.MaxPoolSize = maxPoolSize - - config.Redis.Username = getEnv("REDIS_USERNAME", config.Redis.Username) - config.Redis.Password = getEnv("REDIS_PASSWORD", config.Redis.Password) - config.Redis.Address = getArrEnv("REDIS_ADDRESS", "REDIS_PORT", config.Redis.Address) - - config.Object.ApiURL = getEnv("OBJECT_APIURL", config.Object.ApiURL) - config.Object.Minio.Endpoint = getEnv("MINIO_ENDPOINT", config.Object.Minio.Endpoint) - config.Object.Minio.AccessKeyID = getEnv("MINIO_ACCESS_KEY_ID", config.Object.Minio.AccessKeyID) - config.Object.Minio.SecretAccessKey = getEnv("MINIO_SECRET_ACCESS_KEY", config.Object.Minio.SecretAccessKey) - config.Object.Minio.SignEndpoint = getEnv("MINIO_SIGN_ENDPOINT", config.Object.Minio.SignEndpoint) - - config.Zookeeper.Schema = getEnv("ZOOKEEPER_SCHEMA", config.Zookeeper.Schema) - config.Zookeeper.ZkAddr = getArrEnv("ZOOKEEPER_ADDRESS", "ZOOKEEPER_PORT", config.Zookeeper.ZkAddr) - config.Zookeeper.Username = getEnv("ZOOKEEPER_USERNAME", config.Zookeeper.Username) - config.Zookeeper.Password = getEnv("ZOOKEEPER_PASSWORD", config.Zookeeper.Password) - - config.Kafka.Username = getEnv("KAFKA_USERNAME", config.Kafka.Username) - config.Kafka.Password = getEnv("KAFKA_PASSWORD", config.Kafka.Password) - config.Kafka.Addr = getArrEnv("KAFKA_ADDRESS", "KAFKA_PORT", config.Kafka.Addr) - config.Object.Minio.Endpoint = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Object.Minio.Endpoint) - return nil -} - func getMinioAddr(key1, key2, key3, fallback string) string { // Prioritize environment variables endpoint := getEnv(key1, fallback) @@ -278,54 +245,3 @@ func getMinioAddr(key1, key2, key3, fallback string) string { } return endpoint } - -// Helper function to get environment variable or default value -func getEnv(key, fallback string) string { - if value, exists := os.LookupEnv(key); exists { - return value - } - return fallback -} - -// Helper function to get environment variable or default value -func getEnvInt(key string, fallback int) (int, error) { - if value, exists := os.LookupEnv(key); exists { - val, err := strconv.Atoi(value) - if err != nil { - return 0, errs.WrapMsg(err, "string to int failed") - } - return val, nil - } - return fallback, nil -} - -func getArrEnv(key1, key2 string, fallback []string) []string { - address, addrExists := os.LookupEnv(key1) - port, portExists := os.LookupEnv(key2) - - if addrExists && portExists { - addresses := strings.Split(address, ",") - for i, addr := range addresses { - addresses[i] = addr + ":" + port - } - return addresses - } - - if addrExists && !portExists { - addresses := strings.Split(address, ",") - for i, addr := range addresses { - addresses[i] = addr + ":" + "0" - } - return addresses - } - - if !addrExists && portExists { - result := make([]string, len(fallback)) - for i, addr := range fallback { - add := strings.Split(addr, ":") - result[i] = add[0] + ":" + port - } - return result - } - return fallback -} diff --git a/tools/component/config/config.go b/tools/component/config/config.go index b663f62c4..f3921b062 100644 --- a/tools/component/config/config.go +++ b/tools/component/config/config.go @@ -1,3 +1,2 @@ package config - diff --git a/tools/component/util/env.go b/tools/component/util/env.go new file mode 100644 index 000000000..62bad9fa3 --- /dev/null +++ b/tools/component/util/env.go @@ -0,0 +1,95 @@ +package env + +import ( + "os" + "strconv" + "strings" + + "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/tools/errs" +) + +func configGetEnv(config *config.GlobalConfig) error { + config.Mongo.Uri = getEnv("MONGO_URI", config.Mongo.Uri) + config.Mongo.Username = getEnv("MONGO_OPENIM_USERNAME", config.Mongo.Username) + config.Mongo.Password = getEnv("MONGO_OPENIM_PASSWORD", config.Mongo.Password) + config.Mongo.Address = getArrEnv("MONGO_ADDRESS", "MONGO_PORT", config.Mongo.Address) + config.Mongo.Database = getEnv("MONGO_DATABASE", config.Mongo.Database) + maxPoolSize, err := getEnvInt("MONGO_MAX_POOL_SIZE", config.Mongo.MaxPoolSize) + if err != nil { + return errs.WrapMsg(err, "MONGO_MAX_POOL_SIZE") + } + config.Mongo.MaxPoolSize = maxPoolSize + + config.Redis.Username = getEnv("REDIS_USERNAME", config.Redis.Username) + config.Redis.Password = getEnv("REDIS_PASSWORD", config.Redis.Password) + config.Redis.Address = getArrEnv("REDIS_ADDRESS", "REDIS_PORT", config.Redis.Address) + + config.Object.ApiURL = getEnv("OBJECT_APIURL", config.Object.ApiURL) + config.Object.Minio.Endpoint = getEnv("MINIO_ENDPOINT", config.Object.Minio.Endpoint) + config.Object.Minio.AccessKeyID = getEnv("MINIO_ACCESS_KEY_ID", config.Object.Minio.AccessKeyID) + config.Object.Minio.SecretAccessKey = getEnv("MINIO_SECRET_ACCESS_KEY", config.Object.Minio.SecretAccessKey) + config.Object.Minio.SignEndpoint = getEnv("MINIO_SIGN_ENDPOINT", config.Object.Minio.SignEndpoint) + + config.Zookeeper.Schema = getEnv("ZOOKEEPER_SCHEMA", config.Zookeeper.Schema) + config.Zookeeper.ZkAddr = getArrEnv("ZOOKEEPER_ADDRESS", "ZOOKEEPER_PORT", config.Zookeeper.ZkAddr) + config.Zookeeper.Username = getEnv("ZOOKEEPER_USERNAME", config.Zookeeper.Username) + config.Zookeeper.Password = getEnv("ZOOKEEPER_PASSWORD", config.Zookeeper.Password) + + config.Kafka.Username = getEnv("KAFKA_USERNAME", config.Kafka.Username) + config.Kafka.Password = getEnv("KAFKA_PASSWORD", config.Kafka.Password) + config.Kafka.Addr = getArrEnv("KAFKA_ADDRESS", "KAFKA_PORT", config.Kafka.Addr) + config.Object.Minio.Endpoint = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Object.Minio.Endpoint) + return nil +} + +// Helper function to get environment variable or default value +func getEnv(key, fallback string) string { + if value, exists := os.LookupEnv(key); exists { + return value + } + return fallback +} + +// Helper function to get environment variable or default value +func getEnvInt(key string, fallback int) (int, error) { + if value, exists := os.LookupEnv(key); exists { + val, err := strconv.Atoi(value) + if err != nil { + return 0, errs.WrapMsg(err, "string to int failed") + } + return val, nil + } + return fallback, nil +} + +func getArrEnv(key1, key2 string, fallback []string) []string { + address, addrExists := os.LookupEnv(key1) + port, portExists := os.LookupEnv(key2) + + if addrExists && portExists { + addresses := strings.Split(address, ",") + for i, addr := range addresses { + addresses[i] = addr + ":" + port + } + return addresses + } + + if addrExists && !portExists { + addresses := strings.Split(address, ",") + for i, addr := range addresses { + addresses[i] = addr + ":" + "0" + } + return addresses + } + + if !addrExists && portExists { + result := make([]string, len(fallback)) + for i, addr := range fallback { + add := strings.Split(addr, ":") + result[i] = add[0] + ":" + port + } + return result + } + return fallback +} diff --git a/tools/component/util/print.go b/tools/component/util/print.go new file mode 100644 index 000000000..e69de29bb diff --git a/tools/versionchecker/versionchecker.go b/tools/versionchecker/versionchecker.go index 7a66b8e26..bec7daa79 100644 --- a/tools/versionchecker/versionchecker.go +++ b/tools/versionchecker/versionchecker.go @@ -21,7 +21,7 @@ import ( "runtime" "github.com/fatih/color" - "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/tools/utils/timeutil" ) func ExecuteCommand(cmdName string, args ...string) (string, error) { @@ -39,7 +39,7 @@ func ExecuteCommand(cmdName string, args ...string) (string, error) { } func printTime() string { - formattedTime := genutil.GetCurrentTimeFormatted() + formattedTime := timeutil.GetCurrentTimeFormatted() return fmt.Sprintf("Current Date & Time: %s", formattedTime) }