fix: reset branch. (#1277)

* fix: to start im or chat, ZooKeeper must be started first.

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* fix: msg gateway start output err info

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: go mod update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* chore: package path changes

Signed-off-by: withchao <993506633@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: token update

Signed-off-by: Gordon <1432970085@qq.com>

* fix: get all userID

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: msggateway add online status call

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: log change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: log change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* chore: network mode change

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: add api of get server time

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* feat: remove go work sum

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: pull message add isRead field

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: check msg-transfer script

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix:  script update

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: start don't kill old process

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: check component

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: pull message set isRead only message come from single.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: multiple gateway kick user each other.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: add ex field to update group info.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

* cicd: robot automated Change

* refactor: change project module name.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: change project module name.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* refactor: change project module name.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

* test: for pressure test.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* test: for pressure test.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* test: for pressure test.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* test: message log.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

* fxi: component check output valid info.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fxi: component check output valid info.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* test: send message test log.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* cicd: robot automated Change

* cicd: robot automated Change

* test: remove info log.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* feat: api of send message add sendTime field.

Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* fix: add callback for update user's info.

* cicd: robot automated Change

* fix: change callback command name.

* cicd: robot automated Change

* fix: single chat unread status change.

* fix: single chat unread status change.

* fix: single chat unread status change.

* fix: user status change.

* cicd: robot automated Change

* fix: user status change.

* fix: user status change.

* fix: user status change.

* cicd: robot automated Change

* fix: ws close when user logout.

* fix: remove repeat platform on online status.

* cicd: robot automated Change

* fix: api send messages for notification conversation .

* fix: api send messages for notification conversation .

* fix: api send messages for notification conversation .

* fix: api send messages for notification conversation .

* fix: api send messages for notification conversation .

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

* re: remove router of unsubscribeStatus.

* re: remove router of unsubscribeStatus.

* re: remove router of unsubscribeStatus.

* re: remove router of unsubscribeStatus.

* fix: reset branch

* fix: not support redis cluster. CROSSSLOT Keys in request don't hash to the same slot

* fix: update user.FaceURL do not trigger GroupMemberInfoSetNotification

* cicd: robot automated Change

* fix: api send messages for notification conversation.

* fix: api send messages for notification conversation.

---------

Signed-off-by: Gordon <1432970085@qq.com>
Signed-off-by: withchao <993506633@qq.com>
Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com>
Co-authored-by: FGadvancer <FGadvancer@users.noreply.github.com>
Co-authored-by: withchao <withchao@users.noreply.github.com>

.golangci.yml

@@ -510,7 +510,7 @@ linters-settings:
 
   nestif:
     # minimal complexity of if statements to report, 5 by default
-    min-complexity: 6
+    min-complexity: 4
 
   nilnil:
     # By default, nilnil checks all returned types below.

cmd/openim-api/main.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
-
 	"github.com/openimsdk/open-im-server/v3/internal/api"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"

go.work

@@ -1,18 +1,16 @@
 go 1.19
 
-
 use (
 	.
 	./test/typecheck
 	./tools/changelog
-	./tools/component
-	./tools/data-conversion
-	./tools/imctl
 	//./tools/imctl
 	./tools/infra
 	./tools/ncpu
 	./tools/openim-web
-	./tools/url2im
 	./tools/versionchecker
 	./tools/yamlfmt
+	./tools/component
+	./tools/url2im
+	./tools/data-conversion
 )

internal/msgtransfer/init.go

@@ -16,12 +16,10 @@ package msgtransfer
 
 import (
 	"fmt"
-	"sync"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
-
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-
+	"sync"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 
 	"github.com/OpenIMSDK/tools/mw"
 
@@ -65,7 +63,8 @@ func StartTransfer(prometheusPort int) error {
 	/*
 		client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
 			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 {
+				config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/
+	if err != nil {
 		return err
 	}
 	if err := client.CreateRpcRootNodes(config.Config.GetServiceNames()); err != nil {

internal/rpc/msg/as_read.go

@@ -147,6 +147,7 @@ func (m *msgServer) MarkConversationAsRead(
 		for i := hasReadSeq + 1; i <= req.HasReadSeq; i++ {
 			seqs = append(seqs, i)
 		}
+
 		if len(seqs) > 0 {
 			log.ZDebug(ctx, "MarkConversationAsRead", "seqs", seqs, "conversationID", req.ConversationID)
 			if err = m.MsgDatabase.MarkSingleChatMsgsAsRead(ctx, req.UserID, req.ConversationID, seqs); err != nil {
@@ -164,7 +165,6 @@ func (m *msgServer) MarkConversationAsRead(
 			m.conversationAndGetRecvID(conversation, req.UserID), seqs, hasReadSeq); err != nil {
 			return nil, err
 		}
-
 	} else if conversation.ConversationType == constant.SuperGroupChatType ||
 		conversation.ConversationType == constant.NotificationChatType {
 		if req.HasReadSeq > hasReadSeq {
@@ -178,6 +178,7 @@ func (m *msgServer) MarkConversationAsRead(
 			req.UserID, seqs, hasReadSeq); err != nil {
 			return nil, err
 		}
+
 	}
 
 	return &msg.MarkConversationAsReadResp{}, nil

internal/rpc/user/user.go

@@ -290,8 +290,7 @@ func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbus
 
 // GetUserStatus Get the online status of the user.
 func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp,
-	err error,
+	err error) {
-) {
 	onlineStatusList, err := s.UserDatabase.GetUserStatus(ctx, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -301,8 +300,7 @@ func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatu
 
 // SetUserStatus Synchronize user's online status.
 func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp,
-	err error,
+	err error) {
-) {
 	err = s.UserDatabase.SetUserStatus(ctx, req.UserID, req.Status, req.PlatformID)
 	if err != nil {
 		return nil, err
@@ -326,8 +324,7 @@ func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatu
 
 // GetSubscribeUsersStatus Get the online status of subscribers.
 func (s *userServer) GetSubscribeUsersStatus(ctx context.Context,
-	req *pbuser.GetSubscribeUsersStatusReq,
+	req *pbuser.GetSubscribeUsersStatusReq) (*pbuser.GetSubscribeUsersStatusResp, error) {
-) (*pbuser.GetSubscribeUsersStatusResp, error) {
 	userList, err := s.UserDatabase.GetAllSubscribeList(ctx, req.UserID)
 	if err != nil {
 		return nil, err

internal/tools/msg.go

@@ -17,13 +17,11 @@ package tools
 import (
 	"context"
 	"fmt"
-	"math"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
-
 	"github.com/redis/go-redis/v9"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-
+	"math"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"

pkg/authverify/token.go

@@ -41,7 +41,6 @@ func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) {
 	if opUserID == ownerUserID {
 		return nil
 	}
-
 	return errs.ErrNoPermission.Wrap(utils.GetSelfFuncName())
 }
 
@@ -53,7 +52,6 @@ func CheckAdmin(ctx context.Context) error {
 	if utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID) {
 		return nil
 	}
-
 	return errs.ErrNoPermission.Wrap(fmt.Sprintf("user %s is not admin userID", mcontext.GetOpUserID(ctx)))
 }
 
@@ -76,6 +74,5 @@ func WsVerifyToken(token, userID string, platformID int) error {
 	if claim.PlatformID != platformID {
 		return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token platform %d != %d", claim.PlatformID, platformID))
 	}
-
 	return nil
 }

pkg/callbackstruct/common.go

@@ -61,7 +61,6 @@ func (c CommonCallbackResp) Parse() error {
 	if c.ActionCode != errs.NoError || c.ErrCode != errs.NoError {
 		return errs.NewCodeError(int(c.ErrCode), c.ErrMsg).WithDetail(c.ErrDlt)
 	}
-
 	return nil
 }
 

pkg/common/cmd/api.go

@@ -16,11 +16,9 @@ package cmd
 
 import (
 	"fmt"
-
 	"github.com/OpenIMSDK/protocol/constant"
-	"github.com/spf13/cobra"
-
 	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/spf13/cobra"
 )
 
 type ApiCmd struct {
@@ -44,7 +42,8 @@ func (a *ApiCmd) GetPortFromConfig(portType string) int {
 	fmt.Println("GetPortFromConfig:", portType)
 	if portType == constant.FlagPort {
 		return config2.Config.Api.OpenImApiPort[0]
-	}
+	} else {
 
-	return 0
+		return 0
+	}
 }

pkg/common/cmd/cron_task.go

@@ -23,7 +23,6 @@ type CronTaskCmd struct {
 func NewCronTaskCmd() *CronTaskCmd {
 	ret := &CronTaskCmd{NewRootCmd("cronTask", WithCronTaskLogName())}
 	ret.SetRootCmdPt(ret)
-
 	return ret
 }
 
@@ -35,6 +34,5 @@ func (c *CronTaskCmd) addRunE(f func() error) {
 
 func (c *CronTaskCmd) Exec(f func() error) error {
 	c.addRunE(f)
-
 	return c.Execute()
 }

pkg/common/cmd/msg_gateway.go

@@ -31,7 +31,6 @@ type MsgGatewayCmd struct {
 func NewMsgGatewayCmd() *MsgGatewayCmd {
 	ret := &MsgGatewayCmd{NewRootCmd("msgGateway")}
 	ret.SetRootCmdPt(ret)
-
 	return ret
 }
 
@@ -44,7 +43,6 @@ func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = m.PortFromConfig(constant.FlagWsPort)
 	}
-
 	return port
 }
 
@@ -56,10 +54,8 @@ func (m *MsgGatewayCmd) addRunE() {
 
 func (m *MsgGatewayCmd) Exec() error {
 	m.addRunE()
-
 	return m.Execute()
 }
-
 func (m *MsgGatewayCmd) GetPortFromConfig(portType string) int {
 	if portType == constant.FlagWsPort {
 		return config2.Config.LongConnSvr.OpenImWsPort[0]

pkg/common/cmd/msg_transfer.go

@@ -27,7 +27,6 @@ type MsgTransferCmd struct {
 func NewMsgTransferCmd() *MsgTransferCmd {
 	ret := &MsgTransferCmd{NewRootCmd("msgTransfer")}
 	ret.SetRootCmdPt(ret)
-
 	return ret
 }
 
@@ -39,6 +38,5 @@ func (m *MsgTransferCmd) addRunE() {
 
 func (m *MsgTransferCmd) Exec() error {
 	m.addRunE()
-
 	return m.Execute()
 }

pkg/common/cmd/msg_utils.go

@@ -22,7 +22,7 @@ import (
 
 type MsgUtilsCmd struct {
 	cobra.Command
-	// msgTool *tools.MsgTool
+	msgTool *tools.MsgTool
 }
 
 func (m *MsgUtilsCmd) AddUserIDFlag() {
@@ -31,7 +31,6 @@ func (m *MsgUtilsCmd) AddUserIDFlag() {
 
 func (m *MsgUtilsCmd) getUserIDFlag(cmdLines *cobra.Command) string {
 	userID, _ := cmdLines.Flags().GetString("userID")
-
 	return userID
 }
 
@@ -39,17 +38,26 @@ func (m *MsgUtilsCmd) AddFixAllFlag() {
 	m.Command.PersistentFlags().BoolP("fixAll", "f", false, "openIM fix all seqs")
 }
 
+func (m *MsgUtilsCmd) getFixAllFlag(cmdLines *cobra.Command) bool {
+	fixAll, _ := cmdLines.Flags().GetBool("fixAll")
+	return fixAll
+}
+
 func (m *MsgUtilsCmd) AddClearAllFlag() {
 	m.Command.PersistentFlags().BoolP("clearAll", "c", false, "openIM clear all seqs")
 }
 
+func (m *MsgUtilsCmd) getClearAllFlag(cmdLines *cobra.Command) bool {
+	clearAll, _ := cmdLines.Flags().GetBool("clearAll")
+	return clearAll
+}
+
 func (m *MsgUtilsCmd) AddSuperGroupIDFlag() {
 	m.Command.PersistentFlags().StringP("superGroupID", "g", "", "openIM superGroupID")
 }
 
 func (m *MsgUtilsCmd) getSuperGroupIDFlag(cmdLines *cobra.Command) string {
 	superGroupID, _ := cmdLines.Flags().GetString("superGroupID")
-
 	return superGroupID
 }
 
@@ -57,10 +65,20 @@ func (m *MsgUtilsCmd) AddBeginSeqFlag() {
 	m.Command.PersistentFlags().Int64P("beginSeq", "b", 0, "openIM beginSeq")
 }
 
+func (m *MsgUtilsCmd) getBeginSeqFlag(cmdLines *cobra.Command) int64 {
+	beginSeq, _ := cmdLines.Flags().GetInt64("beginSeq")
+	return beginSeq
+}
+
 func (m *MsgUtilsCmd) AddLimitFlag() {
 	m.Command.PersistentFlags().Int64P("limit", "l", 0, "openIM limit")
 }
 
+func (m *MsgUtilsCmd) getLimitFlag(cmdLines *cobra.Command) int64 {
+	limit, _ := cmdLines.Flags().GetInt64("limit")
+	return limit
+}
+
 func (m *MsgUtilsCmd) Execute() error {
 	return m.Command.Execute()
 }
@@ -113,7 +131,6 @@ func NewSeqCmd() *SeqCmd {
 	seqCmd := &SeqCmd{
 		NewMsgUtilsCmd("seq", "seq", nil),
 	}
-
 	return seqCmd
 }
 
@@ -141,7 +158,6 @@ func (s *SeqCmd) GetSeqCmd() *cobra.Command {
 			// println(seq)
 		}
 	}
-
 	return &s.Command
 }
 
@@ -157,7 +173,6 @@ func NewMsgCmd() *MsgCmd {
 	msgCmd := &MsgCmd{
 		NewMsgUtilsCmd("msg", "msg", nil),
 	}
-
 	return msgCmd
 }
 

pkg/common/cmd/root.go

@@ -17,6 +17,8 @@ package cmd
 import (
 	"fmt"
 
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+
 	"github.com/spf13/cobra"
 
 	"github.com/OpenIMSDK/protocol/constant"
@@ -59,81 +61,62 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) *RootCmd {
 		Short: fmt.Sprintf(`Start %s `, name),
 		Long:  fmt.Sprintf(`Start %s `, name),
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			if err := rootCmd.getConfFromCmdAndInit(cmd); err != nil {
+			return rootCmd.persistentPreRun(cmd, opts...)
-				panic(err)
-			}
-			cmdOpts := &CmdOpts{}
-			for _, opt := range opts {
-				opt(cmdOpts)
-			}
-			if cmdOpts.loggerPrefixName == "" {
-				cmdOpts.loggerPrefixName = "OpenIM.log.all"
-			}
-			err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel,
-				config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation,
-				config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime)
-			if err != nil {
-				panic(err)
-			}
-
-			return nil
 		},
 	}
 	rootCmd.Command = cmd
 	rootCmd.addConfFlag()
-
 	return rootCmd
 }
 
-// func (rc *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error {
+func (rc *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error {
-// 	if err := rc.initializeConfiguration(cmd); err != nil {
+	if err := rc.initializeConfiguration(cmd); err != nil {
-// 		return fmt.Errorf("failed to get configuration from command: %w", err)
+		return fmt.Errorf("failed to get configuration from command: %w", err)
-// 	}
+	}
 
-// 	cmdOpts := rc.applyOptions(opts...)
+	cmdOpts := rc.applyOptions(opts...)
 
-// 	if err := rc.initializeLogger(cmdOpts); err != nil {
+	if err := rc.initializeLogger(cmdOpts); err != nil {
-// 		return fmt.Errorf("failed to initialize from config: %w", err)
+		return fmt.Errorf("failed to initialize from config: %w", err)
-// 	}
+	}
 
-// 	return nil
+	return nil
-// }
+}
 
-//nolint:unused		//unused work wrongly
 func (rc *RootCmd) initializeConfiguration(cmd *cobra.Command) error {
 	return rc.getConfFromCmdAndInit(cmd)
 }
 
-// func (rc *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts {
+func (rc *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts {
-// 	cmdOpts := defaultCmdOpts()
+	cmdOpts := defaultCmdOpts()
-// 	for _, opt := range opts {
+	for _, opt := range opts {
-// 		opt(cmdOpts)
+		opt(cmdOpts)
-// 	}
+	}
 
-// 	return cmdOpts
+	return cmdOpts
-// }
+}
 
-// func (rc *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
+func (rc *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
-// 	logConfig := config.Config.Log
+	logConfig := config.Config.Log
 
-// 	return log.InitFromConfig(
+	return log.InitFromConfig(
 
-// 		cmdOpts.loggerPrefixName,
+		cmdOpts.loggerPrefixName,
-// 		rc.Name,
+		rc.Name,
-// 		logConfig.RemainLogLevel,
+		logConfig.RemainLogLevel,
-// 		logConfig.IsStdout,
+		logConfig.IsStdout,
-// 		logConfig.IsJson,
+		logConfig.IsJson,
-// 		logConfig.StorageLocation,
+		logConfig.StorageLocation,
-// 		logConfig.RemainRotationCount,
+		logConfig.RemainRotationCount,
-// 		logConfig.RotationTime,
+		logConfig.RotationTime,
-// 	)
+	)
-// }
+}
 
-// func defaultCmdOpts() *CmdOpts {
+func defaultCmdOpts() *CmdOpts {
-// 	return &CmdOpts{
+	return &CmdOpts{
-// 		loggerPrefixName: "OpenIM.log.all",
+		loggerPrefixName: "OpenIM.log.all",
-// 	}
+	}
-// }
+}
 
 func (r *RootCmd) SetRootCmdPt(cmdItf RootCmdPt) {
 	r.cmdItf = cmdItf
@@ -152,7 +135,6 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = r.PortFromConfig(constant.FlagPort)
 	}
-
 	return port
 }
 
@@ -169,7 +151,6 @@ func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = r.PortFromConfig(constant.FlagPrometheusPort)
 	}
-
 	return port
 }
 
@@ -180,8 +161,7 @@ func (r *RootCmd) GetPrometheusPortFlag() int {
 func (r *RootCmd) getConfFromCmdAndInit(cmdLines *cobra.Command) error {
 	configFolderPath, _ := cmdLines.Flags().GetString(constant.FlagConf)
 	fmt.Println("configFolderPath:", configFolderPath)
-
+	return config2.InitConfig(configFolderPath)
-	return config.InitConfig(configFolderPath)
 }
 
 func (r *RootCmd) Execute() error {
@@ -194,12 +174,9 @@ func (r *RootCmd) AddCommand(cmds ...*cobra.Command) {
 
 func (r *RootCmd) GetPortFromConfig(portType string) int {
 	fmt.Println("RootCmd.GetPortFromConfig:", portType)
-
 	return 0
 }
-
 func (r *RootCmd) PortFromConfig(portType string) int {
 	fmt.Println("PortFromConfig:", portType)
-
 	return r.cmdItf.GetPortFromConfig(portType)
 }

pkg/common/cmd/rpc.go

@@ -16,13 +16,11 @@ package cmd
 
 import (
 	"errors"
-
 	"github.com/OpenIMSDK/protocol/constant"
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
@@ -35,7 +33,6 @@ type RpcCmd struct {
 func NewRpcCmd(name string) *RpcCmd {
 	ret := &RpcCmd{NewRootCmd(name)}
 	ret.SetRootCmdPt(ret)
-
 	return ret
 }
 
@@ -44,7 +41,6 @@ func (a *RpcCmd) Exec() error {
 		a.port = a.getPortFlag(cmd)
 		a.prometheusPort = a.getPrometheusPortFlag(cmd)
 	}
-
 	return a.Execute()
 }
 
@@ -55,10 +51,8 @@ func (a *RpcCmd) StartSvr(
 	if a.GetPortFlag() == 0 {
 		return errors.New("port is required")
 	}
-
 	return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
 }
-
 func (a *RpcCmd) GetPortFromConfig(portType string) int {
 	switch a.Name {
 	case RpcPushServer:
@@ -94,6 +88,5 @@ func (a *RpcCmd) GetPortFromConfig(portType string) int {
 			return config2.Config.RpcPort.OpenImUserPort[0]
 		}
 	}
-
 	return 0
 }

pkg/common/config/config.go

@@ -336,7 +336,6 @@ func (c *configStruct) RegisterConf2Registry(registry discoveryregistry.SvcDisco
 	if err != nil {
 		return err
 	}
-
 	return registry.RegisterConf2Registry(ConfKey, data)
 }
 
@@ -349,6 +348,5 @@ func (c *configStruct) EncodeConfig() []byte {
 	if err := yaml.NewEncoder(buf).Encode(c); err != nil {
 		panic(err)
 	}
-
 	return buf.Bytes()
 }

pkg/common/config/parse.go

@@ -21,9 +21,8 @@ import (
 	"path/filepath"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	"gopkg.in/yaml.v3"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
+	"gopkg.in/yaml.v3"
 )
 
 //go:embed version
@@ -35,7 +34,7 @@ const (
 	DefaultFolderPath    = "../config/"
 )
 
-// getProjectRoot returns the absolute path of the project root directory.
+// getProjectRoot returns the absolute path of the project root directory
 func GetProjectRoot() string {
 	b, _ := filepath.Abs(os.Args[0])
 
@@ -57,7 +56,6 @@ func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
 		opts = msgprocessor.WithOptions(opts, msgprocessor.WithHistory(true), msgprocessor.WithPersistent())
 	}
 	opts = msgprocessor.WithOptions(opts, msgprocessor.WithSendMsg(cfg.IsSendMsg))
-
 	return opts
 }
 
@@ -78,7 +76,6 @@ func initConfig(config interface{}, configName, configFolderPath string) error {
 		return fmt.Errorf("unmarshal yaml error: %w", err)
 	}
 	fmt.Println("use config", configFolderPath)
-
 	return nil
 }
 
@@ -96,5 +93,5 @@ func InitConfig(configFolderPath string) error {
 		return err
 	}
 
-	return nil
+	return initConfig(&Config.Notification, NotificationFileName, configFolderPath)
 }

pkg/common/convert/black.go

@@ -18,6 +18,7 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/protocol/sdkws"
+	sdk "github.com/OpenIMSDK/protocol/sdkws"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
@@ -26,11 +27,11 @@ func BlackDB2Pb(
 	ctx context.Context,
 	blackDBs []*relation.BlackModel,
 	f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
-) (blackPbs []*sdkws.BlackInfo, err error) {
+) (blackPbs []*sdk.BlackInfo, err error) {
 	if len(blackDBs) == 0 {
 		return nil, nil
 	}
-	userIDs := make([]string, 0, len(blackDBs))
+	var userIDs []string
 	for _, blackDB := range blackDBs {
 		userIDs = append(userIDs, blackDB.BlockUserID)
 	}
@@ -39,7 +40,7 @@ func BlackDB2Pb(
 		return nil, err
 	}
 	for _, blackDB := range blackDBs {
-		blackPb := &sdkws.BlackInfo{
+		blackPb := &sdk.BlackInfo{
 			OwnerUserID:    blackDB.OwnerUserID,
 			CreateTime:     blackDB.CreateTime.Unix(),
 			AddSource:      blackDB.AddSource,
@@ -54,6 +55,5 @@ func BlackDB2Pb(
 		}
 		blackPbs = append(blackPbs, blackPb)
 	}
-
 	return blackPbs, nil
 }

pkg/common/convert/conversation.go

@@ -27,7 +27,6 @@ func ConversationDB2Pb(conversationDB *relation.ConversationModel) *conversation
 	if err := utils.CopyStructFields(conversationPB, conversationDB); err != nil {
 		return nil
 	}
-
 	return conversationPB
 }
 
@@ -40,7 +39,6 @@ func ConversationsDB2Pb(conversationsDB []*relation.ConversationModel) (conversa
 		conversationPB.LatestMsgDestructTime = conversationDB.LatestMsgDestructTime.Unix()
 		conversationsPB = append(conversationsPB, conversationPB)
 	}
-
 	return conversationsPB
 }
 
@@ -49,7 +47,6 @@ func ConversationPb2DB(conversationPB *conversation.Conversation) *relation.Conv
 	if err := utils.CopyStructFields(conversationDB, conversationPB); err != nil {
 		return nil
 	}
-
 	return conversationDB
 }
 
@@ -61,6 +58,5 @@ func ConversationsPb2DB(conversationsPB []*conversation.Conversation) (conversat
 		}
 		conversationsDB = append(conversationsDB, conversationDB)
 	}
-
 	return conversationsDB
 }

pkg/common/convert/friend.go

@@ -16,7 +16,6 @@ package convert
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/utils"
@@ -26,13 +25,9 @@ import (
 
 func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel {
 	dbFriend := &relation.FriendModel{}
-	err := utils.CopyStructFields(dbFriend, friend)
+	utils.CopyStructFields(dbFriend, friend)
-	if err != nil {
-		panic(err)
-	}
 	dbFriend.FriendUserID = friend.FriendUser.UserID
 	dbFriend.CreateTime = utils.UnixSecondToTime(friend.CreateTime)
-
 	return dbFriend
 }
 
@@ -42,10 +37,7 @@ func FriendDB2Pb(
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (*sdkws.FriendInfo, error) {
 	pbfriend := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-	err := utils.CopyStructFields(pbfriend, friendDB)
+	utils.CopyStructFields(pbfriend, friendDB)
-	if err != nil {
-		panic(err)
-	}
 	users, err := getUsers(ctx, []string{friendDB.FriendUserID})
 	if err != nil {
 		return nil, err
@@ -55,7 +47,6 @@ func FriendDB2Pb(
 	pbfriend.FriendUser.FaceURL = users[friendDB.FriendUserID].FaceURL
 	pbfriend.FriendUser.Ex = users[friendDB.FriendUserID].Ex
 	pbfriend.CreateTime = friendDB.CreateTime.Unix()
-
 	return pbfriend, nil
 }
 
@@ -67,7 +58,7 @@ func FriendsDB2Pb(
 	if len(friendsDB) == 0 {
 		return nil, nil
 	}
-	userID := make([]string, 0, len(friendsDB))
+	var userID []string
 	for _, friendDB := range friendsDB {
 		userID = append(userID, friendDB.FriendUserID)
 	}
@@ -77,8 +68,7 @@ func FriendsDB2Pb(
 	}
 	for _, friend := range friendsDB {
 		friendPb := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-		err2 := utils.CopyStructFields(friendPb, friend)
+		utils.CopyStructFields(friendPb, friend)
-		err = fmt.Errorf("%w, %w", err, err2)
 		friendPb.FriendUser.UserID = users[friend.FriendUserID].UserID
 		friendPb.FriendUser.Nickname = users[friend.FriendUserID].Nickname
 		friendPb.FriendUser.FaceURL = users[friend.FriendUserID].FaceURL
@@ -86,8 +76,7 @@ func FriendsDB2Pb(
 		friendPb.CreateTime = friend.CreateTime.Unix()
 		friendsPb = append(friendsPb, friendPb)
 	}
-
+	return friendsPb, nil
-	return friendsPb, err
 }
 
 func FriendRequestDB2Pb(
@@ -127,6 +116,5 @@ func FriendRequestDB2Pb(
 			Ex:            friendRequest.Ex,
 		})
 	}
-
 	return res, nil
 }

pkg/common/convert/msg.go

@@ -55,7 +55,6 @@ func MsgPb2DB(msg *sdkws.MsgData) *unrelation.MsgDataModel {
 	msgDataModel.AtUserIDList = msg.AtUserIDList
 	msgDataModel.AttachedInfo = msg.AttachedInfo
 	msgDataModel.Ex = msg.Ex
-
 	return &msgDataModel
 }
 
@@ -96,6 +95,5 @@ func MsgDB2Pb(msgModel *unrelation.MsgDataModel) *sdkws.MsgData {
 	msg.AtUserIDList = msgModel.AtUserIDList
 	msg.AttachedInfo = msgModel.AttachedInfo
 	msg.Ex = msgModel.Ex
-
 	return &msg
 }

pkg/common/convert/user.go

@@ -34,7 +34,6 @@ func UsersDB2Pb(users []*relationtb.UserModel) (result []*sdkws.UserInfo) {
 		userPb.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
 		result = append(result, &userPb)
 	}
-
 	return result
 }
 
@@ -47,6 +46,5 @@ func UserPb2DB(user *sdkws.UserInfo) *relationtb.UserModel {
 	userDB.CreateTime = time.UnixMilli(user.CreateTime)
 	userDB.AppMangerLevel = user.AppMangerLevel
 	userDB.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
-
 	return &userDB
 }

pkg/common/db/cache/black.go

@@ -62,7 +62,12 @@ func NewBlackCacheRedis(
 }
 
 func (b *BlackCacheRedis) NewCache() BlackCache {
-	return &BlackCacheRedis{expireTime: b.expireTime, rcClient: b.rcClient, blackDB: b.blackDB, metaCache: NewMetaCacheRedis(b.rcClient, b.metaCache.GetPreDelKeys()...)}
+	return &BlackCacheRedis{
+		expireTime: b.expireTime,
+		rcClient:   b.rcClient,
+		blackDB:    b.blackDB,
+		metaCache:  NewMetaCacheRedis(b.rcClient, b.metaCache.GetPreDelKeys()...),
+	}
 }
 
 func (b *BlackCacheRedis) getBlackIDsKey(ownerUserID string) string {
@@ -70,9 +75,15 @@ func (b *BlackCacheRedis) getBlackIDsKey(ownerUserID string) string {
 }
 
 func (b *BlackCacheRedis) GetBlackIDs(ctx context.Context, userID string) (blackIDs []string, err error) {
-	return getCache(ctx, b.rcClient, b.getBlackIDsKey(userID), b.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return b.blackDB.FindBlackUserIDs(ctx, userID)
+		ctx,
-	})
+		b.rcClient,
+		b.getBlackIDsKey(userID),
+		b.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return b.blackDB.FindBlackUserIDs(ctx, userID)
+		},
+	)
 }
 
 func (b *BlackCacheRedis) DelBlackIDs(ctx context.Context, userID string) BlackCache {

pkg/common/db/cache/friend.go

@@ -53,9 +53,9 @@ type FriendCacheRedis struct {
 	rcClient   *rockscache.Client
 }
 
-func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendModelInterface, options rockscache.Options) FriendCache {
+func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendModelInterface,
+	options rockscache.Options) FriendCache {
 	rcClient := rockscache.NewClient(rdb, options)
-
 	return &FriendCacheRedis{
 		metaCache:  NewMetaCacheRedis(rcClient),
 		friendDB:   friendDB,
@@ -64,12 +64,12 @@ func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendMo
 	}
 }
 
-func (c *FriendCacheRedis) NewCache() FriendCache {
+func (f *FriendCacheRedis) NewCache() FriendCache {
 	return &FriendCacheRedis{
-		rcClient:   c.rcClient,
+		rcClient:   f.rcClient,
-		metaCache:  NewMetaCacheRedis(c.rcClient, c.metaCache.GetPreDelKeys()...),
+		metaCache:  NewMetaCacheRedis(f.rcClient, f.metaCache.GetPreDelKeys()...),
-		friendDB:   c.friendDB,
+		friendDB:   f.friendDB,
-		expireTime: c.expireTime,
+		expireTime: f.expireTime,
 	}
 }
 
@@ -128,8 +128,10 @@ func (f *FriendCacheRedis) DelTwoWayFriendIDs(ctx context.Context, ownerUserID s
 	return newFriendCache
 }
 
-func (f *FriendCacheRedis) GetFriend(ctx context.Context, ownerUserID, friendUserID string) (friend *relationtb.FriendModel, err error) {
+func (f *FriendCacheRedis) GetFriend(ctx context.Context, ownerUserID,
-	return getCache(ctx, f.rcClient, f.getFriendKey(ownerUserID, friendUserID), f.expireTime, func(ctx context.Context) (*relationtb.FriendModel, error) {
+	friendUserID string) (friend *relationtb.FriendModel, err error) {
+	return getCache(ctx, f.rcClient, f.getFriendKey(ownerUserID,
+		friendUserID), f.expireTime, func(ctx context.Context) (*relationtb.FriendModel, error) {
 		return f.friendDB.Take(ctx, ownerUserID, friendUserID)
 	})
 }

pkg/common/db/cache/group.go

@@ -412,7 +412,12 @@ func (g *GroupCacheRedis) GetGroupMembersInfo(ctx context.Context, groupID strin
 	})
 }
 
-func (g *GroupCacheRedis) GetGroupMembersPage(ctx context.Context, groupID string, userIDs []string, showNumber, pageNumber int32) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error) {
+func (g *GroupCacheRedis) GetGroupMembersPage(
+	ctx context.Context,
+	groupID string,
+	userIDs []string,
+	showNumber, pageNumber int32,
+) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return 0, nil, err

pkg/common/db/cache/meta_cache.go

@@ -154,7 +154,8 @@ func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key strin
 	return t, nil
 }
 
-//func batchGetCache[T any](ctx context.Context, rcClient *rockscache.Client, keys []string, expire time.Duration, keyIndexFn func(t T, keys []string) (int, error), fn func(ctx context.Context) ([]T, error)) ([]T, error) {
+// func batchGetCache[T any](ctx context.Context, rcClient *rockscache.Client, keys []string, expire time.Duration, keyIndexFn func(t T, keys []string) (int, error), fn func(ctx context.Context) ([]T,
+// error)) ([]T, error) {
 //	batchMap, err := rcClient.FetchBatch2(ctx, keys, expire, func(idxs []int) (m map[int]string, err error) {
 //		values := make(map[int]string)
 //		tArrays, err := fn(ctx)
@@ -191,7 +192,14 @@ func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key strin
 //	return tArrays, nil
 //}
 
-func batchGetCache2[T any, K comparable](ctx context.Context, rcClient *rockscache.Client, expire time.Duration, keys []K, keyFn func(key K) string, fns func(ctx context.Context, key K) (T, error)) ([]T, error) {
+func batchGetCache2[T any, K comparable](
+	ctx context.Context,
+	rcClient *rockscache.Client,
+	expire time.Duration,
+	keys []K,
+	keyFn func(key K) string,
+	fns func(ctx context.Context, key K) (T, error),
+) ([]T, error) {
 	if len(keys) == 0 {
 		return nil, nil
 	}

pkg/common/db/cache/msg.go

@@ -17,11 +17,13 @@ package cache
 import (
 	"context"
 	"errors"
-	"github.com/dtm-labs/rockscache"
-	unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
 	"strconv"
 	"time"
 
+	"github.com/dtm-labs/rockscache"
+
+	unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 
 	"github.com/OpenIMSDK/tools/errs"
@@ -718,21 +720,11 @@ func (c *msgCache) SetMessageTypeKeyValue(
 	return errs.Wrap(c.rdb.HSet(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), typeKey, value).Err())
 }
 
-func (c *msgCache) SetMessageReactionExpire(
+func (c *msgCache) SetMessageReactionExpire(ctx context.Context, clientMsgID string, sessionType int32, expiration time.Duration) (bool, error) {
-	ctx context.Context,
-	clientMsgID string,
-	sessionType int32,
-	expiration time.Duration,
-) (bool, error) {
 	return utils.Wrap2(c.rdb.Expire(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), expiration).Result())
 }
 
-func (c *msgCache) GetMessageTypeKeyValue(
+func (c *msgCache) GetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey string) (string, error) {
-	ctx context.Context,
-	clientMsgID string,
-	sessionType int32,
-	typeKey string,
-) (string, error) {
 	return utils.Wrap2(c.rdb.HGet(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), typeKey).Result())
 }
 

pkg/common/db/controller/auth.go

@@ -69,9 +69,9 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 		}
 	}
 	if len(deleteTokenKey) != 0 {
-		err2 := a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
+		err := a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
-		if err2 != nil {
+		if err != nil {
-			return "", err2
+			return "", err
 		}
 	}
 	claims := tokenverify.BuildClaims(userID, platformID, a.accessExpire)
@@ -80,6 +80,5 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 	if err != nil {
 		return "", utils.Wrap(err, "")
 	}
-
 	return tokenString, a.cache.AddTokenFlag(ctx, userID, platformID, tokenString, constant.NormalToken)
 }

pkg/common/db/controller/black.go

@@ -55,7 +55,6 @@ func (b *blackDatabase) Create(ctx context.Context, blacks []*relation.BlackMode
 	if err := b.black.Create(ctx, blacks); err != nil {
 		return err
 	}
-
 	return b.deleteBlackIDsCache(ctx, blacks)
 }
 
@@ -64,7 +63,6 @@ func (b *blackDatabase) Delete(ctx context.Context, blacks []*relation.BlackMode
 	if err := b.black.Delete(ctx, blacks); err != nil {
 		return err
 	}
-
 	return b.deleteBlackIDsCache(ctx, blacks)
 }
 
@@ -73,7 +71,6 @@ func (b *blackDatabase) deleteBlackIDsCache(ctx context.Context, blacks []*relat
 	for _, black := range blacks {
 		cache = cache.DelBlackIDs(ctx, black.OwnerUserID)
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -100,7 +97,6 @@ func (b *blackDatabase) CheckIn(
 		return
 	}
 	log.ZDebug(ctx, "blackIDs", "user1BlackIDs", userID1BlackIDs, "user2BlackIDs", userID2BlackIDs)
-
 	return utils.IsContain(userID2, userID1BlackIDs), utils.IsContain(userID1, userID2BlackIDs), nil
 }
 

pkg/common/db/controller/conversation.go

@@ -99,8 +99,8 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 		now := time.Now()
 		for _, v := range NotUserIDs {
 			temp := new(relationtb.ConversationModel)
-			if err2 := utils.CopyStructFields(temp, conversation); err2 != nil {
+			if err := utils.CopyStructFields(temp, conversation); err != nil {
-				return err2
+				return err
 			}
 			temp.OwnerUserID = v
 			temp.CreateTime = now
@@ -113,12 +113,10 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 			}
 			cache = cache.DelConversationIDs(NotUserIDs...).DelUserConversationIDsHash(NotUserIDs...).DelConversations(conversation.ConversationID, NotUserIDs...)
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -132,7 +130,6 @@ func (c *conversationDatabase) UpdateUsersConversationFiled(ctx context.Context,
 	if _, ok := args["recv_msg_opt"]; ok {
 		cache = cache.DelConversationNotReceiveMessageUserIDs(conversationID)
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -140,14 +137,13 @@ func (c *conversationDatabase) CreateConversation(ctx context.Context, conversat
 	if err := c.conversationDB.Create(ctx, conversations); err != nil {
 		return err
 	}
-	userIDs := make([]string, 0, len(conversations))
+	var userIDs []string
 	cache := c.cache.NewCache()
 	for _, conversation := range conversations {
 		cache = cache.DelConversations(conversation.OwnerUserID, conversation.ConversationID)
 		cache = cache.DelConversationNotReceiveMessageUserIDs(conversation.ConversationID)
 		userIDs = append(userIDs, conversation.OwnerUserID)
 	}
-
 	return cache.DelConversationIDs(userIDs...).DelUserConversationIDsHash(userIDs...).ExecDel(ctx)
 }
 
@@ -182,12 +178,10 @@ func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Con
 				}
 			}
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -240,15 +234,12 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 			if err != nil {
 				return err
 			}
-			cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID)
+			cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID).DelConversationNotReceiveMessageUserIDs(utils.Slice(notExistConversations, func(e *relationtb.ConversationModel) string { return e.ConversationID })...)
-			cache = cache.DelConversationNotReceiveMessageUserIDs(utils.Slice(notExistConversations, func(e *relationtb.ConversationModel) string { return e.ConversationID })...)
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -285,12 +276,10 @@ func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context,
 		for _, v := range existConversationUserIDs {
 			cache = cache.DelConversations(v, conversationID)
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 

pkg/common/db/controller/friend.go

@@ -16,7 +16,6 @@ package controller
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"gorm.io/gorm"
@@ -110,7 +109,6 @@ func (f *friendDatabase) CheckIn(
 	if err != nil {
 		return
 	}
-
 	return utils.IsContain(userID2, userID1FriendIDs), utils.IsContain(userID1, userID2FriendIDs), nil
 }
 
@@ -123,8 +121,8 @@ func (f *friendDatabase) AddFriendRequest(
 ) (err error) {
 	return f.tx.Transaction(func(tx any) error {
 		_, err := f.friendRequest.NewTx(tx).Take(ctx, fromUserID, toUserID)
-		// if there is a db error
+		// 有db错误
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
 			return err
 		}
 		// 无错误 则更新
@@ -138,14 +136,12 @@ func (f *friendDatabase) AddFriendRequest(
 			if err := f.friendRequest.NewTx(tx).UpdateByMap(ctx, fromUserID, toUserID, m); err != nil {
 				return err
 			}
-
 			return nil
 		}
 		// gorm.ErrRecordNotFound 错误，则新增
 		if err := f.friendRequest.NewTx(tx).Create(ctx, []*relation.FriendRequestModel{{FromUserID: fromUserID, ToUserID: toUserID, ReqMsg: reqMsg, Ex: ex, CreateTime: time.Now(), HandleTime: time.Unix(0, 0)}}); err != nil {
 			return err
 		}
-
 		return nil
 	})
 }
@@ -158,11 +154,11 @@ func (f *friendDatabase) BecomeFriends(
 	addSource int32,
 ) (err error) {
 	cache := f.cache.NewCache()
-	fn := func(tx any) error {
+	if err := f.tx.Transaction(func(tx any) error {
-		// first,find and drop delete ones
+		// 先find 找出重复的 去掉重复的
-		fs1, err2 := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs)
+		fs1, err := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs)
-		if err2 != nil {
+		if err != nil {
-			return err2
+			return err
 		}
 		opUserID := mcontext.GetOperationID(ctx)
 		for _, v := range friendUserIDs {
@@ -172,13 +168,13 @@ func (f *friendDatabase) BecomeFriends(
 			return e.FriendUserID
 		})
 
-		err2 = f.friend.NewTx(tx).Create(ctx, fs11)
+		err = f.friend.NewTx(tx).Create(ctx, fs11)
-		if err2 != nil {
+		if err != nil {
-			return err2
+			return err
 		}
-		fs2, err2 := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs)
+		fs2, err := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs)
-		if err2 != nil {
+		if err != nil {
-			return err2
+			return err
 		}
 		var newFriendIDs []string
 		for _, v := range friendUserIDs {
@@ -188,20 +184,16 @@ func (f *friendDatabase) BecomeFriends(
 		fs22 := utils.DistinctAny(fs2, func(e *relation.FriendModel) string {
 			return e.OwnerUserID
 		})
-		err2 = f.friend.NewTx(tx).Create(ctx, fs22)
+		err = f.friend.NewTx(tx).Create(ctx, fs22)
-		if err2 != nil {
+		if err != nil {
-			return err2
+			return err
 		}
 		newFriendIDs = append(newFriendIDs, ownerUserID)
 		cache = cache.DelFriendIDs(newFriendIDs...)
-
+		return nil
+	}); err != nil {
 		return nil
 	}
-	err = f.tx.Transaction(fn)
-	if err != nil {
-		return err
-	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -224,7 +216,6 @@ func (f *friendDatabase) RefuseFriendRequest(
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
@@ -260,7 +251,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 			if err != nil {
 				return err
 			}
-		} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		} else if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
 			return err
 		}
 
@@ -299,7 +290,6 @@ func (f *friendDatabase) AgreeFriendRequest(
 				return err
 			}
 		}
-
 		return f.cache.DelFriendIDs(friendRequest.ToUserID, friendRequest.FromUserID).ExecDel(ctx)
 	})
 }
@@ -309,7 +299,6 @@ func (f *friendDatabase) Delete(ctx context.Context, ownerUserID string, friendU
 	if err := f.friend.Delete(ctx, ownerUserID, friendUserIDs); err != nil {
 		return err
 	}
-
 	return f.cache.DelFriendIDs(append(friendUserIDs, ownerUserID)...).ExecDel(ctx)
 }
 
@@ -318,7 +307,6 @@ func (f *friendDatabase) UpdateRemark(ctx context.Context, ownerUserID, friendUs
 	if err := f.friend.UpdateRemark(ctx, ownerUserID, friendUserID, remark); err != nil {
 		return err
 	}
-
 	return f.cache.DelFriend(ownerUserID, friendUserID).ExecDel(ctx)
 }
 
@@ -371,7 +359,6 @@ func (f *friendDatabase) FindFriendsWithError(
 	if len(friends) != len(friendUserIDs) {
 		err = errs.ErrRecordNotFound.Wrap()
 	}
-
 	return
 }
 

pkg/common/db/controller/group.go

@@ -102,7 +102,6 @@ func NewGroupDatabase(
 		cache:          cache,
 		mongoDB:        superGroup,
 	}
-
 	return database
 }
 
@@ -110,7 +109,6 @@ func InitGroupDatabase(db *gorm.DB, rdb redis.UniversalClient, database *mongo.D
 	rcOptions := rockscache.NewDefaultOptions()
 	rcOptions.StrongConsistency = true
 	rcOptions.RandomExpireAdjustment = 0.2
-
 	return NewGroupDatabase(
 		relation.NewGroupDB(db),
 		relation.NewGroupMemberDB(db),
@@ -153,7 +151,6 @@ func (g *groupDatabase) FindGroupMemberNum(ctx context.Context, groupID string)
 	if err != nil {
 		return 0, err
 	}
-
 	return uint32(num), nil
 }
 
@@ -187,12 +184,10 @@ func (g *groupDatabase) CreateGroup(
 			cache = cache.DelJoinedGroupID(groupMember.UserID).DelGroupMembersInfo(groupMember.GroupID, groupMember.UserID)
 		}
 		cache = cache.DelGroupsInfo(createGroupIDs...)
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -216,7 +211,6 @@ func (g *groupDatabase) UpdateGroup(ctx context.Context, groupID string, data ma
 	if err := g.groupDB.UpdateMap(ctx, groupID, data); err != nil {
 		return err
 	}
-
 	return g.cache.DelGroupsInfo(groupID).ExecDel(ctx)
 }
 
@@ -237,12 +231,10 @@ func (g *groupDatabase) DismissGroup(ctx context.Context, groupID string, delete
 			cache = cache.DelJoinedGroupID(userIDs...).DelGroupMemberIDs(groupID).DelGroupsMemberNum(groupID).DelGroupMembersHash(groupID)
 		}
 		cache = cache.DelGroupsInfo(groupID)
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -284,7 +276,6 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
 			}
 			res = append(res, v)
 		}
-
 		return res, nil
 	}
 	if len(roleLevels) == 0 {
@@ -295,10 +286,8 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
 			}
 			totalGroupMembers = append(totalGroupMembers, groupMembers...)
 		}
-
 		return totalGroupMembers, nil
 	}
-
 	return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels)
 }
 
@@ -318,7 +307,6 @@ func (g *groupDatabase) PageGetJoinGroup(
 		}
 		totalGroupMembers = append(totalGroupMembers, groupMembers...)
 	}
-
 	return uint32(len(groupIDs)), totalGroupMembers, nil
 }
 
@@ -339,7 +327,6 @@ func (g *groupDatabase) PageGetGroupMember(
 	if err != nil {
 		return 0, nil, err
 	}
-
 	return uint32(len(groupMemberIDs)), members, nil
 }
 
@@ -391,7 +378,6 @@ func (g *groupDatabase) HandlerGroupRequest(
 				return err
 			}
 		}
-
 		return nil
 	})
 }
@@ -400,7 +386,6 @@ func (g *groupDatabase) DeleteGroupMember(ctx context.Context, groupID string, u
 	if err := g.groupMemberDB.Delete(ctx, groupID, userIDs); err != nil {
 		return err
 	}
-
 	return g.cache.DelGroupMembersHash(groupID).
 		DelGroupMemberIDs(groupID).
 		DelGroupsMemberNum(groupID).
@@ -425,7 +410,6 @@ func (g *groupDatabase) MapGroupMemberNum(ctx context.Context, groupIDs []string
 		}
 		m[groupID] = uint32(num)
 	}
-
 	return m, nil
 }
 
@@ -445,7 +429,6 @@ func (g *groupDatabase) TransferGroupOwner(ctx context.Context, groupID string,
 		if rowsAffected != 1 {
 			return utils.Wrap(fmt.Errorf("newOwnerUserID %s rowsAffected = %d", newOwnerUserID, rowsAffected), "")
 		}
-
 		return g.cache.DelGroupMembersInfo(groupID, oldOwnerUserID, newOwnerUserID).DelGroupMembersHash(groupID).ExecDel(ctx)
 	})
 }
@@ -459,7 +442,6 @@ func (g *groupDatabase) UpdateGroupMember(
 	if err := g.groupMemberDB.Update(ctx, groupID, userID, data); err != nil {
 		return err
 	}
-
 	return g.cache.DelGroupMembersInfo(groupID, userID).ExecDel(ctx)
 }
 
@@ -472,12 +454,10 @@ func (g *groupDatabase) UpdateGroupMembers(ctx context.Context, data []*relation
 			}
 			cache = cache.DelGroupMembersInfo(item.GroupID, item.UserID)
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -489,7 +469,6 @@ func (g *groupDatabase) CreateGroupRequest(ctx context.Context, requests []*rela
 				return err
 			}
 		}
-
 		return db.Create(ctx, requests)
 	})
 }
@@ -525,7 +504,6 @@ func (g *groupDatabase) CreateSuperGroup(ctx context.Context, groupID string, in
 	if err := g.mongoDB.CreateSuperGroup(ctx, groupID, initMemberIDs); err != nil {
 		return err
 	}
-
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(initMemberIDs...).ExecDel(ctx)
 }
 
@@ -543,12 +521,10 @@ func (g *groupDatabase) DeleteSuperGroup(ctx context.Context, groupID string) er
 		if len(models) > 0 {
 			cache = cache.DelJoinedSuperGroupIDs(models[0].MemberIDs...)
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
 	return cache.ExecDel(ctx)
 }
 
@@ -556,7 +532,6 @@ func (g *groupDatabase) DeleteSuperGroupMember(ctx context.Context, groupID stri
 	if err := g.mongoDB.RemoverUserFromSuperGroup(ctx, groupID, userIDs); err != nil {
 		return err
 	}
-
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(userIDs...).ExecDel(ctx)
 }
 
@@ -564,7 +539,6 @@ func (g *groupDatabase) CreateSuperGroupMember(ctx context.Context, groupID stri
 	if err := g.mongoDB.AddUserToSuperGroup(ctx, groupID, userIDs); err != nil {
 		return err
 	}
-
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(userIDs...).ExecDel(ctx)
 }
 

pkg/common/db/controller/msg.go

@@ -135,7 +135,6 @@ func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database)
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(database)
 	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel)
-
 	return CommonMsgDatabase
 }
 
@@ -151,17 +150,14 @@ type commonMsgDatabase struct {
 
 func (db *commonMsgDatabase) MsgToMQ(ctx context.Context, key string, msg2mq *sdkws.MsgData) error {
 	_, _, err := db.producer.SendMessage(ctx, key, msg2mq)
-
 	return err
 }
 
 func (db *commonMsgDatabase) MsgToModifyMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData) error {
 	if len(messages) > 0 {
 		_, _, err := db.producerToModify.SendMessage(ctx, key, &pbmsg.MsgDataToModifyByMQ{ConversationID: conversationID, Messages: messages})
-
 		return err
 	}
-
 	return nil
 }
 
@@ -169,26 +165,26 @@ func (db *commonMsgDatabase) MsgToPushMQ(ctx context.Context, key, conversationI
 	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
 	}
-
 	return partition, offset, nil
 }
 
 func (db *commonMsgDatabase) MsgToMongoMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData, lastSeq int64) error {
 	if len(messages) > 0 {
 		_, _, err := db.producerToMongo.SendMessage(ctx, key, &pbmsg.MsgDataToMongoByMQ{LastSeq: lastSeq, ConversationID: conversationID, MsgData: messages})
-
 		return err
 	}
-
 	return nil
 }
 
-func checkTypeForBatchInsertBlock(fields []any, key int8, firstSeq int64) error {
+func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, firstSeq int64) error {
+	if len(fields) == 0 {
+		return nil
+	}
+	num := db.msg.GetSingleGocMsgNum()
 	// num = 100
-	for i, field := range fields { // check type
+	for i, field := range fields { // 检查类型
 		var ok bool
 		switch key {
 		case updateKeyMsg:
@@ -206,106 +202,80 @@ func checkTypeForBatchInsertBlock(fields []any, key int8, firstSeq int64) error
 			return errs.ErrInternalServer.Wrap("field type is invalid")
 		}
 	}
-
+	// 返回值为true表示数据库存在该文档，false表示数据库不存在该文档
-	return nil
+	updateMsgModel := func(seq int64, i int) (bool, error) {
-}
+		var (
-
+			res *mongo.UpdateResult
-func (db *commonMsgDatabase) updateMsgModelForBatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, seq int64, i int) (bool, error) {
+			err error
-	var (
+		)
-		res *mongo.UpdateResult
+		docID := db.msg.GetDocID(conversationID, seq)
-		err error
+		index := db.msg.GetMsgIndex(seq)
-	)
+		field := fields[i]
-	docID := db.msg.GetDocID(conversationID, seq)
-	index := db.msg.GetMsgIndex(seq)
-	field := fields[i]
-	switch key {
-	case updateKeyMsg:
-		res, err = db.msgDocDatabase.UpdateMsg(ctx, docID, index, "msg", field)
-	case updateKeyRevoke:
-		res, err = db.msgDocDatabase.UpdateMsg(ctx, docID, index, "revoke", field)
-	}
-	if err != nil {
-		return false, err
-	}
-
-	return res.MatchedCount > 0, nil
-}
-
-func (db *commonMsgDatabase) newDocForBatchInsertBlock(conversationID string, fields []any, key int8, seq, firstSeq, num int64, i int) (unrelationtb.MsgDocModel, int) {
-	doc := unrelationtb.MsgDocModel{
-		DocID: db.msg.GetDocID(conversationID, seq),
-		Msg:   make([]*unrelationtb.MsgInfoModel, num),
-	}
-	var insert int // number of inserted
-	for j := i; j < len(fields); j++ {
-		seq = firstSeq + int64(j)
-		if db.msg.GetDocID(conversationID, seq) != doc.DocID {
-			break
-		}
-		insert++
 		switch key {
 		case updateKeyMsg:
-			doc.Msg[db.msg.GetMsgIndex(seq)] = &unrelationtb.MsgInfoModel{
+			res, err = db.msgDocDatabase.UpdateMsg(ctx, docID, index, "msg", field)
-				Msg: fields[j].(*unrelationtb.MsgDataModel),
-			}
 		case updateKeyRevoke:
-			doc.Msg[db.msg.GetMsgIndex(seq)] = &unrelationtb.MsgInfoModel{
+			res, err = db.msgDocDatabase.UpdateMsg(ctx, docID, index, "revoke", field)
-				Revoke: fields[j].(*unrelationtb.RevokeModel),
-			}
 		}
-	}
+		if err != nil {
-	for i, model := range doc.Msg {
+			return false, err
-		if model == nil {
-			model = &unrelationtb.MsgInfoModel{}
-			doc.Msg[i] = model
 		}
-		if model.DelList == nil {
+		return res.MatchedCount > 0, nil
-			doc.Msg[i].DelList = []string{}
-		}
-	}
-
-	return doc, insert
-}
-
-func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, firstSeq int64) error {
-	if len(fields) == 0 {
-		return nil
-	}
-	num := db.msg.GetSingleGocMsgNum()
-	// num = 100
-	err := checkTypeForBatchInsertBlock(fields, key, firstSeq)
-	if err != nil {
-		return err
 	}
 	tryUpdate := true
 	for i := 0; i < len(fields); i++ {
-		seq := firstSeq + int64(i) // current seq
+		seq := firstSeq + int64(i) // 当前seq
-		// try update
 		if tryUpdate {
-			matched, err := db.updateMsgModelForBatchInsertBlock(ctx, conversationID, fields, key, seq, i)
+			matched, err := updateMsgModel(seq, i)
 			if err != nil {
 				return err
 			}
 			if matched {
-				continue // if matched,skip
+				continue // 匹配到了，继续下一个(不一定修改)
+			}
+		}
+		doc := unrelationtb.MsgDocModel{
+			DocID: db.msg.GetDocID(conversationID, seq),
+			Msg:   make([]*unrelationtb.MsgInfoModel, num),
+		}
+		var insert int // 插入的数量
+		for j := i; j < len(fields); j++ {
+			seq = firstSeq + int64(j)
+			if db.msg.GetDocID(conversationID, seq) != doc.DocID {
+				break
+			}
+			insert++
+			switch key {
+			case updateKeyMsg:
+				doc.Msg[db.msg.GetMsgIndex(seq)] = &unrelationtb.MsgInfoModel{
+					Msg: fields[j].(*unrelationtb.MsgDataModel),
+				}
+			case updateKeyRevoke:
+				doc.Msg[db.msg.GetMsgIndex(seq)] = &unrelationtb.MsgInfoModel{
+					Revoke: fields[j].(*unrelationtb.RevokeModel),
+				}
+			}
+		}
+		for i, model := range doc.Msg {
+			if model == nil {
+				model = &unrelationtb.MsgInfoModel{}
+				doc.Msg[i] = model
+			}
+			if model.DelList == nil {
+				doc.Msg[i].DelList = []string{}
 			}
 		}
-		doc, insert := db.newDocForBatchInsertBlock(conversationID, fields, key, seq, firstSeq, num, i)
-		// insert doc into db
 		if err := db.msgDocDatabase.Create(ctx, &doc); err != nil {
 			if mongo.IsDuplicateKeyError(err) {
-				i--              // exists concurrent,
+				i--              // 存在并发,重试当前数据
-				tryUpdate = true // try update
+				tryUpdate = true // 以修改模式
-
 				continue
 			}
-
 			return err
 		}
-		tryUpdate = false // if insert success,change to insert mode
+		tryUpdate = false // 当前以插入成功,下一块优先插入模式
-		i += insert - 1   // skip inserted data
+		i += insert - 1   // 跳过已插入的数据
 	}
-
 	return nil
 }
 
@@ -352,7 +322,6 @@ func (db *commonMsgDatabase) BatchInsertChat2DB(ctx context.Context, conversatio
 			Ex:               msg.Ex,
 		}
 	}
-
 	return db.BatchInsertBlock(ctx, conversationID, msgs, updateKeyMsg, msgList[0].Seq)
 }
 
@@ -369,11 +338,9 @@ func (db *commonMsgDatabase) MarkSingleChatMsgsAsRead(ctx context.Context, userI
 		log.ZDebug(ctx, "MarkSingleChatMsgsAsRead", "userID", userID, "docID", docID, "indexes", indexes)
 		if err := db.msgDocDatabase.MarkSingleChatMsgsAsRead(ctx, userID, docID, indexes); err != nil {
 			log.ZError(ctx, "MarkSingleChatMsgsAsRead", err, "userID", userID, "docID", docID, "indexes", indexes)
-
 			return err
 		}
 	}
-
 	return nil
 }
 
@@ -387,9 +354,8 @@ func (db *commonMsgDatabase) DelUserDeleteMsgsList(ctx context.Context, conversa
 
 func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (seq int64, isNew bool, err error) {
 	currentMaxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		prome.Inc(prome.SeqGetFailedCounter)
-
 		return 0, false, err
 	}
 	prome.Inc(prome.SeqGetSuccessCounter)
@@ -400,7 +366,7 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversa
 	if lenList < 1 {
 		return 0, false, errors.New("too short as 0")
 	}
-	if errors.Is(err, redis.Nil) {
+	if errs.Unwrap(err) == redis.Nil {
 		isNew = true
 	}
 	lastMaxSeq := currentMaxSeq
@@ -430,7 +396,6 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversa
 	} else {
 		prome.Inc(prome.SeqSetSuccessCounter)
 	}
-
 	return lastMaxSeq, isNew, utils.Wrap(err, "")
 }
 
@@ -445,7 +410,6 @@ func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversat
 			totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
 		}
 	}
-
 	return totalMsgs, nil
 }
 
@@ -456,7 +420,6 @@ func (db *commonMsgDatabase) findMsgInfoBySeq(ctx context.Context, userID, docID
 			msg.Msg.IsRead = true
 		}
 	}
-
 	return msgs, err
 }
 
@@ -475,76 +438,16 @@ func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID strin
 			seqMsgs = append(seqMsgs, convert.MsgDB2Pb(msg.Msg))
 		}
 	}
-
 	return seqMsgs, nil
 }
 
-func (db *commonMsgDatabase) getCacheMsgForGetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin int64, seqs []int64) ([]*sdkws.MsgData, []int64, error) {
-	newBegin := seqs[0]
-	newEnd := seqs[len(seqs)-1]
-	log.ZDebug(ctx, "GetMsgBySeqsRange", "first seqs", seqs, "newBegin", newBegin, "newEnd", newEnd)
-	cachedMsgs, failedSeqs, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
-	if err != nil {
-		if !errors.Is(err, redis.Nil) {
-			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
-			log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", seqs)
-		}
-	}
-	var successMsgs []*sdkws.MsgData
-	if len(cachedMsgs) == 0 {
-		return successMsgs, failedSeqs, err
-	}
-	// if len(cachedMsgs) > 0
-	delSeqs, err2 := db.cache.GetUserDelList(ctx, userID, conversationID)
-	if err2 != nil && !errors.Is(err2, redis.Nil) {
-		return nil, nil, err2
-	}
-	var cacheDelNum int
-	for _, msg := range cachedMsgs {
-		if !utils.Contain(msg.Seq, delSeqs...) {
-			successMsgs = append(successMsgs, msg)
-		} else {
-			cacheDelNum += 1
-		}
-	}
-	log.ZDebug(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)
-		if newSeq >= begin {
-			if !utils.Contain(newSeq, delSeqs...) {
-				log.ZDebug(ctx, "seq del in cache, a new seq in range append", "new seq", newSeq)
-				reGetSeqsCache = append(reGetSeqsCache, newSeq)
-				i++
-			}
-		} else {
-			break
-		}
-	}
-	if len(reGetSeqsCache) > 0 {
-		log.ZDebug(ctx, "reGetSeqsCache", "reGetSeqsCache", reGetSeqsCache)
-		cachedMsgs, failedSeqs2, err2 := db.cache.GetMessagesBySeq(ctx, conversationID, reGetSeqsCache)
-		if err2 != nil {
-			if !errors.Is(err2, redis.Nil) {
-				prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs2))
-				log.ZError(ctx, "get message from redis exception", err2, "conversationID", conversationID, "seqs", reGetSeqsCache)
-			}
-		}
-		failedSeqs = append(failedSeqs, failedSeqs2...)
-		successMsgs = append(successMsgs, cachedMsgs...)
-	}
-
-	return successMsgs, failedSeqs, err
-}
-
 func (db *commonMsgDatabase) GetMsgBySeqsRange(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 && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
 	minSeq, err := db.cache.GetMinSeq(ctx, conversationID)
-	if err != nil && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
 	if userMinSeq > minSeq {
@@ -552,25 +455,18 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	}
 	if minSeq > end {
 		log.ZInfo(ctx, "minSeq > end", "minSeq", minSeq, "end", end)
-
 		return 0, 0, nil, nil
 	}
 	maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
-
-	// log out debug info
 	log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq)
-
-	// adjust maxSeq according to userMaxSeq
 	if userMaxSeq != 0 {
 		if userMaxSeq < maxSeq {
 			maxSeq = userMaxSeq
 		}
 	}
-
-	// adjust begin and end according to minSeq and maxSeq
 	if begin < minSeq {
 		begin = minSeq
 	}
@@ -580,8 +476,6 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	if end < begin {
 		return 0, 0, nil, errs.ErrArgs.Wrap("seq end < begin")
 	}
-
-	// get seqs to search
 	var seqs []int64
 	for i := end; i > end-num; i-- {
 		if i >= begin {
@@ -593,24 +487,67 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	if len(seqs) == 0 {
 		return 0, 0, nil, nil
 	}
-
+	newBegin := seqs[0]
-	// get info from cache,and filter deleted msg
+	newEnd := seqs[len(seqs)-1]
-	successMsgs, failedSeqs, err := db.getCacheMsgForGetMsgBySeqsRange(ctx, userID, conversationID, begin, seqs)
+	log.ZDebug(ctx, "GetMsgBySeqsRange", "first seqs", seqs, "newBegin", newBegin, "newEnd", newEnd)
+	cachedMsgs, failedSeqs, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
 	if err != nil {
-		return 0, 0, nil, err
+		if err != redis.Nil {
+			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
+			log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", seqs)
+		}
+	}
+	var successMsgs []*sdkws.MsgData
+	if len(cachedMsgs) > 0 {
+		delSeqs, err := db.cache.GetUserDelList(ctx, userID, conversationID)
+		if err != nil && errs.Unwrap(err) != redis.Nil {
+			return 0, 0, nil, err
+		}
+		var cacheDelNum int
+		for _, msg := range cachedMsgs {
+			if !utils.Contain(msg.Seq, delSeqs...) {
+				successMsgs = append(successMsgs, msg)
+			} else {
+				cacheDelNum += 1
+			}
+		}
+		log.ZDebug(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)
+			if newSeq >= begin {
+				if !utils.Contain(newSeq, delSeqs...) {
+					log.ZDebug(ctx, "seq del in cache, a new seq in range append", "new seq", newSeq)
+					reGetSeqsCache = append(reGetSeqsCache, newSeq)
+					i++
+				}
+			} else {
+				break
+			}
+		}
+		if len(reGetSeqsCache) > 0 {
+			log.ZDebug(ctx, "reGetSeqsCache", "reGetSeqsCache", reGetSeqsCache)
+			cachedMsgs, failedSeqs2, err := db.cache.GetMessagesBySeq(ctx, conversationID, reGetSeqsCache)
+			if err != nil {
+				if err != redis.Nil {
+					prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs2))
+					log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", reGetSeqsCache)
+				}
+			}
+			failedSeqs = append(failedSeqs, failedSeqs2...)
+			successMsgs = append(successMsgs, cachedMsgs...)
+		}
 	}
-	// log out debug info
 	log.ZDebug(ctx, "get msgs from cache", "successMsgs", successMsgs)
 	if len(failedSeqs) != 0 {
 		log.ZDebug(ctx, "msgs not exist in redis", "seqs", failedSeqs)
 	}
-	// if not found in cache,find in mongo
+	// get from cache or db
 	prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))
 	if len(failedSeqs) > 0 {
 		mongoMsgs, err := db.getMsgBySeqsRange(ctx, userID, conversationID, failedSeqs, begin, end)
 		if err != nil {
 			prome.Add(prome.MsgPullFromMongoFailedCounter, len(failedSeqs))
-
 			return 0, 0, nil, err
 		}
 		prome.Add(prome.MsgPullFromMongoSuccessCounter, len(mongoMsgs))
@@ -622,15 +559,15 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 
 func (db *commonMsgDatabase) GetMsgBySeqs(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 && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
 	minSeq, err := db.cache.GetMinSeq(ctx, conversationID)
-	if err != nil && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
 	maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && !errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		return 0, 0, nil, err
 	}
 	if userMinSeq < minSeq {
@@ -644,7 +581,7 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 	}
 	successMsgs, failedSeqs, err := db.cache.GetMessagesBySeq(ctx, conversationID, newSeqs)
 	if err != nil {
-		if !errors.Is(err, redis.Nil) {
+		if err != redis.Nil {
 			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
 			log.ZError(ctx, "get message from redis exception", err, "failedSeqs", failedSeqs, "conversationID", conversationID)
 		}
@@ -670,13 +607,11 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 		mongoMsgs, err := db.getMsgBySeqs(ctx, userID, conversationID, failedSeqs)
 		if err != nil {
 			prome.Add(prome.MsgPullFromMongoFailedCounter, len(failedSeqs))
-
 			return 0, 0, nil, err
 		}
 		prome.Add(prome.MsgPullFromMongoSuccessCounter, len(mongoMsgs))
 		successMsgs = append(successMsgs, mongoMsgs...)
 	}
-
 	return minSeq, maxSeq, successMsgs, nil
 }
 
@@ -697,81 +632,61 @@ func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(ctx context.Cont
 			log.ZWarn(ctx, "CleanUpOneUserAllMsg", err, "conversationID", conversationID)
 		}
 	}
-
 	return db.cache.SetMinSeq(ctx, conversationID, minSeq)
 }
 
-func processMsgDocModel(
+func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error) {
-	ctx context.Context,
-	msgDocModel *unrelationtb.MsgDocModel,
-	userID, conversationID string,
-	index int64,
-	destructTime int64,
-	lastMsgDestructTime time.Time,
-) (seqs []int64, over bool) {
-	if len(msgDocModel.Msg) > 0 {
-		i := 0
-		for _, msg := range msgDocModel.Msg {
-			i++
-			if msg != nil && msg.Msg != nil && msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
-				if msg.Msg.SendTime+destructTime*1000 > lastMsgDestructTime.UnixMilli() && !utils.Contain(userID, msg.DelList...) {
-					seqs = append(seqs, msg.Msg.Seq)
-				}
-			} else {
-				log.ZDebug(ctx, "all msg need destruct is found", "conversationID", conversationID, "userID", userID, "index", index, "stop index", i)
-				over = true
-
-				return seqs, over
-			}
-		}
-	}
-
-	return seqs, over
-}
-
-func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error) {
 	var index int64
-
-	// refresh msg list
 	for {
-		// from oldest to newest
+		// from oldest 2 newest
-		msgDocModel, err2 := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
+		msgDocModel, err := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
-		if err2 != nil || msgDocModel.DocID == "" {
+		if err != nil || msgDocModel.DocID == "" {
-			if err2 != nil {
+			if err != nil {
-				if errors.Is(err2, unrelation.ErrMsgListNotExist) {
+				if err == unrelation.ErrMsgListNotExist {
 					log.ZDebug(ctx, "not doc find", "conversationID", conversationID, "userID", userID, "index", index)
 				} else {
-					log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err2, "conversationID", conversationID, "index", index)
+					log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
 				}
 			}
-			// If there is an error or no message document is found, delete the message physically and return the sequence number, then end the recursion.
+			// 获取报错，或者获取不到了，物理删除并且返回seq delMongoMsgsPhysical(delStruct.delDocIDList), 结束递归
 			break
 		}
 		index++
 		//&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli()
-		curSeqs, over := processMsgDocModel(ctx, msgDocModel, userID, conversationID, index, destructTime, lastMsgDestructTime)
+		if len(msgDocModel.Msg) > 0 {
-		seqs = append(seqs, curSeqs...)
+			i := 0
-		if over {
+			var over bool
-			break
+			for _, msg := range msgDocModel.Msg {
-		}
+				i++
-	}
+				if msg != nil && msg.Msg != nil && msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
-	// Log the result of the function call.
+					if msg.Msg.SendTime+destructTime*1000 > lastMsgDestructTime.UnixMilli() && !utils.Contain(userID, msg.DelList...) {
-	log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversationID, "userID", userID, "seqs", seqs)
+						seqs = append(seqs, msg.Msg.Seq)
-	if len(seqs) == 0 {
+					}
-		return seqs, nil
+				} else {
-	}
+					log.ZDebug(ctx, "all msg need destruct is found", "conversationID", conversationID, "userID", userID, "index", index, "stop index", i)
-	// if len(seqs) > 0
+					over = true
-	userMinSeq := seqs[len(seqs)-1] + 1
+					break
-	currentUserMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
+				}
-	if err != nil && !errors.Is(err, redis.Nil) {
+			}
-		return nil, err
+			if over {
-	}
+				break
-	if currentUserMinSeq < userMinSeq {
+			}
-		if err := db.cache.SetConversationUserMinSeq(ctx, conversationID, userID, userMinSeq); err != nil {
-			return nil, err
 		}
 	}
 
+	log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversationID, "userID", userID, "seqs", seqs)
+	if len(seqs) > 0 {
+		userMinSeq := seqs[len(seqs)-1] + 1
+		currentUserMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
+		if err != nil && errs.Unwrap(err) != redis.Nil {
+			return nil, err
+		}
+		if currentUserMinSeq < userMinSeq {
+			if err := db.cache.SetConversationUserMinSeq(ctx, conversationID, userID, userMinSeq); err != nil {
+				return nil, err
+			}
+		}
+	}
 	return seqs, nil
 }
 
@@ -794,65 +709,45 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio
 	msgDocModel, err := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
 	if err != nil || msgDocModel.DocID == "" {
 		if err != nil {
-			if errors.Is(err, unrelation.ErrMsgListNotExist) {
+			if err == unrelation.ErrMsgListNotExist {
 				log.ZDebug(ctx, "deleteMsgRecursion ErrMsgListNotExist", "conversationID", conversationID, "index:", index)
 			} else {
 				log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
 			}
 		}
-		// get error or miss content, delete physically and return minSeq,delMongoMsgsPhysical(delStruct.delDocIDList), end recursion
+		// 获取报错，或者获取不到了，物理删除并且返回seq delMongoMsgsPhysical(delStruct.delDocIDList), 结束递归
 		err = db.msgDocDatabase.DeleteDocs(ctx, delStruct.delDocIDs)
 		if err != nil {
 			return 0, err
 		}
-
 		return delStruct.getSetMinSeq() + 1, nil
 	}
-
 	log.ZDebug(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)
 	}
-	fullAndExpired := msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill()
+	if msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() {
-	if fullAndExpired {
+		log.ZDebug(ctx, "doc is full and all msg is expired", "docID", msgDocModel.DocID)
-		handleFullAndExpiredForDeleteMsgRecursion(ctx, msgDocModel, delStruct)
+		delStruct.delDocIDs = append(delStruct.delDocIDs, msgDocModel.DocID)
+		delStruct.minSeq = msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.Seq
 	} else {
-		handleNotFullAndExpiredForDeleteMsgRecursion(ctx, msgDocModel, remainTime, index, conversationID, delStruct, db)
+		var delMsgIndexs []int
-	}
+		for i, MsgInfoModel := range msgDocModel.Msg {
-	seq, err := db.deleteMsgRecursion(ctx, conversationID, index+1, delStruct, remainTime)
+			if MsgInfoModel != nil && MsgInfoModel.Msg != nil {
-
+				if utils.GetCurrentTimestampByMill() > MsgInfoModel.Msg.SendTime+(remainTime*1000) {
-	return seq, err
+					delMsgIndexs = append(delMsgIndexs, i)
-}
+				}
-
-func handleFullAndExpiredForDeleteMsgRecursion(ctx context.Context, msgDocModel *unrelationtb.MsgDocModel, delStruct *delMsgRecursionStruct) {
-	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
-}
-
-func handleNotFullAndExpiredForDeleteMsgRecursion(
-	ctx context.Context,
-	msgDocModel *unrelationtb.MsgDocModel,
-	remainTime, index int64,
-	conversationID string,
-	delStruct *delMsgRecursionStruct,
-	db *commonMsgDatabase,
-) {
-	var delMsgIndexs []int
-	for i, MsgInfoModel := range msgDocModel.Msg {
-		if MsgInfoModel != nil && MsgInfoModel.Msg != nil {
-			if utils.GetCurrentTimestampByMill() > MsgInfoModel.Msg.SendTime+(remainTime*1000) {
-				delMsgIndexs = append(delMsgIndexs, i)
 			}
 		}
-	}
+		if len(delMsgIndexs) > 0 {
-	if len(delMsgIndexs) > 0 {
+			if err := db.msgDocDatabase.DeleteMsgsInOneDocByIndex(ctx, msgDocModel.DocID, delMsgIndexs); err != nil {
-		err2 := db.msgDocDatabase.DeleteMsgsInOneDocByIndex(ctx, msgDocModel.DocID, delMsgIndexs)
+				log.ZError(ctx, "deleteMsgRecursion DeleteMsgsInOneDocByIndex failed", err, "conversationID", conversationID, "index", index)
-		if err2 != nil {
+			}
-			log.ZError(ctx, "deleteMsgRecursion DeleteMsgsInOneDocByIndex failed", err2, "conversationID", conversationID, "index", index)
+			delStruct.minSeq = int64(msgDocModel.Msg[delMsgIndexs[len(delMsgIndexs)-1]].Msg.Seq)
 		}
-		delStruct.minSeq = msgDocModel.Msg[delMsgIndexs[len(delMsgIndexs)-1]].Msg.Seq
 	}
+	seq, err := db.deleteMsgRecursion(ctx, conversationID, index+1, delStruct, remainTime)
+	return seq, err
 }
 
 func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(ctx context.Context, conversationID string, allSeqs []int64) error {
@@ -868,15 +763,13 @@ func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(ctx context.Context, conve
 			return err
 		}
 	}
-
 	return nil
 }
 
 func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) error {
 	cachedMsgs, _, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
-	if err != nil && errors.Is(err, redis.Nil) {
+	if err != nil && errs.Unwrap(err) != redis.Nil {
 		log.ZWarn(ctx, "DeleteUserMsgsBySeqs", err, "conversationID", conversationID, "seqs", seqs)
-
 		return err
 	}
 	if len(cachedMsgs) > 0 {
@@ -896,7 +789,6 @@ func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(ctx context.Context, userID st
 			}
 		}
 	}
-
 	return nil
 }
 
@@ -908,12 +800,11 @@ func (db *commonMsgDatabase) CleanUpUserConversationsMsgs(ctx context.Context, u
 	for _, conversationID := range conversationIDs {
 		maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
 		if err != nil {
-			if errors.Is(err, redis.Nil) {
+			if err == redis.Nil {
 				log.ZInfo(ctx, "max seq is nil", "conversationID", conversationID)
 			} else {
 				log.ZError(ctx, "get max seq failed", err, "conversationID", conversationID)
 			}
-
 			continue
 		}
 		if err := db.cache.SetMinSeq(ctx, conversationID, maxSeq+1); err != nil {
@@ -1007,7 +898,6 @@ func (db *commonMsgDatabase) GetConversationMinMaxSeqInMongoAndCache(ctx context
 	if err != nil {
 		return
 	}
-
 	return
 }
 
@@ -1026,7 +916,6 @@ func (db *commonMsgDatabase) GetMinMaxSeqMongo(ctx context.Context, conversation
 		return
 	}
 	maxSeqMongo = newestMsgMongo.Msg.Seq
-
 	return
 }
 
@@ -1054,7 +943,7 @@ func (db *commonMsgDatabase) RangeGroupSendCount(
 }
 
 func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int32, msgData []*sdkws.MsgData, err error) {
-	totalMsgs := make([]*sdkws.MsgData, 0)
+	var totalMsgs []*sdkws.MsgData
 	total, msgs, err := db.msgDocDatabase.SearchMessage(ctx, req)
 	if err != nil {
 		return 0, nil, err
@@ -1065,7 +954,6 @@ func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.Searc
 		}
 		totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
 	}
-
 	return total, totalMsgs, nil
 }
 

pkg/common/db/controller/msg_test.go

@@ -162,7 +162,6 @@ func GetDB() *commonMsgDatabase {
 	if err != nil {
 		panic(err)
 	}
-
 	return &commonMsgDatabase{
 		msgDocDatabase: unrelation.NewMsgMongoDriver(mongo.GetDatabase()),
 	}

pkg/common/db/controller/s3.go

@@ -89,6 +89,5 @@ func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Dur
 	if err != nil {
 		return time.Time{}, "", err
 	}
-
 	return expireTime, rawURL, nil
 }

pkg/common/db/controller/user.go

@@ -90,7 +90,6 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel
 	if len(miss) > 0 {
 		_ = u.userDB.Create(ctx, miss)
 	}
-
 	return nil
 }
 
@@ -103,35 +102,30 @@ func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (use
 	if len(users) != len(userIDs) {
 		err = errs.ErrRecordNotFound.Wrap("userID not found")
 	}
-
 	return
 }
 
 // Find Get the information of the specified user. If the userID is not found, no error will be returned.
 func (u *userDatabase) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
-
 	return
 }
 
 // Create Insert multiple external guarantees that the userID is not repeated and does not exist in the db.
 func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel) (err error) {
-	err = u.tx.Transaction(func(tx any) error {
+	if err := u.tx.Transaction(func(tx any) error {
 		err = u.userDB.Create(ctx, users)
 		if err != nil {
 			return err
 		}
-
 		return nil
-	})
+	}); err != nil {
-	if err != nil {
 		return err
 	}
-	userIDs := make([]string, 0, len(users))
+	var userIDs []string
 	for _, user := range users {
 		userIDs = append(userIDs, user.UserID)
 	}
-
 	return u.cache.DelUsersInfo(userIDs...).ExecDel(ctx)
 }
 
@@ -140,7 +134,6 @@ func (u *userDatabase) Update(ctx context.Context, user *relation.UserModel) (er
 	if err := u.userDB.Update(ctx, user); err != nil {
 		return err
 	}
-
 	return u.cache.DelUsersInfo(user.UserID).ExecDel(ctx)
 }
 
@@ -149,7 +142,6 @@ func (u *userDatabase) UpdateByMap(ctx context.Context, userID string, args map[
 	if err := u.userDB.UpdateByMap(ctx, userID, args); err != nil {
 		return err
 	}
-
 	return u.cache.DelUsersInfo(userID).ExecDel(ctx)
 }
 
@@ -170,7 +162,6 @@ func (u *userDatabase) IsExist(ctx context.Context, userIDs []string) (exist boo
 	if len(users) > 0 {
 		return true, nil
 	}
-
 	return false, nil
 }
 
@@ -192,14 +183,12 @@ func (u *userDatabase) CountRangeEverydayTotal(ctx context.Context, start time.T
 // SubscribeUsersStatus Subscribe or unsubscribe a user's presence status.
 func (u *userDatabase) SubscribeUsersStatus(ctx context.Context, userID string, userIDs []string) error {
 	err := u.mongoDB.AddSubscriptionList(ctx, userID, userIDs)
-
 	return err
 }
 
 // UnsubscribeUsersStatus unsubscribe a user's presence status.
 func (u *userDatabase) UnsubscribeUsersStatus(ctx context.Context, userID string, userIDs []string) error {
 	err := u.mongoDB.UnsubscriptionList(ctx, userID, userIDs)
-
 	return err
 }
 
@@ -209,7 +198,6 @@ func (u *userDatabase) GetAllSubscribeList(ctx context.Context, userID string) (
 	if err != nil {
 		return nil, err
 	}
-
 	return list, nil
 }
 
@@ -219,14 +207,12 @@ func (u *userDatabase) GetSubscribedList(ctx context.Context, userID string) ([]
 	if err != nil {
 		return nil, err
 	}
-
 	return list, nil
 }
 
 // GetUserStatus get user status.
 func (u *userDatabase) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
 	onlineStatusList, err := u.cache.GetUserStatus(ctx, userIDs)
-
 	return onlineStatusList, err
 }
 

pkg/common/db/localcache/conversation.go

@@ -50,7 +50,6 @@ func (g *ConversationLocalCache) GetRecvMsgNotNotifyUserIDs(ctx context.Context,
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.UserIDs, nil
 }
 

pkg/common/db/localcache/group.go

@@ -57,7 +57,6 @@ func (g *GroupLocalCache) GetGroupMemberIDs(ctx context.Context, groupID string)
 	localHashInfo, ok := g.cache[groupID]
 	if ok && localHashInfo.memberListHash == resp.GroupAbstractInfos[0].GroupMemberListHash {
 		g.lock.Unlock()
-
 		return localHashInfo.userIDs, nil
 	}
 	g.lock.Unlock()
@@ -75,6 +74,5 @@ func (g *GroupLocalCache) GetGroupMemberIDs(ctx context.Context, groupID string)
 		memberListHash: resp.GroupAbstractInfos[0].GroupMemberListHash,
 		userIDs:        groupMembersResp.UserIDs,
 	}
-
 	return g.cache[groupID].userIDs, nil
 }

pkg/common/db/relation/black_model.go

@@ -63,11 +63,10 @@ func (b *BlackGorm) Find(
 	ctx context.Context,
 	blacks []*relation.BlackModel,
 ) (blackList []*relation.BlackModel, err error) {
-	where := make([][]interface{}, 0, len(blacks))
+	var where [][]interface{}
 	for _, black := range blacks {
 		where = append(where, []interface{}{black.OwnerUserID, black.BlockUserID})
 	}
-
 	return blackList, utils.Wrap(
 		b.db(ctx).Where("(owner_user_id, block_user_id) in ?", where).Find(&blackList).Error,
 		"",
@@ -76,7 +75,6 @@ func (b *BlackGorm) Find(
 
 func (b *BlackGorm) Take(ctx context.Context, ownerUserID, blockUserID string) (black *relation.BlackModel, err error) {
 	black = &relation.BlackModel{}
-
 	return black, utils.Wrap(
 		b.db(ctx).Where("owner_user_id = ? and block_user_id = ?", ownerUserID, blockUserID).Take(black).Error,
 		"",
@@ -98,7 +96,6 @@ func (b *BlackGorm) FindOwnerBlacks(
 		showNumber,
 	)
 	total = int64(totalUint32)
-
 	return
 }
 

pkg/common/db/relation/chat_log_model.go

@@ -15,8 +15,6 @@
 package relation
 
 import (
-
-	//nolint:staticcheck  //tofix: SA1019: "github.com/golang/protobuf/jsonpb" is deprecated: Use the "google.golang.org/protobuf/encoding/protojson" package instead.
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/jinzhu/copier"
 	"google.golang.org/protobuf/proto"
@@ -40,10 +38,7 @@ func NewChatLogGorm(db *gorm.DB) relation.ChatLogModelInterface {
 
 func (c *ChatLogGorm) Create(msg *pbmsg.MsgDataToMQ) error {
 	chatLog := new(relation.ChatLogModel)
-	err := copier.Copy(chatLog, msg.MsgData)
+	copier.Copy(chatLog, msg.MsgData)
-	if err != nil {
-		return err
-	}
 	switch msg.MsgData.SessionType {
 	case constant.GroupChatType, constant.SuperGroupChatType:
 		chatLog.RecvID = msg.MsgData.GroupID
@@ -64,6 +59,5 @@ func (c *ChatLogGorm) Create(msg *pbmsg.MsgDataToMQ) error {
 	}
 	chatLog.CreateTime = utils.UnixMillSecondToTime(msg.MsgData.CreateTime)
 	chatLog.SendTime = utils.UnixMillSecondToTime(msg.MsgData.SendTime)
-
 	return c.DB.Create(chatLog).Error
 }

pkg/common/db/relation/conversation_model.go

@@ -54,7 +54,6 @@ func (c *ConversationGorm) UpdateByMap(
 	args map[string]interface{},
 ) (rows int64, err error) {
 	result := c.db(ctx).Where("owner_user_id IN (?) and  conversation_id=?", userIDList, conversationID).Updates(args)
-
 	return result.RowsAffected, utils.Wrap(result.Error, "")
 }
 
@@ -80,7 +79,6 @@ func (c *ConversationGorm) Find(
 			Error,
 		"",
 	)
-
 	return conversations, err
 }
 
@@ -89,7 +87,6 @@ func (c *ConversationGorm) Take(
 	userID, conversationID string,
 ) (conversation *relation.ConversationModel, err error) {
 	cc := &relation.ConversationModel{}
-
 	return cc, utils.Wrap(
 		c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error,
 		"",
@@ -172,7 +169,6 @@ func (c *ConversationGorm) GetUserRecvMsgOpt(
 	ownerUserID, conversationID string,
 ) (opt int, err error) {
 	var conversation relation.ConversationModel
-
 	return int(
 			conversation.RecvMsgOpt,
 		), utils.Wrap(
@@ -223,7 +219,6 @@ func (c *ConversationGorm) GetConversationIDsNeedDestruct(
 
 func (c *ConversationGorm) GetConversationRecvMsgOpt(ctx context.Context, userID string, conversationID string) (int32, error) {
 	var recvMsgOpt int32
-
 	return recvMsgOpt, errs.Wrap(
 		c.db(ctx).
 			Model(&relation.ConversationModel{}).
@@ -235,7 +230,6 @@ func (c *ConversationGorm) GetConversationRecvMsgOpt(ctx context.Context, userID
 
 func (c *ConversationGorm) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) {
 	var userIDs []string
-
 	return userIDs, errs.Wrap(
 		c.db(ctx).
 			Model(&relation.ConversationModel{}).

pkg/common/db/relation/friend_model.go

@@ -50,7 +50,6 @@ func (f *FriendGorm) Delete(ctx context.Context, ownerUserID string, friendUserI
 			Error,
 		"",
 	)
-
 	return err
 }
 
@@ -85,7 +84,6 @@ func (f *FriendGorm) UpdateRemark(ctx context.Context, ownerUserID, friendUserID
 	}
 	m := make(map[string]interface{}, 1)
 	m["remark"] = ""
-
 	return utils.Wrap(f.db(ctx).Where("owner_user_id = ?", ownerUserID).Updates(m).Error, "")
 }
 
@@ -95,7 +93,6 @@ func (f *FriendGorm) Take(
 	ownerUserID, friendUserID string,
 ) (friend *relation.FriendModel, err error) {
 	friend = &relation.FriendModel{}
-
 	return friend, utils.Wrap(
 		f.db(ctx).Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error,
 		"",
@@ -159,7 +156,6 @@ func (f *FriendGorm) FindOwnerFriends(
 			Error,
 		"",
 	)
-
 	return
 }
 
@@ -182,7 +178,6 @@ func (f *FriendGorm) FindInWhoseFriends(
 			Error,
 		"",
 	)
-
 	return
 }
 

pkg/common/db/relation/friend_request_model.go

@@ -74,7 +74,6 @@ func (f *FriendRequestGorm) Update(ctx context.Context, friendRequest *relation.
 	fr2 := *friendRequest
 	fr2.FromUserID = ""
 	fr2.ToUserID = ""
-
 	return utils.Wrap(
 		f.db(ctx).
 			Where("from_user_id = ? AND to_user_id =?", friendRequest.FromUserID, friendRequest.ToUserID).
@@ -94,7 +93,6 @@ func (f *FriendRequestGorm) Find(
 		f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Find(friendRequest).Error,
 		"",
 	)
-
 	return friendRequest, err
 }
 
@@ -107,7 +105,6 @@ func (f *FriendRequestGorm) Take(
 		f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Take(friendRequest).Error,
 		"",
 	)
-
 	return friendRequest, err
 }
 
@@ -130,7 +127,6 @@ func (f *FriendRequestGorm) FindToUserID(
 			Error,
 		"",
 	)
-
 	return
 }
 
@@ -153,7 +149,6 @@ func (f *FriendRequestGorm) FindFromUserID(
 			Error,
 		"",
 	)
-
 	return
 }
 
@@ -165,6 +160,5 @@ func (f *FriendRequestGorm) FindBothFriendRequests(ctx context.Context, fromUser
 			Error,
 		"",
 	)
-
 	return
 }

pkg/common/db/relation/group_member_model.go

@@ -68,7 +68,6 @@ func (g *GroupMemberGorm) UpdateRoleLevel(
 	db := g.db(ctx).Where("group_id = ? and user_id = ?", groupID, userID).Updates(map[string]any{
 		"role_level": roleLevel,
 	})
-
 	return db.RowsAffected, utils.Wrap(db.Error, "")
 }
 
@@ -88,7 +87,6 @@ func (g *GroupMemberGorm) Find(
 	if len(roleLevels) > 0 {
 		db = db.Where("role_level in (?)", roleLevels)
 	}
-
 	return groupMembers, utils.Wrap(db.Find(&groupMembers).Error, "")
 }
 
@@ -98,7 +96,6 @@ func (g *GroupMemberGorm) Take(
 	userID string,
 ) (groupMember *relation.GroupMemberModel, err error) {
 	groupMember = &relation.GroupMemberModel{}
-
 	return groupMember, utils.Wrap(
 		g.db(ctx).Where("group_id = ? and user_id = ?", groupID, userID).Take(groupMember).Error,
 		"",
@@ -110,7 +107,6 @@ func (g *GroupMemberGorm) TakeOwner(
 	groupID string,
 ) (groupMember *relation.GroupMemberModel, err error) {
 	groupMember = &relation.GroupMemberModel{}
-
 	return groupMember, utils.Wrap(
 		g.db(ctx).Where("group_id = ? and role_level = ?", groupID, constant.GroupOwner).Take(groupMember).Error,
 		"",
@@ -129,7 +125,6 @@ func (g *GroupMemberGorm) SearchMember(
 	ormutil.GormIn(&db, "group_id", groupIDs)
 	ormutil.GormIn(&db, "user_id", userIDs)
 	ormutil.GormIn(&db, "role_level", roleLevels)
-
 	return ormutil.GormSearch[relation.GroupMemberModel](db, []string{"nickname"}, keyword, pageNumber, showNumber)
 }
 
@@ -157,7 +152,6 @@ func (g *GroupMemberGorm) FindJoinUserID(
 			groupUsers[item.GroupID] = append(v, item.UserID)
 		}
 	}
-
 	return groupUsers, nil
 }
 
@@ -188,7 +182,6 @@ func (g *GroupMemberGorm) FindUsersJoinedGroupID(ctx context.Context, userIDs []
 			result[groupMember.UserID] = append(v, groupMember.GroupID)
 		}
 	}
-
 	return result, nil
 }
 

pkg/common/db/relation/group_model.go

@@ -61,14 +61,12 @@ func (g *GroupGorm) Find(ctx context.Context, groupIDs []string) (groups []*rela
 
 func (g *GroupGorm) Take(ctx context.Context, groupID string) (group *relation.GroupModel, err error) {
 	group = &relation.GroupModel{}
-
 	return group, utils.Wrap(g.DB.Where("group_id = ?", groupID).Take(group).Error, "")
 }
 
 func (g *GroupGorm) Search(ctx context.Context, 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)
 }
 
@@ -84,7 +82,6 @@ func (g *GroupGorm) CountTotal(ctx context.Context, before *time.Time) (count in
 	if err := db.Count(&count).Error; err != nil {
 		return 0, err
 	}
-
 	return count, nil
 }
 
@@ -101,7 +98,6 @@ func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time
 	for _, r := range res {
 		v[r.Date.Format("2006-01-02")] = r.Count
 	}
-
 	return v, nil
 }
 

pkg/common/db/relation/group_request_model.go

@@ -80,7 +80,6 @@ func (g *GroupRequestGorm) Take(
 	userID string,
 ) (groupRequest *relation.GroupRequestModel, err error) {
 	groupRequest = &relation.GroupRequestModel{}
-
 	return groupRequest, utils.Wrap(
 		g.DB.WithContext(ctx).Where("group_id = ? and user_id = ? ", groupID, userID).Take(groupRequest).Error,
 		utils.GetSelfFuncName(),
@@ -115,6 +114,5 @@ func (g *GroupRequestGorm) PageGroup(
 
 func (g *GroupRequestGorm) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (total int64, groupRequests []*relation.GroupRequestModel, err error) {
 	err = g.DB.WithContext(ctx).Where("group_id = ? and user_id in ?", groupID, userIDs).Find(&groupRequests).Error
-
 	return int64(len(groupRequests)), groupRequests, utils.Wrap(err, utils.GetSelfFuncName())
 }

pkg/common/db/relation/log_model.go

@@ -25,7 +25,6 @@ func (l *LogGorm) Search(ctx context.Context, keyword string, start time.Time, e
 		db = l.db.WithContext(ctx).Where("create_time <= ?", end)
 	}
 	db = db.Order("create_time desc")
-
 	return ormutil.GormSearch[relationtb.Log](db, []string{"user_id"}, keyword, pageNumber, showNumber)
 }
 
@@ -33,7 +32,6 @@ func (l *LogGorm) Delete(ctx context.Context, logIDs []string, userID string) er
 	if userID == "" {
 		return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Delete(&relationtb.Log{}).Error)
 	}
-
 	return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Delete(&relationtb.Log{}).Error)
 }
 
@@ -42,15 +40,10 @@ func (l *LogGorm) Get(ctx context.Context, logIDs []string, userID string) ([]*r
 	if userID == "" {
 		return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Find(&logs).Error)
 	}
-
 	return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Find(&logs).Error)
 }
 
 func NewLogGorm(db *gorm.DB) relationtb.LogInterface {
-	err := db.AutoMigrate(&relationtb.Log{})
+	db.AutoMigrate(&relationtb.Log{})
-	if err != nil {
-		panic(err)
-	}
-
 	return &LogGorm{db: db}
 }

pkg/common/db/relation/meta_db.go

@@ -34,6 +34,5 @@ func NewMetaDB(db *gorm.DB, table any) *MetaDB {
 
 func (g *MetaDB) db(ctx context.Context) *gorm.DB {
 	db := g.DB.WithContext(ctx).Model(g.table)
-
 	return db
 }

pkg/common/db/relation/mysql_init.go

@@ -15,7 +15,6 @@
 package relation
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -83,7 +82,6 @@ func newMysqlGormDB() (*gorm.DB, error) {
 	sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.Config.Mysql.MaxLifeTime))
 	sqlDB.SetMaxOpenConns(config.Config.Mysql.MaxOpenConn)
 	sqlDB.SetMaxIdleConns(config.Config.Mysql.MaxIdleConn)
-
 	return db, nil
 }
 
@@ -96,13 +94,11 @@ func connectToDatabase(dsn string, maxRetry int) (*gorm.DB, error) {
 		if err == nil {
 			return db, nil
 		}
-		var mysqlErr *mysqldriver.MySQLError
+		if mysqlErr, ok := err.(*mysqldriver.MySQLError); ok && mysqlErr.Number == 1045 {
-		if errors.As(err, &mysqlErr) && mysqlErr.Number == 1045 {
 			return nil, err
 		}
 		time.Sleep(time.Duration(1) * time.Second)
 	}
-
 	return nil, err
 }
 
@@ -110,7 +106,6 @@ func connectToDatabase(dsn string, maxRetry int) (*gorm.DB, error) {
 func NewGormDB() (*gorm.DB, error) {
 	specialerror.AddReplace(gorm.ErrRecordNotFound, errs.ErrRecordNotFound)
 	specialerror.AddErrHandler(replaceDuplicateKey)
-
 	return newMysqlGormDB()
 }
 
@@ -118,15 +113,12 @@ func replaceDuplicateKey(err error) errs.CodeError {
 	if IsMysqlDuplicateKey(err) {
 		return errs.ErrDuplicateKey
 	}
-
 	return nil
 }
 
 func IsMysqlDuplicateKey(err error) bool {
-	var mysqlErr *mysqldriver.MySQLError
+	if mysqlErr, ok := err.(*mysqldriver.MySQLError); ok {
-	if errors.As(err, &mysqlErr) {
 		return mysqlErr.Number == 1062
 	}
-
 	return false
 }

pkg/common/db/relation/object_model.go

@@ -44,12 +44,10 @@ func (o *ObjectInfoGorm) SetObject(ctx context.Context, obj *relation.ObjectMode
 	if err := o.DB.WithContext(ctx).Where("name = ?", obj.Name).FirstOrCreate(obj).Error; err != nil {
 		return errs.Wrap(err)
 	}
-
 	return nil
 }
 
 func (o *ObjectInfoGorm) Take(ctx context.Context, name string) (info *relation.ObjectModel, err error) {
 	info = &relation.ObjectModel{}
-
 	return info, errs.Wrap(o.DB.WithContext(ctx).Where("name = ?", name).Take(info).Error)
 }

pkg/common/db/relation/user_model.go

@@ -53,7 +53,6 @@ func (u *UserGorm) Update(ctx context.Context, user *relation.UserModel) (err er
 // 获取指定用户信息  不存在，也不返回错误.
 func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	err = utils.Wrap(u.db(ctx).Where("user_id in (?)", userIDs).Find(&users).Error, "")
-
 	return users, err
 }
 
@@ -61,7 +60,6 @@ func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relatio
 func (u *UserGorm) Take(ctx context.Context, userID string) (user *relation.UserModel, err error) {
 	user = &relation.UserModel{}
 	err = utils.Wrap(u.db(ctx).Where("user_id = ?", userID).Take(&user).Error, "")
-
 	return user, err
 }
 
@@ -83,7 +81,6 @@ func (u *UserGorm) Page(
 			Error,
 		"",
 	)
-
 	return
 }
 
@@ -91,14 +88,13 @@ func (u *UserGorm) Page(
 func (u *UserGorm) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) {
 	if pageNumber == 0 || showNumber == 0 {
 		return userIDs, errs.Wrap(u.db(ctx).Pluck("user_id", &userIDs).Error)
+	} else {
+		return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)
 	}
-
-	return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)
 }
 
 func (u *UserGorm) GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error) {
 	err = u.db(ctx).Model(&relation.UserModel{}).Where("user_id = ?", userID).Pluck("global_recv_msg_opt", &opt).Error
-
 	return opt, err
 }
 
@@ -110,7 +106,6 @@ func (u *UserGorm) CountTotal(ctx context.Context, before *time.Time) (count int
 	if err := db.Count(&count).Error; err != nil {
 		return 0, err
 	}
-
 	return count, nil
 }
 
@@ -137,6 +132,5 @@ func (u *UserGorm) CountRangeEverydayTotal(
 	for _, r := range res {
 		v[r.Date.Format("2006-01-02")] = r.Count
 	}
-
 	return v, nil
 }

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

@@ -46,7 +46,6 @@ func (c *Controller) HashPath(md5 string) string {
 
 func (c *Controller) NowPath() string {
 	now := time.Now()
-
 	return path.Join(
 		fmt.Sprintf("%04d", now.Year()),
 		fmt.Sprintf("%02d", now.Month()),
@@ -59,7 +58,6 @@ func (c *Controller) NowPath() string {
 
 func (c *Controller) UUID() string {
 	id := uuid.New()
-
 	return hex.EncodeToString(id[:])
 }
 
@@ -94,24 +92,20 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 		partNumber++
 	}
 	if maxParts > 0 && partNumber > 0 && partNumber < maxParts {
-		return nil, fmt.Errorf("too few parts: %d", partNumber)
+		return nil, errors.New(fmt.Sprintf("too many parts: %d", partNumber))
 	}
-	info, err := c.impl.StatObject(ctx, c.HashPath(hash))
+	if info, err := c.impl.StatObject(ctx, c.HashPath(hash)); err == nil {
-	if err == nil {
 		return nil, &HashAlreadyExistsError{Object: info}
-	}
+	} else if !c.impl.IsNotFound(err) {
-	if !c.impl.IsNotFound(err) {
 		return nil, err
 	}
-
 	if size <= partSize {
 		// 预签名上传
 		key := path.Join(tempPath, c.NowPath(), fmt.Sprintf("%s_%d_%s.presigned", hash, size, c.UUID()))
-		rawURL, err2 := c.impl.PresignedPutObject(ctx, key, expire)
+		rawURL, err := c.impl.PresignedPutObject(ctx, key, expire)
-		if err2 != nil {
+		if err != nil {
-			return nil, err2
+			return nil, err
 		}
-
 		return &InitiateUploadResult{
 			UploadID: newMultipartUploadID(multipartUploadID{
 				Type: UploadTypePresigned,
@@ -130,39 +124,38 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 				},
 			},
 		}, nil
-	}
+	} else {
-
+		// 分片上传
-	// 分片上传
+		upload, err := c.impl.InitiateMultipartUpload(ctx, c.HashPath(hash))
-	upload, err := c.impl.InitiateMultipartUpload(ctx, c.HashPath(hash))
-	if err != nil {
-		return nil, err
-	}
-	if maxParts < 0 {
-		maxParts = partNumber
-	}
-	var authSign *s3.AuthSignResult
-	if maxParts > 0 {
-		partNumbers := make([]int, partNumber)
-		for i := 0; i < maxParts; i++ {
-			partNumbers[i] = i + 1
-		}
-		authSign, err = c.impl.AuthSign(ctx, upload.UploadID, upload.Key, time.Hour*24, partNumbers)
 		if err != nil {
 			return nil, err
 		}
+		if maxParts < 0 {
+			maxParts = partNumber
+		}
+		var authSign *s3.AuthSignResult
+		if maxParts > 0 {
+			partNumbers := make([]int, partNumber)
+			for i := 0; i < maxParts; i++ {
+				partNumbers[i] = i + 1
+			}
+			authSign, err = c.impl.AuthSign(ctx, upload.UploadID, upload.Key, time.Hour*24, partNumbers)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return &InitiateUploadResult{
+			UploadID: newMultipartUploadID(multipartUploadID{
+				Type: UploadTypeMultipart,
+				ID:   upload.UploadID,
+				Key:  upload.Key,
+				Size: size,
+				Hash: hash,
+			}),
+			PartSize: partSize,
+			Sign:     authSign,
+		}, nil
 	}
-
-	return &InitiateUploadResult{
-		UploadID: newMultipartUploadID(multipartUploadID{
-			Type: UploadTypeMultipart,
-			ID:   upload.UploadID,
-			Key:  upload.Key,
-			Size: size,
-			Hash: hash,
-		}),
-		PartSize: partSize,
-		Sign:     authSign,
-	}, nil
 }
 
 func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHashs []string) (*UploadResult, error) {
@@ -171,10 +164,8 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 	if err != nil {
 		return nil, err
 	}
-	//nolint:gosec 	//tofix G401: Use of weak cryptographic primitive
 	if md5Sum := md5.Sum([]byte(strings.Join(partHashs, partSeparator))); hex.EncodeToString(md5Sum[:]) != upload.Hash {
 		fmt.Println("CompleteUpload sum:", hex.EncodeToString(md5Sum[:]), "upload hash:", upload.Hash)
-
 		return nil, errors.New("md5 mismatching")
 	}
 	if info, err := c.impl.StatObject(ctx, c.HashPath(upload.Hash)); err == nil {
@@ -202,7 +193,7 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 				ETag:       part,
 			}
 		}
-		// todo: verify size
+		// todo: 验证大小
 		result, err := c.impl.CompleteMultipartUpload(ctx, upload.ID, upload.Key, parts)
 		if err != nil {
 			return nil, err
@@ -217,12 +208,11 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 		if uploadInfo.Size != upload.Size {
 			return nil, errors.New("upload size mismatching")
 		}
-		//nolint:gosec 	//G401: Use of weak cryptographic primitive
 		md5Sum := md5.Sum([]byte(strings.Join([]string{uploadInfo.ETag}, partSeparator)))
 		if md5val := hex.EncodeToString(md5Sum[:]); md5val != upload.Hash {
 			return nil, errs.ErrArgs.Wrap(fmt.Sprintf("md5 mismatching %s != %s", md5val, upload.Hash))
 		}
-		// Prevent concurrent operations at this time to avoid file overwrite
+		// 防止在这个时候，并发操作，导致文件被覆盖
 		copyInfo, err := c.impl.CopyObject(ctx, uploadInfo.Key, upload.Key+"."+c.UUID())
 		if err != nil {
 			return nil, err
@@ -240,7 +230,6 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 	default:
 		return nil, errors.New("invalid upload id type")
 	}
-
 	return &UploadResult{
 		Key:  targetKey,
 		Size: upload.Size,
@@ -272,6 +261,5 @@ func (c *Controller) AccessURL(ctx context.Context, name string, expire time.Dur
 		opt.Filename = ""
 		opt.ContentType = ""
 	}
-
 	return c.impl.AccessURL(ctx, name, expire, opt)
 }

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

@@ -33,7 +33,6 @@ func newMultipartUploadID(id multipartUploadID) string {
 	if err != nil {
 		panic(err)
 	}
-
 	return base64.StdEncoding.EncodeToString(data)
 }
 
@@ -46,6 +45,5 @@ func parseMultipartUploadID(id string) (*multipartUploadID, error) {
 	if err := json.Unmarshal(data, &upload); err != nil {
 		return nil, fmt.Errorf("invalid multipart upload id: %w", err)
 	}
-
 	return &upload, nil
 }

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

@@ -44,6 +44,11 @@ const (
 	imageWebp = "webp"
 )
 
+const (
+	videoSnapshotImagePng = "png"
+	videoSnapshotImageJpg = "jpg"
+)
+
 func NewCos() (s3.Interface, error) {
 	conf := config.Config.Object.Cos
 	u, err := url.Parse(conf.BucketURL)
@@ -57,7 +62,6 @@ func NewCos() (s3.Interface, error) {
 			SessionToken: conf.SessionToken,
 		},
 	})
-
 	return &Cos{
 		copyURL:    u.Host + "/",
 		client:     client,
@@ -88,7 +92,6 @@ func (c *Cos) InitiateMultipartUpload(ctx context.Context, name string) (*s3.Ini
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.InitiateMultipartUploadResult{
 		UploadID: result.UploadID,
 		Bucket:   result.Bucket,
@@ -110,7 +113,6 @@ func (c *Cos) CompleteMultipartUpload(ctx context.Context, uploadID string, name
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CompleteMultipartUploadResult{
 		Location: result.Location,
 		Bucket:   result.Bucket,
@@ -133,7 +135,6 @@ func (c *Cos) PartSize(ctx context.Context, size int64) (int64, error) {
 	if size%maxNumSize != 0 {
 		partSize++
 	}
-
 	return partSize, nil
 }
 
@@ -156,7 +157,6 @@ func (c *Cos) AuthSign(ctx context.Context, uploadID string, name string, expire
 			Query:      url.Values{"partNumber": {strconv.Itoa(partNumber)}},
 		}
 	}
-
 	return &result, nil
 }
 
@@ -165,13 +165,11 @@ func (c *Cos) PresignedPutObject(ctx context.Context, name string, expire time.D
 	if err != nil {
 		return "", err
 	}
-
 	return rawURL.String(), nil
 }
 
 func (c *Cos) DeleteObject(ctx context.Context, name string) error {
 	_, err := c.client.Object.Delete(ctx, name)
-
 	return err
 }
 
@@ -187,26 +185,25 @@ func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro
 	if res.ETag = strings.ToLower(strings.ReplaceAll(info.Header.Get("ETag"), `"`, "")); res.ETag == "" {
 		return nil, errors.New("StatObject etag not found")
 	}
-	contentLengthStr := info.Header.Get("Content-Length")
+	if contentLengthStr := info.Header.Get("Content-Length"); contentLengthStr == "" {
-	if contentLengthStr == "" {
 		return nil, errors.New("StatObject content-length not found")
+	} else {
+		res.Size, err = strconv.ParseInt(contentLengthStr, 10, 64)
+		if err != nil {
+			return nil, fmt.Errorf("StatObject content-length parse error: %w", err)
+		}
+		if res.Size < 0 {
+			return nil, errors.New("StatObject content-length must be greater than 0")
+		}
 	}
-	res.Size, err = strconv.ParseInt(contentLengthStr, 10, 64)
+	if lastModified := info.Header.Get("Last-Modified"); lastModified == "" {
-	if err != nil {
-		return nil, fmt.Errorf("StatObject content-length parse error: %w", err)
-	}
-	if res.Size < 0 {
-		return nil, errors.New("StatObject content-length must be greater than 0")
-	}
-	lastModified := info.Header.Get("Last-Modified")
-	if lastModified == "" {
 		return nil, errors.New("StatObject last-modified not found")
+	} else {
+		res.LastModified, err = time.Parse(http.TimeFormat, lastModified)
+		if err != nil {
+			return nil, fmt.Errorf("StatObject last-modified parse error: %w", err)
+		}
 	}
-	res.LastModified, err = time.Parse(http.TimeFormat, lastModified)
-	if err != nil {
-		return nil, fmt.Errorf("StatObject last-modified parse error: %w", err)
-	}
-
 	return res, nil
 }
 
@@ -216,7 +213,6 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CopyObjectInfo{
 		Key:  dst,
 		ETag: strings.ReplaceAll(result.ETag, `"`, ``),
@@ -224,17 +220,16 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }
 
 func (c *Cos) IsNotFound(err error) bool {
-	var cosErr *cos.ErrorResponse
+	switch e := err.(type) {
-	if errors.As(err, &cosErr) {
+	case *cos.ErrorResponse:
-		return cosErr.Response.StatusCode == http.StatusNotFound || cosErr.Code == "NoSuchKey"
+		return e.Response.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
+	default:
+		return false
 	}
-
-	return false
 }
 
 func (c *Cos) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error {
 	_, err := c.client.Object.AbortMultipartUpload(ctx, name, uploadID)
-
 	return err
 }
 
@@ -262,59 +257,46 @@ func (c *Cos) ListUploadedParts(ctx context.Context, uploadID string, name strin
 			Size:         part.Size,
 		}
 	}
-
 	return res, nil
 }
 
 func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
 	var imageMogr string
 	var option cos.PresignedURLOptions
-	getImageMogr := func(opt *s3.AccessURLOption) (imageMogr string) {
+	if opt != nil {
-		if opt.Image == nil {
+		query := make(url.Values)
-			return imageMogr
+		if opt.Image != nil {
+			// https://cloud.tencent.com/document/product/436/44880
+			style := make([]string, 0, 2)
+			wh := make([]string, 2)
+			if opt.Image.Width > 0 {
+				wh[0] = strconv.Itoa(opt.Image.Width)
+			}
+			if opt.Image.Height > 0 {
+				wh[1] = strconv.Itoa(opt.Image.Height)
+			}
+			if opt.Image.Width > 0 || opt.Image.Height > 0 {
+				style = append(style, strings.Join(wh, "x"))
+			}
+			switch opt.Image.Format {
+			case
+				imagePng,
+				imageJpg,
+				imageJpeg,
+				imageGif,
+				imageWebp:
+				style = append(style, "format/"+opt.Image.Format)
+			}
+			if len(style) > 0 {
+				imageMogr = "imageMogr2/thumbnail/" + strings.Join(style, "/") + "/ignore-error/1"
+			}
 		}
-		// https://cloud.tencent.com/document/product/436/44880
-		style := make([]string, 0, 2)
-		wh := make([]string, 2)
-		if opt.Image.Width > 0 {
-			wh[0] = strconv.Itoa(opt.Image.Width)
-		}
-		if opt.Image.Height > 0 {
-			wh[1] = strconv.Itoa(opt.Image.Height)
-		}
-		if opt.Image.Width > 0 || opt.Image.Height > 0 {
-			style = append(style, strings.Join(wh, "x"))
-		}
-		switch opt.Image.Format {
-		case
-			imagePng,
-			imageJpg,
-			imageJpeg,
-			imageGif,
-			imageWebp:
-			style = append(style, "format/"+opt.Image.Format)
-		}
-		if len(style) > 0 {
-			imageMogr = "imageMogr2/thumbnail/" + strings.Join(style, "/") + "/ignore-error/1"
-		}
-
-		return imageMogr
-	}
-	getQuery := func(opt *s3.AccessURLOption) (query url.Values) {
-		query = make(url.Values)
 		if opt.ContentType != "" {
 			query.Set("response-content-type", opt.ContentType)
 		}
 		if opt.Filename != "" {
 			query.Set("response-content-disposition", `attachment; filename=`+strconv.Quote(opt.Filename))
 		}
-
-		return query
-	}
-
-	if opt != nil {
-		imageMogr = getImageMogr(opt)
-		query := getQuery(opt)
 		if len(query) > 0 {
 			option.Query = &query
 		}
@@ -335,7 +317,6 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
 			rawURL.RawQuery = rawURL.RawQuery + "&" + imageMogr
 		}
 	}
-
 	return rawURL.String(), nil
 }
 
@@ -343,6 +324,5 @@ func (c *Cos) getPresignedURL(ctx context.Context, name string, expire time.Dura
 	if !config.Config.Object.Cos.PublicRead {
 		return c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, opt)
 	}
-
 	return c.client.Object.GetObjectURL(name), nil
 }

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

@@ -39,7 +39,6 @@ func ImageStat(reader io.Reader) (image.Image, string, error) {
 
 func ImageWidthHeight(img image.Image) (int, int) {
 	bounds := img.Bounds().Max
-
 	return bounds.X, bounds.Y
 }
 
@@ -48,27 +47,27 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 	imgWidth := bounds.Max.X
 	imgHeight := bounds.Max.Y
 
-	// Calculate scaling ratio
+	// 计算缩放比例
 	scaleWidth := float64(maxWidth) / float64(imgWidth)
 	scaleHeight := float64(maxHeight) / float64(imgHeight)
 
-	// If both maxWidth and maxHeight are 0, return the original image
+	// 如果都为0，则不缩放，返回原始图片
 	if maxWidth == 0 && maxHeight == 0 {
 		return img
 	}
 
-	// If both maxWidth and maxHeight are greater than 0, choose the smaller scaling ratio to maintain aspect ratio
+	// 如果宽度和高度都大于0，则选择较小的缩放比例，以保持宽高比
 	if maxWidth > 0 && maxHeight > 0 {
 		scale := scaleWidth
 		if scaleHeight < scaleWidth {
 			scale = scaleHeight
 		}
 
-		// Calculate thumbnail size
+		// 计算缩略图尺寸
 		thumbnailWidth := int(float64(imgWidth) * scale)
 		thumbnailHeight := int(float64(imgHeight) * scale)
 
-		// Generate thumbnail using the Resample method of the "image" library
+		// 使用"image"库的Resample方法生成缩略图
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -81,12 +80,12 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		return thumbnail
 	}
 
-	// If only maxWidth or maxHeight is specified, generate thumbnail according to the "max not exceed" rule
+	// 如果只指定了宽度或高度，则根据最大不超过的规则生成缩略图
 	if maxWidth > 0 {
 		thumbnailWidth := maxWidth
 		thumbnailHeight := int(float64(imgHeight) * scaleWidth)
 
-		// Generate thumbnail using the Resample method of the "image" library
+		// 使用"image"库的Resample方法生成缩略图
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -103,7 +102,7 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		thumbnailWidth := int(float64(imgWidth) * scaleHeight)
 		thumbnailHeight := maxHeight
 
-		// Generate thumbnail using the Resample method of the "image" library
+		// 使用"image"库的Resample方法生成缩略图
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -116,6 +115,6 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		return thumbnail
 	}
 
-	// By default, return the original image
+	// 默认情况下，返回原始图片
 	return img
 }

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

@@ -111,7 +111,6 @@ func NewMinio() (s3.Interface, error) {
 	if err := m.initMinio(ctx); err != nil {
 		fmt.Println("init minio error:", err)
 	}
-
 	return m, nil
 }
 
@@ -142,9 +141,8 @@ func (m *Minio) initMinio(ctx context.Context) error {
 		return fmt.Errorf("check bucket exists error: %w", err)
 	}
 	if !exists {
-		err2 := m.core.Client.MakeBucket(ctx, conf.Bucket, minio.MakeBucketOptions{})
+		if err := m.core.Client.MakeBucket(ctx, conf.Bucket, minio.MakeBucketOptions{}); err != nil {
-		if err2 != nil {
+			return fmt.Errorf("make bucket error: %w", err)
-			return fmt.Errorf("make bucket error: %w", err2)
 		}
 	}
 	if conf.PublicRead {
@@ -152,9 +150,8 @@ func (m *Minio) initMinio(ctx context.Context) error {
 			`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`,
 			conf.Bucket,
 		)
-		err2 := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy)
+		if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil {
-		if err2 != nil {
+			return err
-			return err2
 		}
 	}
 	m.location, err = m.core.Client.GetBucketLocation(ctx, conf.Bucket)
@@ -185,7 +182,6 @@ func (m *Minio) initMinio(ctx context.Context) error {
 		vblc.Elem().Elem().Interface().(interface{ Set(string, string) }).Set(conf.Bucket, m.location)
 	}()
 	m.init = true
-
 	return nil
 }
 
@@ -209,7 +205,6 @@ func (m *Minio) InitiateMultipartUpload(ctx context.Context, name string) (*s3.I
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.InitiateMultipartUploadResult{
 		Bucket:   m.bucket,
 		Key:      name,
@@ -232,7 +227,6 @@ func (m *Minio) CompleteMultipartUpload(ctx context.Context, uploadID string, na
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CompleteMultipartUploadResult{
 		Location: upload.Location,
 		Bucket:   upload.Bucket,
@@ -255,7 +249,6 @@ func (m *Minio) PartSize(ctx context.Context, size int64) (int64, error) {
 	if size%maxNumSize != 0 {
 		partSize++
 	}
-
 	return partSize, nil
 }
 
@@ -289,7 +282,6 @@ func (m *Minio) AuthSign(ctx context.Context, uploadID string, name string, expi
 	if m.prefix != "" {
 		result.URL = m.signEndpoint + m.prefix + "/" + m.bucket + "/" + name
 	}
-
 	return &result, nil
 }
 
@@ -304,7 +296,6 @@ func (m *Minio) PresignedPutObject(ctx context.Context, name string, expire time
 	if m.prefix != "" {
 		rawURL.Path = path.Join(m.prefix, rawURL.Path)
 	}
-
 	return rawURL.String(), nil
 }
 
@@ -312,7 +303,6 @@ func (m *Minio) DeleteObject(ctx context.Context, name string) error {
 	if err := m.initMinio(ctx); err != nil {
 		return err
 	}
-
 	return m.core.Client.RemoveObject(ctx, m.bucket, name, minio.RemoveObjectOptions{})
 }
 
@@ -324,7 +314,6 @@ func (m *Minio) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, er
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.ObjectInfo{
 		ETag:         strings.ToLower(info.ETag),
 		Key:          info.Key,
@@ -347,7 +336,6 @@ func (m *Minio) CopyObject(ctx context.Context, src string, dst string) (*s3.Cop
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CopyObjectInfo{
 		Key:  dst,
 		ETag: strings.ToLower(result.ETag),
@@ -358,23 +346,20 @@ func (m *Minio) IsNotFound(err error) bool {
 	if err == nil {
 		return false
 	}
-	var minioErr minio.ErrorResponse
+	switch e := err.(type) {
-	if errors.As(err, &minio.ErrorResponse{}) {
+	case minio.ErrorResponse:
-		return minioErr.StatusCode == http.StatusNotFound || minioErr.Code == "NoSuchKey"
+		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
+	case *minio.ErrorResponse:
+		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
+	default:
+		return false
 	}
-	var minioErr2 *minio.ErrorResponse
-	if errors.As(err, &minioErr2) {
-		return minioErr2.StatusCode == http.StatusNotFound || minioErr2.Code == "NoSuchKey"
-	}
-
-	return false
 }
 
 func (m *Minio) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error {
 	if err := m.initMinio(ctx); err != nil {
 		return err
 	}
-
 	return m.core.AbortMultipartUpload(ctx, m.bucket, name, uploadID)
 }
 
@@ -401,7 +386,6 @@ func (m *Minio) ListUploadedParts(ctx context.Context, uploadID string, name str
 			Size:         part.Size,
 		}
 	}
-
 	return res, nil
 }
 
@@ -426,17 +410,14 @@ func (m *Minio) presignedGetObject(ctx context.Context, name string, expire time
 	if m.prefix != "" {
 		rawURL.Path = path.Join(m.prefix, rawURL.Path)
 	}
-
 	return rawURL.String(), nil
 }
 
-func (m *Minio) getImageInfoForAccessURL(
+func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	ctx context.Context,
+	if err := m.initMinio(ctx); err != nil {
-	name string,
+		return "", err
-	expire time.Duration,
+	}
-	opt *s3.AccessURLOption,
+	reqParams := make(url.Values)
-	reqParams url.Values,
-) (fileInfo *s3.ObjectInfo, objectInfoPath, msg string, err error) {
 	if opt != nil {
 		if opt.ContentType != "" {
 			reqParams.Set("response-content-type", opt.ContentType)
@@ -446,47 +427,35 @@ func (m *Minio) getImageInfoForAccessURL(
 		}
 	}
 	if opt.Image == nil || (opt.Image.Width < 0 && opt.Image.Height < 0 && opt.Image.Format == "") || (opt.Image.Width > maxImageWidth || opt.Image.Height > maxImageHeight) {
-		msg, err = m.presignedGetObject(ctx, name, expire, reqParams)
+		return m.presignedGetObject(ctx, name, expire, reqParams)
-
-		return nil, "", msg, err
 	}
-	fileInfo, err = m.StatObject(ctx, name)
+	fileInfo, err := m.StatObject(ctx, name)
-	objectInfoPath = path.Join(pathInfo, fileInfo.ETag, "image.json")
 	if err != nil {
-		return nil, "", msg, err
+		return "", err
 	}
 	if fileInfo.Size > maxImageSize {
-		return nil, "", "", errors.New("file size too large")
+		return "", errors.New("file size too large")
 	}
-
+	objectInfoPath := path.Join(pathInfo, fileInfo.ETag, "image.json")
-	return fileInfo, objectInfoPath, "", nil
+	var (
-}
+		img  image.Image
-
+		info minioImageInfo
-func (m *Minio) loadImgDataForAccessURL(objectInfoPath string, ctx context.Context, name string, info *minioImageInfo) (img image.Image, msg string, err error) {
+	)
-	var data []byte
+	data, err := m.getObjectData(ctx, objectInfoPath, 1024)
-	data, err = m.getObjectData(ctx, objectInfoPath, 1024)
-
-	//nolint:nestif 	//easy enough to understand
 	if err == nil {
-		err = json.Unmarshal(data, &info)
+		if err := json.Unmarshal(data, &info); err != nil {
-		if err != nil {
+			return "", fmt.Errorf("unmarshal minio image info.json error: %w", err)
-			return nil, "", fmt.Errorf("unmarshal minio image info.json error: %w", err)
 		}
 		if info.NotImage {
-			return nil, "", errors.New("not image")
+			return "", errors.New("not image")
 		}
 	} else if m.IsNotFound(err) {
-		var reader *minio.Object
+		reader, err := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
-		reader, err = m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
 		if err != nil {
-			return img, msg, err
+			return "", err
 		}
 		defer reader.Close()
-		var (
+		imageInfo, format, err := ImageStat(reader)
-			imageInfo image.Image
-			format    string
-		)
-		imageInfo, format, err = ImageStat(reader)
 		if err == nil {
 			info.NotImage = false
 			info.Format = format
@@ -495,22 +464,16 @@ func (m *Minio) loadImgDataForAccessURL(objectInfoPath string, ctx context.Conte
 		} else {
 			info.NotImage = true
 		}
-
+		data, err := json.Marshal(&info)
-		data, err = json.Marshal(&info)
 		if err != nil {
-			return img, msg, err
+			return "", err
 		}
-
+		if _, err := m.core.Client.PutObject(ctx, m.bucket, objectInfoPath, bytes.NewReader(data), int64(len(data)), minio.PutObjectOptions{}); err != nil {
-		_, err = m.core.Client.PutObject(ctx, m.bucket, objectInfoPath, bytes.NewReader(data), int64(len(data)), minio.PutObjectOptions{})
+			return "", err
-		if err != nil {
-			return img, msg, err
 		}
+	} else {
+		return "", err
 	}
-
-	return img, msg, err
-}
-
-func (m *Minio) formatImgInfoForAccessURL(opt *s3.AccessURLOption, info *minioImageInfo, reqParams url.Values) {
 	if opt.Image.Width > info.Width || opt.Image.Width <= 0 {
 		opt.Image.Width = info.Width
 	}
@@ -533,24 +496,24 @@ func (m *Minio) formatImgInfoForAccessURL(opt *s3.AccessURLOption, info *minioIm
 		}
 	}
 	reqParams.Set("response-content-type", "image/"+opt.Image.Format)
-}
+	if opt.Image.Width == info.Width && opt.Image.Height == info.Height && opt.Image.Format == info.Format {
-
+		return m.presignedGetObject(ctx, name, expire, reqParams)
-func (m *Minio) cacheImgInfoForAccessURL(ctx context.Context, name, cacheKey string, img image.Image, expire time.Duration, opt *s3.AccessURLOption, reqParams url.Values) (string, error) {
+	}
-	_, err := m.core.Client.StatObject(ctx, m.bucket, cacheKey, minio.StatObjectOptions{})
+	cacheKey := filepath.Join(pathInfo, fileInfo.ETag, fmt.Sprintf("image_w%d_h%d.%s", opt.Image.Width, opt.Image.Height, opt.Image.Format))
-	if err == nil {
+	if _, err := m.core.Client.StatObject(ctx, m.bucket, cacheKey, minio.StatObjectOptions{}); err == nil {
 		return m.presignedGetObject(ctx, cacheKey, expire, reqParams)
 	} else if !m.IsNotFound(err) {
 		return "", err
 	}
 	if img == nil {
-		reader, err2 := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
+		reader, err := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
-		if err2 != nil {
+		if err != nil {
-			return "", err2
+			return "", err
 		}
 		defer reader.Close()
-		img, _, err2 = ImageStat(reader)
+		img, _, err = ImageStat(reader)
-		if err2 != nil {
+		if err != nil {
-			return "", err2
+			return "", err
 		}
 	}
 	thumbnail := resizeImage(img, opt.Image.Width, opt.Image.Height)
@@ -563,48 +526,9 @@ func (m *Minio) cacheImgInfoForAccessURL(ctx context.Context, name, cacheKey str
 	case formatGif:
 		err = gif.Encode(buf, thumbnail, nil)
 	}
-	if err != nil {
-		return "", err
-	}
 	if _, err := m.core.Client.PutObject(ctx, m.bucket, cacheKey, buf, int64(buf.Len()), minio.PutObjectOptions{}); err != nil {
 		return "", err
 	}
-
-	return "", nil
-}
-
-func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	errInit := m.initMinio(ctx)
-	if errInit != nil {
-		return "", errInit
-	}
-	reqParams := make(url.Values)
-	fileInfo, objectInfoPath, msg, err := m.getImageInfoForAccessURL(ctx, name, expire, opt, reqParams)
-	if err != nil {
-		return msg, err
-	}
-	// load-cache img data
-	var (
-		img  image.Image
-		info minioImageInfo
-	)
-	img, msg, err = m.loadImgDataForAccessURL(objectInfoPath, ctx, name, &info)
-	if err != nil {
-		return msg, err
-	}
-	// format img info
-	m.formatImgInfoForAccessURL(opt, &info, reqParams)
-	// no need resize
-	if opt.Image.Width == info.Width && opt.Image.Height == info.Height && opt.Image.Format == info.Format {
-		return m.presignedGetObject(ctx, name, expire, reqParams)
-	}
-	// cache img
-	cacheKey := filepath.Join(pathInfo, fileInfo.ETag, fmt.Sprintf("image_w%d_h%d.%s", opt.Image.Width, opt.Image.Height, opt.Image.Format))
-	msg, err = m.cacheImgInfoForAccessURL(ctx, name, cacheKey, img, expire, opt, reqParams)
-	if err != nil {
-		return msg, err
-	}
-	// return cache img
 	return m.presignedGetObject(ctx, cacheKey, expire, reqParams)
 }
 
@@ -617,6 +541,5 @@ func (m *Minio) getObjectData(ctx context.Context, name string, limit int64) ([]
 	if limit < 0 {
 		return io.ReadAll(object)
 	}
-
 	return io.ReadAll(io.LimitReader(object, 1024))
 }

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

@@ -45,6 +45,11 @@ const (
 	imageWebp = "webp"
 )
 
+const (
+	videoSnapshotImagePng = "png"
+	videoSnapshotImageJpg = "jpg"
+)
+
 func NewOSS() (s3.Interface, error) {
 	conf := config.Config.Object.Oss
 	if conf.BucketURL == "" {
@@ -61,7 +66,6 @@ func NewOSS() (s3.Interface, error) {
 	if conf.BucketURL[len(conf.BucketURL)-1] != '/' {
 		conf.BucketURL += "/"
 	}
-
 	return &OSS{
 		bucketURL:   conf.BucketURL,
 		bucket:      bucket,
@@ -94,7 +98,6 @@ func (o *OSS) InitiateMultipartUpload(ctx context.Context, name string) (*s3.Ini
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.InitiateMultipartUploadResult{
 		UploadID: result.UploadID,
 		Bucket:   result.Bucket,
@@ -118,7 +121,6 @@ func (o *OSS) CompleteMultipartUpload(ctx context.Context, uploadID string, name
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CompleteMultipartUploadResult{
 		Location: result.Location,
 		Bucket:   result.Bucket,
@@ -141,7 +143,6 @@ func (o *OSS) PartSize(ctx context.Context, size int64) (int64, error) {
 	if size%maxNumSize != 0 {
 		partSize++
 	}
-
 	return partSize, nil
 }
 
@@ -154,7 +155,7 @@ func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire
 	}
 	for i, partNumber := range partNumbers {
 		rawURL := fmt.Sprintf(`%s%s?partNumber=%d&uploadId=%s`, o.bucketURL, name, partNumber, uploadID)
-		request, err := http.NewRequestWithContext(context.Background(), http.MethodPut, rawURL, nil)
+		request, err := http.NewRequest(http.MethodPut, rawURL, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -174,7 +175,6 @@ func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire
 			Header:     request.Header,
 		}
 	}
-
 	return &result, nil
 }
 
@@ -191,26 +191,25 @@ func (o *OSS) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro
 	if res.ETag = strings.ToLower(strings.ReplaceAll(header.Get("ETag"), `"`, ``)); res.ETag == "" {
 		return nil, errors.New("StatObject etag not found")
 	}
-	contentLengthStr := header.Get("Content-Length")
+	if contentLengthStr := header.Get("Content-Length"); contentLengthStr == "" {
-	if contentLengthStr == "" {
 		return nil, errors.New("StatObject content-length not found")
+	} else {
+		res.Size, err = strconv.ParseInt(contentLengthStr, 10, 64)
+		if err != nil {
+			return nil, fmt.Errorf("StatObject content-length parse error: %w", err)
+		}
+		if res.Size < 0 {
+			return nil, errors.New("StatObject content-length must be greater than 0")
+		}
 	}
-	res.Size, err = strconv.ParseInt(contentLengthStr, 10, 64)
+	if lastModified := header.Get("Last-Modified"); lastModified == "" {
-	if err != nil {
-		return nil, fmt.Errorf("StatObject content-length parse error: %w", err)
-	}
-	if res.Size < 0 {
-		return nil, errors.New("StatObject content-length must be greater than 0")
-	}
-	lastModified := header.Get("Last-Modified")
-	if lastModified == "" {
 		return nil, errors.New("StatObject last-modified not found")
+	} else {
+		res.LastModified, err = time.Parse(http.TimeFormat, lastModified)
+		if err != nil {
+			return nil, fmt.Errorf("StatObject last-modified parse error: %w", err)
+		}
 	}
-	res.LastModified, err = time.Parse(http.TimeFormat, lastModified)
-	if err != nil {
-		return nil, fmt.Errorf("StatObject last-modified parse error: %w", err)
-	}
-
 	return res, nil
 }
 
@@ -223,7 +222,6 @@ func (o *OSS) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 	if err != nil {
 		return nil, err
 	}
-
 	return &s3.CopyObjectInfo{
 		Key:  dst,
 		ETag: strings.ToLower(strings.ReplaceAll(result.ETag, `"`, ``)),
@@ -231,7 +229,6 @@ func (o *OSS) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }
 
 func (o *OSS) IsNotFound(err error) bool {
-	//nolint:errorlint  //this is exactly what we want,there is no risk for no wrapped errors
 	switch e := err.(type) {
 	case oss.ServiceError:
 		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
@@ -274,7 +271,6 @@ func (o *OSS) ListUploadedParts(ctx context.Context, uploadID string, name strin
 			Size:         int64(part.Size),
 		}
 	}
-
 	return res, nil
 }
 
@@ -282,7 +278,39 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 	publicRead := config.Config.Object.Oss.PublicRead
 	var opts []oss.Option
 	if opt != nil {
-		opts = optsForAccessURL(opt, opts, publicRead)
+		if opt.Image != nil {
+			// 文档地址: https://help.aliyun.com/zh/oss/user-guide/resize-images-4?spm=a2c4g.11186623.0.0.4b3b1e4fWW6yji
+			var format string
+			switch opt.Image.Format {
+			case
+				imagePng,
+				imageJpg,
+				imageJpeg,
+				imageGif,
+				imageWebp:
+				format = opt.Image.Format
+			default:
+				opt.Image.Format = imageJpg
+			}
+			// https://oss-console-img-demo-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/example.jpg?x-oss-process=image/resize,h_100,m_lfit
+			process := "image/resize,m_lfit"
+			if opt.Image.Width > 0 {
+				process += ",w_" + strconv.Itoa(opt.Image.Width)
+			}
+			if opt.Image.Height > 0 {
+				process += ",h_" + strconv.Itoa(opt.Image.Height)
+			}
+			process += ",format," + format
+			opts = append(opts, oss.Process(process))
+		}
+		if !publicRead {
+			if opt.ContentType != "" {
+				opts = append(opts, oss.ResponseContentType(opt.ContentType))
+			}
+			if opt.Filename != "" {
+				opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
+			}
+		}
 	}
 	if expire <= 0 {
 		expire = time.Hour * 24 * 365 * 99 // 99 years
@@ -297,44 +325,5 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 		return "", err
 	}
 	params := getURLParams(*o.bucket.Client.Conn, rawParams)
-
 	return getURL(o.um, o.bucket.BucketName, name, params).String(), nil
 }
-
-func optsForAccessURL(opt *s3.AccessURLOption, opts []oss.Option, publicRead bool) []oss.Option {
-	if opt.Image != nil {
-		// 文档地址: https://help.aliyun.com/zh/oss/user-guide/resize-images-4?spm=a2c4g.11186623.0.0.4b3b1e4fWW6yji
-		var format string
-		switch opt.Image.Format {
-		case
-			imagePng,
-			imageJpg,
-			imageJpeg,
-			imageGif,
-			imageWebp:
-			format = opt.Image.Format
-		default:
-			opt.Image.Format = imageJpg
-		}
-		// https://oss-console-img-demo-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/example.jpg?x-oss-process=image/resize,h_100,m_lfit
-		process := "image/resize,m_lfit"
-		if opt.Image.Width > 0 {
-			process += ",w_" + strconv.Itoa(opt.Image.Width)
-		}
-		if opt.Image.Height > 0 {
-			process += ",h_" + strconv.Itoa(opt.Image.Height)
-		}
-		process += ",format," + format
-		opts = append(opts, oss.Process(process))
-	}
-	if !publicRead {
-		if opt.ContentType != "" {
-			opts = append(opts, oss.ResponseContentType(opt.ContentType))
-		}
-		if opt.Filename != "" {
-			opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
-		}
-	}
-
-	return opts
-}

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

@@ -30,7 +30,7 @@ type GroupModel struct {
 	Introduction           string    `gorm:"column:introduction;size:255"                        json:"introduction"`
 	FaceURL                string    `gorm:"column:face_url;size:255"                            json:"faceURL"`
 	CreateTime             time.Time `gorm:"column:create_time;index:create_time;autoCreateTime"`
-	Ex                     string    `gorm:"column:ex;size:1024"                                 json:"ex"`
+	Ex                     string    `gorm:"column:ex"                                           json:"ex;size:1024"`
 	Status                 int32     `gorm:"column:status"`
 	CreatorUserID          string    `gorm:"column:creator_user_id;size:64"`
 	GroupType              int32     `gorm:"column:group_type"`

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

@@ -15,8 +15,6 @@
 package relation
 
 import (
-	"errors"
-
 	"gorm.io/gorm"
 
 	"github.com/OpenIMSDK/tools/utils"
@@ -34,5 +32,5 @@ type GroupSimpleUserID struct {
 }
 
 func IsNotFound(err error) bool {
-	return errors.Is(utils.Unwrap(err), gorm.ErrRecordNotFound)
+	return utils.Unwrap(err) == gorm.ErrRecordNotFound
 }

pkg/common/db/table/unrelation/msg.go

@@ -150,7 +150,6 @@ func (m *MsgDocModel) IsFull() bool {
 
 func (m MsgDocModel) GetDocID(conversationID string, seq int64) string {
 	seqSuffix := (seq - 1) / singleGocMsgNum
-
 	return m.indexGen(conversationID, seqSuffix)
 }
 
@@ -165,7 +164,6 @@ func (m MsgDocModel) GetDocIDSeqsMap(conversationID string, seqs []int64) map[st
 			t[docID] = append(value, seqs[i])
 		}
 	}
-
 	return t
 }
 
@@ -183,6 +181,5 @@ func (MsgDocModel) GenExceptionMessageBySeqs(seqs []int64) (exceptionMsg []*sdkw
 		msgModel.Seq = v
 		exceptionMsg = append(exceptionMsg, msgModel)
 	}
-
 	return exceptionMsg
 }

pkg/common/db/unrelation/mongo.go

@@ -16,7 +16,6 @@ package unrelation
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -45,12 +44,27 @@ type Mongo struct {
 // NewMongo Initialize MongoDB connection.
 func NewMongo() (*Mongo, error) {
 	specialerror.AddReplace(mongo.ErrNoDocuments, errs.ErrRecordNotFound)
-	// uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
+	uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
-	var uri string
 	if config.Config.Mongo.Uri != "" {
 		uri = config.Config.Mongo.Uri
 	} else {
-		uri = defaultMongoUriForNewMongo()
+		mongodbHosts := ""
+		for i, v := range config.Config.Mongo.Address {
+			if i == len(config.Config.Mongo.Address)-1 {
+				mongodbHosts += v
+			} else {
+				mongodbHosts += v + ","
+			}
+		}
+		if config.Config.Mongo.Password != "" && config.Config.Mongo.Username != "" {
+			uri = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin",
+				config.Config.Mongo.Username, config.Config.Mongo.Password, mongodbHosts,
+				config.Config.Mongo.Database, config.Config.Mongo.MaxPoolSize)
+		} else {
+			uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d&authSource=admin",
+				mongodbHosts, config.Config.Mongo.Database,
+				config.Config.Mongo.MaxPoolSize)
+		}
 	}
 	fmt.Println("mongo:", uri)
 	var mongoClient *mongo.Client
@@ -62,41 +76,17 @@ func NewMongo() (*Mongo, error) {
 		if err == nil {
 			return &Mongo{db: mongoClient}, nil
 		}
-		var cmdErr mongo.CommandError
+		if cmdErr, ok := err.(mongo.CommandError); ok {
-		if errors.As(err, &cmdErr) {
 			if cmdErr.Code == 13 || cmdErr.Code == 18 {
 				return nil, err
+			} else {
+				fmt.Printf("Failed to connect to MongoDB: %s\n", err)
 			}
-			fmt.Printf("Failed to connect to MongoDB: %s\n", err)
 		}
 	}
-
 	return nil, err
 }
 
-func defaultMongoUriForNewMongo() string {
-	var uri string
-	mongodbHosts := ""
-	for i, v := range config.Config.Mongo.Address {
-		if i == len(config.Config.Mongo.Address)-1 {
-			mongodbHosts += v
-		} else {
-			mongodbHosts += v + ","
-		}
-	}
-	if config.Config.Mongo.Password != "" && config.Config.Mongo.Username != "" {
-		uri = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin",
-			config.Config.Mongo.Username, config.Config.Mongo.Password, mongodbHosts,
-			config.Config.Mongo.Database, config.Config.Mongo.MaxPoolSize)
-	} else {
-		uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d&authSource=admin",
-			mongodbHosts, config.Config.Mongo.Database,
-			config.Config.Mongo.MaxPoolSize)
-	}
-
-	return uri
-}
-
 func (m *Mongo) GetClient() *mongo.Client {
 	return m.db
 }
@@ -116,7 +106,6 @@ func (m *Mongo) CreateSuperGroupIndex() error {
 	if err := m.createMongoIndex(unrelation.CUserToSuperGroup, true, "user_id"); err != nil {
 		return err
 	}
-
 	return nil
 }
 
@@ -150,6 +139,5 @@ func (m *Mongo) createMongoIndex(collection string, isUnique bool, keys ...strin
 	if err != nil {
 		return utils.Wrap(err, result)
 	}
-
 	return nil
 }

pkg/common/db/unrelation/msg.go

@@ -49,7 +49,6 @@ type MsgMongoDriver struct {
 
 func NewMsgMongoDriver(database *mongo.Database) table.MsgDocModelInterface {
 	collection := database.Collection(table.MsgDocModel{}.TableName())
-
 	return &MsgMongoDriver{MsgCollection: collection}
 }
 
@@ -60,7 +59,6 @@ func (m *MsgMongoDriver) PushMsgsToDoc(ctx context.Context, docID string, msgsTo
 
 func (m *MsgMongoDriver) Create(ctx context.Context, model *table.MsgDocModel) error {
 	_, err := m.MsgCollection.InsertOne(ctx, model)
-
 	return err
 }
 
@@ -83,7 +81,6 @@ func (m *MsgMongoDriver) UpdateMsg(
 	if err != nil {
 		return nil, utils.Wrap(err, "")
 	}
-
 	return res, nil
 }
 
@@ -111,7 +108,6 @@ func (m *MsgMongoDriver) PushUnique(
 	if err != nil {
 		return nil, utils.Wrap(err, "")
 	}
-
 	return res, nil
 }
 
@@ -124,7 +120,6 @@ func (m *MsgMongoDriver) UpdateMsgContent(ctx context.Context, docID string, ind
 	if err != nil {
 		return utils.Wrap(err, "")
 	}
-
 	return nil
 }
 
@@ -148,14 +143,12 @@ func (m *MsgMongoDriver) UpdateMsgStatusByIndexInOneDoc(
 	if err != nil {
 		return utils.Wrap(err, "")
 	}
-
 	return nil
 }
 
 func (m *MsgMongoDriver) FindOneByDocID(ctx context.Context, docID string) (*table.MsgDocModel, error) {
 	doc := &table.MsgDocModel{}
 	err := m.MsgCollection.FindOne(ctx, bson.M{"doc_id": docID}).Decode(doc)
-
 	return doc, err
 }
 
@@ -184,7 +177,6 @@ func (m *MsgMongoDriver) GetMsgDocModelByIndex(
 	if len(msgs) > 0 {
 		return &msgs[0], nil
 	}
-
 	return nil, ErrMsgListNotExist
 }
 
@@ -233,7 +225,6 @@ func (m *MsgMongoDriver) DeleteMsgsInOneDocByIndex(ctx context.Context, docID st
 	if err != nil {
 		return utils.Wrap(err, "")
 	}
-
 	return nil
 }
 
@@ -242,7 +233,6 @@ func (m *MsgMongoDriver) DeleteDocs(ctx context.Context, docIDs []string) error
 		return nil
 	}
 	_, err := m.MsgCollection.DeleteMany(ctx, bson.M{"doc_id": bson.M{"$in": docIDs}})
-
 	return err
 }
 
@@ -256,7 +246,6 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(
 	for _, seq := range seqs {
 		indexs = append(indexs, m.model.GetMsgIndex(seq))
 	}
-	//nolint:govet  //This is already the officially recommended standard practice.
 	pipeline := mongo.Pipeline{
 		{
 			{"$match", bson.D{
@@ -347,7 +336,6 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(
 		}
 		msgs = append(msgs, msg)
 	}
-
 	return msgs, nil
 }
 
@@ -356,7 +344,6 @@ func (m *MsgMongoDriver) IsExistDocID(ctx context.Context, docID string) (bool,
 	if err != nil {
 		return false, errs.Wrap(err)
 	}
-
 	return count > 0, nil
 }
 
@@ -385,7 +372,6 @@ func (m *MsgMongoDriver) MarkSingleChatMsgsAsRead(
 		updates = append(updates, updateModel)
 	}
 	_, err := m.MsgCollection.BulkWrite(ctx, updates)
-
 	return err
 }
 
@@ -625,39 +611,7 @@ func (m *MsgMongoDriver) RangeUserSendCount(
 			},
 		)
 	}
-	pipeline := buildPiplineForRangeUserSendCount(or, start, end, sort, pageNumber, showNumber)
+	pipeline := bson.A{
-	cur, err := m.MsgCollection.Aggregate(ctx, pipeline, options.Aggregate().SetAllowDiskUse(true))
-	if err != nil {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	defer cur.Close(ctx)
-	var result []Result
-	if err = cur.All(ctx, &result); err != nil {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	if len(result) == 0 {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	users = make([]*table.UserCount, len(result[0].Users))
-	for i, r := range result[0].Users {
-		users[i] = &table.UserCount{
-			UserID: r.UserID,
-			Count:  r.Count,
-		}
-	}
-	dateCount = make(map[string]int64)
-	for _, r := range result[0].Dates {
-		dateCount[r.Date] = r.Count
-	}
-
-	return result[0].MsgCount, result[0].UserCount, users, dateCount, nil
-}
-
-//nolint:funlen	// it need to be such long
-func buildPiplineForRangeUserSendCount(or bson.A, start time.Time,
-	end time.Time, sort int, pageNumber, showNumber int32,
-) bson.A {
-	return bson.A{
 		bson.M{
 			"$match": bson.M{
 				"$and": bson.A{
@@ -841,6 +795,30 @@ func buildPiplineForRangeUserSendCount(or bson.A, start time.Time,
 			},
 		},
 	}
+	cur, err := m.MsgCollection.Aggregate(ctx, pipeline, options.Aggregate().SetAllowDiskUse(true))
+	if err != nil {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	defer cur.Close(ctx)
+	var result []Result
+	if err := cur.All(ctx, &result); err != nil {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	if len(result) == 0 {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	users = make([]*table.UserCount, len(result[0].Users))
+	for i, r := range result[0].Users {
+		users[i] = &table.UserCount{
+			UserID: r.UserID,
+			Count:  r.Count,
+		}
+	}
+	dateCount = make(map[string]int64)
+	for _, r := range result[0].Dates {
+		dateCount[r.Date] = r.Count
+	}
+	return result[0].MsgCount, result[0].UserCount, users, dateCount, nil
 }
 
 func (m *MsgMongoDriver) RangeGroupSendCount(
@@ -869,39 +847,7 @@ func (m *MsgMongoDriver) RangeGroupSendCount(
 			Count int64  `bson:"count"`
 		} `bson:"dates"`
 	}
-	pipeline := buildPiplineForRangeGroupSendCount(start, end, sort, pageNumber, showNumber)
+	pipeline := bson.A{
-	cur, err := m.MsgCollection.Aggregate(ctx, pipeline, options.Aggregate().SetAllowDiskUse(true))
-	if err != nil {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	defer cur.Close(ctx)
-	var result []Result
-	if err = cur.All(ctx, &result); err != nil {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	if len(result) == 0 {
-		return 0, 0, nil, nil, errs.Wrap(err)
-	}
-	groups = make([]*table.GroupCount, len(result[0].Groups))
-	for i, r := range result[0].Groups {
-		groups[i] = &table.GroupCount{
-			GroupID: r.GroupID,
-			Count:   r.Count,
-		}
-	}
-	dateCount = make(map[string]int64)
-	for _, r := range result[0].Dates {
-		dateCount[r.Date] = r.Count
-	}
-
-	return result[0].MsgCount, result[0].UserCount, groups, dateCount, nil
-}
-
-//nolint:funlen  //it need to has such length
-func buildPiplineForRangeGroupSendCount(start time.Time,
-	end time.Time, sort int, pageNumber, showNumber int32,
-) bson.A {
-	return bson.A{
 		bson.M{
 			"$match": bson.M{
 				"$and": bson.A{
@@ -1098,6 +1044,30 @@ func buildPiplineForRangeGroupSendCount(start time.Time,
 			},
 		},
 	}
+	cur, err := m.MsgCollection.Aggregate(ctx, pipeline, options.Aggregate().SetAllowDiskUse(true))
+	if err != nil {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	defer cur.Close(ctx)
+	var result []Result
+	if err := cur.All(ctx, &result); err != nil {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	if len(result) == 0 {
+		return 0, 0, nil, nil, errs.Wrap(err)
+	}
+	groups = make([]*table.GroupCount, len(result[0].Groups))
+	for i, r := range result[0].Groups {
+		groups[i] = &table.GroupCount{
+			GroupID: r.GroupID,
+			Count:   r.Count,
+		}
+	}
+	dateCount = make(map[string]int64)
+	for _, r := range result[0].Dates {
+		dateCount[r.Date] = r.Count
+	}
+	return result[0].MsgCount, result[0].UserCount, groups, dateCount, nil
 }
 
 func (m *MsgMongoDriver) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (int32, []*table.MsgInfoModel, error) {
@@ -1105,7 +1075,6 @@ func (m *MsgMongoDriver) SearchMessage(ctx context.Context, req *msg.SearchMessa
 	if err != nil {
 		return 0, nil, err
 	}
-
 	return total, msgs, nil
 }
 
@@ -1150,7 +1119,7 @@ func (m *MsgMongoDriver) searchMessage(ctx context.Context, req *msg.SearchMessa
 			},
 		},
 	)
-	//nolint:govet  //this is already standard
+
 	pipe = mongo.Pipeline{
 		{
 			{"$match", bson.D{
@@ -1245,6 +1214,5 @@ func (m *MsgMongoDriver) searchMessage(ctx context.Context, req *msg.SearchMessa
 	} else {
 		msgs = msgs[start:]
 	}
-
 	return n, msgs, nil
 }

pkg/common/db/unrelation/msg_convert.go

@@ -31,14 +31,12 @@ func (m *MsgMongoDriver) ConvertMsgsDocLen(ctx context.Context, conversationIDs
 		cursor, err := m.MsgCollection.Find(ctx, bson.M{"doc_id": regex})
 		if err != nil {
 			log.ZError(ctx, "convertAll find msg doc failed", err, "conversationID", conversationID)
-
 			continue
 		}
 		var msgDocs []table.MsgDocModel
 		err = cursor.All(ctx, &msgDocs)
 		if err != nil {
 			log.ZError(ctx, "convertAll cursor all failed", err, "conversationID", conversationID)
-
 			continue
 		}
 		if len(msgDocs) < 1 {
@@ -46,45 +44,39 @@ func (m *MsgMongoDriver) ConvertMsgsDocLen(ctx context.Context, conversationIDs
 		}
 		log.ZInfo(ctx, "msg doc convert", "conversationID", conversationID, "len(msgDocs)", len(msgDocs))
 		if len(msgDocs[0].Msg) == int(m.model.GetSingleGocMsgNum5000()) {
-			convertMsgDocs(m, ctx, msgDocs, conversationID, regex)
+			if _, err := m.MsgCollection.DeleteMany(ctx, bson.M{"doc_id": regex}); err != nil {
-		}
+				log.ZError(ctx, "convertAll delete many failed", err, "conversationID", conversationID)
-	}
+				continue
-}
+			}
-
+			var newMsgDocs []interface{}
-func convertMsgDocs(m *MsgMongoDriver, ctx context.Context, msgDocs []table.MsgDocModel, conversationID string, regex primitive.Regex) {
+			for _, msgDoc := range msgDocs {
-	var err error
+				if int64(len(msgDoc.Msg)) == m.model.GetSingleGocMsgNum() {
-	if _, err = m.MsgCollection.DeleteMany(ctx, bson.M{"doc_id": regex}); err != nil {
+					continue
-		log.ZError(ctx, "convertAll delete many failed", err, "conversationID", conversationID)
-
-		return
-	}
-	var newMsgDocs []interface{}
-	for _, msgDoc := range msgDocs {
-		if int64(len(msgDoc.Msg)) == m.model.GetSingleGocMsgNum() {
-			continue
-		}
-		var index int64
-		for index < int64(len(msgDoc.Msg)) {
-			msg := msgDoc.Msg[index]
-			if msg != nil && msg.Msg != nil {
-				msgDocModel := table.MsgDocModel{DocID: m.model.GetDocID(conversationID, msg.Msg.Seq)}
-				end := index + m.model.GetSingleGocMsgNum()
-				if int(end) >= len(msgDoc.Msg) {
-					msgDocModel.Msg = msgDoc.Msg[index:]
-				} else {
-					msgDocModel.Msg = msgDoc.Msg[index:end]
 				}
-				newMsgDocs = append(newMsgDocs, msgDocModel)
+				var index int64
-				index = end
+				for index < int64(len(msgDoc.Msg)) {
+					msg := msgDoc.Msg[index]
+					if msg != nil && msg.Msg != nil {
+						msgDocModel := table.MsgDocModel{DocID: m.model.GetDocID(conversationID, msg.Msg.Seq)}
+						end := index + m.model.GetSingleGocMsgNum()
+						if int(end) >= len(msgDoc.Msg) {
+							msgDocModel.Msg = msgDoc.Msg[index:]
+						} else {
+							msgDocModel.Msg = msgDoc.Msg[index:end]
+						}
+						newMsgDocs = append(newMsgDocs, msgDocModel)
+						index = end
+					} else {
+						break
+					}
+				}
+			}
+			_, err = m.MsgCollection.InsertMany(ctx, newMsgDocs)
+			if err != nil {
+				log.ZError(ctx, "convertAll insert many failed", err, "conversationID", conversationID, "len(newMsgDocs)", len(newMsgDocs))
 			} else {
-				break
+				log.ZInfo(ctx, "msg doc convert", "conversationID", conversationID, "len(newMsgDocs)", len(newMsgDocs))
 			}
 		}
 	}
-	_, err = m.MsgCollection.InsertMany(ctx, newMsgDocs)
-	if err != nil {
-		log.ZError(ctx, "convertAll insert many failed", err, "conversationID", conversationID, "len(newMsgDocs)", len(newMsgDocs))
-	} else {
-		log.ZInfo(ctx, "msg doc convert", "conversationID", conversationID, "len(newMsgDocs)", len(newMsgDocs))
-	}
 }

pkg/common/db/unrelation/super_group.go

@@ -59,7 +59,6 @@ func (s *SuperGroupMongoDriver) CreateSuperGroup(ctx context.Context, groupID st
 			return err
 		}
 	}
-
 	return nil
 }
 
@@ -70,7 +69,6 @@ func (s *SuperGroupMongoDriver) TakeSuperGroup(
 	if err := s.superGroupCollection.FindOne(ctx, bson.M{"group_id": groupID}).Decode(&group); err != nil {
 		return nil, utils.Wrap(err, "")
 	}
-
 	return group, nil
 }
 
@@ -88,7 +86,6 @@ func (s *SuperGroupMongoDriver) FindSuperGroup(
 	if err := cursor.All(ctx, &groups); err != nil {
 		return nil, utils.Wrap(err, "")
 	}
-
 	return groups, nil
 }
 
@@ -116,7 +113,6 @@ func (s *SuperGroupMongoDriver) AddUserToSuperGroup(ctx context.Context, groupID
 			return utils.Wrap(err, "transaction failed")
 		}
 	}
-
 	return nil
 }
 
@@ -133,7 +129,6 @@ func (s *SuperGroupMongoDriver) RemoverUserFromSuperGroup(ctx context.Context, g
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
@@ -143,7 +138,6 @@ func (s *SuperGroupMongoDriver) GetSuperGroupByUserID(
 ) (*unrelation.UserToSuperGroupModel, error) {
 	var user unrelation.UserToSuperGroupModel
 	err := s.userToSuperGroupCollection.FindOne(ctx, bson.M{"user_id": userID}).Decode(&user)
-
 	return &user, utils.Wrap(err, "")
 }
 
@@ -155,7 +149,6 @@ func (s *SuperGroupMongoDriver) DeleteSuperGroup(ctx context.Context, groupID st
 	if _, err := s.superGroupCollection.DeleteOne(ctx, bson.M{"group_id": groupID}); err != nil {
 		return utils.Wrap(err, "")
 	}
-
 	return s.RemoveGroupFromUser(ctx, groupID, group.MemberIDs)
 }
 
@@ -165,6 +158,5 @@ func (s *SuperGroupMongoDriver) RemoveGroupFromUser(ctx context.Context, groupID
 		bson.M{"user_id": bson.M{"$in": userIDs}},
 		bson.M{"$pull": bson.M{"group_id_list": groupID}},
 	)
-
 	return utils.Wrap(err, "")
 }

pkg/common/db/unrelation/user.go

@@ -16,7 +16,6 @@ package unrelation
 
 import (
 	"context"
-	"errors"
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
@@ -51,7 +50,6 @@ type UserMongoDriver struct {
 // AddSubscriptionList Subscriber's handling of thresholds.
 func (u *UserMongoDriver) AddSubscriptionList(ctx context.Context, userID string, userIDList []string) error {
 	// Check the number of lists in the key.
-	//nolint:govet  //this has already been the standard format for mongo.Pipeline
 	pipeline := mongo.Pipeline{
 		{{"$match", bson.D{{"user_id", SubscriptionPrefix + userID}}}},
 		{{"$project", bson.D{{"count", bson.D{{"$size", "$user_id_list"}}}}}},
@@ -67,7 +65,7 @@ func (u *UserMongoDriver) AddSubscriptionList(ctx context.Context, userID string
 	}
 	// iterate over aggregated results
 	for cursor.Next(ctx) {
-		err = cursor.Decode(&cnt)
+		err := cursor.Decode(&cnt)
 		if err != nil {
 			return errs.Wrap(err)
 		}
@@ -124,7 +122,6 @@ func (u *UserMongoDriver) AddSubscriptionList(ctx context.Context, userID string
 			return utils.Wrap(err, "transaction failed")
 		}
 	}
-
 	return nil
 }
 
@@ -142,7 +139,6 @@ func (u *UserMongoDriver) UnsubscriptionList(ctx context.Context, userID string,
 	if err != nil {
 		return errs.Wrap(err)
 	}
-
 	return nil
 }
 
@@ -156,7 +152,6 @@ func (u *UserMongoDriver) RemoveSubscribedListFromUser(ctx context.Context, user
 			bson.M{"$pull": bson.M{"user_id_list": userID}},
 		)
 	}
-
 	return errs.Wrap(err)
 }
 
@@ -168,13 +163,12 @@ func (u *UserMongoDriver) GetAllSubscribeList(ctx context.Context, userID string
 		bson.M{"user_id": SubscriptionPrefix + userID})
 	err = cursor.Decode(&user)
 	if err != nil {
-		if errors.Is(err, mongo.ErrNoDocuments) {
+		if err == mongo.ErrNoDocuments {
 			return []string{}, nil
+		} else {
+			return nil, errs.Wrap(err)
 		}
-
-		return nil, errs.Wrap(err)
 	}
-
 	return user.UserIDList, nil
 }
 
@@ -186,12 +180,11 @@ func (u *UserMongoDriver) GetSubscribedList(ctx context.Context, userID string)
 		bson.M{"user_id": SubscribedPrefix + userID})
 	err = cursor.Decode(&user)
 	if err != nil {
-		if errors.Is(err, mongo.ErrNoDocuments) {
+		if err == mongo.ErrNoDocuments {
 			return []string{}, nil
+		} else {
+			return nil, errs.Wrap(err)
 		}
-
-		return nil, errs.Wrap(err)
 	}
-
 	return user.UserIDList, nil
 }

pkg/common/discovery_register/k8s_discovery_register.go

@@ -4,14 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"
-
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"
-	"google.golang.org/grpc"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"google.golang.org/grpc"
+	"time"
 )
 
 func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistry, error) {
@@ -30,7 +28,6 @@ func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistr
 		client = nil
 		err = errors.New("envType not correct")
 	}
-
 	return client, err
 }
 
@@ -45,51 +42,47 @@ func NewK8sDiscoveryRegister() (discoveryregistry.SvcDiscoveryRegistry, error) {
 
 func (cli *K8sDR) Register(serviceName, host string, port int, opts ...grpc.DialOption) error {
 	cli.rpcRegisterAddr = serviceName
-
 	return nil
 }
-
 func (cli *K8sDR) UnRegister() error {
+
 	return nil
 }
-
 func (cli *K8sDR) CreateRpcRootNodes(serviceNames []string) error {
+
 	return nil
 }
-
 func (cli *K8sDR) RegisterConf2Registry(key string, conf []byte) error {
+
 	return nil
 }
 
 func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
+
 	return nil, nil
 }
-
 func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
-	conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
 
+	conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
 	return []*grpc.ClientConn{conn}, err
 }
-
 func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
+
 	return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
 }
-
 func (cli *K8sDR) GetSelfConnTarget() string {
+
 	return cli.rpcRegisterAddr
 }
-
 func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
 	cli.options = append(cli.options, opts...)
 }
-
 func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
 	conn.Close()
 }
 
-// do not use this method for call rpc.
+// do not use this method for call rpc
 func (cli *K8sDR) GetClientLocalConns() map[string][]*grpc.ClientConn {
 	fmt.Println("should not call this function!!!!!!!!!!!!!!!!!!!!!!!!!")
-
 	return nil
 }

pkg/common/http/http_client.go

@@ -34,21 +34,16 @@ import (
 var client http.Client
 
 func Get(url string) (response []byte, err error) {
-	clientGet := http.Client{Timeout: 5 * time.Second}
+	client := http.Client{Timeout: 5 * time.Second}
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
+	resp, err := client.Get(url)
 	if err != nil {
 		return nil, err
 	}
-	resp, err2 := clientGet.Do(req)
-	if err2 != nil {
-		return nil, err
-	}
 	defer resp.Body.Close()
-	body, err3 := io.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
-	if err3 != nil {
+	if err != nil {
 		return nil, err
 	}
-
 	return body, nil
 }
 
@@ -88,7 +83,6 @@ func Post(
 	if err != nil {
 		return nil, err
 	}
-
 	return result, nil
 }
 
@@ -104,7 +98,6 @@ func PostReturn(
 		return err
 	}
 	err = json.Unmarshal(b, output)
-
 	return err
 }
 
@@ -123,22 +116,17 @@ func callBackPostReturn(
 	if err != nil {
 		if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue {
 			log.ZWarn(ctx, "callback failed but continue", err, "url", url)
-
 			return errs.ErrCallbackContinue
 		}
-
 		return errs.ErrNetwork.Wrap(err.Error())
 	}
 	if err = json.Unmarshal(b, output); err != nil {
 		if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue {
 			log.ZWarn(ctx, "callback failed but continue", err, "url", url)
-
 			return errs.ErrCallbackContinue
 		}
-
 		return errs.ErrData.Wrap(err.Error())
 	}
-
 	return output.Parse()
 }
 

pkg/common/kafka/consumer_group.go

@@ -51,7 +51,6 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addrs []str
 	if err != nil {
 		panic(err.Error())
 	}
-
 	return &MConsumerGroup{
 		consumerGroup,
 		groupID,

pkg/common/kafka/producer.go

@@ -67,7 +67,6 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
 		producer, err = sarama.NewSyncProducer(p.addr, p.config) // Initialize the client
 		if err == nil {
 			p.producer = producer
-
 			return &p
 		}
 		//TODO If the password is wrong, exit directly
@@ -84,7 +83,6 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
 		panic(err.Error())
 	}
 	p.producer = producer
-
 	return &p
 }
 
@@ -93,7 +91,6 @@ func GetMQHeaderWithContext(ctx context.Context) ([]sarama.RecordHeader, error)
 	if err != nil {
 		return nil, err
 	}
-
 	return []sarama.RecordHeader{
 		{Key: []byte(constant.OperationID), Value: []byte(operationID)},
 		{Key: []byte(constant.OpUserID), Value: []byte(opUserID)},
@@ -103,11 +100,10 @@ func GetMQHeaderWithContext(ctx context.Context) ([]sarama.RecordHeader, error)
 }
 
 func GetContextWithMQHeader(header []*sarama.RecordHeader) context.Context {
-	values := make([]string, 0, len(header))
+	var values []string
 	for _, recordHeader := range header {
 		values = append(values, string(recordHeader.Value))
 	}
-
 	return mcontext.WithMustInfoCtx(values) // TODO
 }
 
@@ -138,6 +134,5 @@ func (p *Producer) SendMessage(ctx context.Context, key string, msg proto.Messag
 	if err == nil {
 		prome.Inc(prome.SendMsgCounter)
 	}
-
 	return partition, offset, utils.Wrap(err, "")
 }

pkg/common/locker/message_locker.go

@@ -42,13 +42,11 @@ func (l *LockerMessage) LockMessageTypeKey(ctx context.Context, clientMsgID, typ
 		err = l.cache.LockMessageTypeKey(ctx, clientMsgID, typeKey)
 		if err != nil {
 			time.Sleep(time.Millisecond * 100)
-
 			continue
 		} else {
 			break
 		}
 	}
-
 	return err
 }
 
@@ -57,13 +55,11 @@ func (l *LockerMessage) LockGlobalMessage(ctx context.Context, clientMsgID strin
 		err = l.cache.LockMessageTypeKey(ctx, clientMsgID, GlOBALLOCK)
 		if err != nil {
 			time.Sleep(time.Millisecond * 100)
-
 			continue
 		} else {
 			break
 		}
 	}
-
 	return err
 }
 

pkg/common/prome/gather.go

@@ -79,7 +79,6 @@ var (
 	ConversationCreateFailedCounter  prometheus.Counter
 )
 
-//nolint:promlinter    //no idea to fix it
 func NewUserLoginCounter() {
 	if UserLoginCounter != nil {
 		return
@@ -90,7 +89,6 @@ func NewUserLoginCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewUserRegisterCounter() {
 	if UserRegisterCounter != nil {
 		return
@@ -101,7 +99,6 @@ func NewUserRegisterCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSeqGetSuccessCounter() {
 	if SeqGetSuccessCounter != nil {
 		return
@@ -112,7 +109,6 @@ func NewSeqGetSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSeqGetFailedCounter() {
 	if SeqGetFailedCounter != nil {
 		return
@@ -123,7 +119,6 @@ func NewSeqGetFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSeqSetSuccessCounter() {
 	if SeqSetSuccessCounter != nil {
 		return
@@ -134,7 +129,6 @@ func NewSeqSetSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSeqSetFailedCounter() {
 	if SeqSetFailedCounter != nil {
 		return
@@ -145,7 +139,6 @@ func NewSeqSetFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewApiRequestCounter() {
 	if ApiRequestCounter != nil {
 		return
@@ -156,7 +149,6 @@ func NewApiRequestCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewApiRequestSuccessCounter() {
 	if ApiRequestSuccessCounter != nil {
 		return
@@ -167,7 +159,6 @@ func NewApiRequestSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewApiRequestFailedCounter() {
 	if ApiRequestFailedCounter != nil {
 		return
@@ -178,7 +169,6 @@ func NewApiRequestFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGrpcRequestCounter() {
 	if GrpcRequestCounter != nil {
 		return
@@ -189,7 +179,6 @@ func NewGrpcRequestCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGrpcRequestSuccessCounter() {
 	if GrpcRequestSuccessCounter != nil {
 		return
@@ -200,7 +189,6 @@ func NewGrpcRequestSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGrpcRequestFailedCounter() {
 	if GrpcRequestFailedCounter != nil {
 		return
@@ -211,7 +199,6 @@ func NewGrpcRequestFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSendMsgCount() {
 	if SendMsgCounter != nil {
 		return
@@ -222,7 +209,6 @@ func NewSendMsgCount() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgInsertRedisSuccessCounter() {
 	if MsgInsertRedisSuccessCounter != nil {
 		return
@@ -233,7 +219,6 @@ func NewMsgInsertRedisSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix its
 func NewMsgInsertRedisFailedCounter() {
 	if MsgInsertRedisFailedCounter != nil {
 		return
@@ -244,7 +229,6 @@ func NewMsgInsertRedisFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgInsertMongoSuccessCounter() {
 	if MsgInsertMongoSuccessCounter != nil {
 		return
@@ -255,7 +239,6 @@ func NewMsgInsertMongoSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgInsertMongoFailedCounter() {
 	if MsgInsertMongoFailedCounter != nil {
 		return
@@ -266,7 +249,6 @@ func NewMsgInsertMongoFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgPullFromRedisSuccessCounter() {
 	if MsgPullFromRedisSuccessCounter != nil {
 		return
@@ -277,7 +259,6 @@ func NewMsgPullFromRedisSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgPullFromRedisFailedCounter() {
 	if MsgPullFromRedisFailedCounter != nil {
 		return
@@ -288,7 +269,6 @@ func NewMsgPullFromRedisFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgPullFromMongoSuccessCounter() {
 	if MsgPullFromMongoSuccessCounter != nil {
 		return
@@ -299,7 +279,6 @@ func NewMsgPullFromMongoSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgPullFromMongoFailedCounter() {
 	if MsgPullFromMongoFailedCounter != nil {
 		return
@@ -340,7 +319,6 @@ func NewPullMsgBySeqListTotalCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSingleChatMsgRecvSuccessCounter() {
 	if SingleChatMsgRecvSuccessCounter != nil {
 		return
@@ -351,7 +329,6 @@ func NewSingleChatMsgRecvSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGroupChatMsgRecvSuccessCounter() {
 	if GroupChatMsgRecvSuccessCounter != nil {
 		return
@@ -362,7 +339,6 @@ func NewGroupChatMsgRecvSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewWorkSuperGroupChatMsgRecvSuccessCounter() {
 	if WorkSuperGroupChatMsgRecvSuccessCounter != nil {
 		return
@@ -383,7 +359,6 @@ func NewOnlineUserGauges() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSingleChatMsgProcessSuccessCounter() {
 	if SingleChatMsgProcessSuccessCounter != nil {
 		return
@@ -394,7 +369,6 @@ func NewSingleChatMsgProcessSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewSingleChatMsgProcessFailedCounter() {
 	if SingleChatMsgProcessFailedCounter != nil {
 		return
@@ -405,7 +379,6 @@ func NewSingleChatMsgProcessFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGroupChatMsgProcessSuccessCounter() {
 	if GroupChatMsgProcessSuccessCounter != nil {
 		return
@@ -416,7 +389,6 @@ func NewGroupChatMsgProcessSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewGroupChatMsgProcessFailedCounter() {
 	if GroupChatMsgProcessFailedCounter != nil {
 		return
@@ -427,7 +399,6 @@ func NewGroupChatMsgProcessFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewWorkSuperGroupChatMsgProcessSuccessCounter() {
 	if WorkSuperGroupChatMsgProcessSuccessCounter != nil {
 		return
@@ -438,7 +409,6 @@ func NewWorkSuperGroupChatMsgProcessSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewWorkSuperGroupChatMsgProcessFailedCounter() {
 	if WorkSuperGroupChatMsgProcessFailedCounter != nil {
 		return
@@ -449,7 +419,6 @@ func NewWorkSuperGroupChatMsgProcessFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgOnlinePushSuccessCounter() {
 	if MsgOnlinePushSuccessCounter != nil {
 		return
@@ -460,7 +429,6 @@ func NewMsgOnlinePushSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgOfflinePushSuccessCounter() {
 	if MsgOfflinePushSuccessCounter != nil {
 		return
@@ -471,7 +439,6 @@ func NewMsgOfflinePushSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewMsgOfflinePushFailedCounter() {
 	if MsgOfflinePushFailedCounter != nil {
 		return
@@ -482,7 +449,6 @@ func NewMsgOfflinePushFailedCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewConversationCreateSuccessCounter() {
 	if ConversationCreateSuccessCounter != nil {
 		return
@@ -493,7 +459,6 @@ func NewConversationCreateSuccessCounter() {
 	})
 }
 
-//nolint:promlinter    //no idea to fix it
 func NewConversationCreateFailedCounter() {
 	if ConversationCreateFailedCounter != nil {
 		return

pkg/common/prome/prometheus.go

@@ -30,16 +30,13 @@ func StartPrometheusSrv(prometheusPort int) error {
 	if config.Config.Prometheus.Enable {
 		http.Handle("/metrics", promhttp.Handler())
 		err := http.ListenAndServe(":"+strconv.Itoa(prometheusPort), nil)
-
 		return err
 	}
-
 	return nil
 }
 
 func PrometheusHandler() gin.HandlerFunc {
 	h := promhttp.Handler()
-
 	return func(c *gin.Context) {
 		h.ServeHTTP(c.Writer, c.Request)
 	}
@@ -52,7 +49,6 @@ type responseBodyWriter struct {
 
 func (r responseBodyWriter) Write(b []byte) (int, error) {
 	r.body.Write(b)
-
 	return r.ResponseWriter.Write(b)
 }
 

pkg/common/tls/tls.go

@@ -24,7 +24,6 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
-//nolint:staticcheck //we have not time looking for a replacement for x509 to fix the security valnerability
 func decryptPEM(data []byte, passphrase []byte) ([]byte, error) {
 	if len(passphrase) == 0 {
 		return data, nil
@@ -34,7 +33,6 @@ func decryptPEM(data []byte, passphrase []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	return pem.EncodeToMemory(&pem.Block{
 		Type:  b.Type,
 		Bytes: d,
@@ -46,7 +44,6 @@ func readEncryptablePEMBlock(path string, pwd []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	return decryptPEM(data, pwd)
 }
 

pkg/msgprocessor/conversation.go

@@ -28,7 +28,6 @@ func GetNotificationConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.SingleChatType:
 		l := []string{msg.SendID, msg.RecvID}
 		sort.Strings(l)
-
 		return "n_" + strings.Join(l, "_")
 	case constant.GroupChatType:
 		return "n_" + msg.GroupID
@@ -37,7 +36,6 @@ func GetNotificationConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.NotificationChatType:
 		return "n_" + msg.SendID + "_" + msg.RecvID
 	}
-
 	return ""
 }
 
@@ -46,7 +44,6 @@ func GetChatConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.SingleChatType:
 		l := []string{msg.SendID, msg.RecvID}
 		sort.Strings(l)
-
 		return "si_" + strings.Join(l, "_")
 	case constant.GroupChatType:
 		return "g_" + msg.GroupID
@@ -55,7 +52,6 @@ func GetChatConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.NotificationChatType:
 		return "sn_" + msg.SendID + "_" + msg.RecvID
 	}
-
 	return ""
 }
 
@@ -64,12 +60,10 @@ func GenConversationUniqueKey(msg *sdkws.MsgData) string {
 	case constant.SingleChatType, constant.NotificationChatType:
 		l := []string{msg.SendID, msg.RecvID}
 		sort.Strings(l)
-
 		return strings.Join(l, "_")
 	case constant.SuperGroupChatType:
 		return msg.GroupID
 	}
-
 	return ""
 }
 
@@ -82,28 +76,23 @@ func GetConversationIDByMsg(msg *sdkws.MsgData) string {
 		if !options.IsNotNotification() {
 			return "n_" + strings.Join(l, "_")
 		}
-
 		return "si_" + strings.Join(l, "_") // single chat
 	case constant.GroupChatType:
 		if !options.IsNotNotification() {
 			return "n_" + msg.GroupID // group chat
 		}
-
 		return "g_" + msg.GroupID // group chat
 	case constant.SuperGroupChatType:
 		if !options.IsNotNotification() {
 			return "n_" + msg.GroupID // super group chat
 		}
-
 		return "sg_" + msg.GroupID // super group chat
 	case constant.NotificationChatType:
 		if !options.IsNotNotification() {
 			return "n_" + msg.SendID + "_" + msg.RecvID // super group chat
 		}
-
 		return "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat
 	}
-
 	return ""
 }
 
@@ -122,7 +111,6 @@ func GetConversationIDBySessionType(sessionType int, ids ...string) string {
 	case constant.NotificationChatType:
 		return "sn_" + ids[0] // server notification chat
 	}
-
 	return ""
 }
 
@@ -130,11 +118,10 @@ func GetNotificationConversationIDByConversationID(conversationID string) string
 	l := strings.Split(conversationID, "_")
 	if len(l) > 1 {
 		l[0] = "n"
-
 		return strings.Join(l, "_")
+	} else {
+		return ""
 	}
-
-	return ""
 }
 
 func GetNotificationConversationID(sessionType int, ids ...string) string {
@@ -148,7 +135,6 @@ func GetNotificationConversationID(sessionType int, ids ...string) string {
 	case constant.SuperGroupChatType:
 		return "n_" + ids[0] // super group chat
 	}
-
 	return ""
 }
 
@@ -169,22 +155,18 @@ func ParseConversationID(msg *sdkws.MsgData) (isNotification bool, conversationI
 		if !options.IsNotNotification() {
 			return true, "n_" + strings.Join(l, "_")
 		}
-
 		return false, "si_" + strings.Join(l, "_") // single chat
 	case constant.SuperGroupChatType:
 		if !options.IsNotNotification() {
 			return true, "n_" + msg.GroupID // super group chat
 		}
-
 		return false, "sg_" + msg.GroupID // super group chat
 	case constant.NotificationChatType:
 		if !options.IsNotNotification() {
 			return true, "n_" + msg.SendID + "_" + msg.RecvID // super group chat
 		}
-
 		return false, "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat
 	}
-
 	return false, ""
 }
 
@@ -207,7 +189,6 @@ func Pb2String(pb proto.Message) (string, error) {
 	if err != nil {
 		return "", err
 	}
-
 	return string(s), nil
 }
 

pkg/msgprocessor/options.go

@@ -38,14 +38,12 @@ func NewOptions(opts ...OptionsOpt) Options {
 	for _, opt := range opts {
 		opt(options)
 	}
-
 	return options
 }
 
 func NewMsgOptions() Options {
 	options := make(map[string]bool, 11)
 	options[constant.IsOfflinePush] = false
-
 	return make(map[string]bool)
 }
 
@@ -53,7 +51,6 @@ func WithOptions(options Options, opts ...OptionsOpt) Options {
 	for _, opt := range opts {
 		opt(options)
 	}
-
 	return options
 }
 
@@ -134,7 +131,6 @@ func (o Options) Is(notification string) bool {
 	if !ok || v {
 		return true
 	}
-
 	return false
 }
 

pkg/rpcclient/auth.go

@@ -31,7 +31,6 @@ func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry) *Auth {
 		panic(err)
 	}
 	client := auth.NewAuthClient(conn)
-
 	return &Auth{discov: discov, conn: conn, Client: client}
 }
 

pkg/rpcclient/conversation.go

@@ -60,8 +60,7 @@ func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(ctx context.Cont
 }
 
 func (c *ConversationRpcClient) SingleChatFirstCreateConversation(ctx context.Context, recvID, sendID,
-	conversationID string, conversationType int32,
+	conversationID string, conversationType int32) error {
-) error {
 	_, err := c.Client.CreateSingleChatConversations(ctx,
 		&pbconversation.CreateSingleChatConversationsReq{
 			RecvID: recvID, SendID: sendID, ConversationID: conversationID,
@@ -72,19 +71,16 @@ func (c *ConversationRpcClient) SingleChatFirstCreateConversation(ctx context.Co
 
 func (c *ConversationRpcClient) GroupChatFirstCreateConversation(ctx context.Context, groupID string, userIDs []string) error {
 	_, err := c.Client.CreateGroupChatConversations(ctx, &pbconversation.CreateGroupChatConversationsReq{UserIDs: userIDs, GroupID: groupID})
-
 	return err
 }
 
 func (c *ConversationRpcClient) SetConversationMaxSeq(ctx context.Context, 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 {
 	_, err := c.Client.SetConversations(ctx, &pbconversation.SetConversationsReq{UserIDs: userIDs, Conversation: conversation})
-
 	return err
 }
 
@@ -93,7 +89,6 @@ func (c *ConversationRpcClient) GetConversationIDs(ctx context.Context, ownerUse
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.ConversationIDs, nil
 }
 
@@ -102,7 +97,6 @@ func (c *ConversationRpcClient) GetConversation(ctx context.Context, ownerUserID
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.Conversation, nil
 }
 
@@ -117,7 +111,6 @@ func (c *ConversationRpcClient) GetConversationsByConversationID(ctx context.Con
 	if len(resp.Conversations) == 0 {
 		return nil, errs.ErrRecordNotFound.Wrap(fmt.Sprintf("conversationIDs: %v not found", conversationIDs))
 	}
-
 	return resp.Conversations, nil
 }
 
@@ -136,6 +129,5 @@ func (c *ConversationRpcClient) GetConversations(
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.Conversations, nil
 }

pkg/rpcclient/friend.go

@@ -38,7 +38,6 @@ func NewFriend(discov discoveryregistry.SvcDiscoveryRegistry) *Friend {
 		panic(err)
 	}
 	client := friend.NewFriendClient(conn)
-
 	return &Friend{discov: discov, conn: conn, Client: client}
 }
 
@@ -60,7 +59,6 @@ func (f *FriendRpcClient) GetFriendsInfo(
 		return nil, err
 	}
 	resp = r.FriendsInfo[0]
-
 	return
 }
 
@@ -70,7 +68,6 @@ func (f *FriendRpcClient) IsFriend(ctx context.Context, possibleFriendUserID, us
 	if err != nil {
 		return false, err
 	}
-
 	return resp.InUser1Friends, nil
 }
 
@@ -80,7 +77,6 @@ func (f *FriendRpcClient) GetFriendIDs(ctx context.Context, ownerUserID string)
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.FriendIDs, nil
 }
 
@@ -89,6 +85,5 @@ func (b *FriendRpcClient) IsBlocked(ctx context.Context, possibleBlackUserID, us
 	if err != nil {
 		return false, err
 	}
-
 	return r.InUser2Blacks, nil
 }

pkg/rpcclient/group.go

@@ -42,7 +42,6 @@ func NewGroup(discov discoveryregistry.SvcDiscoveryRegistry) *Group {
 		panic(err)
 	}
 	client := group.NewGroupClient(conn)
-
 	return &Group{discov: discov, conn: conn, Client: client}
 }
 
@@ -70,7 +69,6 @@ func (g *GroupRpcClient) GetGroupInfos(
 			return nil, errs.ErrGroupIDNotFound.Wrap(strings.Join(ids, ","))
 		}
 	}
-
 	return resp.GroupInfos, nil
 }
 
@@ -79,7 +77,6 @@ func (g *GroupRpcClient) GetGroupInfo(ctx context.Context, groupID string) (*sdk
 	if err != nil {
 		return nil, err
 	}
-
 	return groups[0], nil
 }
 
@@ -92,7 +89,6 @@ func (g *GroupRpcClient) GetGroupInfoMap(
 	if err != nil {
 		return nil, err
 	}
-
 	return utils.SliceToMap(groups, func(e *sdkws.GroupInfo) string {
 		return e.GroupID
 	}), nil
@@ -118,7 +114,6 @@ func (g *GroupRpcClient) GetGroupMemberInfos(
 			return nil, errs.ErrNotInGroupYet.Wrap(strings.Join(ids, ","))
 		}
 	}
-
 	return resp.Members, nil
 }
 
@@ -131,7 +126,6 @@ func (g *GroupRpcClient) GetGroupMemberInfo(
 	if err != nil {
 		return nil, err
 	}
-
 	return members[0], nil
 }
 
@@ -145,7 +139,6 @@ func (g *GroupRpcClient) GetGroupMemberInfoMap(
 	if err != nil {
 		return nil, err
 	}
-
 	return utils.SliceToMap(members, func(e *sdkws.GroupMemberFullInfo) string {
 		return e.UserID
 	}), nil
@@ -162,7 +155,6 @@ func (g *GroupRpcClient) GetOwnerAndAdminInfos(
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.Members, nil
 }
 
@@ -171,7 +163,6 @@ func (g *GroupRpcClient) GetOwnerInfo(ctx context.Context, groupID string) (*sdk
 		GroupID:    groupID,
 		RoleLevels: []int32{constant.GroupOwner},
 	})
-
 	return resp.Members[0], err
 }
 
@@ -182,7 +173,6 @@ func (g *GroupRpcClient) GetGroupMemberIDs(ctx context.Context, groupID string)
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.UserIDs, nil
 }
 
@@ -193,7 +183,6 @@ func (g *GroupRpcClient) GetGroupInfoCache(ctx context.Context, groupID string)
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.GroupInfo, nil
 }
 
@@ -209,7 +198,6 @@ func (g *GroupRpcClient) GetGroupMemberCache(
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.Member, nil
 }
 
@@ -218,7 +206,6 @@ func (g *GroupRpcClient) DismissGroup(ctx context.Context, groupID string) error
 		GroupID:      groupID,
 		DeleteMember: true,
 	})
-
 	return err
 }
 
@@ -226,6 +213,5 @@ func (g *GroupRpcClient) NotificationUserInfoUpdate(ctx context.Context, userID
 	_, err := g.Client.NotificationUserInfoUpdate(ctx, &group.NotificationUserInfoUpdateReq{
 		UserID: userID,
 	})
-
 	return err
 }

pkg/rpcclient/msg.go

@@ -136,7 +136,6 @@ func NewMessage(discov discoveryregistry.SvcDiscoveryRegistry) *Message {
 		panic(err)
 	}
 	client := msg.NewMsgClient(conn)
-
 	return &Message{discov: discov, conn: conn, Client: client}
 }
 
@@ -148,19 +147,16 @@ func NewMessageRpcClient(discov discoveryregistry.SvcDiscoveryRegistry) MessageR
 
 func (m *MessageRpcClient) SendMsg(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error) {
 	resp, err := m.Client.SendMsg(ctx, req)
-
 	return resp, err
 }
 
 func (m *MessageRpcClient) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sdkws.GetMaxSeqResp, error) {
 	resp, err := m.Client.GetMaxSeq(ctx, req)
-
 	return resp, err
 }
 
 func (m *MessageRpcClient) PullMessageBySeqList(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) {
 	resp, err := m.Client.PullMessageBySeqs(ctx, req)
-
 	return resp, err
 }
 
@@ -169,7 +165,6 @@ func (m *MessageRpcClient) GetConversationMaxSeq(ctx context.Context, conversati
 	if err != nil {
 		return 0, err
 	}
-
 	return resp.MaxSeq, nil
 }
 
@@ -205,7 +200,6 @@ func NewNotificationSender(opts ...NotificationSenderOptions) *NotificationSende
 	for _, opt := range opts {
 		opt(notificationSender)
 	}
-
 	return notificationSender
 }
 
@@ -221,13 +215,11 @@ func WithRpcGetUserName() NotificationOptions {
 	}
 }
 
-func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, sendID, recvID string,
+func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, sendID, recvID string, contentType, sesstionType int32, m proto.Message, opts ...NotificationOptions) (err error) {
-	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(ctx, "MsgClient Notification json.Marshal failed", err, "sendID",
+		log.ZError(ctx, "MsgClient Notification json.Marshal failed", err, "sendID", sendID, "recvID", recvID, "contentType", contentType, "msg", m)
-			sendID, "recvID", recvID, "contentType", contentType, "msg", m)
 		return err
 	}
 	notificationOpt := &notificationOpt{}
@@ -276,7 +268,6 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
 	} else {
 		log.ZError(ctx, "MsgClient Notification SendMsg failed", err, "req", &req)
 	}
-
 	return err
 }
 

pkg/rpcclient/notification/friend.go

@@ -57,7 +57,6 @@ func WithDBFunc(
 			for _, user := range users {
 				result = append(result, user)
 			}
-
 			return result, nil
 		}
 		s.getUsersInfo = f
@@ -76,7 +75,6 @@ func WithRpcFunc(
 			for _, user := range users {
 				result = append(result, user)
 			}
-
 			return result, err
 		}
 		s.getUsersInfo = f
@@ -93,7 +91,6 @@ func NewFriendNotificationSender(
 	for _, opt := range opts {
 		opt(f)
 	}
-
 	return f
 }
 
@@ -109,13 +106,22 @@ func (f *FriendNotificationSender) getUsersInfoMap(
 	for _, user := range users {
 		result[user.GetUserID()] = user.(*sdkws.UserInfo)
 	}
-
 	return result, nil
 }
 
+func (f *FriendNotificationSender) getFromToUserNickname(
+	ctx context.Context,
+	fromUserID, toUserID string,
+) (string, string, error) {
+	users, err := f.getUsersInfoMap(ctx, []string{fromUserID, toUserID})
+	if err != nil {
+		return "", "", nil
+	}
+	return users[fromUserID].Nickname, users[toUserID].Nickname, nil
+}
+
 func (f *FriendNotificationSender) UserInfoUpdatedNotification(ctx context.Context, changedUserID string) error {
 	tips := sdkws.UserInfoUpdatedTips{UserID: changedUserID}
-
 	return f.Notification(ctx, mcontext.GetOpUserID(ctx), changedUserID, constant.UserInfoUpdatedNotification, &tips)
 }
 
@@ -127,7 +133,6 @@ func (f *FriendNotificationSender) FriendApplicationAddNotification(
 		FromUserID: req.FromUserID,
 		ToUserID:   req.ToUserID,
 	}}
-
 	return f.Notification(ctx, req.FromUserID, req.ToUserID, constant.FriendApplicationNotification, &tips)
 }
 
@@ -139,7 +144,6 @@ func (f *FriendNotificationSender) FriendApplicationAgreedNotification(
 		FromUserID: req.FromUserID,
 		ToUserID:   req.ToUserID,
 	}, HandleMsg: req.HandleMsg}
-
 	return f.Notification(ctx, req.ToUserID, req.FromUserID, constant.FriendApplicationApprovedNotification, &tips)
 }
 
@@ -151,7 +155,6 @@ func (f *FriendNotificationSender) FriendApplicationRefusedNotification(
 		FromUserID: req.FromUserID,
 		ToUserID:   req.ToUserID,
 	}, HandleMsg: req.HandleMsg}
-
 	return f.Notification(ctx, req.ToUserID, req.FromUserID, constant.FriendApplicationRejectedNotification, &tips)
 }
 
@@ -176,7 +179,6 @@ func (f *FriendNotificationSender) FriendAddedNotification(
 	if err != nil {
 		return err
 	}
-
 	return f.Notification(ctx, fromUserID, toUserID, constant.FriendAddedNotification, &tips)
 }
 
@@ -185,7 +187,6 @@ func (f *FriendNotificationSender) FriendDeletedNotification(ctx context.Context
 		FromUserID: req.OwnerUserID,
 		ToUserID:   req.FriendUserID,
 	}}
-
 	return f.Notification(ctx, req.OwnerUserID, req.FriendUserID, constant.FriendDeletedNotification, &tips)
 }
 
@@ -193,7 +194,6 @@ func (f *FriendNotificationSender) FriendRemarkSetNotification(ctx context.Conte
 	tips := sdkws.FriendInfoChangedTips{FromToUserID: &sdkws.FromToUserID{}}
 	tips.FromToUserID.FromUserID = fromUserID
 	tips.FromToUserID.ToUserID = toUserID
-
 	return f.Notification(ctx, fromUserID, toUserID, constant.FriendRemarkSetNotification, &tips)
 }
 
@@ -201,7 +201,6 @@ func (f *FriendNotificationSender) BlackAddedNotification(ctx context.Context, r
 	tips := sdkws.BlackAddedTips{FromToUserID: &sdkws.FromToUserID{}}
 	tips.FromToUserID.FromUserID = req.OwnerUserID
 	tips.FromToUserID.ToUserID = req.BlackUserID
-
 	return f.Notification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackAddedNotification, &tips)
 }
 
@@ -210,10 +209,7 @@ func (f *FriendNotificationSender) BlackDeletedNotification(ctx context.Context,
 		FromUserID: req.OwnerUserID,
 		ToUserID:   req.BlackUserID,
 	}}
-	err := f.Notification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips)
+	f.Notification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips)
-	if err != nil {
-		panic(err)
-	}
 }
 
 func (f *FriendNotificationSender) FriendInfoUpdatedNotification(
@@ -222,8 +218,5 @@ func (f *FriendNotificationSender) FriendInfoUpdatedNotification(
 	needNotifiedUserID string,
 ) {
 	tips := sdkws.UserInfoUpdatedTips{UserID: changedUserID}
-	err := f.Notification(ctx, mcontext.GetOpUserID(ctx), needNotifiedUserID, constant.FriendInfoUpdatedNotification, &tips)
+	f.Notification(ctx, mcontext.GetOpUserID(ctx), needNotifiedUserID, constant.FriendInfoUpdatedNotification, &tips)
-	if err != nil {
-		panic(err)
-	}
 }

pkg/rpcclient/notification/group.go

@@ -60,7 +60,6 @@ func (g *GroupNotificationSender) getUser(ctx context.Context, userID string) (*
 	if len(users) == 0 {
 		return nil, errs.ErrUserIDNotFound.Wrap(fmt.Sprintf("user %s not found", userID))
 	}
-
 	return &sdkws.PublicUserInfo{
 		UserID:   users[0].GetUserID(),
 		Nickname: users[0].GetNickname(),
@@ -69,23 +68,6 @@ func (g *GroupNotificationSender) getUser(ctx context.Context, userID string) (*
 	}, nil
 }
 
-func (g *GroupNotificationSender) groupMemberDB2PB(member *relation.GroupMemberModel, appMangerLevel int32) *sdkws.GroupMemberFullInfo {
-	return &sdkws.GroupMemberFullInfo{
-		GroupID:        member.GroupID,
-		UserID:         member.UserID,
-		RoleLevel:      member.RoleLevel,
-		JoinTime:       member.JoinTime.UnixMilli(),
-		Nickname:       member.Nickname,
-		FaceURL:        member.FaceURL,
-		AppMangerLevel: appMangerLevel,
-		JoinSource:     member.JoinSource,
-		OperatorUserID: member.OperatorUserID,
-		Ex:             member.Ex,
-		MuteEndTime:    member.MuteEndTime.UnixMilli(),
-		InviterUserID:  member.InviterUserID,
-	}
-}
-
 func (g *GroupNotificationSender) getGroupInfo(ctx context.Context, groupID string) (*sdkws.GroupInfo, error) {
 	gm, err := g.db.TakeGroup(ctx, groupID)
 	if err != nil {
@@ -99,7 +81,6 @@ func (g *GroupNotificationSender) getGroupInfo(ctx context.Context, groupID stri
 	if err != nil {
 		return nil, err
 	}
-
 	return &sdkws.GroupInfo{
 		GroupID:                gm.GroupID,
 		GroupName:              gm.GroupName,
@@ -167,7 +148,6 @@ func (g *GroupNotificationSender) getGroupMemberMap(ctx context.Context, groupID
 	for i, member := range members {
 		m[member.UserID] = members[i]
 	}
-
 	return m, nil
 }
 
@@ -179,7 +159,6 @@ func (g *GroupNotificationSender) getGroupMember(ctx context.Context, groupID st
 	if len(members) == 0 {
 		return nil, errs.ErrInternalServer.Wrap(fmt.Sprintf("group %s member %s not found", groupID, userID))
 	}
-
 	return members[0], nil
 }
 
@@ -189,10 +168,48 @@ func (g *GroupNotificationSender) getGroupOwnerAndAdminUserID(ctx context.Contex
 		return nil, err
 	}
 	fn := func(e *relation.GroupMemberModel) string { return e.UserID }
-
 	return utils.Slice(members, fn), nil
 }
 
+func (g *GroupNotificationSender) groupDB2PB(group *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo {
+	return &sdkws.GroupInfo{
+		GroupID:                group.GroupID,
+		GroupName:              group.GroupName,
+		Notification:           group.Notification,
+		Introduction:           group.Introduction,
+		FaceURL:                group.FaceURL,
+		OwnerUserID:            ownerUserID,
+		CreateTime:             group.CreateTime.UnixMilli(),
+		MemberCount:            memberCount,
+		Ex:                     group.Ex,
+		Status:                 group.Status,
+		CreatorUserID:          group.CreatorUserID,
+		GroupType:              group.GroupType,
+		NeedVerification:       group.NeedVerification,
+		LookMemberInfo:         group.LookMemberInfo,
+		ApplyMemberFriend:      group.ApplyMemberFriend,
+		NotificationUpdateTime: group.NotificationUpdateTime.UnixMilli(),
+		NotificationUserID:     group.NotificationUserID,
+	}
+}
+
+func (g *GroupNotificationSender) groupMemberDB2PB(member *relation.GroupMemberModel, appMangerLevel int32) *sdkws.GroupMemberFullInfo {
+	return &sdkws.GroupMemberFullInfo{
+		GroupID:        member.GroupID,
+		UserID:         member.UserID,
+		RoleLevel:      member.RoleLevel,
+		JoinTime:       member.JoinTime.UnixMilli(),
+		Nickname:       member.Nickname,
+		FaceURL:        member.FaceURL,
+		AppMangerLevel: appMangerLevel,
+		JoinSource:     member.JoinSource,
+		OperatorUserID: member.OperatorUserID,
+		Ex:             member.Ex,
+		MuteEndTime:    member.MuteEndTime.UnixMilli(),
+		InviterUserID:  member.InviterUserID,
+	}
+}
+
 func (g *GroupNotificationSender) getUsersInfoMap(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error) {
 	users, err := g.getUsersInfo(ctx, userIDs)
 	if err != nil {
@@ -202,7 +219,6 @@ func (g *GroupNotificationSender) getUsersInfoMap(ctx context.Context, userIDs [
 	for _, user := range users {
 		result[user.GetUserID()] = user.(*sdkws.UserInfo)
 	}
-
 	return result, nil
 }
 
@@ -220,31 +236,21 @@ func (g *GroupNotificationSender) fillOpUser(ctx context.Context, opUser **sdkws
 		return nil
 	}
 	userID := mcontext.GetOpUserID(ctx)
-	getOpUser := func(g *GroupNotificationSender, groupID, userID string) (opUser *sdkws.GroupMemberFullInfo, err error) {
+	if groupID != "" {
 		if authverify.IsManagerUserID(userID) {
-			opUser = &sdkws.GroupMemberFullInfo{
+			*opUser = &sdkws.GroupMemberFullInfo{
 				GroupID:        groupID,
 				UserID:         userID,
 				RoleLevel:      constant.GroupAdmin,
 				AppMangerLevel: constant.AppAdmin,
 			}
-
+		} else {
-			return opUser, nil
+			member, err := g.db.TakeGroupMember(ctx, groupID, userID)
-		}
+			if err == nil {
-		var member *relation.GroupMemberModel
+				*opUser = g.groupMemberDB2PB(member, 0)
-		member, err = g.db.TakeGroupMember(ctx, groupID, userID)
+			} else if !errs.ErrRecordNotFound.Is(err) {
-		if err == nil {
+				return err
-			opUser = g.groupMemberDB2PB(member, 0)
+			}
-		} else if !errs.ErrRecordNotFound.Is(err) {
-			return nil, err
-		}
-
-		return opUser, nil
-	}
-	if groupID != "" {
-		*opUser, err = getOpUser(g, groupID, userID)
-		if err != nil {
-			return err
 		}
 	}
 	user, err := g.getUser(ctx, userID)
@@ -267,7 +273,6 @@ func (g *GroupNotificationSender) fillOpUser(ctx context.Context, opUser **sdkws
 			(*opUser).FaceURL = user.FaceURL
 		}
 	}
-
 	return nil
 }
 
@@ -281,7 +286,6 @@ func (g *GroupNotificationSender) GroupCreatedNotification(ctx context.Context,
 	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)
 }
 
@@ -295,7 +299,6 @@ func (g *GroupNotificationSender) GroupInfoSetNotification(ctx context.Context,
 	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.GroupInfoSetNotification, tips, rpcclient.WithRpcGetUserName())
 }
 
@@ -309,7 +312,6 @@ func (g *GroupNotificationSender) GroupInfoSetNameNotification(ctx context.Conte
 	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.GroupInfoSetNameNotification, tips)
 }
 
@@ -323,7 +325,6 @@ func (g *GroupNotificationSender) GroupInfoSetAnnouncementNotification(ctx conte
 	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.GroupInfoSetAnnouncementNotification, tips, rpcclient.WithRpcGetUserName())
 }
 
@@ -354,7 +355,6 @@ func (g *GroupNotificationSender) JoinGroupApplicationNotification(ctx context.C
 			log.ZError(ctx, "JoinGroupApplicationNotification failed", err, "group", req.GroupID, "userID", userID)
 		}
 	}
-
 	return nil
 }
 
@@ -370,7 +370,6 @@ func (g *GroupNotificationSender) MemberQuitNotification(ctx context.Context, me
 		return err
 	}
 	tips := &sdkws.MemberQuitTips{Group: group, QuitUser: member}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), member.GroupID, constant.MemberQuitNotification, tips)
 }
 
@@ -390,8 +389,7 @@ func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(ctx conte
 		return err
 	}
 	tips := &sdkws.GroupApplicationAcceptedTips{Group: group, HandleMsg: req.HandledMsg, ReceiverAs: 1}
-	err = g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID)
+	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
-	if err != nil {
 		return err
 	}
 	for _, userID := range append(userIDs, mcontext.GetOpUserID(ctx)) {
@@ -400,7 +398,6 @@ func (g *GroupNotificationSender) GroupApplicationAcceptedNotification(ctx conte
 			log.ZError(ctx, "failed", err)
 		}
 	}
-
 	return nil
 }
 
@@ -420,8 +417,7 @@ func (g *GroupNotificationSender) GroupApplicationRejectedNotification(ctx conte
 		return err
 	}
 	tips := &sdkws.GroupApplicationRejectedTips{Group: group, HandleMsg: req.HandledMsg}
-	err = g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID)
+	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
-	if err != nil {
 		return err
 	}
 	for _, userID := range append(userIDs, mcontext.GetOpUserID(ctx)) {
@@ -430,7 +426,6 @@ func (g *GroupNotificationSender) GroupApplicationRejectedNotification(ctx conte
 			log.ZError(ctx, "failed", err)
 		}
 	}
-
 	return nil
 }
 
@@ -454,7 +449,6 @@ func (g *GroupNotificationSender) GroupOwnerTransferredNotification(ctx context.
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupOwnerTransferredNotification, tips)
 }
 
@@ -468,7 +462,6 @@ func (g *GroupNotificationSender) MemberKickedNotification(ctx context.Context,
 	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)
 }
 
@@ -494,7 +487,6 @@ func (g *GroupNotificationSender) MemberInvitedNotification(ctx context.Context,
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberInvitedNotification, tips)
 }
 
@@ -514,7 +506,6 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
 		return err
 	}
 	tips := &sdkws.MemberEnterTips{Group: group, EntrantUser: user}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberEnterNotification, tips)
 }
 
@@ -528,7 +519,6 @@ func (g *GroupNotificationSender) GroupDismissedNotification(ctx context.Context
 	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)
 }
 
@@ -554,7 +544,6 @@ func (g *GroupNotificationSender) GroupMemberMutedNotification(ctx context.Conte
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberMutedNotification, tips)
 }
 
@@ -577,7 +566,6 @@ func (g *GroupNotificationSender) GroupMemberCancelMutedNotification(ctx context
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberCancelMutedNotification, tips)
 }
 
@@ -603,7 +591,6 @@ func (g *GroupNotificationSender) GroupMutedNotification(ctx context.Context, gr
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMutedNotification, tips)
 }
 
@@ -629,7 +616,6 @@ func (g *GroupNotificationSender) GroupCancelMutedNotification(ctx context.Conte
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupCancelMutedNotification, tips)
 }
 
@@ -652,7 +638,6 @@ func (g *GroupNotificationSender) GroupMemberInfoSetNotification(ctx context.Con
 	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)
 }
 
@@ -675,7 +660,6 @@ func (g *GroupNotificationSender) GroupMemberSetToAdminNotification(ctx context.
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberSetToAdminNotification, tips)
 }
 
@@ -698,7 +682,6 @@ func (g *GroupNotificationSender) GroupMemberSetToOrdinaryUserNotification(ctx c
 	if err := g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
 		return err
 	}
-
 	return g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMemberSetToOrdinaryUserNotification, tips)
 }
 
@@ -710,6 +693,5 @@ func (g *GroupNotificationSender) SuperGroupNotification(ctx context.Context, se
 		}
 	}()
 	err = g.Notification(ctx, sendID, recvID, constant.SuperGroupUpdateNotification, nil)
-
 	return err
 }

pkg/rpcclient/notification/msg.go

@@ -37,7 +37,6 @@ func (m *MsgNotificationSender) UserDeleteMsgsNotification(ctx context.Context,
 		ConversationID: conversationID,
 		Seqs:           seqs,
 	}
-
 	return m.Notification(ctx, userID, userID, constant.DeleteMsgsNotification, &tips)
 }
 
@@ -48,6 +47,5 @@ func (m *MsgNotificationSender) MarkAsReadNotification(ctx context.Context, conv
 		Seqs:             seqs,
 		HasReadSeq:       hasReadSeq,
 	}
-
 	return m.NotificationWithSesstionType(ctx, sendID, recvID, constant.HasReadReceipt, sesstionType, tips)
 }

pkg/rpcclient/notification/user.go

@@ -52,7 +52,6 @@ func WithUserFunc(
 			for _, user := range users {
 				result = append(result, user)
 			}
-
 			return result, nil
 		}
 		u.getUsersInfo = f
@@ -69,37 +68,34 @@ func NewUserNotificationSender(
 	for _, opt := range opts {
 		opt(f)
 	}
-
 	return f
 }
 
-// func (u *UserNotificationSender) getUsersInfoMap(
+func (u *UserNotificationSender) getUsersInfoMap(
-// 	ctx context.Context,
+	ctx context.Context,
-// 	userIDs []string,
+	userIDs []string,
-// ) (map[string]*sdkws.UserInfo, error) {
+) (map[string]*sdkws.UserInfo, error) {
-// 	users, err := u.getUsersInfo(ctx, userIDs)
+	users, err := u.getUsersInfo(ctx, userIDs)
-// 	if err != nil {
+	if err != nil {
-// 		return nil, err
+		return nil, err
-// 	}
+	}
-// 	result := make(map[string]*sdkws.UserInfo)
+	result := make(map[string]*sdkws.UserInfo)
-// 	for _, user := range users {
+	for _, user := range users {
-// 		result[user.GetUserID()] = user.(*sdkws.UserInfo)
+		result[user.GetUserID()] = user.(*sdkws.UserInfo)
-// 	}
+	}
+	return result, nil
+}
 
-// 	return result, nil
+func (u *UserNotificationSender) getFromToUserNickname(
-// }
+	ctx context.Context,
-
+	fromUserID, toUserID string,
-// func (u *UserNotificationSender) getFromToUserNickname(
+) (string, string, error) {
-// 	ctx context.Context,
+	users, err := u.getUsersInfoMap(ctx, []string{fromUserID, toUserID})
-// 	fromUserID, toUserID string,
+	if err != nil {
-// ) (string, string, error) {
+		return "", "", nil
-// 	users, err := u.getUsersInfoMap(ctx, []string{fromUserID, toUserID})
+	}
-// 	if err != nil {
+	return users[fromUserID].Nickname, users[toUserID].Nickname, nil
-// 		return "", "", err
+}
-// 	}
-
-// 	return users[fromUserID].Nickname, users[toUserID].Nickname, nil
-// }
 
 func (u *UserNotificationSender) UserStatusChangeNotification(
 	ctx context.Context,

pkg/rpcclient/push.go

@@ -36,7 +36,6 @@ func NewPush(discov discoveryregistry.SvcDiscoveryRegistry) *Push {
 	if err != nil {
 		panic(err)
 	}
-
 	return &Push{
 		discov: discov,
 		conn:   conn,

pkg/rpcclient/third.go

@@ -42,13 +42,14 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
 		panic(err)
 	}
 	client := third.NewThirdClient(conn)
-	minioClient, _ := minioInit()
+	minioClient, err := minioInit()
-
 	return &Third{discov: discov, Client: client, conn: conn, MinioClient: minioClient}
 }
 
 func minioInit() (*minio.Client, error) {
-	initUrl := config.Config.Object.Minio.Endpoint
+	minioClient := &minio.Client{}
+	var initUrl string
+	initUrl = config.Config.Object.Minio.Endpoint
 	minioUrl, err := url.Parse(initUrl)
 	if err != nil {
 		return nil, err
@@ -62,11 +63,9 @@ func minioInit() (*minio.Client, error) {
 	} else if minioUrl.Scheme == "https" {
 		opts.Secure = true
 	}
-	var minioClient *minio.Client
 	minioClient, err = minio.New(minioUrl.Host, opts)
 	if err != nil {
 		return nil, err
 	}
-
 	return minioClient, nil
 }

pkg/rpcclient/user.go

@@ -45,7 +45,6 @@ func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User {
 		panic(err)
 	}
 	client := user.NewUserClient(conn)
-
 	return &User{Discov: discov, Client: client, conn: conn}
 }
 
@@ -55,7 +54,6 @@ type UserRpcClient User
 // NewUserRpcClientByUser initializes a UserRpcClient based on the provided User instance.
 func NewUserRpcClientByUser(user *User) *UserRpcClient {
 	rpc := UserRpcClient(*user)
-
 	return &rpc
 }
 
@@ -77,7 +75,6 @@ func (u *UserRpcClient) GetUsersInfo(ctx context.Context, userIDs []string) ([]*
 	})); len(ids) > 0 {
 		return nil, errs.ErrUserIDNotFound.Wrap(strings.Join(ids, ","))
 	}
-
 	return resp.UsersInfo, nil
 }
 
@@ -87,7 +84,6 @@ func (u *UserRpcClient) GetUserInfo(ctx context.Context, userID string) (*sdkws.
 	if err != nil {
 		return nil, err
 	}
-
 	return users[0], nil
 }
 
@@ -97,7 +93,6 @@ func (u *UserRpcClient) GetUsersInfoMap(ctx context.Context, userIDs []string) (
 	if err != nil {
 		return nil, err
 	}
-
 	return utils.SliceToMap(users, func(e *sdkws.UserInfo) string {
 		return e.UserID
 	}), nil
@@ -113,7 +108,6 @@ func (u *UserRpcClient) GetPublicUserInfos(
 	if err != nil {
 		return nil, err
 	}
-
 	return utils.Slice(users, func(e *sdkws.UserInfo) *sdkws.PublicUserInfo {
 		return &sdkws.PublicUserInfo{
 			UserID:   e.UserID,
@@ -130,7 +124,6 @@ func (u *UserRpcClient) GetPublicUserInfo(ctx context.Context, userID string) (*
 	if err != nil {
 		return nil, err
 	}
-
 	return users[0], nil
 }
 
@@ -144,7 +137,6 @@ func (u *UserRpcClient) GetPublicUserInfoMap(
 	if err != nil {
 		return nil, err
 	}
-
 	return utils.SliceToMap(users, func(e *sdkws.PublicUserInfo) string {
 		return e.UserID
 	}), nil
@@ -158,7 +150,6 @@ func (u *UserRpcClient) GetUserGlobalMsgRecvOpt(ctx context.Context, userID stri
 	if err != nil {
 		return 0, err
 	}
-
 	return resp.GlobalRecvMsgOpt, nil
 }
 
@@ -168,7 +159,6 @@ func (u *UserRpcClient) Access(ctx context.Context, ownerUserID string) error {
 	if err != nil {
 		return err
 	}
-
 	return authverify.CheckAccessV3(ctx, ownerUserID)
 }
 
@@ -178,7 +168,6 @@ func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumbe
 	if err != nil {
 		return nil, err
 	}
-
 	return resp.UserIDs, nil
 }
 
@@ -188,6 +177,5 @@ func (u *UserRpcClient) SetUserStatus(ctx context.Context, userID string, status
 		UserID: userID,
 		Status: status, PlatformID: int32(platformID),
 	})
-
 	return err
 }

pkg/statistics/statistics.go

@@ -36,8 +36,9 @@ func (s *Statistics) output() {
 	var timeIntervalNum uint64
 	for {
 		sum = *s.AllCount
-		<-t.C
+		select {
-
+		case <-t.C:
+		}
 		if *s.AllCount-sum <= 0 {
 			intervalCount = 0
 		} else {
@@ -65,6 +66,5 @@ func (s *Statistics) output() {
 func NewStatistics(allCount *uint64, moduleName, printArgs string, sleepTime int) *Statistics {
 	p := &Statistics{AllCount: allCount, ModuleName: moduleName, SleepTime: uint64(sleepTime), PrintArgs: printArgs}
 	go p.output()
-
 	return p
 }

tools/url2im/pkg/buffer.go

@@ -15,7 +15,7 @@ func NewReader(r io.Reader, max int64, path string) (ReadSeekSizeCloser, error)
 	buf := make([]byte, max+1)
 	n, err := io.ReadFull(r, buf)
 	if err == nil {
-		f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0666)
+		f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o666)
 		if err != nil {
 			return nil, err
 		}

tools/yamlfmt/yamlfmt.go

@@ -39,7 +39,7 @@ func main() {
 			fmt.Fprintf(os.Stderr, "%s: %v\n", path, err)
 			continue
 		}
-		writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+		writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%s: %v\n", path, err)
 			continue