fix: conflict resolve main (#537)

* statistics user register

* refactor: router change

* minio init

* UserRegisterCount

* push use local conn

* refactor: user pb update

* remove online push close grpc conn

* refactor: user pb update

* refactor:pb file

* msgs statistics

* msgs statistics

* revoke userID

* refactor: errcode update

* active user

* active user

* active user

* refactor: errcode update

* feat: conn update token

* active user

* active user

* feat: conn update token

* active user

* feat: conn update token

* feat: conn update token

* feat: conn update token

* add tx_oss cos

* active user

* active user

* group create

* group create

* feat: group notification show to conversation

* feat: group notification show to conversation

* group active

* user active

* sendNotificationWithName

* withname

* privateChat

* a2r call option

* grpc with detail return error

* change log error

* chain unary interceptor

* api nil slice map

* fix sync has read

* fix: text update

* fix: update add model

* set conversations update

* set privateChat

* fix: content update

* remove unuse rpc

* msgDestruct

* cron use rpc mw

* set IsMsgDestruct

* msg destruct

* msgDestruct

* s3 minio, cos, oss support

* feat: add implement of GetUsersOnlineStatus, #472 (#477)

* s3 minio, cos, oss support

* s3 route

* remove extendMsg code

* s3 route

* remove unuse code

* s3 pb

* s3 pb

* s3 pb

* s3 presigned put

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* Update .gitignore (#482)

* s3 debug log

* s3 debug log

* cron add log and fix cron

* add log

* cron

* s3 config

* fix kick user bug

* s3 cos

* add kick log

* s3 cos test

* s3 cos test

* s3 cos test

* kick user log

* kickuserlog

* s3 cos copy

* s3 cos copy

* s3 url

* s3 url

* s3 AccessURL

* log

* s3 InitiateMultipartUpload add ExpireTime

* feat: regenerate pb file

* feat: regenerate pb file

* Revert "feat: regenerate pb file"

This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885.

* Delete .idea directory

* feat: regenerate pb file

* fix: remove import C

* fix: add msg transfer main file

* fix: get user online status fix

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com>
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com>
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com>
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>

config/config.yaml

@@ -36,7 +36,7 @@ mysql:
 mongo:
   uri:                                    #不为空则直接使用该值
   address: [ 127.0.0.1:37017 ]            #单机时为mongo地址，使用分片集群时，为mongos地址
-  database: openIM_v3                     #mongo db 默认即可
+  database: openIM_v3                      #mongo db 默认即可
   username: root                          #用户名
   password: openIM123                     #密码
   maxPoolSize: 100
@@ -56,14 +56,11 @@ kafka:
     topic: "offlineMsgToMongoMysql"       #不建议修改
   msgToPush:
     topic: "msgToPush"                    #不建议修改
-  msgToModify:
-    topic: "msgToModify"                  #不建议修改
   consumerGroupID: #消费者组，不建议修改
     msgToRedis: redis                     #
     msgToMongo: mongo                     #
     msgToMySql: mysql                     #
     msgToPush: push                       #
-    msgToModify: modify                   #
 
 
 rpc:
@@ -76,41 +73,26 @@ api:
   listenIP:                               #默认为0.0.0.0
 
 object:
-  enable: minio                           #使用minio
+  enable: "minio"                           #使用minio
-  apiURL: http://127.0.0.1:10002/third/object
+  apiURL: "http://127.0.0.1:10002/object/"
   minio:
-    tempBucket: "openim"                  #不建议修改
+    bucket: "openim"                      #不建议修改
-    dataBucket: "openim"                  #不建议修改
+    endpoint: "http://127.0.0.1:10005"      #minio对外服务的ip和端口，app要能访问此ip和端口
-    location: us-east-1                   #不建议修改
+    accessKeyID: "root"                     #ID
-    endpoint: http://127.0.0.1:10005      #minio对外服务的ip和端口，app要能访问此ip和端口
+    secretAccessKey: "openIM123"            #秘钥
-    accessKeyID: root                     #ID
+    sessionToken: ""            #token
-    secretAccessKey: openIM123            #秘钥
+  cos: #tencent cos
-    isDistributedMod: false               #是否分布式多硬盘部署，如果是多硬盘部署，需要修改为true
+    bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
-  tencent: #tencent cos
+    secretID: ""
-    appID:
+    secretKey: ""
-    region:
+    sessionToken: ""
-    bucket:
+  oss: #ali oss
-    secretID:
+    endpoint: "https://oss-cn-chengdu.aliyuncs.com"
-    secretKey:
+    bucket: "demo-9999999"
-  ali: #ali oss
+    bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com"
-    regionID:
+    accessKeyID: ""
-    accessKeyID:
+    accessKeySecret: ""
-    accessKeySecret:
+    sessionToken: ""
-    stsEndpoint:
-    ossEndpoint:
-    bucket:
-    finalHost:
-    stsDurationSeconds:
-    OssRoleArn:
-  aws:
-    accessKeyID:
-    accessKeySecret:
-    region:
-    bucket:
-    finalHost:
-    roleArn:
-    externalId:
-    roleSessionName:
 
 rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如  [10110, 10111]
   openImUserPort: [ 10110 ]
@@ -135,7 +117,7 @@ rpcRegisterName: #rpc注册服务名，不建议修改
   openImThirdName: Third
 
 log:
-  storageLocation: ../../../../../logs/           #TODO: 存放目录
+  storageLocation: ../logs/           #存放目录
   rotationTime: 24                    #日志旋转时间
   remainRotationCount: 2              #日志数量
   remainLogLevel: 6                   #日志级别 6表示全都打印，
@@ -182,7 +164,8 @@ groupMessageHasReadReceiptEnable: true                  #群聊已读是否开
 singleMessageHasReadReceiptEnable: true                 #单聊已读是否开启
 
 retainChatRecords: 365                                  #mongo保存离线消息时间（天）
-chatRecordsClearTime: "0 2 * * 3"                       #每周三凌晨2点清理mongo中的过期（超过retainChatRecords时间）消息
+chatRecordsClearTime: "0 2 * * 3"                       #每周三凌晨2点清理mongo中的过期（超过retainChatRecords时间）消息，这个删除是为了清理满足上个配置retainChatRecords的过期消息，不会发送通知，仅仅作为清理磁盘使用
+msgDestructTime: "0 2 * * *"                            #消息自动删除时间，每天凌晨2点删除过期消息，这个删除是为了删除保留时间超过超过会话字段msg_destruct_time（秒）的消息。
 
 secret: tuoyun #秘钥，获取token时校验
 

internal/msgtransfer/init.go

@@ -5,9 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -19,6 +16,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 type MsgTransfer struct {
@@ -47,18 +46,9 @@ func StartTransfer(prometheusPort int) error {
 	if err := mongo.CreateMsgIndex(); err != nil {
 		return err
 	}
-	client, err := openKeeper.NewClient(
+	client, err := openKeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		config.Config.Zookeeper.ZkAddr,
+		openKeeper.WithFreq(time.Hour), openKeeper.WithRoundRobin(), openKeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-		config.Config.Zookeeper.Schema,
+			config.Config.Zookeeper.Password), openKeeper.WithTimeout(10), openKeeper.WithLogger(log.NewZkLogger()))
-		openKeeper.WithFreq(
-			time.Hour,
-		),
-		openKeeper.WithRoundRobin(),
-		openKeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password),
-		openKeeper.WithTimeout(10),
-		openKeeper.WithLogger(log.NewZkLogger()),
-	)
 	if err != nil {
 		return err
 	}
@@ -68,9 +58,8 @@ func StartTransfer(prometheusPort int) error {
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	msgModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(mongo.GetDatabase())
-	msgMysModel := relation.NewChatLogGorm(db)
+	chatLogDatabase := controller.NewChatLogDatabase(relation.NewChatLogGorm(db))
-	chatLogDatabase := controller.NewChatLogDatabase(msgMysModel)
+	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, msgModel)
-	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, msgModel, msgMysModel)
 	conversationRpcClient := rpcclient.NewConversationRpcClient(client)
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	msgTransfer := NewMsgTransfer(chatLogDatabase, msgDatabase, &conversationRpcClient, &groupRpcClient)
@@ -81,11 +70,8 @@ func StartTransfer(prometheusPort int) error {
 func NewMsgTransfer(chatLogDatabase controller.ChatLogDatabase,
 	msgDatabase controller.CommonMsgDatabase,
 	conversationRpcClient *rpcclient.ConversationRpcClient, groupRpcClient *rpcclient.GroupRpcClient) *MsgTransfer {
-	return &MsgTransfer{
+	return &MsgTransfer{persistentCH: NewPersistentConsumerHandler(chatLogDatabase), historyCH: NewOnlineHistoryRedisConsumerHandler(msgDatabase, conversationRpcClient, groupRpcClient),
-		persistentCH:   NewPersistentConsumerHandler(chatLogDatabase),
+		historyMongoCH: NewOnlineHistoryMongoConsumerHandler(msgDatabase)}
-		historyCH:      NewOnlineHistoryRedisConsumerHandler(msgDatabase, conversationRpcClient, groupRpcClient),
-		historyMongoCH: NewOnlineHistoryMongoConsumerHandler(msgDatabase),
-	}
 }
 
 func (m *MsgTransfer) initPrometheus() {

internal/push/push_to_client.go

@@ -38,16 +38,9 @@ type Pusher struct {
 
 var errNoOfflinePusher = errors.New("no offlinePusher is configured")
 
-func NewPusher(
+func NewPusher(discov discoveryregistry.SvcDiscoveryRegistry, offlinePusher offlinepush.OfflinePusher, database controller.PushDatabase,
-	discov discoveryregistry.SvcDiscoveryRegistry,
+	groupLocalCache *localcache.GroupLocalCache, conversationLocalCache *localcache.ConversationLocalCache,
-	offlinePusher offlinepush.OfflinePusher,
+	conversationRpcClient *rpcclient.ConversationRpcClient, groupRpcClient *rpcclient.GroupRpcClient, msgRpcClient *rpcclient.MessageRpcClient) *Pusher {
-	database controller.PushDatabase,
-	groupLocalCache *localcache.GroupLocalCache,
-	conversationLocalCache *localcache.ConversationLocalCache,
-	conversationRpcClient *rpcclient.ConversationRpcClient,
-	groupRpcClient *rpcclient.GroupRpcClient,
-	msgRpcClient *rpcclient.MessageRpcClient,
-) *Pusher {
 	return &Pusher{
 		discov:                 discov,
 		database:               database,
@@ -94,18 +87,7 @@ func (p *Pusher) Push2User(ctx context.Context, userIDs []string, msg *sdkws.Msg
 		return err
 	}
 	isOfflinePush := utils.GetSwitchFromOptions(msg.Options, constant.IsOfflinePush)
-	log.ZDebug(
+	log.ZDebug(ctx, "push_result", "ws push result", wsResults, "sendData", msg, "isOfflinePush", isOfflinePush, "push_to_userID", userIDs)
-		ctx,
-		"push_result",
-		"ws push result",
-		wsResults,
-		"sendData",
-		msg,
-		"isOfflinePush",
-		isOfflinePush,
-		"push_to_userID",
-		userIDs,
-	)
 	p.successCount++
 	for _, userID := range userIDs {
 		if isOfflinePush && userID != msg.SendID {
@@ -156,15 +138,7 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 			}
 			defer func(groupID string, userIDs []string) {
 				if err := p.DeleteMemberAndSetConversationSeq(ctx, groupID, userIDs); err != nil {
-					log.ZError(
+					log.ZError(ctx, "MemberQuitNotification DeleteMemberAndSetConversationSeq", err, "groupID", groupID, "userIDs", userIDs)
-						ctx,
-						"MemberQuitNotification DeleteMemberAndSetConversationSeq",
-						err,
-						"groupID",
-						groupID,
-						"userIDs",
-						userIDs,
-					)
 				}
 			}(groupID, []string{tips.QuitUser.UserID})
 			pushToUserIDs = append(pushToUserIDs, tips.QuitUser.UserID)
@@ -173,21 +147,10 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 			if p.UnmarshalNotificationElem(msg.Content, &tips) != nil {
 				return err
 			}
-			kickedUsers := utils.Slice(
+			kickedUsers := utils.Slice(tips.KickedUserList, func(e *sdkws.GroupMemberFullInfo) string { return e.UserID })
-				tips.KickedUserList,
-				func(e *sdkws.GroupMemberFullInfo) string { return e.UserID },
-			)
 			defer func(groupID string, userIDs []string) {
 				if err := p.DeleteMemberAndSetConversationSeq(ctx, groupID, userIDs); err != nil {
-					log.ZError(
+					log.ZError(ctx, "MemberKickedNotification DeleteMemberAndSetConversationSeq", err, "groupID", groupID, "userIDs", userIDs)
-						ctx,
-						"MemberKickedNotification DeleteMemberAndSetConversationSeq",
-						err,
-						"groupID",
-						groupID,
-						"userIDs",
-						userIDs,
-					)
 				}
 			}(groupID, kickedUsers)
 			pushToUserIDs = append(pushToUserIDs, kickedUsers...)
@@ -197,16 +160,7 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 				if p.UnmarshalNotificationElem(msg.Content, &tips) != nil {
 					return err
 				}
-				log.ZInfo(
+				log.ZInfo(ctx, "GroupDismissedNotificationInfo****", "groupID", groupID, "num", len(pushToUserIDs), "list", pushToUserIDs)
-					ctx,
-					"GroupDismissedNotificationInfo****",
-					"groupID",
-					groupID,
-					"num",
-					len(pushToUserIDs),
-					"list",
-					pushToUserIDs,
-				)
 				if len(config.Config.Manager.UserID) > 0 {
 					ctx = mcontext.WithOpUserIDContext(ctx, config.Config.Manager.UserID[0])
 				}
@@ -270,23 +224,9 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 				log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg)
 				return err
 			}
-			_, err := p.GetConnsAndOnlinePush(
+			_, err := p.GetConnsAndOnlinePush(ctx, msg, utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs))
-				ctx,
-				msg,
-				utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs),
-			)
 			if err != nil {
-				log.ZError(
+				log.ZError(ctx, "offlinePushMsg failed", err, "groupID", groupID, "msg", msg, "userIDs", utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs))
-					ctx,
-					"offlinePushMsg failed",
-					err,
-					"groupID",
-					groupID,
-					"msg",
-					msg,
-					"userIDs",
-					utils.IntersectString(needOfflinePushUserIDs, WebAndPcBackgroundUserIDs),
-				)
 				return err
 			}
 		}
@@ -294,11 +234,7 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 	return nil
 }
 
