From c348661764658cbd911f93a77961580975497935 Mon Sep 17 00:00:00 2001
From: luhaoling <2198702716@qq.com>
Date: Tue, 27 Feb 2024 15:21:08 +0800
Subject: [PATCH] fix: fix the comflect

---
 internal/rpc/group/group.go | 8 ++++----
 pkg/rpcclient/third.go      | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 0b15648bb..aa5e7f407 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -858,14 +858,14 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
 			JoinTime:       time.Now(),
 			MuteEndTime:    time.UnixMilli(0),
 		}
-		if err := CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); err != nil {
+		if err = CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); err != nil {
 			return nil, err
 		}
-		if err := s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
+		if err = s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
 			return nil, err
 		}
 
-		if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
+		if err = s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
 			return nil, err
 		}
 		s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
@@ -883,7 +883,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
 		HandledTime: time.Unix(0, 0),
 		Ex:          req.Ex,
 	}
-	if err := s.db.CreateGroupRequest(ctx, []*relationtb.GroupRequestModel{&groupRequest}); err != nil {
+	if err = s.db.CreateGroupRequest(ctx, []*relationtb.GroupRequestModel{&groupRequest}); err != nil {
 		return nil, err
 	}
 	s.Notification.JoinGroupApplicationNotification(ctx, req)
diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go
index ae35f047b..1faf1655b 100755
--- a/pkg/rpcclient/third.go
+++ b/pkg/rpcclient/third.go
@@ -46,13 +46,12 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry, config *config.Glob
 	if err != nil {
 		panic(err)
 	}
-	return &Third{discov: discov, Client: client, conn: conn, MinioClient: minioClient,Config: config}
+	return &Third{discov: discov, Client: client, conn: conn, MinioClient: minioClient, Config: config}
 }
 
 func minioInit(config *config.GlobalConfig) (*minio.Client, error) {
 	minioClient := &minio.Client{}
-	var initUrl string
-	initUrl = config.Object.Minio.Endpoint
+	initUrl := config.Object.Minio.Endpoint
 	minioUrl, err := url.Parse(initUrl)
 	if err != nil {
 		return nil, err