From cb73dad6944e5fc85c840d8c9ced9f94750fdfee Mon Sep 17 00:00:00 2001 From: luhaoling Date: Tue, 14 Nov 2023 13:37:33 +0000 Subject: [PATCH] cicd: robot automated Change --- cmd/openim-api/main.go | 5 +++-- internal/api/third.go | 3 ++- internal/msggateway/n_ws_server.go | 3 ++- internal/msgtransfer/init.go | 12 +++++++----- internal/msgtransfer/online_msg_to_mongo_handler.go | 1 + internal/push/offlinepush/dummy/push.go | 1 + internal/push/push_to_client.go | 3 ++- internal/rpc/auth/auth.go | 1 + internal/rpc/msg/send.go | 1 + internal/tools/conversation.go | 12 ++++++++---- internal/tools/msg.go | 9 ++++++--- pkg/common/cmd/msg_transfer.go | 4 +++- pkg/common/db/cache/meta_cache.go | 3 ++- pkg/common/db/cache/s3.go | 8 +++++--- pkg/common/db/controller/msg.go | 6 ++++-- pkg/common/db/controller/s3.go | 8 +++++--- pkg/common/db/relation/conversation_model.go | 1 + pkg/common/db/s3/cont/controller.go | 3 ++- pkg/common/db/s3/minio/minio.go | 3 ++- pkg/common/db/s3/minio/thumbnail.go | 12 +++++++----- pkg/common/prom_metrics/func.go | 5 +++-- pkg/common/startrpc/start.go | 8 +++++--- 22 files changed, 73 insertions(+), 39 deletions(-) diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index 0f50c621f..e7fa81879 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -17,12 +17,13 @@ package main import ( "context" "fmt" - ginProm "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "net" _ "net/http/pprof" "strconv" + ginProm "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" "github.com/OpenIMSDK/protocol/constant" diff --git a/internal/api/third.go b/internal/api/third.go index fca133ea9..5191903da 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -15,11 +15,12 @@ package api import ( - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "math/rand" "net/http" "strconv" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/gin-gonic/gin" "github.com/OpenIMSDK/protocol/third" diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index c58710e1b..6c63fcdc7 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -17,13 +17,14 @@ package msggateway import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "net/http" "strconv" "sync" "sync/atomic" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/OpenIMSDK/protocol/msggateway" "github.com/openimsdk/open-im-server/v3/pkg/authverify" diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index c18186fa8..88410c093 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -17,16 +17,18 @@ package msgtransfer import ( "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "log" + "net/http" + "sync" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "log" - "net/http" - "sync" + + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/OpenIMSDK/tools/mw" diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index 88fd256d1..f420ed72e 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -16,6 +16,7 @@ package msgtransfer import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/IBM/sarama" diff --git a/internal/push/offlinepush/dummy/push.go b/internal/push/offlinepush/dummy/push.go index 1be234d68..2b15bc05d 100644 --- a/internal/push/offlinepush/dummy/push.go +++ b/internal/push/offlinepush/dummy/push.go @@ -2,6 +2,7 @@ package dummy import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" ) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 2f3156c28..07bea4f67 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -18,8 +18,9 @@ import ( "context" "encoding/json" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/dummy" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/OpenIMSDK/protocol/conversation" diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index bcca59152..2617124c0 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -16,6 +16,7 @@ package auth import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/openimsdk/open-im-server/v3/pkg/authverify" diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index b43bc82be..15b1835ad 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -16,6 +16,7 @@ package msg import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index 5d568cac5..05d963a17 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -16,12 +16,14 @@ package tools import ( "context" + "math/rand" + "time" + "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "math/rand" - "time" ) //func (c *MsgTool) ConversationsDestructMsgs() { @@ -54,7 +56,8 @@ import ( // continue // } // if len(seqs) > 0 { -// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err != nil { +// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err +// != nil { // log.ZError(ctx, "updateUsersConversationFiled failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID) // continue // } @@ -104,7 +107,8 @@ func (c *MsgTool) ConversationsDestructMsgs() { } temp := make([]*relation.ConversationModel, 0, len(conversations)) for i, conversation := range conversations { - if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || conversation.LatestMsgDestructTime.IsZero() { + if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || + conversation.LatestMsgDestructTime.IsZero() { temp = append(temp, conversations[i]) } } diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 7e06fda4a..f13938eba 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -17,11 +17,15 @@ package tools import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + "math" + "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "math" + + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + + "math/rand" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" @@ -29,7 +33,6 @@ import ( "github.com/OpenIMSDK/tools/mw" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "math/rand" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index 903d1fb95..f99b625c7 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -16,10 +16,12 @@ package cmd import ( "fmt" + "github.com/OpenIMSDK/protocol/constant" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" ) diff --git a/pkg/common/db/cache/meta_cache.go b/pkg/common/db/cache/meta_cache.go index 45888ed8f..ccac88d68 100644 --- a/pkg/common/db/cache/meta_cache.go +++ b/pkg/common/db/cache/meta_cache.go @@ -18,9 +18,10 @@ import ( "context" "encoding/json" "errors" - "github.com/OpenIMSDK/tools/mw/specialerror" "time" + "github.com/OpenIMSDK/tools/mw/specialerror" + "github.com/dtm-labs/rockscache" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/cache/s3.go b/pkg/common/db/cache/s3.go index a63496d05..3520ba2ec 100644 --- a/pkg/common/db/cache/s3.go +++ b/pkg/common/db/cache/s3.go @@ -2,12 +2,14 @@ package cache import ( "context" + "strconv" + "time" + "github.com/dtm-labs/rockscache" + "github.com/redis/go-redis/v9" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" - "strconv" - "time" ) type ObjectCache interface { diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 62ecf7232..62df71497 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -17,21 +17,23 @@ package controller import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/redis/go-redis/v9" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" + "go.mongodb.org/mongo-driver/mongo" + "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" - "go.mongodb.org/mongo-driver/mongo" pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go index ffe9ff508..ddbd5d27f 100644 --- a/pkg/common/db/controller/s3.go +++ b/pkg/common/db/controller/s3.go @@ -16,13 +16,15 @@ package controller import ( "context" + "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" - "path/filepath" - "time" ) type S3Database interface { diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index 5df14ad4a..f39047bf6 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -16,6 +16,7 @@ package relation import ( "context" + "github.com/OpenIMSDK/tools/errs" "gorm.io/gorm" diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index 2db1b800f..09025e130 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -20,11 +20,12 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "path" "strings" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/google/uuid" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 01101e893..be49e2faa 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "io" "net/http" "net/url" @@ -30,6 +29,8 @@ import ( "time" "unsafe" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/OpenIMSDK/tools/log" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/pkg/common/db/s3/minio/thumbnail.go b/pkg/common/db/s3/minio/thumbnail.go index fa3581572..01b14541b 100644 --- a/pkg/common/db/s3/minio/thumbnail.go +++ b/pkg/common/db/s3/minio/thumbnail.go @@ -5,11 +5,6 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/minio/minio-go/v7" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "image" "image/gif" "image/jpeg" @@ -18,6 +13,13 @@ import ( "path/filepath" "strings" "time" + + "github.com/OpenIMSDK/tools/errs" + "github.com/OpenIMSDK/tools/log" + "github.com/minio/minio-go/v7" + + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) func (m *Minio) getImageThumbnailURL(ctx context.Context, name string, expire time.Duration, opt *s3.Image) (string, error) { diff --git a/pkg/common/prom_metrics/func.go b/pkg/common/prom_metrics/func.go index e451c441b..a4eff0ed6 100644 --- a/pkg/common/prom_metrics/func.go +++ b/pkg/common/prom_metrics/func.go @@ -2,10 +2,11 @@ package prom_metrics import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - 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" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" ) func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *grpc_prometheus.ServerMetrics, error) { diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 975d21246..9b2dd4c2b 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -16,14 +16,16 @@ package startrpc import ( "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" "log" "net" "net/http" "strconv" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"