-func (p *Pusher) GetConnsAndOnlinePush(
+func (p *Pusher) GetConnsAndOnlinePush(ctx context.Context, msg *sdkws.MsgData, pushToUserIDs []string) (wsResults []*msggateway.SingleMsgToUserResults, err error) {
-	ctx context.Context,
-	msg *sdkws.MsgData,
-	pushToUserIDs []string,
-) (wsResults []*msggateway.SingleMsgToUserResults, err error) {
 	conns, err := p.discov.GetConns(ctx, config.Config.RpcRegisterName.OpenImMessageGatewayName)
 	log.ZDebug(ctx, "get gateway conn", "conn length", len(conns))
 	if err != nil {
@@ -307,10 +243,7 @@ func (p *Pusher) GetConnsAndOnlinePush(
 	//Online push message
 	for _, v := range conns {
 		msgClient := msggateway.NewMsgGatewayClient(v)
-		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(
+		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(ctx, &msggateway.OnlineBatchPushOneMsgReq{MsgData: msg, PushToUserIDs: pushToUserIDs})
-			ctx,
-			&msggateway.OnlineBatchPushOneMsgReq{MsgData: msg, PushToUserIDs: pushToUserIDs},
-		)
 		if err != nil {
 			continue
 		}
@@ -323,12 +256,7 @@ func (p *Pusher) GetConnsAndOnlinePush(
 	return wsResults, nil
 }
 
-func (p *Pusher) offlinePushMsg(
+func (p *Pusher) offlinePushMsg(ctx context.Context, conversationID string, msg *sdkws.MsgData, offlinePushUserIDs []string) error {
-	ctx context.Context,
-	conversationID string,
-	msg *sdkws.MsgData,
-	offlinePushUserIDs []string,
-) error {
 	title, content, opts, err := p.getOfflinePushInfos(conversationID, msg)
 	if err != nil {
 		return err
@@ -362,10 +290,7 @@ func (p *Pusher) GetOfflinePushOpts(msg *sdkws.MsgData) (opts *offlinepush.Opts,
 	return opts, nil
 }
 
-func (p *Pusher) getOfflinePushInfos(
+func (p *Pusher) getOfflinePushInfos(conversationID string, msg *sdkws.MsgData) (title, content string, opts *offlinepush.Opts, err error) {
-	conversationID string,
-	msg *sdkws.MsgData,
-) (title, content string, opts *offlinepush.Opts, err error) {
 	if p.offlinePusher == nil {
 		err = errNoOfflinePusher
 		return

internal/rpc/conversation/conversaion.go

@@ -3,8 +3,6 @@ package conversation
 import (
 	"context"
 
-	"google.golang.org/grpc"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -19,6 +17,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"google.golang.org/grpc"
 )
 
 type conversationServer struct {
@@ -45,19 +44,12 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	pbConversation.RegisterConversationServer(server, &conversationServer{
 		conversationNotificationSender: notification.NewConversationNotificationSender(&msgRpcClient),
 		groupRpcClient:                 &groupRpcClient,
-		conversationDatabase: controller.NewConversationDatabase(
+		conversationDatabase:           controller.NewConversationDatabase(conversationDB, cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB), tx.NewGorm(db)),
-			conversationDB,
-			cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB),
-			tx.NewGorm(db),
-		),
 	})
 	return nil
 }
 
-func (c *conversationServer) GetConversation(
+func (c *conversationServer) GetConversation(ctx context.Context, req *pbConversation.GetConversationReq) (*pbConversation.GetConversationResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetConversationReq,
-) (*pbConversation.GetConversationResp, error) {
 	conversations, err := c.conversationDatabase.FindConversations(ctx, req.OwnerUserID, []string{req.ConversationID})
 	if err != nil {
 		return nil, err
@@ -70,10 +62,7 @@ func (c *conversationServer) GetConversation(
 	return resp, nil
 }
 
-func (c *conversationServer) GetAllConversations(
+func (c *conversationServer) GetAllConversations(ctx context.Context, req *pbConversation.GetAllConversationsReq) (*pbConversation.GetAllConversationsResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetAllConversationsReq,
-) (*pbConversation.GetAllConversationsResp, error) {
 	conversations, err := c.conversationDatabase.GetUserAllConversation(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
@@ -83,10 +72,7 @@ func (c *conversationServer) GetAllConversations(
 	return resp, nil
 }
 
-func (c *conversationServer) GetConversations(
+func (c *conversationServer) GetConversations(ctx context.Context, req *pbConversation.GetConversationsReq) (*pbConversation.GetConversationsResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetConversationsReq,
-) (*pbConversation.GetConversationsResp, error) {
 	conversations, err := c.conversationDatabase.FindConversations(ctx, req.OwnerUserID, req.ConversationIDs)
 	if err != nil {
 		return nil, err
@@ -96,19 +82,12 @@ func (c *conversationServer) GetConversations(
 	return resp, nil
 }
 
-func (c *conversationServer) SetConversation(
+func (c *conversationServer) SetConversation(ctx context.Context, req *pbConversation.SetConversationReq) (*pbConversation.SetConversationResp, error) {
-	ctx context.Context,
-	req *pbConversation.SetConversationReq,
-) (*pbConversation.SetConversationResp, error) {
 	var conversation tableRelation.ConversationModel
 	if err := utils.CopyStructFields(&conversation, req.Conversation); err != nil {
 		return nil, err
 	}
-	err := c.conversationDatabase.SetUserConversations(
+	err := c.conversationDatabase.SetUserConversations(ctx, req.Conversation.OwnerUserID, []*tableRelation.ConversationModel{&conversation})
-		ctx,
-		req.Conversation.OwnerUserID,
-		[]*tableRelation.ConversationModel{&conversation},
-	)
 	if err != nil {
 		return nil, err
 	}
@@ -117,10 +96,7 @@ func (c *conversationServer) SetConversation(
 	return resp, nil
 }
 
-func (c *conversationServer) SetConversations(
+func (c *conversationServer) SetConversations(ctx context.Context, req *pbConversation.SetConversationsReq) (*pbConversation.SetConversationsResp, error) {
-	ctx context.Context,
-	req *pbConversation.SetConversationsReq,
-) (*pbConversation.SetConversationsResp, error) {
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.Wrap("conversation must not be nil")
 	}
@@ -178,12 +154,7 @@ func (c *conversationServer) SetConversations(
 			return nil, err
 		}
 		for _, userID := range req.UserIDs {
-			c.conversationNotificationSender.ConversationSetPrivateNotification(
+			c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, req.Conversation.IsPrivateChat.Value)
-				ctx,
-				userID,
-				req.Conversation.UserID,
-				req.Conversation.IsPrivateChat.Value,
-			)
 		}
 	}
 	if req.Conversation.BurnDuration != nil {
@@ -200,10 +171,7 @@ func (c *conversationServer) SetConversations(
 }
 
 // 获取超级大群开启免打扰的用户ID
-func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(
+func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbConversation.GetRecvMsgNotNotifyUserIDsReq) (*pbConversation.GetRecvMsgNotNotifyUserIDsResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetRecvMsgNotNotifyUserIDsReq,
-) (*pbConversation.GetRecvMsgNotNotifyUserIDsResp, error) {
 	userIDs, err := c.conversationDatabase.FindRecvMsgNotNotifyUserIDs(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -212,10 +180,7 @@ func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(
 }
 
 // create conversation without notification for msg redis transfer
-func (c *conversationServer) CreateSingleChatConversations(
+func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbConversation.CreateSingleChatConversationsReq) (*pbConversation.CreateSingleChatConversationsResp, error) {
-	ctx context.Context,
-	req *pbConversation.CreateSingleChatConversationsReq,
-) (*pbConversation.CreateSingleChatConversationsResp, error) {
 	var conversation tableRelation.ConversationModel
 	conversation.ConversationID = utils.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID)
 	conversation.ConversationType = constant.SingleChatType
@@ -236,10 +201,7 @@ func (c *conversationServer) CreateSingleChatConversations(
 	return &pbConversation.CreateSingleChatConversationsResp{}, nil
 }
 
-func (c *conversationServer) CreateGroupChatConversations(
+func (c *conversationServer) CreateGroupChatConversations(ctx context.Context, req *pbConversation.CreateGroupChatConversationsReq) (*pbConversation.CreateGroupChatConversationsResp, error) {
-	ctx context.Context,
-	req *pbConversation.CreateGroupChatConversationsReq,
-) (*pbConversation.CreateGroupChatConversationsResp, error) {
 	err := c.conversationDatabase.CreateGroupChatConversation(ctx, req.GroupID, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -247,10 +209,7 @@ func (c *conversationServer) CreateGroupChatConversations(
 	return &pbConversation.CreateGroupChatConversationsResp{}, nil
 }
 
-func (c *conversationServer) SetConversationMaxSeq(
+func (c *conversationServer) SetConversationMaxSeq(ctx context.Context, req *pbConversation.SetConversationMaxSeqReq) (*pbConversation.SetConversationMaxSeqResp, error) {
-	ctx context.Context,
-	req *pbConversation.SetConversationMaxSeqReq,
-) (*pbConversation.SetConversationMaxSeqResp, error) {
 	if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, req.OwnerUserID, req.ConversationID,
 		map[string]interface{}{"max_seq": req.MaxSeq}); err != nil {
 		return nil, err
@@ -258,10 +217,7 @@ func (c *conversationServer) SetConversationMaxSeq(
 	return &pbConversation.SetConversationMaxSeqResp{}, nil
 }
 
-func (c *conversationServer) GetConversationIDs(
+func (c *conversationServer) GetConversationIDs(ctx context.Context, req *pbConversation.GetConversationIDsReq) (*pbConversation.GetConversationIDsResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetConversationIDsReq,
-) (*pbConversation.GetConversationIDsResp, error) {
 	conversationIDs, err := c.conversationDatabase.GetConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -269,10 +225,7 @@ func (c *conversationServer) GetConversationIDs(
 	return &pbConversation.GetConversationIDsResp{ConversationIDs: conversationIDs}, nil
 }
 
-func (c *conversationServer) GetUserConversationIDsHash(
+func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req *pbConversation.GetUserConversationIDsHashReq) (*pbConversation.GetUserConversationIDsHashResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetUserConversationIDsHashReq,
-) (*pbConversation.GetUserConversationIDsHashResp, error) {
 	hash, err := c.conversationDatabase.GetUserConversationIDsHash(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
@@ -280,15 +233,10 @@ func (c *conversationServer) GetUserConversationIDsHash(
 	return &pbConversation.GetUserConversationIDsHashResp{Hash: hash}, nil
 }
 
-func (c *conversationServer) GetConversationsByConversationID(
+func (c *conversationServer) GetConversationsByConversationID(ctx context.Context, req *pbConversation.GetConversationsByConversationIDReq) (*pbConversation.GetConversationsByConversationIDResp, error) {
-	ctx context.Context,
-	req *pbConversation.GetConversationsByConversationIDReq,
-) (*pbConversation.GetConversationsByConversationIDResp, error) {
 	conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, req.ConversationIDs)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.GetConversationsByConversationIDResp{
+	return &pbConversation.GetConversationsByConversationIDResp{Conversations: convert.ConversationsDB2Pb(conversations)}, nil
-		Conversations: convert.ConversationsDB2Pb(conversations),
-	}, nil
 }

internal/rpc/group/group.go

@@ -3,23 +3,20 @@ package group
 import (
 	"context"
 	"fmt"
+	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 	"math/big"
 	"math/rand"
 	"strconv"
 	"strings"
 	"time"
 
-	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw/specialerror"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 
-	"google.golang.org/grpc"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -34,6 +31,7 @@ import (
 	pbGroup "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"google.golang.org/grpc"
 )
 
 func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
@@ -59,18 +57,13 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	pbGroup.RegisterGroupServer(server, &groupServer{
 		GroupDatabase: database,
 		User:          userRpcClient,
-		Notification: notification.NewGroupNotificationSender(
+		Notification: notification.NewGroupNotificationSender(database, &msgRpcClient, &userRpcClient, func(ctx context.Context, userIDs []string) ([]notification.CommonUser, error) {
-			database,
+			users, err := userRpcClient.GetUsersInfo(ctx, userIDs)
-			&msgRpcClient,
+			if err != nil {
-			&userRpcClient,
+				return nil, err
-			func(ctx context.Context, userIDs []string) ([]notification.CommonUser, error) {
+			}
-				users, err := userRpcClient.GetUsersInfo(ctx, userIDs)
+			return utils.Slice(users, func(e *sdkws.UserInfo) notification.CommonUser { return e }), nil
-				if err != nil {
+		}),
-					return nil, err
-				}
-				return utils.Slice(users, func(e *sdkws.UserInfo) notification.CommonUser { return e }), nil
-			},
-		),
 		conversationRpcClient: conversationRpcClient,
 		msgRpcClient:          msgRpcClient,
 	})
@@ -127,16 +120,7 @@ func (s *groupServer) GenGroupID(ctx context.Context, groupID *string) error {
 		}
 	}
 	for i := 0; i < 10; i++ {
-		id := utils.Md5(
+		id := utils.Md5(strings.Join([]string{mcontext.GetOperationID(ctx), strconv.FormatInt(time.Now().UnixNano(), 10), strconv.Itoa(rand.Int())}, ",;,"))
-			strings.Join(
-				[]string{
-					mcontext.GetOperationID(ctx),
-					strconv.FormatInt(time.Now().UnixNano(), 10),
-					strconv.Itoa(rand.Int()),
-				},
-				",;,",
-			),
-		)
 		bi := big.NewInt(0)
 		bi.SetString(id[0:8], 16)
 		id = bi.String()
@@ -250,10 +234,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 	return resp, nil
 }
 
-func (s *groupServer) GetJoinedGroupList(
+func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJoinedGroupListReq) (*pbGroup.GetJoinedGroupListResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetJoinedGroupListReq,
-) (*pbGroup.GetJoinedGroupListResp, error) {
 	resp := &pbGroup.GetJoinedGroupListResp{}
 	if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
@@ -263,8 +244,7 @@ func (s *groupServer) GetJoinedGroupList(
 		pageNumber = req.Pagination.PageNumber
 		showNumber = req.Pagination.ShowNumber
 	}
-	// total, members, err := s.GroupDatabase.PageGroupMember(ctx, nil, []string{req.FromUserID}, nil, pageNumber,
+	//total, members, err := s.GroupDatabase.PageGroupMember(ctx, nil, []string{req.FromUserID}, nil, pageNumber, showNumber)
-	// showNumber)
 	total, members, err := s.GroupDatabase.PageGetJoinGroup(ctx, req.FromUserID, pageNumber, showNumber)
 	if err != nil {
 		return nil, err
@@ -303,10 +283,7 @@ func (s *groupServer) GetJoinedGroupList(
 	return resp, nil
 }
 
-func (s *groupServer) InviteUserToGroup(
+func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.InviteUserToGroupReq) (*pbGroup.InviteUserToGroupResp, error) {
-	ctx context.Context,
-	req *pbGroup.InviteUserToGroupReq,
-) (*pbGroup.InviteUserToGroupResp, error) {
 	resp := &pbGroup.InviteUserToGroupResp{}
 	if len(req.InvitedUserIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("user empty")
@@ -407,10 +384,7 @@ func (s *groupServer) InviteUserToGroup(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupAllMember(
+func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupAllMemberReq,
-) (*pbGroup.GetGroupAllMemberResp, error) {
 	resp := &pbGroup.GetGroupAllMemberResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
@@ -438,10 +412,7 @@ func (s *groupServer) GetGroupAllMember(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberList(
+func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGroupMemberListReq) (*pbGroup.GetGroupMemberListResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupMemberListReq,
-) (*pbGroup.GetGroupMemberListResp, error) {
 	resp := &pbGroup.GetGroupMemberListResp{}
 	total, members, err := s.PageGetGroupMember(ctx, req.GroupID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	log.ZDebug(ctx, "GetGroupMemberList", "total", total, "members", members, "length", len(members))
@@ -454,10 +425,7 @@ func (s *groupServer) GetGroupMemberList(
 	return resp, nil
 }
 
-func (s *groupServer) KickGroupMember(
+func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGroupMemberReq) (*pbGroup.KickGroupMemberResp, error) {
-	ctx context.Context,
-	req *pbGroup.KickGroupMemberReq,
-) (*pbGroup.KickGroupMemberResp, error) {
 	resp := &pbGroup.KickGroupMemberResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
@@ -565,10 +533,7 @@ func (s *groupServer) KickGroupMember(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMembersInfo(
+func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetGroupMembersInfoReq) (*pbGroup.GetGroupMembersInfoResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupMembersInfoReq,
-) (*pbGroup.GetGroupMembersInfoResp, error) {
 	resp := &pbGroup.GetGroupMembersInfoResp{}
 	if len(req.UserIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("userIDs empty")
@@ -595,10 +560,7 @@ func (s *groupServer) GetGroupMembersInfo(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupApplicationList(
+func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.GetGroupApplicationListReq) (*pbGroup.GetGroupApplicationListResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupApplicationListReq,
-) (*pbGroup.GetGroupApplicationListResp, error) {
 	pageNumber, showNumber := utils.GetPage(req.Pagination)
 
 	groupIDs, err := s.GroupDatabase.FindUserManagedGroupID(ctx, req.FromUserID)
@@ -649,19 +611,12 @@ func (s *groupServer) GetGroupApplicationList(
 		return e.GroupID
 	})
 	resp.GroupRequests = utils.Slice(groupRequests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
-		return convert.Db2PbGroupRequest(
+		return convert.Db2PbGroupRequest(e, userMap[e.UserID], convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]))
-			e,
-			userMap[e.UserID],
-			convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]),
-		)
 	})
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupsInfo(
+func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsInfoReq) (*pbGroup.GetGroupsInfoResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupsInfoReq,
-) (*pbGroup.GetGroupsInfoResp, error) {
 	resp := &pbGroup.GetGroupsInfoResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupID is empty")
@@ -691,10 +646,7 @@ func (s *groupServer) GetGroupsInfo(
 	return resp, nil
 }
 
-func (s *groupServer) GroupApplicationResponse(
+func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (*pbGroup.GroupApplicationResponseResp, error) {
-	ctx context.Context,
-	req *pbGroup.GroupApplicationResponseReq,
-) (*pbGroup.GroupApplicationResponseResp, error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
 	if !utils.Contain(req.HandleResult, constant.GroupResponseAgree, constant.GroupResponseRefuse) {
 		return nil, errs.ErrArgs.Wrap("HandleResult unknown")
@@ -766,10 +718,7 @@ func (s *groupServer) GroupApplicationResponse(
 	return &pbGroup.GroupApplicationResponseResp{}, nil
 }
 
-func (s *groupServer) JoinGroup(
+func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) (resp *pbGroup.JoinGroupResp, err error) {
-	ctx context.Context,
-	req *pbGroup.JoinGroupReq,
-) (resp *pbGroup.JoinGroupResp, err error) {
 	defer log.ZInfo(ctx, "JoinGroup.Return")
 	user, err := s.User.GetUserInfo(ctx, req.InviterUserID)
 	if err != nil {
@@ -869,10 +818,7 @@ func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, gro
 	return s.conversationRpcClient.SetConversationMaxSeq(ctx, userIDs, conevrsationID, maxSeq)
 }
 
-func (s *groupServer) SetGroupInfo(
+func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
-	ctx context.Context,
-	req *pbGroup.SetGroupInfoReq,
-) (*pbGroup.SetGroupInfoResp, error) {
 	var opMember *relationTb.GroupMemberModel
 	if !tokenverify.IsAppManagerUid(ctx) {
 		var err error
@@ -924,17 +870,11 @@ func (s *groupServer) SetGroupInfo(
 		go func() {
 			nctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(ctx))
 			conversation := &pbConversation.ConversationReq{
-				ConversationID: utils.GetConversationIDBySessionType(
+				ConversationID:   utils.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID),
-					constant.SuperGroupChatType,
-					req.GroupInfoForSet.GroupID,
-				),
 				ConversationType: constant.SuperGroupChatType,
 				GroupID:          req.GroupInfoForSet.GroupID,
 			}
-			resp, err := s.GetGroupMemberUserIDs(
+			resp, err := s.GetGroupMemberUserIDs(nctx, &pbGroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
-				nctx,
-				&pbGroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID},
-			)
 			if err != nil {
 				log.ZWarn(ctx, "GetGroupMemberIDs", err)
 				return
@@ -945,10 +885,7 @@ func (s *groupServer) SetGroupInfo(
 			}
 		}()
 		num++
-		s.Notification.GroupInfoSetAnnouncementNotification(
+		s.Notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser})
-			ctx,
-			&sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser},
-		)
 
 	}
 	switch len(data) - num {
@@ -965,10 +902,7 @@ func (s *groupServer) SetGroupInfo(
 	return resp, nil
 }
 
-func (s *groupServer) TransferGroupOwner(
+func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.TransferGroupOwnerReq) (*pbGroup.TransferGroupOwnerResp, error) {
-	ctx context.Context,
-	req *pbGroup.TransferGroupOwnerReq,
-) (*pbGroup.TransferGroupOwnerResp, error) {
 	resp := &pbGroup.TransferGroupOwnerResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
@@ -1047,20 +981,9 @@ func (s *groupServer) GetGroups(ctx context.Context, req *pbGroup.GetGroupsReq)
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMembersCMS(
+func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbGroup.GetGroupMembersCMSReq) (*pbGroup.GetGroupMembersCMSResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupMembersCMSReq,
-) (*pbGroup.GetGroupMembersCMSResp, error) {
 	resp := &pbGroup.GetGroupMembersCMSResp{}
-	total, members, err := s.GroupDatabase.SearchGroupMember(
+	total, members, err := s.GroupDatabase.SearchGroupMember(ctx, req.UserName, []string{req.GroupID}, nil, nil, req.Pagination.PageNumber, req.Pagination.ShowNumber)
-		ctx,
-		req.UserName,
-		[]string{req.GroupID},
-		nil,
-		nil,
-		req.Pagination.PageNumber,
-		req.Pagination.ShowNumber,
-	)
 	if err != nil {
 		return nil, err
 	}
@@ -1080,10 +1003,7 @@ func (s *groupServer) GetGroupMembersCMS(
 	return resp, nil
 }
 
-func (s *groupServer) GetUserReqApplicationList(
+func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGroup.GetUserReqApplicationListReq) (*pbGroup.GetUserReqApplicationListResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetUserReqApplicationListReq,
-) (*pbGroup.GetUserReqApplicationListResp, error) {
 	resp := &pbGroup.GetUserReqApplicationListResp{}
 	user, err := s.User.GetPublicUserInfo(ctx, req.UserID)
 	if err != nil {
@@ -1130,19 +1050,12 @@ func (s *groupServer) GetUserReqApplicationList(
 		return nil, err
 	}
 	resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
-		return convert.Db2PbGroupRequest(
+		return convert.Db2PbGroupRequest(e, user, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])))
-			e,
-			user,
-			convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])),
-		)
 	})
 	return resp, nil
 }
 
-func (s *groupServer) DismissGroup(
+func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGroupReq) (*pbGroup.DismissGroupResp, error) {
-	ctx context.Context,
-	req *pbGroup.DismissGroupReq,
-) (*pbGroup.DismissGroupResp, error) {
 	defer log.ZInfo(ctx, "DismissGroup.return")
 	resp := &pbGroup.DismissGroupResp{}
 	owner, err := s.TakeGroupOwner(ctx, req.GroupID)
@@ -1191,10 +1104,7 @@ func (s *groupServer) DismissGroup(
 	return resp, nil
 }
 
-func (s *groupServer) MuteGroupMember(
+func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGroupMemberReq) (*pbGroup.MuteGroupMemberResp, error) {
-	ctx context.Context,
-	req *pbGroup.MuteGroupMemberReq,
-) (*pbGroup.MuteGroupMemberResp, error) {
 	resp := &pbGroup.MuteGroupMemberResp{}
 	//if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
 	//	return nil, err
@@ -1229,10 +1139,7 @@ func (s *groupServer) MuteGroupMember(
 	return resp, nil
 }
 
-func (s *groupServer) CancelMuteGroupMember(
+func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.CancelMuteGroupMemberReq) (*pbGroup.CancelMuteGroupMemberResp, error) {
-	ctx context.Context,
-	req *pbGroup.CancelMuteGroupMemberReq,
-) (*pbGroup.CancelMuteGroupMemberResp, error) {
 	resp := &pbGroup.CancelMuteGroupMemberResp{}
 	//member, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.UserID)
 	//if err != nil {
@@ -1244,8 +1151,7 @@ func (s *groupServer) CancelMuteGroupMember(
 	//		return nil, err
 	//	}
 	//	if opMember.RoleLevel <= member.RoleLevel {
-	// 		return nil, errs.ErrNoPermission.Wrap(fmt.Sprintf("self RoleLevel %d target %d", opMember.RoleLevel,
+	//		return nil, errs.ErrNoPermission.Wrap(fmt.Sprintf("self RoleLevel %d target %d", opMember.RoleLevel, member.RoleLevel))
-	// member.RoleLevel))
 	//	}
 	//}
 	//if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
@@ -1293,10 +1199,7 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq)
 	return resp, nil
 }
 
-func (s *groupServer) CancelMuteGroup(
+func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMuteGroupReq) (*pbGroup.CancelMuteGroupResp, error) {
-	ctx context.Context,
-	req *pbGroup.CancelMuteGroupReq,
-) (*pbGroup.CancelMuteGroupResp, error) {
 	resp := &pbGroup.CancelMuteGroupResp{}
 	if err := s.CheckGroupAdmin(ctx, req.GroupID); err != nil {
 		return nil, err
@@ -1308,10 +1211,7 @@ func (s *groupServer) CancelMuteGroup(
 	return resp, nil
 }
 
-func (s *groupServer) SetGroupMemberInfo(
+func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGroupMemberInfoReq) (*pbGroup.SetGroupMemberInfoResp, error) {
-	ctx context.Context,
-	req *pbGroup.SetGroupMemberInfoReq,
-) (*pbGroup.SetGroupMemberInfoResp, error) {
 	resp := &pbGroup.SetGroupMemberInfoResp{}
 	if len(req.Members) == 0 {
 		return nil, errs.ErrArgs.Wrap("members empty")
@@ -1338,11 +1238,9 @@ func (s *groupServer) SetGroupMemberInfo(
 		delete(duplicateMap, [...]string{member.GroupID, member.UserID})
 	}
 	if len(duplicateMap) > 0 {
-		return nil, errs.ErrArgs.Wrap(
+		return nil, errs.ErrArgs.Wrap("user not found" + strings.Join(utils.Slice(utils.Keys(duplicateMap), func(e [2]string) string {
-			"user not found" + strings.Join(utils.Slice(utils.Keys(duplicateMap), func(e [2]string) string {
+			return fmt.Sprintf("[group: %s user: %s]", e[0], e[1])
-				return fmt.Sprintf("[group: %s user: %s]", e[0], e[1])
+		}), ","))
-			}), ","),
-		)
 	}
 	memberMap := utils.SliceToMap(members, func(e *relationTb.GroupMemberModel) [2]string {
 		return [...]string{e.GroupID, e.UserID}
@@ -1372,9 +1270,7 @@ func (s *groupServer) SetGroupMemberInfo(
 			}
 			dbMember, ok := memberMap[[...]string{member.GroupID, member.UserID}]
 			if !ok {
-				return nil, errs.ErrRecordNotFound.Wrap(
+				return nil, errs.ErrRecordNotFound.Wrap(fmt.Sprintf("user %s not in group %s", member.UserID, member.GroupID))
-					fmt.Sprintf("user %s not in group %s", member.UserID, member.GroupID),
-				)
 			}
 			//if opMember.RoleLevel == constant.GroupOwner {
 			//	continue
@@ -1436,25 +1332,14 @@ func (s *groupServer) SetGroupMemberInfo(
 		if member.Nickname != nil || member.FaceURL != nil || member.Ex != nil {
 			log.ZDebug(ctx, "setGroupMemberInfo notification", "member", member.UserID)
 			if err := s.Notification.GroupMemberInfoSetNotification(ctx, member.GroupID, member.UserID); err != nil {
-				log.ZError(
+				log.ZError(ctx, "setGroupMemberInfo notification failed", err, "member", member.UserID, "groupID", member.GroupID)
-					ctx,
-					"setGroupMemberInfo notification failed",
-					err,
-					"member",
-					member.UserID,
-					"groupID",
-					member.GroupID,
-				)
 			}
 		}
 	}
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupAbstractInfo(
+func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.GetGroupAbstractInfoReq) (*pbGroup.GetGroupAbstractInfoResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupAbstractInfoReq,
-) (*pbGroup.GetGroupAbstractInfoResp, error) {
 	resp := &pbGroup.GetGroupAbstractInfoResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupIDs empty")
@@ -1485,10 +1370,7 @@ func (s *groupServer) GetGroupAbstractInfo(
 	return resp, nil
 }
 
-func (s *groupServer) GetUserInGroupMembers(
+func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbGroup.GetUserInGroupMembersReq) (*pbGroup.GetUserInGroupMembersResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetUserInGroupMembersReq,
-) (*pbGroup.GetUserInGroupMembersResp, error) {
 	resp := &pbGroup.GetUserInGroupMembersResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupIDs empty")
@@ -1512,10 +1394,7 @@ func (s *groupServer) GetUserInGroupMembers(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberUserIDs(
+func (s *groupServer) GetGroupMemberUserIDs(ctx context.Context, req *pbGroup.GetGroupMemberUserIDsReq) (resp *pbGroup.GetGroupMemberUserIDsResp, err error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupMemberUserIDsReq,
-) (resp *pbGroup.GetGroupMemberUserIDsResp, err error) {
 	resp = &pbGroup.GetGroupMemberUserIDsResp{}
 	resp.UserIDs, err = s.GroupDatabase.FindGroupMemberUserID(ctx, req.GroupID)
 	if err != nil {
@@ -1524,10 +1403,7 @@ func (s *groupServer) GetGroupMemberUserIDs(
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberRoleLevel(
+func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbGroup.GetGroupMemberRoleLevelReq) (*pbGroup.GetGroupMemberRoleLevelResp, error) {
-	ctx context.Context,
-	req *pbGroup.GetGroupMemberRoleLevelReq,
-) (*pbGroup.GetGroupMemberRoleLevelResp, error) {
 	resp := &pbGroup.GetGroupMemberRoleLevelResp{}
 	if len(req.RoleLevels) == 0 {
 		return nil, errs.ErrArgs.Wrap("RoleLevels empty")

internal/rpc/group/statistics.go

@@ -2,16 +2,12 @@ package group
 
 import (
 	"context"
-	"time"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
+	"time"
 )
 
-func (s *groupServer) GroupCreateCount(
+func (s *groupServer) GroupCreateCount(ctx context.Context, req *group.GroupCreateCountReq) (*group.GroupCreateCountResp, error) {
-	ctx context.Context,
-	req *group.GroupCreateCountReq,
-) (*group.GroupCreateCountResp, error) {
 	if req.Start > req.End {
 		return nil, errs.ErrArgs.Wrap("start > end")
 	}

internal/rpc/msg/statistics.go

@@ -2,24 +2,15 @@ package msg
 
 import (
 	"context"
-	"time"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"time"
 )
 
 func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) {
-	msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(
+	msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Group, req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
-		ctx,
-		time.UnixMilli(req.Start),
-		time.UnixMilli(req.End),
-		req.Group,
-		req.Ase,
-		req.Pagination.PageNumber,
-		req.Pagination.ShowNumber,
-	)
 	if err != nil {
 		return nil, err
 	}
@@ -54,14 +45,7 @@ func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq
 }
 
 func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupReq) (*msg.GetActiveGroupResp, error) {
-	msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(
+	msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
-		ctx,
-		time.UnixMilli(req.Start),
-		time.UnixMilli(req.End),
-		req.Ase,
-		req.Pagination.PageNumber,
-		req.Pagination.ShowNumber,
-	)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/third/s3.go

@@ -2,8 +2,6 @@ package third
 
 import (
 	"context"
-	"time"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -11,6 +9,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"time"
 )
 
 func (t *thirdServer) PartLimit(ctx context.Context, req *third.PartLimitReq) (*third.PartLimitResp, error) {
@@ -30,10 +29,7 @@ func (t *thirdServer) PartSize(ctx context.Context, req *third.PartSizeReq) (*th
 	return &third.PartSizeResp{Size: size}, nil
 }
 
-func (t *thirdServer) InitiateMultipartUpload(
+func (t *thirdServer) InitiateMultipartUpload(ctx context.Context, req *third.InitiateMultipartUploadReq) (*third.InitiateMultipartUploadResp, error) {
-	ctx context.Context,
-	req *third.InitiateMultipartUploadReq,
-) (*third.InitiateMultipartUploadResp, error) {
 	defer log.ZDebug(ctx, "return")
 	if err := checkUploadName(ctx, req.Name); err != nil {
 		return nil, err
@@ -112,10 +108,7 @@ func (t *thirdServer) AuthSign(ctx context.Context, req *third.AuthSignReq) (*th
 	return resp, nil
 }
 
-func (t *thirdServer) CompleteMultipartUpload(
+func (t *thirdServer) CompleteMultipartUpload(ctx context.Context, req *third.CompleteMultipartUploadReq) (*third.CompleteMultipartUploadResp, error) {
-	ctx context.Context,
-	req *third.CompleteMultipartUploadReq,
-) (*third.CompleteMultipartUploadResp, error) {
 	defer log.ZDebug(ctx, "return")
 	if err := checkUploadName(ctx, req.Name); err != nil {
 		return nil, err

internal/rpc/third/third.go

@@ -3,15 +3,12 @@ package third
 import (
 	"context"
 	"fmt"
-	"net/url"
-	"time"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cos"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/minio"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/oss"
-
+	"net/url"
-	"google.golang.org/grpc"
+	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -21,6 +18,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"google.golang.org/grpc"
 )
 
 func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
@@ -79,10 +77,7 @@ type thirdServer struct {
 	defaultExpire time.Duration
 }
 
-func (t *thirdServer) FcmUpdateToken(
+func (t *thirdServer) FcmUpdateToken(ctx context.Context, req *third.FcmUpdateTokenReq) (resp *third.FcmUpdateTokenResp, err error) {
-	ctx context.Context,
-	req *third.FcmUpdateTokenReq,
-) (resp *third.FcmUpdateTokenResp, err error) {
 	err = t.thirdDatabase.FcmUpdateToken(ctx, req.Account, int(req.PlatformID), req.FcmToken, req.ExpireTime)
 	if err != nil {
 		return nil, err
@@ -90,10 +85,7 @@ func (t *thirdServer) FcmUpdateToken(
 	return &third.FcmUpdateTokenResp{}, nil
 }
 
-func (t *thirdServer) SetAppBadge(
+func (t *thirdServer) SetAppBadge(ctx context.Context, req *third.SetAppBadgeReq) (resp *third.SetAppBadgeResp, err error) {
-	ctx context.Context,
-	req *third.SetAppBadgeReq,
-) (resp *third.SetAppBadgeResp, err error) {
 	err = t.thirdDatabase.SetAppBadge(ctx, req.UserID, int(req.AppUnreadCount))
 	if err != nil {
 		return nil, err

internal/rpc/third/tool.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
-	"unicode/utf8"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
+	"strings"
+	"unicode/utf8"
 )
 
 func toPbMapArray(m map[string][]string) []*third.KeyValues {

internal/rpc/user/user.go

@@ -3,11 +3,10 @@ package user
 import (
 	"context"
 	"errors"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"strings"
 	"time"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
@@ -24,9 +23,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 
-	"google.golang.org/grpc"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"google.golang.org/grpc"
 )
 
 type userServer struct {
@@ -61,22 +59,16 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	friendRpcClient := rpcclient.NewFriendRpcClient(client)
 	msgRpcClient := rpcclient.NewMessageRpcClient(client)
 	u := &userServer{
-		UserDatabase:    database,
+		UserDatabase:       database,
-		RegisterCenter:  client,
+		RegisterCenter:     client,
-		friendRpcClient: &friendRpcClient,
+		friendRpcClient:    &friendRpcClient,
-		notificationSender: notification.NewFriendNotificationSender(
+		notificationSender: notification.NewFriendNotificationSender(&msgRpcClient, notification.WithDBFunc(database.FindWithError)),
-			&msgRpcClient,
-			notification.WithDBFunc(database.FindWithError),
-		),
 	}
 	pbuser.RegisterUserServer(server, u)
 	return u.UserDatabase.InitOnce(context.Background(), users)
 }
 
-func (s *userServer) GetDesignateUsers(
+func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesignateUsersReq) (resp *pbuser.GetDesignateUsersResp, err error) {
-	ctx context.Context,
-	req *pbuser.GetDesignateUsersReq,
-) (resp *pbuser.GetDesignateUsersResp, err error) {
 	resp = &pbuser.GetDesignateUsersResp{}
 	users, err := s.FindWithError(ctx, req.UserIDs)
 	if err != nil {
@@ -89,10 +81,7 @@ func (s *userServer) GetDesignateUsers(
 	return resp, nil
 }
 
-func (s *userServer) UpdateUserInfo(
+func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserInfoReq) (resp *pbuser.UpdateUserInfoResp, err error) {
-	ctx context.Context,
-	req *pbuser.UpdateUserInfoReq,
-) (resp *pbuser.UpdateUserInfoResp, err error) {
 	resp = &pbuser.UpdateUserInfoResp{}
 	err = tokenverify.CheckAccessV3(ctx, req.UserInfo.UserID)
 	if err != nil {
@@ -117,10 +106,7 @@ func (s *userServer) UpdateUserInfo(
 	return resp, nil
 }
 
-func (s *userServer) SetGlobalRecvMessageOpt(
+func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.SetGlobalRecvMessageOptReq) (resp *pbuser.SetGlobalRecvMessageOptResp, err error) {
-	ctx context.Context,
-	req *pbuser.SetGlobalRecvMessageOptReq,
-) (resp *pbuser.SetGlobalRecvMessageOptResp, err error) {
 	resp = &pbuser.SetGlobalRecvMessageOptResp{}
 	if _, err := s.FindWithError(ctx, []string{req.UserID}); err != nil {
 		return nil, err
@@ -134,10 +120,7 @@ func (s *userServer) SetGlobalRecvMessageOpt(
 	return resp, nil
 }
 
-func (s *userServer) AccountCheck(
+func (s *userServer) AccountCheck(ctx context.Context, req *pbuser.AccountCheckReq) (resp *pbuser.AccountCheckResp, err error) {
-	ctx context.Context,
-	req *pbuser.AccountCheckReq,
-) (resp *pbuser.AccountCheckResp, err error) {
 	resp = &pbuser.AccountCheckResp{}
 	if utils.Duplicate(req.CheckUserIDs) {
 		return nil, errs.ErrArgs.Wrap("userID repeated")
@@ -166,10 +149,7 @@ func (s *userServer) AccountCheck(
 	return resp, nil
 }
 
-func (s *userServer) GetPaginationUsers(
+func (s *userServer) GetPaginationUsers(ctx context.Context, req *pbuser.GetPaginationUsersReq) (resp *pbuser.GetPaginationUsersResp, err error) {
-	ctx context.Context,
-	req *pbuser.GetPaginationUsersReq,
-) (resp *pbuser.GetPaginationUsersResp, err error) {
 	var pageNumber, showNumber int32
 	if req.Pagination != nil {
 		pageNumber = req.Pagination.PageNumber
@@ -182,10 +162,7 @@ func (s *userServer) GetPaginationUsers(
 	return &pbuser.GetPaginationUsersResp{Total: int32(total), Users: convert.UsersDB2Pb(users)}, err
 }
 
-func (s *userServer) UserRegister(
+func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterReq) (resp *pbuser.UserRegisterResp, err error) {
-	ctx context.Context,
-	req *pbuser.UserRegisterReq,
-) (resp *pbuser.UserRegisterResp, err error) {
 	resp = &pbuser.UserRegisterResp{}
 	if len(req.Users) == 0 {
 		return nil, errs.ErrArgs.Wrap("users is empty")
@@ -233,10 +210,7 @@ func (s *userServer) UserRegister(
 	return resp, nil
 }
 
-func (s *userServer) GetGlobalRecvMessageOpt(
+func (s *userServer) GetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.GetGlobalRecvMessageOptReq) (resp *pbuser.GetGlobalRecvMessageOptResp, err error) {
-	ctx context.Context,
-	req *pbuser.GetGlobalRecvMessageOptReq,
-) (resp *pbuser.GetGlobalRecvMessageOptResp, err error) {
 	user, err := s.FindWithError(ctx, []string{req.UserID})
 	if err != nil {
 		return nil, err
@@ -244,10 +218,7 @@ func (s *userServer) GetGlobalRecvMessageOpt(
 	return &pbuser.GetGlobalRecvMessageOptResp{GlobalRecvMsgOpt: user[0].GlobalRecvMsgOpt}, nil
 }
 
-func (s *userServer) GetAllUserID(
+func (s *userServer) GetAllUserID(ctx context.Context, req *pbuser.GetAllUserIDReq) (resp *pbuser.GetAllUserIDResp, err error) {
-	ctx context.Context,
-	req *pbuser.GetAllUserIDReq,
-) (resp *pbuser.GetAllUserIDResp, err error) {
 	userIDs, err := s.UserDatabase.GetAllUserID(ctx)
 	if err != nil {
 		return nil, err

internal/tools/conversation.go

@@ -19,60 +19,19 @@ func (c *MsgTool) ConversationsDestructMsgs() {
 	}
 	log.ZDebug(context.Background(), "nums conversations need destruct", "nums", len(conversations))
 	for _, conversation := range conversations {
-		log.ZDebug(
+		log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID, "msgDestructTime", conversation.MsgDestructTime, "lastMsgDestructTime", conversation.LatestMsgDestructTime)
-			ctx,
+		seqs, err := c.msgDatabase.UserMsgsDestruct(ctx, conversation.OwnerUserID, conversation.ConversationID, conversation.MsgDestructTime, conversation.LatestMsgDestructTime)
-			"UserMsgsDestruct",
-			"conversationID",
-			conversation.ConversationID,
-			"ownerUserID",
-			conversation.OwnerUserID,
-			"msgDestructTime",
-			conversation.MsgDestructTime,
-			"lastMsgDestructTime",
-			conversation.LatestMsgDestructTime,
-		)
-		seqs, err := c.msgDatabase.UserMsgsDestruct(
-			ctx,
-			conversation.OwnerUserID,
-			conversation.ConversationID,
-			conversation.MsgDestructTime,
-			conversation.LatestMsgDestructTime,
-		)
 		if err != nil {
-			log.ZError(
+			log.ZError(ctx, "user msg destruct failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID)
-				ctx,
-				"user msg destruct failed",
-				err,
-				"conversationID",
-				conversation.ConversationID,
-				"ownerUserID",
-				conversation.OwnerUserID,
-			)
 			continue
 		}
 		if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": time.Now()}); err != nil {
-			log.ZError(
+			log.ZError(ctx, "updateUsersConversationFiled failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID)
-				ctx,
-				"updateUsersConversationFiled failed",
-				err,
-				"conversationID",
-				conversation.ConversationID,
-				"ownerUserID",
-				conversation.OwnerUserID,
-			)
 			continue
 		}
 		if len(seqs) > 0 {
 			if err := c.msgNotificationSender.UserDeleteMsgsNotification(ctx, conversation.OwnerUserID, conversation.ConversationID, seqs); err != nil {
-				log.ZError(
+				log.ZError(ctx, "userDeleteMsgsNotification failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID)
-					ctx,
-					"userDeleteMsgsNotification failed",
-					err,
-					"conversationID",
-					conversation.ConversationID,
-					"ownerUserID",
-					conversation.OwnerUserID,
-				)
 			}
 		}
 	}

internal/tools/cron_task.go

@@ -34,19 +34,10 @@ func StartCronTask() error {
 	c := cron.New()
 	var wg sync.WaitGroup
 	wg.Add(1)
-	log.ZInfo(
+	log.ZInfo(context.Background(), "start chatRecordsClearTime cron task", "cron config", config.Config.ChatRecordsClearTime)
-		context.Background(),
-		"start chatRecordsClearTime cron task",
-		"cron config",
-		config.Config.ChatRecordsClearTime,
-	)
 	_, err = c.AddFunc(config.Config.ChatRecordsClearTime, msgTool.AllConversationClearMsgAndFixSeq)
 	if err != nil {
-		fmt.Println(
+		fmt.Println("start allConversationClearMsgAndFixSeq cron failed", err.Error(), config.Config.ChatRecordsClearTime)
-			"start allConversationClearMsgAndFixSeq cron failed",
-			err.Error(),
-			config.Config.ChatRecordsClearTime,
-		)
 		panic(err)
 	}
 	log.ZInfo(context.Background(), "start msgDestruct cron task", "cron config", config.Config.MsgDestructTime)

internal/tools/msg.go

@@ -6,10 +6,6 @@ import (
 	"math"
 	"time"
 
-	"github.com/redis/go-redis/v9"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -24,6 +20,9 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"github.com/redis/go-redis/v9"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 type MsgTool struct {
@@ -34,13 +33,8 @@ type MsgTool struct {
 	msgNotificationSender *notification.MsgNotificationSender
 }
 
-func NewMsgTool(
+func NewMsgTool(msgDatabase controller.CommonMsgDatabase, userDatabase controller.UserDatabase,
-	msgDatabase controller.CommonMsgDatabase,
+	groupDatabase controller.GroupDatabase, conversationDatabase controller.ConversationDatabase, msgNotificationSender *notification.MsgNotificationSender) *MsgTool {
-	userDatabase controller.UserDatabase,
-	groupDatabase controller.GroupDatabase,
-	conversationDatabase controller.ConversationDatabase,
-	msgNotificationSender *notification.MsgNotificationSender,
-) *MsgTool {
 	return &MsgTool{
 		msgDatabase:           msgDatabase,
 		userDatabase:          userDatabase,
@@ -63,35 +57,18 @@ func InitMsgTool() (*MsgTool, error) {
 	if err != nil {
 		return nil, err
 	}
-	discov, err := zookeeper.NewClient(
+	discov, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		config.Config.Zookeeper.ZkAddr,
+		zookeeper.WithFreq(time.Hour), zookeeper.WithRoundRobin(), zookeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-		config.Config.Zookeeper.Schema,
+			config.Config.Zookeeper.Password), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))
-		zookeeper.WithFreq(
-			time.Hour,
-		),
-		zookeeper.WithRoundRobin(),
-		zookeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password),
-		zookeeper.WithTimeout(10),
-		zookeeper.WithLogger(log.NewZkLogger()),
-	)
 	if err != nil {
 		return nil, err
 	}
 	discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	userDB := relation.NewUserGorm(db)
-	msgDatabase := controller.InitCommonMsgDatabase(rdb, mongo.GetDatabase(), db)
+	msgDatabase := controller.InitCommonMsgDatabase(rdb, mongo.GetDatabase())
-	userDatabase := controller.NewUserDatabase(
+	userDatabase := controller.NewUserDatabase(userDB, cache.NewUserCacheRedis(rdb, relation.NewUserGorm(db), cache.GetDefaultOpt()), tx.NewGorm(db))
-		userDB,
-		cache.NewUserCacheRedis(rdb, relation.NewUserGorm(db), cache.GetDefaultOpt()),
-		tx.NewGorm(db),
-	)
 	groupDatabase := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
-	conversationDatabase := controller.NewConversationDatabase(
+	conversationDatabase := controller.NewConversationDatabase(relation.NewConversationGorm(db), cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), relation.NewConversationGorm(db)), tx.NewGorm(db))
-		relation.NewConversationGorm(db),
-		cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), relation.NewConversationGorm(db)),
-		tx.NewGorm(db),
-	)
 	msgRpcClient := rpcclient.NewMessageRpcClient(discov)
 	msgNotificationSender := notification.NewMsgNotificationSender(rpcclient.WithRpcClient(&msgRpcClient))
 	msgTool := NewMsgTool(msgDatabase, userDatabase, groupDatabase, conversationDatabase, msgNotificationSender)
@@ -116,15 +93,7 @@ func (c *MsgTool) AllConversationClearMsgAndFixSeq() {
 func (c *MsgTool) ClearConversationsMsg(ctx context.Context, conversationIDs []string) {
 	for _, conversationID := range conversationIDs {
 		if err := c.msgDatabase.DeleteConversationMsgsAndSetMinSeq(ctx, conversationID, int64(config.Config.RetainChatRecords*24*60*60)); err != nil {
-			log.ZError(
+			log.ZError(ctx, "DeleteUserSuperGroupMsgsAndSetMinSeq failed", err, "conversationID", conversationID, "DBRetainChatRecords", config.Config.RetainChatRecords)
-				ctx,
-				"DeleteUserSuperGroupMsgsAndSetMinSeq failed",
-				err,
-				"conversationID",
-				conversationID,
-				"DBRetainChatRecords",
-				config.Config.RetainChatRecords,
-			)
 		}
 		if err := c.checkMaxSeq(ctx, conversationID); err != nil {
 			log.ZError(ctx, "fixSeq failed", err, "conversationID", conversationID)
@@ -138,19 +107,7 @@ func (c *MsgTool) checkMaxSeqWithMongo(ctx context.Context, conversationID strin
 		return err
 	}
 	if math.Abs(float64(maxSeqMongo-maxSeqCache)) > 10 {
-		log.ZError(
+		log.ZError(ctx, "cache max seq and mongo max seq is diff > 10", nil, "maxSeqMongo", maxSeqMongo, "minSeqMongo", minSeqMongo, "maxSeqCache", maxSeqCache, "conversationID", conversationID)
-			ctx,
-			"cache max seq and mongo max seq is diff > 10",
-			nil,
-			"maxSeqMongo",
-			maxSeqMongo,
-			"minSeqMongo",
-			minSeqMongo,
-			"maxSeqCache",
-			maxSeqCache,
-			"conversationID",
-			conversationID,
-		)
 	}
 	return nil
 }

pkg/common/db/controller/conversation.go

@@ -14,22 +14,13 @@ import (
 
 type ConversationDatabase interface {
 	//UpdateUserConversationFiled 更新用户该会话的属性信息
-	UpdateUsersConversationFiled(
+	UpdateUsersConversationFiled(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) error
-		ctx context.Context,
-		userIDs []string,
-		conversationID string,
-		args map[string]interface{},
-	) error
 	//CreateConversation 创建一批新的会话
 	CreateConversation(ctx context.Context, conversations []*relationTb.ConversationModel) error
 	//SyncPeerUserPrivateConversation 同步对端私聊会话内部保证事务操作
 	SyncPeerUserPrivateConversationTx(ctx context.Context, conversation []*relationTb.ConversationModel) error
 	//FindConversations 根据会话ID获取某个用户的多个会话
-	FindConversations(
+	FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationTb.ConversationModel, error)
-		ctx context.Context,
-		ownerUserID string,
-		conversationIDs []string,
-	) ([]*relationTb.ConversationModel, error)
 	//FindRecvMsgNotNotifyUserIDs 获取超级大群开启免打扰的用户ID
 	FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error)
 	//GetUserAllConversation 获取一个用户在服务器上所有的会话
@@ -37,29 +28,17 @@ type ConversationDatabase interface {
 	//SetUserConversations 设置用户多个会话属性，如果会话不存在则创建，否则更新,内部保证原子性
 	SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationTb.ConversationModel) error
 	//SetUsersConversationFiledTx 设置多个用户会话关于某个字段的更新操作，如果会话不存在则创建，否则更新，内部保证事务操作
-	SetUsersConversationFiledTx(
+	SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationTb.ConversationModel, filedMap map[string]interface{}) error
-		ctx context.Context,
-		userIDs []string,
-		conversation *relationTb.ConversationModel,
-		filedMap map[string]interface{},
-	) error
 	CreateGroupChatConversation(ctx context.Context, groupID string, userIDs []string) error
 	GetConversationIDs(ctx context.Context, userID string) ([]string, error)
 	GetUserConversationIDsHash(ctx context.Context, ownerUserID string) (hash uint64, err error)
 	GetAllConversationIDs(ctx context.Context) ([]string, error)
 	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
-	GetConversationsByConversationID(
+	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationTb.ConversationModel, error)
-		ctx context.Context,
-		conversationIDs []string,
-	) ([]*relationTb.ConversationModel, error)
 	GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationTb.ConversationModel, error)
 }
 
-func NewConversationDatabase(
+func NewConversationDatabase(conversation relationTb.ConversationModelInterface, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase {
-	conversation relationTb.ConversationModelInterface,
-	cache cache.ConversationCache,
-	tx tx.Tx,
-) ConversationDatabase {
 	return &conversationDatabase{
 		conversationDB: conversation,
 		cache:          cache,
@@ -73,12 +52,7 @@ type conversationDatabase struct {
 	tx             tx.Tx
 }
 
-func (c *conversationDatabase) SetUsersConversationFiledTx(
+func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationTb.ConversationModel, filedMap map[string]interface{}) (err error) {
-	ctx context.Context,
-	userIDs []string,
-	conversation *relationTb.ConversationModel,
-	filedMap map[string]interface{},
-) (err error) {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		conversationTx := c.conversationDB.NewTx(tx)
@@ -126,12 +100,7 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(
 	return cache.ExecDel(ctx)
 }
 
-func (c *conversationDatabase) UpdateUsersConversationFiled(
+func (c *conversationDatabase) UpdateUsersConversationFiled(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) error {
-	ctx context.Context,
-	userIDs []string,
-	conversationID string,
-	args map[string]interface{},
-) error {
 	_, err := c.conversationDB.UpdateByMap(ctx, userIDs, conversationID, args)
 	if err != nil {
 		return err
@@ -139,10 +108,7 @@ func (c *conversationDatabase) UpdateUsersConversationFiled(
 	return c.cache.DelUsersConversation(conversationID, userIDs...).ExecDel(ctx)
 }
 
-func (c *conversationDatabase) CreateConversation(
+func (c *conversationDatabase) CreateConversation(ctx context.Context, conversations []*relationTb.ConversationModel) error {
-	ctx context.Context,
-	conversations []*relationTb.ConversationModel,
-) error {
 	if err := c.conversationDB.Create(ctx, conversations); err != nil {
 		return err
 	}
@@ -155,10 +121,7 @@ func (c *conversationDatabase) CreateConversation(
 	return cache.DelConversationIDs(userIDs...).DelUserConversationIDsHash(userIDs...).ExecDel(ctx)
 }
 
-func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(
+func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Context, conversations []*relationTb.ConversationModel) error {
-	ctx context.Context,
-	conversations []*relationTb.ConversationModel,
-) error {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		conversationTx := c.conversationDB.NewTx(tx)
@@ -196,34 +159,19 @@ func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(
 	return cache.ExecDel(ctx)
 }
 
-func (c *conversationDatabase) FindConversations(
+func (c *conversationDatabase) FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationTb.ConversationModel, error) {
-	ctx context.Context,
-	ownerUserID string,
-	conversationIDs []string,
-) ([]*relationTb.ConversationModel, error) {
 	return c.cache.GetConversations(ctx, ownerUserID, conversationIDs)
 }
 
-func (c *conversationDatabase) GetConversation(
+func (c *conversationDatabase) GetConversation(ctx context.Context, ownerUserID string, conversationID string) (*relationTb.ConversationModel, error) {
-	ctx context.Context,
-	ownerUserID string,
-	conversationID string,
-) (*relationTb.ConversationModel, error) {
 	return c.cache.GetConversation(ctx, ownerUserID, conversationID)
 }
 
-func (c *conversationDatabase) GetUserAllConversation(
+func (c *conversationDatabase) GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationTb.ConversationModel, error) {
-	ctx context.Context,
-	ownerUserID string,
-) ([]*relationTb.ConversationModel, error) {
 	return c.cache.GetUserAllConversations(ctx, ownerUserID)
 }
 
-func (c *conversationDatabase) SetUserConversations(
+func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationTb.ConversationModel) error {
-	ctx context.Context,
-	ownerUserID string,
-	conversations []*relationTb.ConversationModel,
-) error {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		var conversationIDs []string
@@ -273,11 +221,7 @@ func (c *conversationDatabase) FindRecvMsgNotNotifyUserIDs(ctx context.Context,
 	return c.cache.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
 }
 
-func (c *conversationDatabase) CreateGroupChatConversation(
+func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context, groupID string, userIDs []string) error {
-	ctx context.Context,
-	groupID string,
-	userIDs []string,
-) error {
 	cache := c.cache.NewCache()
 	conversationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
 	if err := c.tx.Transaction(func(tx any) error {
@@ -317,10 +261,7 @@ func (c *conversationDatabase) GetConversationIDs(ctx context.Context, userID st
 	return c.cache.GetUserConversationIDs(ctx, userID)
 }
 
-func (c *conversationDatabase) GetUserConversationIDsHash(
+func (c *conversationDatabase) GetUserConversationIDsHash(ctx context.Context, ownerUserID string) (hash uint64, err error) {
-	ctx context.Context,
-	ownerUserID string,
-) (hash uint64, err error) {
 	return c.cache.GetUserConversationIDsHash(ctx, ownerUserID)
 }
 
@@ -328,22 +269,14 @@ func (c *conversationDatabase) GetAllConversationIDs(ctx context.Context) ([]str
 	return c.conversationDB.GetAllConversationIDs(ctx)
 }
 
-func (c *conversationDatabase) GetUserAllHasReadSeqs(
+func (c *conversationDatabase) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) {
-	ctx context.Context,
-	ownerUserID string,
-) (map[string]int64, error) {
 	return c.cache.GetUserAllHasReadSeqs(ctx, ownerUserID)
 }
 
-func (c *conversationDatabase) GetConversationsByConversationID(
+func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationTb.ConversationModel, error) {
-	ctx context.Context,
-	conversationIDs []string,
-) ([]*relationTb.ConversationModel, error) {
 	return c.conversationDB.GetConversationsByConversationID(ctx, conversationIDs)
 }
 
-func (c *conversationDatabase) GetConversationIDsNeedDestruct(
+func (c *conversationDatabase) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationTb.ConversationModel, error) {
-	ctx context.Context,
-) ([]*relationTb.ConversationModel, error) {
 	return c.conversationDB.GetConversationIDsNeedDestruct(ctx)
 }

pkg/common/db/controller/group.go

@@ -573,10 +573,6 @@ func (g *groupDatabase) CountTotal(ctx context.Context, before *time.Time) (coun
 	return g.groupDB.CountTotal(ctx, before)
 }
 
-func (g *groupDatabase) CountRangeEverydayTotal(
+func (g *groupDatabase) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
-	ctx context.Context,
-	start time.Time,
-	end time.Time,
-) (map[string]int64, error) {
 	return g.groupDB.CountRangeEverydayTotal(ctx, start, end)
 }

pkg/common/db/controller/msg.go

@@ -1,9 +1,6 @@
 package controller
 
 import (
-	relation2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"gorm.io/gorm"
 	"time"
 
 	"github.com/redis/go-redis/v9"
@@ -21,11 +18,10 @@ import (
 	"context"
 	"errors"
 
-	"go.mongodb.org/mongo-driver/mongo"
-
 	pbMsg "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"go.mongodb.org/mongo-driver/mongo"
 )
 
 const (
@@ -44,36 +40,16 @@ type CommonMsgDatabase interface {
 	DeleteMessagesFromCache(ctx context.Context, conversationID string, seqs []int64) error
 	DelUserDeleteMsgsList(ctx context.Context, conversationID string, seqs []int64)
 	// incrSeq然后批量插入缓存
-	BatchInsertChat2Cache(
+	BatchInsertChat2Cache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (seq int64, isNewConversation bool, err error)
-		ctx context.Context,
-		conversationID string,
-		msgs []*sdkws.MsgData,
-	) (seq int64, isNewConversation bool, err error)
 
 	//  通过seqList获取mongo中写扩散消息
-	GetMsgBySeqsRange(
+	GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (minSeq int64, maxSeq int64, seqMsg []*sdkws.MsgData, err error)
-		ctx context.Context,
-		userID string,
-		conversationID string,
-		begin, end, num, userMaxSeq int64,
-	) (minSeq int64, maxSeq int64, seqMsg []*sdkws.MsgData, err error)
 	// 通过seqList获取大群在 mongo里面的消息
-	GetMsgBySeqs(
+	GetMsgBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) (minSeq int64, maxSeq int64, seqMsg []*sdkws.MsgData, err error)
-		ctx context.Context,
-		userID string,
-		conversationID string,
-		seqs []int64,
-	) (minSeq int64, maxSeq int64, seqMsg []*sdkws.MsgData, err error)
 	// 删除会话消息重置最小seq， remainTime为消息保留的时间单位秒,超时消息删除， 传0删除所有消息(此方法不删除redis cache)
 	DeleteConversationMsgsAndSetMinSeq(ctx context.Context, conversationID string, remainTime int64) error
 	// 用户标记删除过期消息返回标记删除的seq列表
-	UserMsgsDestruct(
+	UserMsgsDestruct(cte context.Context, userID string, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error)
-		cte context.Context,
-		userID string,
-		conversationID string,
-		destructTime int64,
-		lastMsgDestructTime time.Time,
-	) (seqs []int64, err error)
 
 	// 用户根据seq删除消息
 	DeleteUserMsgsBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) error
@@ -99,13 +75,9 @@ type CommonMsgDatabase interface {
 	UserSetHasReadSeqs(ctx context.Context, userID string, hasReadSeqs map[string]int64) error
 
 	GetMongoMaxAndMinSeq(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo int64, err error)
-	GetConversationMinMaxSeqInMongoAndCache(
+	GetConversationMinMaxSeqInMongoAndCache(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error)
-		ctx context.Context,
-		conversationID string,
-	) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error)
 	SetSendMsgStatus(ctx context.Context, id string, status int32) error
 	GetSendMsgStatus(ctx context.Context, id string) (int32, error)
-	SearchMessage(ctx context.Context, req *pbMsg.SearchMessageReq) (msgData []*sdkws.MsgData, err error)
 
 	// to mq
 	MsgToMQ(ctx context.Context, key string, msg2mq *sdkws.MsgData) error
@@ -113,28 +85,12 @@ type CommonMsgDatabase interface {
 	MsgToPushMQ(ctx context.Context, key, conversarionID string, msg2mq *sdkws.MsgData) (int32, int64, error)
 	MsgToMongoMQ(ctx context.Context, key, conversarionID string, msgs []*sdkws.MsgData, lastSeq int64) error
 
-	RangeUserSendCount(
+	RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error)
-		ctx context.Context,
+	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error)
-		start time.Time,
-		end time.Time,
-		group bool,
-		ase bool,
-		pageNumber int32,
-		showNumber int32,
-	) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error)
-	RangeGroupSendCount(
-		ctx context.Context,
-		start time.Time,
-		end time.Time,
-		ase bool,
-		pageNumber int32,
-		showNumber int32,
-	) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error)
 }
 
-func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel cache.MsgModel, msgMyqModel relation.ChatLogModelInterface) CommonMsgDatabase {
+func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel cache.MsgModel) CommonMsgDatabase {
 	return &commonMsgDatabase{
-		msgMyq:          msgMyqModel,
 		msgDocDatabase:  msgDocModel,
 		cache:           cacheModel,
 		producer:        kafka.NewKafkaProducer(config.Config.Kafka.Addr, config.Config.Kafka.LatestMsgToRedis.Topic),
@@ -143,18 +99,16 @@ func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheMo
 	}
 }
 
-func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database, dbGrom *gorm.DB) CommonMsgDatabase {
+func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database) CommonMsgDatabase {
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(database)
-	msgMyqModel := relation2.NewChatLogGorm(dbGrom)
+	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel)
-	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel, msgMyqModel)
 	return CommonMsgDatabase
 }
 
 type commonMsgDatabase struct {
 	msgDocDatabase   unRelationTb.MsgDocModelInterface
 	msg              unRelationTb.MsgDocModel
-	msgMyq           relation.ChatLogModelInterface
 	cache            cache.MsgModel
 	producer         *kafka.Producer
 	producerToMongo  *kafka.Producer
@@ -167,32 +121,16 @@ func (db *commonMsgDatabase) MsgToMQ(ctx context.Context, key string, msg2mq *sd
 	return err
 }
 
-func (db *commonMsgDatabase) MsgToModifyMQ(
+func (db *commonMsgDatabase) MsgToModifyMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData) error {
-	ctx context.Context,
-	key, conversationID string,
-	messages []*sdkws.MsgData,
-) error {
 	if len(messages) > 0 {
-		_, _, err := db.producerToModify.SendMessage(
+		_, _, err := db.producerToModify.SendMessage(ctx, key, &pbMsg.MsgDataToModifyByMQ{ConversationID: conversationID, Messages: messages})
-			ctx,
-			key,
-			&pbMsg.MsgDataToModifyByMQ{ConversationID: conversationID, Messages: messages},
-		)
 		return err
 	}
 	return nil
 }
 
-func (db *commonMsgDatabase) MsgToPushMQ(
+func (db *commonMsgDatabase) MsgToPushMQ(ctx context.Context, key, conversationID string, msg2mq *sdkws.MsgData) (int32, int64, error) {
-	ctx context.Context,
+	partition, offset, err := db.producerToPush.SendMessage(ctx, key, &pbMsg.PushMsgDataToMQ{MsgData: msg2mq, ConversationID: conversationID})
-	key, conversationID string,
-	msg2mq *sdkws.MsgData,
-) (int32, int64, error) {
-	partition, offset, err := db.producerToPush.SendMessage(
-		ctx,
-		key,
-		&pbMsg.PushMsgDataToMQ{MsgData: msg2mq, ConversationID: conversationID},
-	)
 	if err != nil {
 		log.ZError(ctx, "MsgToPushMQ", err, "key", key, "msg2mq", msg2mq)
 		return 0, 0, err
@@ -200,30 +138,15 @@ func (db *commonMsgDatabase) MsgToPushMQ(
 	return partition, offset, nil
 }
 
-func (db *commonMsgDatabase) MsgToMongoMQ(
+func (db *commonMsgDatabase) MsgToMongoMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData, lastSeq int64) error {
-	ctx context.Context,
-	key, conversationID string,
-	messages []*sdkws.MsgData,
-	lastSeq int64,
-) error {
 	if len(messages) > 0 {
-		_, _, err := db.producerToMongo.SendMessage(
+		_, _, err := db.producerToMongo.SendMessage(ctx, key, &pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, ConversationID: conversationID, MsgData: messages})
-			ctx,
-			key,
-			&pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, ConversationID: conversationID, MsgData: messages},
-		)
 		return err
 	}
 	return nil
 }
 
-func (db *commonMsgDatabase) BatchInsertBlock(
+func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, firstSeq int64) error {
-	ctx context.Context,
-	conversationID string,
-	fields []any,
-	key int8,
-	firstSeq int64,
-) error {
 	if len(fields) == 0 {
 		return nil
 	}
@@ -324,12 +247,7 @@ func (db *commonMsgDatabase) BatchInsertBlock(
 	return nil
 }
 
-func (db *commonMsgDatabase) BatchInsertChat2DB(
+func (db *commonMsgDatabase) BatchInsertChat2DB(ctx context.Context, conversationID string, msgList []*sdkws.MsgData, currentMaxSeq int64) error {
-	ctx context.Context,
-	conversationID string,
-	msgList []*sdkws.MsgData,
-	currentMaxSeq int64,
-) error {
 	if len(msgList) == 0 {
 		return errs.ErrArgs.Wrap("msgList is empty")
 	}
@@ -375,21 +293,11 @@ func (db *commonMsgDatabase) BatchInsertChat2DB(
 	return db.BatchInsertBlock(ctx, conversationID, msgs, updateKeyMsg, msgList[0].Seq)
 }
 
-func (db *commonMsgDatabase) RevokeMsg(
+func (db *commonMsgDatabase) RevokeMsg(ctx context.Context, conversationID string, seq int64, revoke *unRelationTb.RevokeModel) error {
-	ctx context.Context,
-	conversationID string,
-	seq int64,
-	revoke *unRelationTb.RevokeModel,
-) error {
 	return db.BatchInsertBlock(ctx, conversationID, []any{revoke}, updateKeyRevoke, seq)
 }
 
-func (db *commonMsgDatabase) MarkSingleChatMsgsAsRead(
+func (db *commonMsgDatabase) MarkSingleChatMsgsAsRead(ctx context.Context, userID string, conversationID string, totalSeqs []int64) error {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	totalSeqs []int64,
-) error {
 	for docID, seqs := range db.msg.GetDocIDSeqsMap(conversationID, totalSeqs) {
 		var indexes []int64
 		for _, seq := range seqs {
@@ -412,11 +320,7 @@ func (db *commonMsgDatabase) DelUserDeleteMsgsList(ctx context.Context, conversa
 	db.cache.DelUserDeleteMsgsList(ctx, conversationID, seqs)
 }
 
-func (db *commonMsgDatabase) BatchInsertChat2Cache(
+func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (seq int64, isNew bool, err error) {
-	ctx context.Context,
-	conversationID string,
-	msgs []*sdkws.MsgData,
-) (seq int64, isNew bool, err error) {
 	currentMaxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		prome.Inc(prome.SeqGetFailedCounter)
@@ -463,11 +367,7 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(
 	return lastMaxSeq, isNew, utils.Wrap(err, "")
 }
 
-func (db *commonMsgDatabase) getMsgBySeqs(
+func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversationID string, seqs []int64) (totalMsgs []*sdkws.MsgData, err error) {
-	ctx context.Context,
-	userID, conversationID string,
-	seqs []int64,
-) (totalMsgs []*sdkws.MsgData, err error) {
 	for docID, seqs := range db.msg.GetDocIDSeqsMap(conversationID, seqs) {
 		//log.ZDebug(ctx, "getMsgBySeqs", "docID", docID, "seqs", seqs)
 		msgs, err := db.findMsgInfoBySeq(ctx, userID, docID, seqs)
@@ -481,11 +381,7 @@ func (db *commonMsgDatabase) getMsgBySeqs(
 	return totalMsgs, nil
 }
 
-func (db *commonMsgDatabase) findMsgInfoBySeq(
+func (db *commonMsgDatabase) findMsgInfoBySeq(ctx context.Context, userID, docID string, seqs []int64) (totalMsgs []*unRelationTb.MsgInfoModel, err error) {
-	ctx context.Context,
-	userID, docID string,
-	seqs []int64,
-) (totalMsgs []*unRelationTb.MsgInfoModel, err error) {
 	msgs, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, userID, docID, seqs)
 	for _, msg := range msgs {
 		if msg.IsRead {
@@ -495,25 +391,8 @@ func (db *commonMsgDatabase) findMsgInfoBySeq(
 	return msgs, err
 }
 
-func (db *commonMsgDatabase) getMsgBySeqsRange(
+func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID string, conversationID string, allSeqs []int64, begin, end int64) (seqMsgs []*sdkws.MsgData, err error) {
-	ctx context.Context,
+	log.ZDebug(ctx, "getMsgBySeqsRange", "conversationID", conversationID, "allSeqs", allSeqs, "begin", begin, "end", end)
-	userID string,
-	conversationID string,
-	allSeqs []int64,
-	begin, end int64,
-) (seqMsgs []*sdkws.MsgData, err error) {
-	log.ZDebug(
-		ctx,
-		"getMsgBySeqsRange",
-		"conversationID",
-		conversationID,
-		"allSeqs",
-		allSeqs,
-		"begin",
-		begin,
-		"end",
-		end,
-	)
 	for docID, seqs := range db.msg.GetDocIDSeqsMap(conversationID, allSeqs) {
 		log.ZDebug(ctx, "getMsgBySeqsRange", "docID", docID, "seqs", seqs)
 		msgs, err := db.findMsgInfoBySeq(ctx, userID, docID, seqs)
@@ -530,12 +409,7 @@ func (db *commonMsgDatabase) getMsgBySeqsRange(
 	return seqMsgs, nil
 }
 
-func (db *commonMsgDatabase) GetMsgBySeqsRange(
+func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (int64, int64, []*sdkws.MsgData, error) {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	begin, end, num, userMaxSeq int64,
-) (int64, int64, []*sdkws.MsgData, error) {
 	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
@@ -555,18 +429,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
-	log.ZDebug(
+	log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq)
-		ctx,
-		"GetMsgBySeqsRange",
-		"userMinSeq",
-		userMinSeq,
-		"conMinSeq",
-		minSeq,
-		"conMaxSeq",
-		maxSeq,
-		"userMaxSeq",
-		userMaxSeq,
-	)
 	if userMaxSeq != 0 {
 		if userMaxSeq < maxSeq {
 			maxSeq = userMaxSeq
@@ -616,18 +479,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(
 				cacheDelNum += 1
 			}
 		}
-		log.ZDebug(
+		log.ZDebug(ctx, "get delSeqs from redis", "delSeqs", delSeqs, "userID", userID, "conversationID", conversationID, "cacheDelNum", cacheDelNum)
-			ctx,
-			"get delSeqs from redis",
-			"delSeqs",
-			delSeqs,
-			"userID",
-			userID,
-			"conversationID",
-			conversationID,
-			"cacheDelNum",
-			cacheDelNum,
-		)
 		var reGetSeqsCache []int64
 		for i := 1; i <= cacheDelNum; {
 			newSeq := newBegin - int64(i)
@@ -647,15 +499,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(
 			if err != nil {
 				if err != redis.Nil {
 					prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs2))
-					log.ZError(
+					log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", reGetSeqsCache)
-						ctx,
-						"get message from redis exception",
-						err,
-						"conversationID",
-						conversationID,
-						"seqs",
-						reGetSeqsCache,
-					)
 				}
 			}
 			failedSeqs = append(failedSeqs, failedSeqs2...)
@@ -681,12 +525,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(
 	return minSeq, maxSeq, successMsgs, nil
 }
 
-func (db *commonMsgDatabase) GetMsgBySeqs(
+func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) (int64, int64, []*sdkws.MsgData, error) {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	seqs []int64,
-) (int64, int64, []*sdkws.MsgData, error) {
 	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
@@ -712,33 +551,10 @@ func (db *commonMsgDatabase) GetMsgBySeqs(
 	if err != nil {
 		if err != redis.Nil {
 			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
-			log.ZError(
+			log.ZError(ctx, "get message from redis exception", err, "failedSeqs", failedSeqs, "conversationID", conversationID)
-				ctx,
-				"get message from redis exception",
-				err,
-				"failedSeqs",
-				failedSeqs,
-				"conversationID",
-				conversationID,
-			)
 		}
 	}
-	log.ZInfo(
+	log.ZInfo(ctx, "db.cache.GetMessagesBySeq", "userID", userID, "conversationID", conversationID, "seqs", seqs, "successMsgs", len(successMsgs), "failedSeqs", failedSeqs, "conversationID", conversationID)
-		ctx,
-		"db.cache.GetMessagesBySeq",
-		"userID",
-		userID,
-		"conversationID",
-		conversationID,
-		"seqs",
-		seqs,
-		"successMsgs",
-		len(successMsgs),
-		"failedSeqs",
-		failedSeqs,
-		"conversationID",
-		conversationID,
-	)
 	prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))
 	if len(failedSeqs) > 0 {
 		mongoMsgs, err := db.getMsgBySeqs(ctx, userID, conversationID, failedSeqs)
@@ -752,11 +568,7 @@ func (db *commonMsgDatabase) GetMsgBySeqs(
 	return minSeq, maxSeq, successMsgs, nil
 }
 
-func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(
+func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(ctx context.Context, conversationID string, remainTime int64) error {
-	ctx context.Context,
-	conversationID string,
-	remainTime int64,
-) error {
 	var delStruct delMsgRecursionStruct
 	var skip int64
 	minSeq, err := db.deleteMsgRecursion(ctx, conversationID, skip, &delStruct, remainTime)
@@ -776,13 +588,7 @@ func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(
 	return db.cache.SetMinSeq(ctx, conversationID, minSeq)
 }
 
-func (db *commonMsgDatabase) UserMsgsDestruct(
+func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error) {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	destructTime int64,
-	lastMsgDestructTime time.Time,
-) (seqs []int64, err error) {
 	var index int64
 	for {
 		// from oldest 2 newest
@@ -790,16 +596,7 @@ func (db *commonMsgDatabase) UserMsgsDestruct(
 		if err != nil || msgDocModel.DocID == "" {
 			if err != nil {
 				if err == unrelation.ErrMsgListNotExist {
-					log.ZDebug(
+					log.ZDebug(ctx, "deleteMsgRecursion finished", "conversationID", conversationID, "userID", userID, "index", index)
-						ctx,
-						"deleteMsgRecursion finished",
-						"conversationID",
-						conversationID,
-						"userID",
-						userID,
-						"index",
-						index,
-					)
 				} else {
 					log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
 				}
@@ -848,26 +645,13 @@ func (d *delMsgRecursionStruct) getSetMinSeq() int64 {
 // seq 70
 // set minSeq 21
 // recursion 删除list并且返回设置的最小seq
-func (db *commonMsgDatabase) deleteMsgRecursion(
+func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversationID string, index int64, delStruct *delMsgRecursionStruct, remainTime int64) (int64, error) {
-	ctx context.Context,
-	conversationID string,
-	index int64,
-	delStruct *delMsgRecursionStruct,
-	remainTime int64,
-) (int64, error) {
 	// find from oldest list
 	msgDocModel, err := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
 	if err != nil || msgDocModel.DocID == "" {
 		if err != nil {
 			if err == unrelation.ErrMsgListNotExist {
-				log.ZDebug(
+				log.ZDebug(ctx, "deleteMsgRecursion ErrMsgListNotExist", "conversationID", conversationID, "index:", index)
-					ctx,
-					"deleteMsgRecursion ErrMsgListNotExist",
-					"conversationID",
-					conversationID,
-					"index:",
-					index,
-				)
 			} else {
 				log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
 			}
@@ -879,23 +663,11 @@ func (db *commonMsgDatabase) deleteMsgRecursion(
 		}
 		return delStruct.getSetMinSeq() + 1, nil
 	}
-	log.ZDebug(
+	log.ZDebug(ctx, "doc info", "conversationID", conversationID, "index", index, "docID", msgDocModel.DocID, "len", len(msgDocModel.Msg))
-		ctx,
-		"doc info",
-		"conversationID",
-		conversationID,
-		"index",
-		index,
-		"docID",
-		msgDocModel.DocID,
-		"len",
-		len(msgDocModel.Msg),
-	)
 	if int64(len(msgDocModel.Msg)) > db.msg.GetSingleGocMsgNum() {
 		log.ZWarn(ctx, "msgs too large", nil, "lenth", len(msgDocModel.Msg), "docID:", msgDocModel.DocID)
 	}
-	if msgDocModel.IsFull() &&
+	if msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() {
-		msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() {
 		log.ZDebug(ctx, "doc is full and all msg is expired", "docID", msgDocModel.DocID)
 		delStruct.delDocIDs = append(delStruct.delDocIDs, msgDocModel.DocID)
 		delStruct.minSeq = msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.Seq
@@ -932,11 +704,7 @@ func (db *commonMsgDatabase) deleteMsgRecursion(
 	return seq, err
 }
 
-func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(
+func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(ctx context.Context, conversationID string, allSeqs []int64) error {
-	ctx context.Context,
-	conversationID string,
-	allSeqs []int64,
-) error {
 	if err := db.cache.DeleteMessages(ctx, conversationID, allSeqs); err != nil {
 		return err
 	}
@@ -952,12 +720,7 @@ func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(
 	return nil
 }
 
-func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(
+func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) error {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	seqs []int64,
-) error {
 	cachedMsgs, _, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
 		log.ZWarn(ctx, "DeleteUserMsgsBySeqs", err, "conversationID", conversationID, "seqs", seqs)
@@ -1026,70 +789,31 @@ func (db *commonMsgDatabase) GetMinSeqs(ctx context.Context, conversationIDs []s
 func (db *commonMsgDatabase) GetMinSeq(ctx context.Context, conversationID string) (int64, error) {
 	return db.cache.GetMinSeq(ctx, conversationID)
 }
-
+func (db *commonMsgDatabase) GetConversationUserMinSeq(ctx context.Context, conversationID string, userID string) (int64, error) {
-func (db *commonMsgDatabase) GetConversationUserMinSeq(
-	ctx context.Context,
-	conversationID string,
-	userID string,
-) (int64, error) {
 	return db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
 }
-
+func (db *commonMsgDatabase) GetConversationUserMinSeqs(ctx context.Context, conversationID string, userIDs []string) (map[string]int64, error) {
-func (db *commonMsgDatabase) GetConversationUserMinSeqs(
-	ctx context.Context,
-	conversationID string,
-	userIDs []string,
-) (map[string]int64, error) {
 	return db.cache.GetConversationUserMinSeqs(ctx, conversationID, userIDs)
 }
-
+func (db *commonMsgDatabase) SetConversationUserMinSeq(ctx context.Context, conversationID string, userID string, minSeq int64) error {
-func (db *commonMsgDatabase) SetConversationUserMinSeq(
-	ctx context.Context,
-	conversationID string,
-	userID string,
-	minSeq int64,
-) error {
 	return db.cache.SetConversationUserMinSeq(ctx, conversationID, userID, minSeq)
 }
-
+func (db *commonMsgDatabase) SetConversationUserMinSeqs(ctx context.Context, conversationID string, seqs map[string]int64) (err error) {
-func (db *commonMsgDatabase) SetConversationUserMinSeqs(
-	ctx context.Context,
-	conversationID string,
-	seqs map[string]int64,
-) (err error) {
 	return db.cache.SetConversationUserMinSeqs(ctx, conversationID, seqs)
 }
 
-func (db *commonMsgDatabase) SetUserConversationsMinSeqs(
+func (db *commonMsgDatabase) SetUserConversationsMinSeqs(ctx context.Context, userID string, seqs map[string]int64) error {
-	ctx context.Context,
-	userID string,
-	seqs map[string]int64,
-) error {
 	return db.cache.SetUserConversationsMinSeqs(ctx, userID, seqs)
 }
 
-func (db *commonMsgDatabase) UserSetHasReadSeqs(
+func (db *commonMsgDatabase) UserSetHasReadSeqs(ctx context.Context, userID string, hasReadSeqs map[string]int64) error {
-	ctx context.Context,
-	userID string,
-	hasReadSeqs map[string]int64,
-) error {
 	return db.cache.UserSetHasReadSeqs(ctx, userID, hasReadSeqs)
 }
 
-func (db *commonMsgDatabase) SetHasReadSeq(
+func (db *commonMsgDatabase) SetHasReadSeq(ctx context.Context, userID string, conversationID string, hasReadSeq int64) error {
-	ctx context.Context,
-	userID string,
-	conversationID string,
-	hasReadSeq int64,
-) error {
 	return db.cache.SetHasReadSeq(ctx, userID, conversationID, hasReadSeq)
 }
-
+func (db *commonMsgDatabase) GetHasReadSeqs(ctx context.Context, userID string, conversationIDs []string) (map[string]int64, error) {
-func (db *commonMsgDatabase) GetHasReadSeqs(
-	ctx context.Context,
-	userID string,
-	conversationIDs []string,
-) (map[string]int64, error) {
 	return db.cache.GetHasReadSeqs(ctx, userID, conversationIDs)
 }
 
@@ -1105,10 +829,7 @@ func (db *commonMsgDatabase) GetSendMsgStatus(ctx context.Context, id string) (i
 	return db.cache.GetSendMsgStatus(ctx, id)
 }
 
-func (db *commonMsgDatabase) GetConversationMinMaxSeqInMongoAndCache(
+func (db *commonMsgDatabase) GetConversationMinMaxSeqInMongoAndCache(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error) {
-	ctx context.Context,
-	conversationID string,
-) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error) {
 	minSeqMongo, maxSeqMongo, err = db.GetMinMaxSeqMongo(ctx, conversationID)
 	if err != nil {
 		return
@@ -1124,17 +845,11 @@ func (db *commonMsgDatabase) GetConversationMinMaxSeqInMongoAndCache(
 	return
 }
 
-func (db *commonMsgDatabase) GetMongoMaxAndMinSeq(
+func (db *commonMsgDatabase) GetMongoMaxAndMinSeq(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo int64, err error) {
-	ctx context.Context,
-	conversationID string,
-) (minSeqMongo, maxSeqMongo int64, err error) {
 	return db.GetMinMaxSeqMongo(ctx, conversationID)
 }
 
-func (db *commonMsgDatabase) GetMinMaxSeqMongo(
+func (db *commonMsgDatabase) GetMinMaxSeqMongo(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo int64, err error) {
-	ctx context.Context,
-	conversationID string,
-) (minSeqMongo, maxSeqMongo int64, err error) {
 	oldestMsgMongo, err := db.msgDocDatabase.GetOldestMsg(ctx, conversationID)
 	if err != nil {
 		return
@@ -1148,37 +863,10 @@ func (db *commonMsgDatabase) GetMinMaxSeqMongo(
 	return
 }
 
-func (db *commonMsgDatabase) RangeUserSendCount(
+func (db *commonMsgDatabase) RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error) {
-	ctx context.Context,
-	start time.Time,
-	end time.Time,
-	group bool,
-	ase bool,
-	pageNumber int32,
-	showNumber int32,
-) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error) {
 	return db.msgDocDatabase.RangeUserSendCount(ctx, start, end, group, ase, pageNumber, showNumber)
 }
 
-func (db *commonMsgDatabase) RangeGroupSendCount(
+func (db *commonMsgDatabase) RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error) {
-	ctx context.Context,
-	start time.Time,
-	end time.Time,
-	ase bool,
-	pageNumber int32,
-	showNumber int32,
-) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error) {
 	return db.msgDocDatabase.RangeGroupSendCount(ctx, start, end, ase, pageNumber, showNumber)
 }
-
-func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbMsg.SearchMessageReq) (msgData []*sdkws.MsgData, err error) {
-	var totalMsgs []*sdkws.MsgData
-	msgs, err := db.msgDocDatabase.SearchMessage(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	for _, msg := range msgs {
-		totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
-	}
-	return totalMsgs, nil
-}

pkg/common/db/controller/s3.go

@@ -2,25 +2,18 @@ package controller
 
 import (
 	"context"
-	"path/filepath"
-	"time"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"path/filepath"
+	"time"
 )
 
 type S3Database interface {
 	PartLimit() *s3.PartLimit
 	PartSize(ctx context.Context, size int64) (int64, error)
 	AuthSign(ctx context.Context, uploadID string, partNumbers []int) (*s3.AuthSignResult, error)
-	InitiateMultipartUpload(
+	InitiateMultipartUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*cont.InitiateUploadResult, error)
-		ctx context.Context,
-		hash string,
-		size int64,
-		expire time.Duration,
-		maxParts int,
-	) (*cont.InitiateUploadResult, error)
 	CompleteMultipartUpload(ctx context.Context, uploadID string, parts []string) (*cont.UploadResult, error)
 	AccessURL(ctx context.Context, name string, expire time.Duration) (time.Time, string, error)
 	SetObject(ctx context.Context, info *relation.ObjectModel) error
@@ -50,21 +43,11 @@ func (s *s3Database) AuthSign(ctx context.Context, uploadID string, partNumbers
 	return s.s3.AuthSign(ctx, uploadID, partNumbers)
 }
 
-func (s *s3Database) InitiateMultipartUpload(
+func (s *s3Database) InitiateMultipartUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*cont.InitiateUploadResult, error) {
-	ctx context.Context,
-	hash string,
-	size int64,
-	expire time.Duration,
-	maxParts int,
-) (*cont.InitiateUploadResult, error) {
 	return s.s3.InitiateUpload(ctx, hash, size, expire, maxParts)
 }
 
-func (s *s3Database) CompleteMultipartUpload(
+func (s *s3Database) CompleteMultipartUpload(ctx context.Context, uploadID string, parts []string) (*cont.UploadResult, error) {
-	ctx context.Context,
-	uploadID string,
-	parts []string,
-) (*cont.UploadResult, error) {
 	return s.s3.CompleteUpload(ctx, uploadID, parts)
 }
 

pkg/common/db/relation/group_model.go

@@ -2,15 +2,12 @@ package relation
 
 import (
 	"context"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
-	"time"
-
-	"gorm.io/gorm"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/ormutil"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"gorm.io/gorm"
+	"time"
 )
 
 var _ relation.GroupModelInterface = (*GroupGorm)(nil)
@@ -36,13 +33,7 @@ func (g *GroupGorm) UpdateMap(ctx context.Context, groupID string, args map[stri
 }
 
 func (g *GroupGorm) UpdateStatus(ctx context.Context, groupID string, status int32) (err error) {
-	return utils.Wrap(
+	return utils.Wrap(g.DB.Where("group_id = ?", groupID).Model(&relation.GroupModel{}).Updates(map[string]any{"status": status}).Error, "")
-		g.DB.Where("group_id = ?", groupID).
-			Model(&relation.GroupModel{}).
-			Updates(map[string]any{"status": status}).
-			Error,
-		"",
-	)
 }
 
 func (g *GroupGorm) Find(ctx context.Context, groupIDs []string) (groups []*relation.GroupModel, err error) {
@@ -54,21 +45,12 @@ func (g *GroupGorm) Take(ctx context.Context, groupID string) (group *relation.G
 	return group, utils.Wrap(g.DB.Where("group_id = ?", groupID).Take(group).Error, "")
 }
 
-func (g *GroupGorm) Search(
+func (g *GroupGorm) Search(ctx context.Context, keyword string, pageNumber, showNumber int32) (total uint32, groups []*relation.GroupModel, err error) {
-	ctx context.Context,
+	return ormutil.GormSearch[relation.GroupModel](g.DB, []string{"name"}, keyword, pageNumber, showNumber)
-	keyword string,
-	pageNumber, showNumber int32,
-) (total uint32, groups []*relation.GroupModel, err error) {
-	db := g.DB
-	db = db.WithContext(ctx).Where("status!=?", constant.GroupStatusDismissed)
-	return ormutil.GormSearch[relation.GroupModel](db, []string{"name"}, keyword, pageNumber, showNumber)
 }
 
 func (g *GroupGorm) GetGroupIDsByGroupType(ctx context.Context, groupType int) (groupIDs []string, err error) {
-	return groupIDs, utils.Wrap(
+	return groupIDs, utils.Wrap(g.DB.Model(&relation.GroupModel{}).Where("group_type = ? ", groupType).Pluck("group_id", &groupIDs).Error, "")
-		g.DB.Model(&relation.GroupModel{}).Where("group_type = ? ", groupType).Pluck("group_id", &groupIDs).Error,
-		"",
-	)
 }
 
 func (g *GroupGorm) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {
@@ -82,22 +64,12 @@ func (g *GroupGorm) CountTotal(ctx context.Context, before *time.Time) (count in
 	return count, nil
 }
 
-func (g *GroupGorm) CountRangeEverydayTotal(
+func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
-	ctx context.Context,
-	start time.Time,
-	end time.Time,
-) (map[string]int64, error) {
 	var res []struct {
 		Date  time.Time `gorm:"column:date"`
 		Count int64     `gorm:"column:count"`
 	}
-	err := g.db(ctx).
+	err := g.db(ctx).Model(&relation.GroupModel{}).Select("DATE(create_time) AS date, count(1) AS count").Where("create_time >= ? and create_time < ?", start, end).Group("date").Find(&res).Error
-		Model(&relation.GroupModel{}).
-		Select("DATE(create_time) AS date, count(1) AS count").
-		Where("create_time >= ? and create_time < ?", start, end).
-		Group("date").
-		Find(&res).
-		Error
 	if err != nil {
 		return nil, errs.Wrap(err)
 	}

pkg/common/db/s3/cont/controller.go

@@ -6,15 +6,13 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+	"github.com/google/uuid"
+	"path"
+	"strings"
+	"time"
 )
 
 func New(impl s3.Interface) *Controller {
@@ -58,13 +56,7 @@ func (c *Controller) GetHashObject(ctx context.Context, hash string) (*s3.Object
 	return c.impl.StatObject(ctx, c.HashPath(hash))
 }
 
-func (c *Controller) InitiateUpload(
+func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*InitiateUploadResult, error) {
-	ctx context.Context,
-	hash string,
-	size int64,
-	expire time.Duration,
-	maxParts int,
-) (*InitiateUploadResult, error) {
 	defer log.ZDebug(ctx, "return")
 	if size < 0 {
 		return nil, errors.New("invalid size")
@@ -247,11 +239,6 @@ func (c *Controller) IsNotFound(err error) bool {
 	return c.impl.IsNotFound(err)
 }
 
-func (c *Controller) AccessURL(
+func (c *Controller) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	ctx context.Context,
-	name string,
-	expire time.Duration,
-	opt *s3.AccessURLOption,
-) (string, error) {
 	return c.impl.AccessURL(ctx, name, expire, opt)
 }

pkg/common/db/s3/cont/error.go

@@ -2,7 +2,6 @@ package cont
 
 import (
 	"fmt"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 )
 

pkg/common/db/s3/cos/cos.go

@@ -4,16 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
+	"github.com/tencentyun/cos-go-sdk-v5"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/tencentyun/cos-go-sdk-v5"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 )
 
 const (
@@ -72,12 +70,7 @@ func (c *Cos) InitiateMultipartUpload(ctx context.Context, name string) (*s3.Ini
 	}, nil
 }
 
-func (c *Cos) CompleteMultipartUpload(
+func (c *Cos) CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []s3.Part) (*s3.CompleteMultipartUploadResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	parts []s3.Part,
-) (*s3.CompleteMultipartUploadResult, error) {
 	opts := &cos.CompleteMultipartUploadOptions{
 		Parts: make([]cos.Object, len(parts)),
 	}
@@ -116,13 +109,7 @@ func (c *Cos) PartSize(ctx context.Context, size int64) (int64, error) {
 	return partSize, nil
 }
 
-func (c *Cos) AuthSign(
+func (c *Cos) AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*s3.AuthSignResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	expire time.Duration,
-	partNumbers []int,
-) (*s3.AuthSignResult, error) {
 	result := s3.AuthSignResult{
 		URL:    c.client.BaseURL.BucketURL.String() + "/" + cos.EncodeURIComponent(name),
 		Query:  url.Values{"uploadId": {uploadID}},
@@ -133,13 +120,7 @@ func (c *Cos) AuthSign(
 	if err != nil {
 		return nil, err
 	}
-	cos.AddAuthorizationHeader(
+	cos.AddAuthorizationHeader(c.credential.SecretID, c.credential.SecretKey, c.credential.SessionToken, req, cos.NewAuthTime(expire))
-		c.credential.SecretID,
-		c.credential.SecretKey,
-		c.credential.SessionToken,
-		req,
-		cos.NewAuthTime(expire),
-	)
 	result.Header = req.Header
 	for i, partNumber := range partNumbers {
 		result.Parts[i] = s3.SignPart{
@@ -151,15 +132,7 @@ func (c *Cos) AuthSign(
 }
 
 func (c *Cos) PresignedPutObject(ctx context.Context, name string, expire time.Duration) (string, error) {
-	rawURL, err := c.client.Object.GetPresignedURL(
+	rawURL, err := c.client.Object.GetPresignedURL(ctx, http.MethodPut, name, c.credential.SecretID, c.credential.SecretKey, expire, nil)
-		ctx,
-		http.MethodPut,
-		name,
-		c.credential.SecretID,
-		c.credential.SecretKey,
-		expire,
-		nil,
-	)
 	if err != nil {
 		return "", err
 	}
@@ -231,13 +204,7 @@ func (c *Cos) AbortMultipartUpload(ctx context.Context, uploadID string, name st
 	return err
 }
 
-func (c *Cos) ListUploadedParts(
+func (c *Cos) ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*s3.ListUploadedPartsResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	partNumberMarker int,
-	maxParts int,
-) (*s3.ListUploadedPartsResult, error) {
 	result, _, err := c.client.Object.ListParts(ctx, name, uploadID, &cos.ObjectListPartsOptions{
 		MaxParts:         strconv.Itoa(maxParts),
 		PartNumberMarker: strconv.Itoa(partNumberMarker),
@@ -264,12 +231,7 @@ func (c *Cos) ListUploadedParts(
 	return res, nil
 }
 
-func (c *Cos) AccessURL(
+func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	ctx context.Context,
-	name string,
-	expire time.Duration,
-	opt *s3.AccessURLOption,
-) (string, error) {
 	//reqParams := make(url.Values)
 	//if opt != nil {
 	//	if opt.ContentType != "" {
@@ -284,15 +246,7 @@ func (c *Cos) AccessURL(
 	} else if expire < time.Second {
 		expire = time.Second
 	}
-	rawURL, err := c.client.Object.GetPresignedURL(
+	rawURL, err := c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, nil)
-		ctx,
-		http.MethodGet,
-		name,
-		c.credential.SecretID,
-		c.credential.SecretKey,
-		expire,
-		nil,
-	)
 	if err != nil {
 		return "", err
 	}

pkg/common/db/s3/minio/minio.go

@@ -4,18 +4,16 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/minio/minio-go/v7/pkg/signer"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/minio/minio-go/v7/pkg/signer"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 )
 
 const (
@@ -81,12 +79,7 @@ func (m *Minio) InitiateMultipartUpload(ctx context.Context, name string) (*s3.I
 	}, nil
 }
 
-func (m *Minio) CompleteMultipartUpload(
+func (m *Minio) CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []s3.Part) (*s3.CompleteMultipartUploadResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	parts []s3.Part,
-) (*s3.CompleteMultipartUploadResult, error) {
 	minioParts := make([]minio.CompletePart, len(parts))
 	for i, part := range parts {
 		minioParts[i] = minio.CompletePart{
@@ -123,13 +116,7 @@ func (m *Minio) PartSize(ctx context.Context, size int64) (int64, error) {
 	return partSize, nil
 }
 
-func (m *Minio) AuthSign(
+func (m *Minio) AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*s3.AuthSignResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	expire time.Duration,
-	partNumbers []int,
-) (*s3.AuthSignResult, error) {
 	creds, err := m.opts.Creds.Get()
 	if err != nil {
 		return nil, err
@@ -146,14 +133,7 @@ func (m *Minio) AuthSign(
 			return nil, err
 		}
 		request.Header.Set("X-Amz-Content-Sha256", unsignedPayload)
-		request = signer.SignV4Trailer(
+		request = signer.SignV4Trailer(*request, creds.AccessKeyID, creds.SecretAccessKey, creds.SessionToken, "us-east-1", nil)
-			*request,
-			creds.AccessKeyID,
-			creds.SecretAccessKey,
-			creds.SessionToken,
-			"us-east-1",
-			nil,
-		)
 		result.Parts[i] = s3.SignPart{
 			PartNumber: partNumber,
 			URL:        request.URL.String(),
@@ -224,13 +204,7 @@ func (m *Minio) AbortMultipartUpload(ctx context.Context, uploadID string, name
 	return m.core.AbortMultipartUpload(ctx, m.bucket, name, uploadID)
 }
 
-func (m *Minio) ListUploadedParts(
+func (m *Minio) ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*s3.ListUploadedPartsResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	partNumberMarker int,
-	maxParts int,
-) (*s3.ListUploadedPartsResult, error) {
 	result, err := m.core.ListObjectParts(ctx, m.bucket, name, uploadID, partNumberMarker, maxParts)
 	if err != nil {
 		return nil, err
@@ -253,12 +227,7 @@ func (m *Minio) ListUploadedParts(
 	return res, nil
 }
 
-func (m *Minio) AccessURL(
+func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	ctx context.Context,
-	name string,
-	expire time.Duration,
-	opt *s3.AccessURLOption,
-) (string, error) {
 	//reqParams := make(url.Values)
 	//if opt != nil {
 	//	if opt.ContentType != "" {

pkg/common/db/s3/oss/oss.go

@@ -4,16 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 )
 
 const (
@@ -75,12 +73,7 @@ func (o *OSS) InitiateMultipartUpload(ctx context.Context, name string) (*s3.Ini
 	}, nil
 }
 
-func (o *OSS) CompleteMultipartUpload(
+func (o *OSS) CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []s3.Part) (*s3.CompleteMultipartUploadResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	parts []s3.Part,
-) (*s3.CompleteMultipartUploadResult, error) {
 	ossParts := make([]oss.UploadPart, len(parts))
 	for i, part := range parts {
 		ossParts[i] = oss.UploadPart{
@@ -121,13 +114,7 @@ func (o *OSS) PartSize(ctx context.Context, size int64) (int64, error) {
 	return partSize, nil
 }
 
-func (o *OSS) AuthSign(
+func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*s3.AuthSignResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	expire time.Duration,
-	partNumbers []int,
-) (*s3.AuthSignResult, error) {
 	result := s3.AuthSignResult{
 		URL:    o.bucketURL + name,
 		Query:  url.Values{"uploadId": {uploadID}},
@@ -145,15 +132,7 @@ func (o *OSS) AuthSign(
 		}
 		request.Header.Set(oss.HTTPHeaderHost, request.Host)
 		request.Header.Set(oss.HTTPHeaderDate, time.Now().UTC().Format(http.TimeFormat))
-		authorization := fmt.Sprintf(
+		authorization := fmt.Sprintf(`OSS %s:%s`, o.credentials.GetAccessKeyID(), o.getSignedStr(request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID), o.credentials.GetAccessKeySecret()))
-			`OSS %s:%s`,
-			o.credentials.GetAccessKeyID(),
-			o.getSignedStr(
-				request,
-				fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID),
-				o.credentials.GetAccessKeySecret(),
-			),
-		)
 		request.Header.Set(oss.HTTPHeaderAuthorization, authorization)
 		result.Parts[i] = s3.SignPart{
 			PartNumber: partNumber,
@@ -234,13 +213,7 @@ func (o *OSS) AbortMultipartUpload(ctx context.Context, uploadID string, name st
 	})
 }
 
-func (o *OSS) ListUploadedParts(
+func (o *OSS) ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*s3.ListUploadedPartsResult, error) {
-	ctx context.Context,
-	uploadID string,
-	name string,
-	partNumberMarker int,
-	maxParts int,
-) (*s3.ListUploadedPartsResult, error) {
 	result, err := o.bucket.ListUploadedParts(oss.InitiateMultipartUploadResult{
 		UploadID: uploadID,
 		Key:      name,
@@ -267,12 +240,7 @@ func (o *OSS) ListUploadedParts(
 	return res, nil
 }
 
-func (o *OSS) AccessURL(
+func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	ctx context.Context,
-	name string,
-	expire time.Duration,
-	opt *s3.AccessURLOption,
-) (string, error) {
 	//var opts []oss.Option
 	//if opt != nil {
 	//	if opt.ContentType != "" {

pkg/common/db/s3/oss/sign.go

@@ -5,13 +5,12 @@ import (
 	"crypto/sha1"
 	"crypto/sha256"
 	"encoding/base64"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"hash"
 	"io"
 	"net/http"
 	"sort"
 	"strings"
-
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 )
 
 func (o *OSS) getAdditionalHeaderKeys(req *http.Request) ([]string, map[string]string) {
@@ -72,10 +71,7 @@ func (o *OSS) getSignedStr(req *http.Request, canonicalizedResource string, keyS
 
 	// v2 signature
 	if o.bucket.Client.Config.AuthVersion == oss.AuthV2 {
-		signStr = req.Method + "\n" + contentMd5 + "\n" + contentType + "\n" + date + "\n" + canonicalizedOSSHeaders + strings.Join(
+		signStr = req.Method + "\n" + contentMd5 + "\n" + contentType + "\n" + date + "\n" + canonicalizedOSSHeaders + strings.Join(additionalList, ";") + "\n" + canonicalizedResource
-			additionalList,
-			";",
-		) + "\n" + canonicalizedResource
 		h = hmac.New(func() hash.Hash { return sha256.New() }, []byte(keySecret))
 	}
 	_, _ = io.WriteString(h, signStr)

pkg/common/db/s3/s3.go

@@ -112,21 +112,10 @@ type Interface interface {
 	PartLimit() *PartLimit
 
 	InitiateMultipartUpload(ctx context.Context, name string) (*InitiateMultipartUploadResult, error)
-	CompleteMultipartUpload(
+	CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []Part) (*CompleteMultipartUploadResult, error)
-		ctx context.Context,
-		uploadID string,
-		name string,
-		parts []Part,
-	) (*CompleteMultipartUploadResult, error)
 
 	PartSize(ctx context.Context, size int64) (int64, error)
-	AuthSign(
+	AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*AuthSignResult, error)
-		ctx context.Context,
-		uploadID string,
-		name string,
-		expire time.Duration,
-		partNumbers []int,
-	) (*AuthSignResult, error)
 
 	PresignedPutObject(ctx context.Context, name string, expire time.Duration) (string, error)
 
@@ -139,13 +128,7 @@ type Interface interface {
 	IsNotFound(err error) bool
 
 	AbortMultipartUpload(ctx context.Context, uploadID string, name string) error
-	ListUploadedParts(
+	ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*ListUploadedPartsResult, error)
-		ctx context.Context,
-		uploadID string,
-		name string,
-		partNumberMarker int,
-		maxParts int,
-	) (*ListUploadedPartsResult, error)
 
 	AccessURL(ctx context.Context, name string, expire time.Duration, opt *AccessURLOption) (string, error)
 }

pkg/common/db/table/relation/conversation.go

@@ -10,20 +10,20 @@ const (
 )
 
 type ConversationModel struct {
-	OwnerUserID           string    `gorm:"column:owner_user_id;primary_key;type:char(128)"     json:"OwnerUserID"`
+	OwnerUserID           string    `gorm:"column:owner_user_id;primary_key;type:char(128)" json:"OwnerUserID"`
-	ConversationID        string    `gorm:"column:conversation_id;primary_key;type:char(128)"   json:"conversationID"`
+	ConversationID        string    `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
-	ConversationType      int32     `gorm:"column:conversation_type"                            json:"conversationType"`
+	ConversationType      int32     `gorm:"column:conversation_type" json:"conversationType"`
-	UserID                string    `gorm:"column:user_id;type:char(64)"                        json:"userID"`
+	UserID                string    `gorm:"column:user_id;type:char(64)" json:"userID"`
-	GroupID               string    `gorm:"column:group_id;type:char(128)"                      json:"groupID"`
+	GroupID               string    `gorm:"column:group_id;type:char(128)" json:"groupID"`
-	RecvMsgOpt            int32     `gorm:"column:recv_msg_opt"                                 json:"recvMsgOpt"`
+	RecvMsgOpt            int32     `gorm:"column:recv_msg_opt" json:"recvMsgOpt"`
-	IsPinned              bool      `gorm:"column:is_pinned"                                    json:"isPinned"`
+	IsPinned              bool      `gorm:"column:is_pinned" json:"isPinned"`
-	IsPrivateChat         bool      `gorm:"column:is_private_chat"                              json:"isPrivateChat"`
+	IsPrivateChat         bool      `gorm:"column:is_private_chat" json:"isPrivateChat"`
-	BurnDuration          int32     `gorm:"column:burn_duration;default:30"                     json:"burnDuration"`
+	BurnDuration          int32     `gorm:"column:burn_duration;default:30" json:"burnDuration"`
-	GroupAtType           int32     `gorm:"column:group_at_type"                                json:"groupAtType"`
+	GroupAtType           int32     `gorm:"column:group_at_type" json:"groupAtType"`
-	AttachedInfo          string    `gorm:"column:attached_info;type:varchar(1024)"             json:"attachedInfo"`
+	AttachedInfo          string    `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
-	Ex                    string    `gorm:"column:ex;type:varchar(1024)"                        json:"ex"`
+	Ex                    string    `gorm:"column:ex;type:varchar(1024)" json:"ex"`
-	MaxSeq                int64     `gorm:"column:max_seq"                                      json:"maxSeq"`
+	MaxSeq                int64     `gorm:"column:max_seq" json:"maxSeq"`
-	MinSeq                int64     `gorm:"column:min_seq"                                      json:"minSeq"`
+	MinSeq                int64     `gorm:"column:min_seq" json:"minSeq"`
 	CreateTime            time.Time `gorm:"column:create_time;index:create_time;autoCreateTime"`
 	IsMsgDestruct         bool      `gorm:"column:is_msg_destruct;default:false"`
 	MsgDestructTime       int64     `gorm:"column:msg_destruct_time;default:604800"`
@@ -37,26 +37,13 @@ func (ConversationModel) TableName() string {
 type ConversationModelInterface interface {
 	Create(ctx context.Context, conversations []*ConversationModel) (err error)
 	Delete(ctx context.Context, groupIDs []string) (err error)
-	UpdateByMap(
+	UpdateByMap(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) (rows int64, err error)
-		ctx context.Context,
-		userIDs []string,
-		conversationID string,
-		args map[string]interface{},
-	) (rows int64, err error)
 	Update(ctx context.Context, conversation *ConversationModel) (err error)
-	Find(
+	Find(ctx context.Context, ownerUserID string, conversationIDs []string) (conversations []*ConversationModel, err error)
-		ctx context.Context,
-		ownerUserID string,
-		conversationIDs []string,
-	) (conversations []*ConversationModel, err error)
 	FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) ([]string, error)
 	FindUserIDAllConversationID(ctx context.Context, userID string) ([]string, error)
 	Take(ctx context.Context, userID, conversationID string) (conversation *ConversationModel, err error)
-	FindConversationID(
+	FindConversationID(ctx context.Context, userID string, conversationIDs []string) (existConversationID []string, err error)
-		ctx context.Context,
-		userID string,
-		conversationIDs []string,
-	) (existConversationID []string, err error)
 	FindUserIDAllConversations(ctx context.Context, userID string) (conversations []*ConversationModel, err error)
 	FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error)
 	GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error)

pkg/common/log/sql_logger.go

@@ -17,11 +17,7 @@ type SqlLogger struct {
 	SlowThreshold             time.Duration
 }
 
-func NewSqlLogger(
+func NewSqlLogger(logLevel gormLogger.LogLevel, ignoreRecordNotFoundError bool, slowThreshold time.Duration) *SqlLogger {
-	logLevel gormLogger.LogLevel,
-	ignoreRecordNotFoundError bool,
-	slowThreshold time.Duration,
-) *SqlLogger {
 	return &SqlLogger{
 		LogLevel:                  logLevel,
 		IgnoreRecordNotFoundError: ignoreRecordNotFoundError,
@@ -56,17 +52,7 @@ func (l *SqlLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql s
 	case err != nil && l.LogLevel >= gormLogger.Error && (!errors.Is(err, gorm.ErrRecordNotFound) || !l.IgnoreRecordNotFoundError):
 		sql, rows := fc()
 		if rows == -1 {
-			ZError(
+			ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
-				ctx,
-				"sql exec detail",
-				err,
-				"gorm",
-				gormUtils.FileWithLineNum(),
-				"elapsed time",
-				fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6),
-				"sql",
-				sql,
-			)
 		} else {
 			ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
 		}
@@ -74,35 +60,14 @@ func (l *SqlLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql s
 		sql, rows := fc()
 		slowLog := fmt.Sprintf("SLOW SQL >= %v", l.SlowThreshold)
 		if rows == -1 {
-			ZWarn(
+			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
-				ctx,
-				"sql exec detail",
-				nil,
-				"gorm",
-				gormUtils.FileWithLineNum(),
-				"slow sql",
-				slowLog,
-				"elapsed time",
-				fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6),
-				"sql",
-				sql,
-			)
 		} else {
 			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
 		}
 	case l.LogLevel == gormLogger.Info:
 		sql, rows := fc()
 		if rows == -1 {
-			ZDebug(
+			ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
-				ctx,
-				"sql exec detail",
-				"gorm",
-				gormUtils.FileWithLineNum(),
-				"elapsed time",
-				fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6),
-				"sql",
-				sql,
-			)
 		} else {
 			ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
 		}

pkg/discoveryregistry/zookeeper/discover.go

@@ -6,10 +6,9 @@ import (
 	"io"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+	"github.com/pkg/errors"
 
 	"github.com/go-zookeeper/zk"
 	"google.golang.org/grpc"
@@ -70,11 +69,7 @@ func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address,
 	return conns, nil
 }
 
-func (s *ZkClient) GetConns(
+func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]grpc.ClientConnInterface, error) {
-	ctx context.Context,
-	serviceName string,
-	opts ...grpc.DialOption,
-) ([]grpc.ClientConnInterface, error) {
 	s.logger.Printf("get conns from client, serviceName: %s", serviceName)
 	opts = append(s.options, opts...)
 	s.lock.Lock()
@@ -88,26 +83,12 @@ func (s *ZkClient) GetConns(
 			return nil, err
 		}
 		if len(addrs) == 0 {
-			return nil, fmt.Errorf(
+			return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot)
-				"no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s",
-				serviceName,
-				s.localConns,
-				s.zkServers,
-				s.zkRoot,
-			)
 		}
 		for _, addr := range addrs {
 			cc, err := grpc.DialContext(ctx, addr.Addr, append(s.options, opts...)...)
 			if err != nil {
-				log.ZError(
+				log.ZError(context.Background(), "dialContext failed", err, "addr", addr.Addr, "opts", append(s.options, opts...))
-					context.Background(),
-					"dialContext failed",
-					err,
-					"addr",
-					addr.Addr,
-					"opts",
-					append(s.options, opts...),
-				)
 				return nil, errs.Wrap(err)
 			}
 			conns = append(conns, cc)
@@ -117,15 +98,8 @@ func (s *ZkClient) GetConns(
 	return conns, nil
 }
 
-func (s *ZkClient) GetConn(
+func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (grpc.ClientConnInterface, error) {
-	ctx context.Context,
+	newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)))
-	serviceName string,
-	opts ...grpc.DialOption,
-) (grpc.ClientConnInterface, error) {
-	newOpts := append(
-		s.options,
-		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)),
-	)
 	s.logger.Printf("get conn from client, serviceName: %s", serviceName)
 	return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...)
 }

pkg/proto/auth/auth.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,13 +8,14 @@ package auth
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (

pkg/proto/conversation/conversation.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,14 +8,16 @@ package conversation
 
 import (
 	context "context"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (

pkg/proto/errinfo/errinfo.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -21,10 +7,11 @@
 package errinfo
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

pkg/proto/friend/friend.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,14 +8,16 @@ package friend
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (

pkg/proto/group/group.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,15 +8,17 @@ package group
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (

pkg/proto/msggateway/msggateway.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,14 +8,16 @@ package msggateway
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (

pkg/proto/push/push.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,14 +8,16 @@ package push
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (

pkg/proto/sdkws/sdkws.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -21,11 +7,13 @@
 package sdkws
 
 import (
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (

pkg/proto/statistics/statistics.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -21,9 +7,10 @@
 package statistics
 
 import (
+	reflect "reflect"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
 )
 
 const (

pkg/proto/third/third.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,13 +8,14 @@ package third
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (

pkg/proto/user/user.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -22,15 +8,17 @@ package user
 
 import (
 	context "context"
-	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (

pkg/proto/wrapperspb/wrapperspb.pb.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -21,10 +7,11 @@
 package wrapperspb
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

pkg/rpcclient/conversation.go

@@ -4,12 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"google.golang.org/grpc"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	"google.golang.org/grpc"
 )
 
 type Conversation struct {
@@ -33,10 +32,7 @@ func NewConversationRpcClient(discov discoveryregistry.SvcDiscoveryRegistry) Con
 	return ConversationRpcClient(*NewConversation(discov))
 }
 
-func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(
+func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(ctx context.Context, userID, conversationID string) (int32, error) {
-	ctx context.Context,
-	userID, conversationID string,
-) (int32, error) {
 	var req pbConversation.GetConversationReq
 	req.OwnerUserID = userID
 	req.ConversationID = conversationID
@@ -48,51 +44,21 @@ func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(
 }
 
 func (c *ConversationRpcClient) SingleChatFirstCreateConversation(ctx context.Context, recvID, sendID string) error {
-	_, err := c.Client.CreateSingleChatConversations(
+	_, err := c.Client.CreateSingleChatConversations(ctx, &pbConversation.CreateSingleChatConversationsReq{RecvID: recvID, SendID: sendID})
-		ctx,
-		&pbConversation.CreateSingleChatConversationsReq{RecvID: recvID, SendID: sendID},
-	)
 	return err
 }
 
-func (c *ConversationRpcClient) GroupChatFirstCreateConversation(
+func (c *ConversationRpcClient) GroupChatFirstCreateConversation(ctx context.Context, groupID string, userIDs []string) error {
-	ctx context.Context,
+	_, err := c.Client.CreateGroupChatConversations(ctx, &pbConversation.CreateGroupChatConversationsReq{UserIDs: userIDs, GroupID: groupID})
-	groupID string,
-	userIDs []string,
-) error {
-	_, err := c.Client.CreateGroupChatConversations(
-		ctx,
-		&pbConversation.CreateGroupChatConversationsReq{UserIDs: userIDs, GroupID: groupID},
-	)
 	return err
 }
 
-func (c *ConversationRpcClient) SetConversationMaxSeq(
+func (c *ConversationRpcClient) SetConversationMaxSeq(ctx context.Context, ownerUserIDs []string, conversationID string, maxSeq int64) error {
-	ctx context.Context,
+	_, err := c.Client.SetConversationMaxSeq(ctx, &pbConversation.SetConversationMaxSeqReq{OwnerUserID: ownerUserIDs, ConversationID: conversationID, MaxSeq: maxSeq})
-	ownerUserIDs []string,
-	conversationID string,
-	maxSeq int64,
-) error {
-	_, err := c.Client.SetConversationMaxSeq(
-		ctx,
-		&pbConversation.SetConversationMaxSeqReq{
-			OwnerUserID:    ownerUserIDs,
-			ConversationID: conversationID,
-			MaxSeq:         maxSeq,
-		},
-	)
 	return err
 }
-
+func (c *ConversationRpcClient) SetConversations(ctx context.Context, userIDs []string, conversation *pbConversation.ConversationReq) error {
-func (c *ConversationRpcClient) SetConversations(
+	_, err := c.Client.SetConversations(ctx, &pbConversation.SetConversationsReq{UserIDs: userIDs, Conversation: conversation})
-	ctx context.Context,
-	userIDs []string,
-	conversation *pbConversation.ConversationReq,
-) error {
-	_, err := c.Client.SetConversations(
-		ctx,
-		&pbConversation.SetConversationsReq{UserIDs: userIDs, Conversation: conversation},
-	)
 	return err
 }
 
@@ -104,28 +70,16 @@ func (c *ConversationRpcClient) GetConversationIDs(ctx context.Context, ownerUse
 	return resp.ConversationIDs, nil
 }
 
-func (c *ConversationRpcClient) GetConversation(
+func (c *ConversationRpcClient) GetConversation(ctx context.Context, ownerUserID, conversationID string) (*pbConversation.Conversation, error) {
-	ctx context.Context,
+	resp, err := c.Client.GetConversation(ctx, &pbConversation.GetConversationReq{OwnerUserID: ownerUserID, ConversationID: conversationID})
-	ownerUserID, conversationID string,
-) (*pbConversation.Conversation, error) {
-	resp, err := c.Client.GetConversation(
-		ctx,
-		&pbConversation.GetConversationReq{OwnerUserID: ownerUserID, ConversationID: conversationID},
-	)
 	if err != nil {
 		return nil, err
 	}
 	return resp.Conversation, nil
 }
 
-func (c *ConversationRpcClient) GetConversationsByConversationID(
+func (c *ConversationRpcClient) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*pbConversation.Conversation, error) {
-	ctx context.Context,
+	resp, err := c.Client.GetConversationsByConversationID(ctx, &pbConversation.GetConversationsByConversationIDReq{ConversationIDs: conversationIDs})
-	conversationIDs []string,
-) ([]*pbConversation.Conversation, error) {
-	resp, err := c.Client.GetConversationsByConversationID(
-		ctx,
-		&pbConversation.GetConversationsByConversationIDReq{ConversationIDs: conversationIDs},
-	)
 	if err != nil {
 		return nil, err
 	}
@@ -135,15 +89,8 @@ func (c *ConversationRpcClient) GetConversationsByConversationID(
 	return resp.Conversations, nil
 }
 
-func (c *ConversationRpcClient) GetConversations(
+func (c *ConversationRpcClient) GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*pbConversation.Conversation, error) {
-	ctx context.Context,
+	resp, err := c.Client.GetConversations(ctx, &pbConversation.GetConversationsReq{OwnerUserID: ownerUserID, ConversationIDs: conversationIDs})
-	ownerUserID string,
-	conversationIDs []string,
-) ([]*pbConversation.Conversation, error) {
-	resp, err := c.Client.GetConversations(
-		ctx,
-		&pbConversation.GetConversationsReq{OwnerUserID: ownerUserID, ConversationIDs: conversationIDs},
-	)
 	if err != nil {
 		return nil, err
 	}

pkg/rpcclient/msg.go

@@ -3,10 +3,6 @@ package rpcclient
 import (
 	"context"
 	"encoding/json"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user"
-
-	"google.golang.org/grpc"
-	"google.golang.org/protobuf/proto"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
@@ -15,6 +11,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 	// "google.golang.org/protobuf/proto"
 )
 
@@ -138,10 +136,7 @@ func (m *MessageRpcClient) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqRe
 	return resp, err
 }
 
-func (m *MessageRpcClient) PullMessageBySeqList(
+func (m *MessageRpcClient) PullMessageBySeqList(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) {
-	ctx context.Context,
-	req *sdkws.PullMessageBySeqsReq,
-) (*sdkws.PullMessageBySeqsResp, error) {
 	resp, err := m.Client.PullMessageBySeqs(ctx, req)
 	return resp, err
 }
@@ -163,9 +158,7 @@ type NotificationSender struct {
 
 type NotificationSenderOptions func(*NotificationSender)
 
-func WithLocalSendMsg(
+func WithLocalSendMsg(sendMsg func(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error)) NotificationSenderOptions {
-	sendMsg func(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error),
-) NotificationSenderOptions {
 	return func(s *NotificationSender) {
 		s.sendMsg = sendMsg
 	}
@@ -184,10 +177,7 @@ func WithUserRpcClient(userRpcClient *UserRpcClient) NotificationSenderOptions {
 }
 
 func NewNotificationSender(opts ...NotificationSenderOptions) *NotificationSender {
-	notificationSender := &NotificationSender{
+	notificationSender := &NotificationSender{contentTypeConf: newContentTypeConf(), sessionTypeConf: newSessionTypeConf()}
-		contentTypeConf: newContentTypeConf(),
-		sessionTypeConf: newSessionTypeConf(),
-	}
 	for _, opt := range opts {
 		opt(notificationSender)
 	}
@@ -206,29 +196,11 @@ func WithRpcGetUserName() NotificationOptions {
 	}
 }
 
-func (s *NotificationSender) NotificationWithSesstionType(
+func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, sendID, recvID string, contentType, sesstionType int32, m proto.Message, opts ...NotificationOptions) (err error) {
-	ctx context.Context,
-	sendID, recvID string,
-	contentType, sesstionType int32,
-	m proto.Message,
-	opts ...NotificationOptions,
-) (err error) {
 	n := sdkws.NotificationElem{Detail: utils.StructToJsonString(m)}
 	content, err := json.Marshal(&n)
 	if err != nil {
-		log.ZError(
+		log.ZError(ctx, "MsgClient Notification json.Marshal failed", err, "sendID", sendID, "recvID", recvID, "contentType", contentType, "msg", m)
-			ctx,
-			"MsgClient Notification json.Marshal failed",
-			err,
-			"sendID",
-			sendID,
-			"recvID",
-			recvID,
-			"contentType",
-			contentType,
-			"msg",
-			m,
-		)
 		return err
 	}
 	notificationOpt := &notificationOpt{}
@@ -275,25 +247,6 @@ func (s *NotificationSender) NotificationWithSesstionType(
 	return err
 }
 
-func (s *NotificationSender) Notification(
+func (s *NotificationSender) Notification(ctx context.Context, sendID, recvID string, contentType int32, m proto.Message, opts ...NotificationOptions) error {
-	ctx context.Context,
-	sendID, recvID string,
-	contentType int32,
-	m proto.Message,
-	opts ...NotificationOptions,
-) error {
 	return s.NotificationWithSesstionType(ctx, sendID, recvID, contentType, s.sessionTypeConf[contentType], m, opts...)
 }
-
-func (m *Message) GetAllUserID(ctx context.Context, req *user.GetAllUserIDReq) (*user.GetAllUserIDResp, error) {
-	conn, err := m.discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImMsgName)
-	if err != nil {
-		panic(err)
-	}
-	client := user.NewUserClient(conn)
-	resp, err := client.GetAllUserID(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return resp, nil
-}

pkg/rpcclient/notification/group.go

@@ -16,19 +16,11 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
-func NewGroupNotificationSender(
+func NewGroupNotificationSender(db controller.GroupDatabase, msgRpcClient *rpcclient.MessageRpcClient, userRpcClient *rpcclient.UserRpcClient, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender {
-	db controller.GroupDatabase,
-	msgRpcClient *rpcclient.MessageRpcClient,
-	userRpcClient *rpcclient.UserRpcClient,
-	fn func(ctx context.Context, userIDs []string) ([]CommonUser, error),
-) *GroupNotificationSender {
 	return &GroupNotificationSender{
-		NotificationSender: rpcclient.NewNotificationSender(
+		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithRpcClient(msgRpcClient), rpcclient.WithUserRpcClient(userRpcClient)),
-			rpcclient.WithRpcClient(msgRpcClient),
+		getUsersInfo:       fn,
-			rpcclient.WithUserRpcClient(userRpcClient),
+		db:                 db,
-		),
-		getUsersInfo: fn,
-		db:           db,
 	}
 }
 
@@ -88,11 +80,7 @@ func (g *GroupNotificationSender) getGroupInfo(ctx context.Context, groupID stri
 	}, nil
 }
 
-func (g *GroupNotificationSender) getGroupMembers(
+func (g *GroupNotificationSender) getGroupMembers(ctx context.Context, groupID string, userIDs []string) ([]*sdkws.GroupMemberFullInfo, error) {
-	ctx context.Context,
-	groupID string,
-	userIDs []string,
-) ([]*sdkws.GroupMemberFullInfo, error) {
 	members, err := g.db.FindGroupMember(ctx, []string{groupID}, userIDs, nil)
 	if err != nil {
 		return nil, err
@@ -107,9 +95,7 @@ func (g *GroupNotificationSender) getGroupMembers(
 	for _, member := range members {
 		user, ok := users[member.UserID]
 		if !ok {
-			return nil, errs.ErrUserIDNotFound.Wrap(
+			return nil, errs.ErrUserIDNotFound.Wrap(fmt.Sprintf("group %s member %s not in user", member.GroupID, member.UserID))
-				fmt.Sprintf("group %s member %s not in user", member.GroupID, member.UserID),
-			)
 		}
 		if member.Nickname == "" {
 			member.Nickname = user.Nickname
@@ -131,11 +117,7 @@ func (g *GroupNotificationSender) getGroupMembers(
 	return res, nil
 }
 
-func (g *GroupNotificationSender) getGroupMemberMap(
+func (g *GroupNotificationSender) getGroupMemberMap(ctx context.Context, groupID string, userIDs []string) (map[string]*sdkws.GroupMemberFullInfo, error) {
-	ctx context.Context,
-	groupID string,
-	userIDs []string,
-) (map[string]*sdkws.GroupMemberFullInfo, error) {
 	members, err := g.getGroupMembers(ctx, groupID, userIDs)
 	if err != nil {
 		return nil, err
@@ -147,11 +129,7 @@ func (g *GroupNotificationSender) getGroupMemberMap(
 	return m, nil
 }
 
-func (g *GroupNotificationSender) getGroupMember(
+func (g *GroupNotificationSender) getGroupMember(ctx context.Context, groupID string, userID string) (*sdkws.GroupMemberFullInfo, error) {
-	ctx context.Context,
-	groupID string,
-	userID string,
-) (*sdkws.GroupMemberFullInfo, error) {
 	members, err := g.getGroupMembers(ctx, groupID, []string{userID})
 	if err != nil {
 		return nil, err
@@ -171,11 +149,7 @@ func (g *GroupNotificationSender) getGroupOwnerAndAdminUserID(ctx context.Contex
 	return utils.Slice(members, fn), nil
 }
 
-func (g *GroupNotificationSender) groupDB2PB(
+func (g *GroupNotificationSender) groupDB2PB(group *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo {
-	group *relation.GroupModel,
-	ownerUserID string,
-	memberCount uint32,
-) *sdkws.GroupInfo {
 	return &sdkws.GroupInfo{
 		GroupID:                group.GroupID,
 		GroupName:              group.GroupName,
@@ -197,10 +171,7 @@ func (g *GroupNotificationSender) groupDB2PB(
 	}
 }
 
-func (g *GroupNotificationSender) groupMemberDB2PB(
+func (g *GroupNotificationSender) groupMemberDB2PB(member *relation.GroupMemberModel, appMangerLevel int32) *sdkws.GroupMemberFullInfo {
-	member *relation.GroupMemberModel,
-	appMangerLevel int32,
-) *sdkws.GroupMemberFullInfo {
 	return &sdkws.GroupMemberFullInfo{
 		GroupID:        member.GroupID,
 		UserID:         member.UserID,
@@ -217,10 +188,7 @@ func (g *GroupNotificationSender) groupMemberDB2PB(
 	}
 }
 
-func (g *GroupNotificationSender) getUsersInfoMap(
+func (g *GroupNotificationSender) getUsersInfoMap(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error) {
-	ctx context.Context,
-	userIDs []string,
-) (map[string]*sdkws.UserInfo, error) {
 	users, err := g.getUsersInfo(ctx, userIDs)
 	if err != nil {
 		return nil, err
@@ -232,11 +200,7 @@ func (g *GroupNotificationSender) getUsersInfoMap(
 	return result, nil
 }
 
-func (g *GroupNotificationSender) fillOpUser(
+func (g *GroupNotificationSender) fillOpUser(ctx context.Context, opUser **sdkws.GroupMemberFullInfo, groupID string) error {
-	ctx context.Context,
-	opUser **sdkws.GroupMemberFullInfo,
-	groupID string,
-) error {
 	if opUser == nil {
 		return errs.ErrInternalServer.Wrap("**sdkws.GroupMemberFullInfo is nil")
 	}
@@ -275,70 +239,35 @@ func (g *GroupNotificationSender) fillOpUser(
 	return nil
 }
 
-func (g *GroupNotificationSender) GroupCreatedNotification(
+func (g *GroupNotificationSender) GroupCreatedNotification(ctx context.Context, tips *sdkws.GroupCreatedTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.GroupCreatedTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupCreatedNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupInfoSetNotification(
+func (g *GroupNotificationSender) GroupInfoSetNotification(ctx context.Context, tips *sdkws.GroupInfoSetTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.GroupInfoSetTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupInfoSetNotification, tips, rpcclient.WithRpcGetUserName())
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		tips.Group.GroupID,
-		constant.GroupInfoSetNotification,
-		tips,
-		rpcclient.WithRpcGetUserName(),
-	)
 }
 
-func (g *GroupNotificationSender) GroupInfoSetNameNotification(
+func (g *GroupNotificationSender) GroupInfoSetNameNotification(ctx context.Context, tips *sdkws.GroupInfoSetNameTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.GroupInfoSetNameTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupInfoSetNameNotification, tips)
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		tips.Group.GroupID,
-		constant.GroupInfoSetNameNotification,
-		tips,
-	)
 }
 
-func (g *GroupNotificationSender) GroupInfoSetAnnouncementNotification(
+func (g *GroupNotificationSender) GroupInfoSetAnnouncementNotification(ctx context.Context, tips *sdkws.GroupInfoSetAnnouncementTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.GroupInfoSetAnnouncementTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupInfoSetAnnouncementNotification, tips, rpcclient.WithRpcGetUserName())
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		tips.Group.GroupID,
-		constant.GroupInfoSetAnnouncementNotification,
-		tips,
-		rpcclient.WithRpcGetUserName(),
-	)
 }
 
-func (g *GroupNotificationSender) JoinGroupApplicationNotification(
+func (g *GroupNotificationSender) JoinGroupApplicationNotification(ctx context.Context, req *pbGroup.JoinGroupReq) (err error) {
-	ctx context.Context,
-	req *pbGroup.JoinGroupReq,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
 		return err
@@ -362,10 +291,7 @@ func (g *GroupNotificationSender) JoinGroupApplicationNotification(
 	return nil
 }
 
-func (g *GroupNotificationSender) MemberQuitNotification(
+func (g *GroupNotificationSender) MemberQuitNotification(ctx context.Context, member *sdkws.GroupMemberFullInfo) (err error) {
-	ctx context.Context,
-	member *sdkws.GroupMemberFullInfo,
-) (err error) {
 	defer log.ZDebug(ctx, "return")
 	defer func() {
 		if err != nil {
@@ -380,10 +306,7 @@ func (g *GroupNotificationSender) MemberQuitNotification(
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), member.GroupID, constant.MemberQuitNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(
+func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (err error) {
-	ctx context.Context,
-	req *pbGroup.GroupApplicationResponseReq,
-) (err error) {
 	defer log.ZDebug(ctx, "return")
 	defer func() {
 		if err != nil {
@@ -403,13 +326,7 @@ func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(
 		return err
 	}
 	for _, userID := range append(userIDs, mcontext.GetOpUserID(ctx)) {
-		err = g.Notification(
+		err = g.Notification(ctx, mcontext.GetOpUserID(ctx), userID, constant.GroupApplicationAcceptedNotification, tips)
-			ctx,
-			mcontext.GetOpUserID(ctx),
-			userID,
-			constant.GroupApplicationAcceptedNotification,
-			tips,
-		)
 		if err != nil {
 			log.ZError(ctx, "failed", err)
 		}
@@ -417,10 +334,7 @@ func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(
 	return nil
 }
 
-func (g *GroupNotificationSender) GroupApplicationRejectedNotification(
+func (g *GroupNotificationSender) GroupApplicationRejectedNotification(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (err error) {
-	ctx context.Context,
-	req *pbGroup.GroupApplicationResponseReq,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
 		return err
@@ -434,13 +348,7 @@ func (g *GroupNotificationSender) GroupApplicationRejectedNotification(
 		return err
 	}
 	for _, userID := range append(userIDs, mcontext.GetOpUserID(ctx)) {
-		err = g.Notification(
+		err = g.Notification(ctx, mcontext.GetOpUserID(ctx), userID, constant.GroupApplicationRejectedNotification, tips)
-			ctx,
-			mcontext.GetOpUserID(ctx),
-			userID,
-			constant.GroupApplicationRejectedNotification,
-			tips,
-		)
 		if err != nil {
 			log.ZError(ctx, "failed", err)
 		}
@@ -448,10 +356,7 @@ func (g *GroupNotificationSender) GroupApplicationRejectedNotification(
 	return nil
 }
 
-func (g *GroupNotificationSender) GroupOwnerTransferredNotification(
+func (g *GroupNotificationSender) GroupOwnerTransferredNotification(ctx context.Context, req *pbGroup.TransferGroupOwnerReq) (err error) {
-	ctx context.Context,
-	req *pbGroup.TransferGroupOwnerReq,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
 		return err
@@ -461,38 +366,21 @@ func (g *GroupNotificationSender) GroupOwnerTransferredNotification(
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.GroupOwnerTransferredTips{
+	tips := &sdkws.GroupOwnerTransferredTips{Group: group, OpUser: member[opUserID], NewGroupOwner: member[req.NewOwnerUserID]}
-		Group:         group,
-		OpUser:        member[opUserID],
-		NewGroupOwner: member[req.NewOwnerUserID],
-	}
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupOwnerTransferredNotification, tips)
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		group.GroupID,
-		constant.GroupOwnerTransferredNotification,
-		tips,
-	)
 }
 
-func (g *GroupNotificationSender) MemberKickedNotification(
+func (g *GroupNotificationSender) MemberKickedNotification(ctx context.Context, tips *sdkws.MemberKickedTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.MemberKickedTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.MemberKickedNotification, tips)
 }
 
-func (g *GroupNotificationSender) MemberInvitedNotification(
+func (g *GroupNotificationSender) MemberInvitedNotification(ctx context.Context, groupID, reason string, invitedUserIDList []string) (err error) {
-	ctx context.Context,
-	groupID, reason string,
-	invitedUserIDList []string,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -511,10 +399,7 @@ func (g *GroupNotificationSender) MemberInvitedNotification(
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberInvitedNotification, tips)
 }
 
-func (g *GroupNotificationSender) MemberEnterNotification(
+func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (err error) {
-	ctx context.Context,
-	req *pbGroup.GroupApplicationResponseReq,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, req.GroupID)
 	if err != nil {
 		return err
@@ -527,21 +412,14 @@ func (g *GroupNotificationSender) MemberEnterNotification(
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberEnterNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupDismissedNotification(
+func (g *GroupNotificationSender) GroupDismissedNotification(ctx context.Context, tips *sdkws.GroupDismissedTips) (err error) {
-	ctx context.Context,
-	tips *sdkws.GroupDismissedTips,
-) (err error) {
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), tips.Group.GroupID, constant.GroupDismissedNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupMemberMutedNotification(
+func (g *GroupNotificationSender) GroupMemberMutedNotification(ctx context.Context, groupID, groupMemberUserID string, mutedSeconds uint32) (err error) {
-	ctx context.Context,
-	groupID, groupMemberUserID string,
-	mutedSeconds uint32,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -558,10 +436,7 @@ func (g *GroupNotificationSender) GroupMemberMutedNotification(
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberMutedNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupMemberCancelMutedNotification(
+func (g *GroupNotificationSender) GroupMemberCancelMutedNotification(ctx context.Context, groupID, groupMemberUserID string) (err error) {
-	ctx context.Context,
-	groupID, groupMemberUserID string,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -570,21 +445,11 @@ func (g *GroupNotificationSender) GroupMemberCancelMutedNotification(
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.GroupMemberCancelMutedTips{
+	tips := &sdkws.GroupMemberCancelMutedTips{Group: group, OpUser: user[mcontext.GetOpUserID(ctx)], MutedUser: user[groupMemberUserID]}
-		Group:     group,
-		OpUser:    user[mcontext.GetOpUserID(ctx)],
-		MutedUser: user[groupMemberUserID],
-	}
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberCancelMutedNotification, tips)
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		group.GroupID,
-		constant.GroupMemberCancelMutedNotification,
-		tips,
-	)
 }
 
 func (g *GroupNotificationSender) GroupMutedNotification(ctx context.Context, groupID string) (err error) {
@@ -625,10 +490,7 @@ func (g *GroupNotificationSender) GroupCancelMutedNotification(ctx context.Conte
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupCancelMutedNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupMemberInfoSetNotification(
+func (g *GroupNotificationSender) GroupMemberInfoSetNotification(ctx context.Context, groupID, groupMemberUserID string) (err error) {
-	ctx context.Context,
-	groupID, groupMemberUserID string,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -637,21 +499,14 @@ func (g *GroupNotificationSender) GroupMemberInfoSetNotification(
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.GroupMemberInfoSetTips{
+	tips := &sdkws.GroupMemberInfoSetTips{Group: group, OpUser: user[mcontext.GetOpUserID(ctx)], ChangedUser: user[groupMemberUserID]}
-		Group:       group,
-		OpUser:      user[mcontext.GetOpUserID(ctx)],
-		ChangedUser: user[groupMemberUserID],
-	}
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberInfoSetNotification, tips)
 }
 
-func (g *GroupNotificationSender) GroupMemberSetToAdminNotification(
+func (g *GroupNotificationSender) GroupMemberSetToAdminNotification(ctx context.Context, groupID, groupMemberUserID string) (err error) {
-	ctx context.Context,
-	groupID, groupMemberUserID string,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -660,27 +515,14 @@ func (g *GroupNotificationSender) GroupMemberSetToAdminNotification(
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.GroupMemberInfoSetTips{
+	tips := &sdkws.GroupMemberInfoSetTips{Group: group, OpUser: user[mcontext.GetOpUserID(ctx)], ChangedUser: user[groupMemberUserID]}
-		Group:       group,
-		OpUser:      user[mcontext.GetOpUserID(ctx)],
-		ChangedUser: user[groupMemberUserID],
-	}
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberSetToAdminNotification, tips)
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		group.GroupID,
-		constant.GroupMemberSetToAdminNotification,
-		tips,
-	)
 }
 
-func (g *GroupNotificationSender) GroupMemberSetToOrdinaryUserNotification(
+func (g *GroupNotificationSender) GroupMemberSetToOrdinaryUserNotification(ctx context.Context, groupID, groupMemberUserID string) (err error) {
-	ctx context.Context,
-	groupID, groupMemberUserID string,
-) (err error) {
 	group, err := g.getGroupInfo(ctx, groupID)
 	if err != nil {
 		return err
@@ -689,28 +531,14 @@ func (g *GroupNotificationSender) GroupMemberSetToOrdinaryUserNotification(
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.GroupMemberInfoSetTips{
+	tips := &sdkws.GroupMemberInfoSetTips{Group: group, OpUser: user[mcontext.GetOpUserID(ctx)], ChangedUser: user[groupMemberUserID]}
-		Group:       group,
-		OpUser:      user[mcontext.GetOpUserID(ctx)],
-		ChangedUser: user[groupMemberUserID],
-	}
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-	return g.Notification(
+	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberSetToOrdinaryUserNotification, tips)
-		ctx,
-		mcontext.GetOpUserID(ctx),
-		group.GroupID,
-		constant.GroupMemberSetToOrdinaryUserNotification,
-		tips,
-	)
 }
 
-func (g *GroupNotificationSender) MemberEnterDirectlyNotification(
+func (g *GroupNotificationSender) MemberEnterDirectlyNotification(ctx context.Context, groupID string, entrantUserID string) (err error) {
-	ctx context.Context,
-	groupID string,
-	entrantUserID string,
-) (err error) {
 	defer log.ZDebug(ctx, "return")
 	defer func() {
 		if err != nil {

pkg/rpcclient/notification/msg.go

@@ -16,11 +16,7 @@ func NewMsgNotificationSender(opts ...rpcclient.NotificationSenderOptions) *MsgN
 	return &MsgNotificationSender{rpcclient.NewNotificationSender(opts...)}
 }
 
-func (m *MsgNotificationSender) UserDeleteMsgsNotification(
+func (m *MsgNotificationSender) UserDeleteMsgsNotification(ctx context.Context, userID, conversationID string, seqs []int64) error {
-	ctx context.Context,
-	userID, conversationID string,
-	seqs []int64,
-) error {
 	tips := sdkws.DeleteMsgsTips{
 		UserID:         userID,
 		ConversationID: conversationID,
@@ -29,14 +25,7 @@ func (m *MsgNotificationSender) UserDeleteMsgsNotification(
 	return m.Notification(ctx, userID, userID, constant.MsgDeleteNotification, &tips)
 }
 
-func (m *MsgNotificationSender) MarkAsReadNotification(
+func (m *MsgNotificationSender) MarkAsReadNotification(ctx context.Context, conversationID string, sesstionType int32, sendID, recvID string, seqs []int64, hasReadSeq int64) error {
-	ctx context.Context,
-	conversationID string,
-	sesstionType int32,
-	sendID, recvID string,
-	seqs []int64,
-	hasReadSeq int64,
-) error {
 	tips := &sdkws.MarkAsReadTips{
 		MarkAsReadUserID: sendID,
 		ConversationID:   conversationID,

pkg/rpcclient/third.go

@@ -16,9 +16,6 @@ package rpcclient
 
 import (
 	"context"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-	"net/url"
 
 	"google.golang.org/grpc"
 
@@ -28,10 +25,9 @@ import (
 )
 
 type Third struct {
-	conn        grpc.ClientConnInterface
+	conn   grpc.ClientConnInterface
-	Client      third.ThirdClient
+	Client third.ThirdClient
-	discov      discoveryregistry.SvcDiscoveryRegistry
+	discov discoveryregistry.SvcDiscoveryRegistry
-	MinioClient *minio.Client
 }
 
 func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
@@ -40,30 +36,5 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
 		panic(err)
 	}
 	client := third.NewThirdClient(conn)
-	minioClient, err := minioInit()
+	return &Third{discov: discov, Client: client, conn: conn}
-	return &Third{discov: discov, Client: client, conn: conn, MinioClient: minioClient}
-}
-
-func minioInit() (*minio.Client, error) {
-	minioClient := &minio.Client{}
-	var initUrl string
-	initUrl = config.Config.Object.Minio.Endpoint
-	minioUrl, err := url.Parse(initUrl)
-	if err != nil {
-		return nil, err
-	}
-	opts := &minio.Options{
-		Creds: credentials.NewStaticV4(config.Config.Object.Minio.AccessKeyID, config.Config.Object.Minio.SecretAccessKey, ""),
-		//Region: config.Config.Credential.Minio.Location,
-	}
-	if minioUrl.Scheme == "http" {
-		opts.Secure = false
-	} else if minioUrl.Scheme == "https" {
-		opts.Secure = true
-	}
-	minioClient, err = minio.New(minioUrl.Host, opts)
-	if err != nil {
-		return nil, err
-	}
-	return minioClient, nil
 }