Merge remote-tracking branch 'origin/errcode' into errcode

internal/api/auth/auth.go

@@ -1,7 +1,7 @@
 package apiAuth
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"

internal/api/conversation/conversation.go

@@ -1,10 +1,9 @@
 package conversation
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/getcdv3"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"

internal/api/friend/friend.go

@@ -2,7 +2,7 @@ package friend
 
 //import (
 //	jsonData "Open_IM/internal/utils"
-//	api "Open_IM/pkg/api_struct"
+//	api "Open_IM/pkg/apistruct"
 //	"Open_IM/pkg/common/config"
 //	"Open_IM/pkg/common/log"
 //	"Open_IM/pkg/common/tokenverify"

internal/api/friend/friend1.go

@@ -1,8 +1,8 @@
 package friend
 
 import (
-	common "Open_IM/internal/api_to_rpc"
-	api "Open_IM/pkg/api_struct"
+	common "Open_IM/internal/api2rpc"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	rpc "Open_IM/pkg/proto/friend"
 	"github.com/gin-gonic/gin"

internal/api/group/group.go

@@ -2,7 +2,7 @@ package group
 
 //import (
 //	common "Open_IM/internal/api_to_rpc"
-//	api "Open_IM/pkg/api_struct"
+//	api "Open_IM/pkg/apistruct"
 //	"Open_IM/pkg/common/config"
 //	"Open_IM/pkg/common/constant"
 //	"Open_IM/pkg/common/log"

internal/api/group/group_test.go

@@ -1,7 +1,7 @@
 package group
 
 import (
-	"Open_IM/pkg/api_struct"
+	"Open_IM/pkg/apistruct"
 	"Open_IM/pkg/proto/group"
 	"context"
 	"errors"

internal/api/group/super_group.go

@@ -2,7 +2,7 @@ package group
 
 //import (
 //	jsonData "Open_IM/internal/utils"
-//	api "Open_IM/pkg/api_struct"
+//	api "Open_IM/pkg/apistruct"
 //	"Open_IM/pkg/common/config"
 //	"Open_IM/pkg/common/log"
 //	"Open_IM/pkg/common/token_verify"

internal/api/manage/management_chat.go

@@ -7,10 +7,9 @@
 package manage
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	pbChat "Open_IM/pkg/proto/msg"

internal/api/manage/management_user.go

@@ -7,12 +7,11 @@
 package manage
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	rpc "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"

internal/api/msg/del_msg.go

@@ -1,12 +1,11 @@
 package msg
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	pbCommon "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"

internal/api/msg/extend_msg.go

@@ -1,12 +1,11 @@
 package msg
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"

internal/api/msg/get_max_min_seq.go

@@ -4,7 +4,6 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdkws "Open_IM/pkg/proto/sdkws"
 	"context"

internal/api/msg/pull_msg.go

@@ -4,7 +4,6 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/getcdv3"
 	"Open_IM/pkg/proto/msg"
 	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"

internal/api/msg/send_msg.go

@@ -7,7 +7,6 @@ import (
 	sdkws "Open_IM/pkg/proto/sdkws"
 	"context"
 
-	"Open_IM/pkg/getcdv3"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"

internal/api/third/ali_oss_credential.go

@@ -1,7 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"

internal/api/third/aws_storage_credential.go

@@ -1,7 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"

internal/api/third/fcm_update_token.go

@@ -1,8 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
-	"Open_IM/pkg/common/db"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"

internal/api/third/minio_storage_credential.go

@@ -1,10 +1,9 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	_ "Open_IM/pkg/common/tokenverify"

internal/api/third/rtc.go

@@ -1,8 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
-	"Open_IM/pkg/common/db"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"

internal/api/third/set_app_badge.go

@@ -1,8 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
-	"Open_IM/pkg/common/db"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/utils"

internal/api/third/tencent_cloud_storage_credential.go

@@ -1,7 +1,7 @@
 package apiThird
 
 import (
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"

internal/api/user/user.go

@@ -1,17 +1,16 @@
 package user
 
 import (
-	jsonData "Open_IM/internal/utils"
-	api "Open_IM/pkg/api_struct"
+	api "Open_IM/pkg/apistruct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
-	cacheRpc "Open_IM/pkg/proto/cache"
 	pbRelay "Open_IM/pkg/proto/relay"
 	sdkws "Open_IM/pkg/proto/sdkws"
 	rpc "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
+	jsonData "Open_IM/pkg/utils"
 	"context"
 	"net/http"
 	"strings"

internal/crontask/clear_msg.go

@@ -3,92 +3,77 @@ package cronTask
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/cache"
 	"Open_IM/pkg/common/db/controller"
-	"Open_IM/pkg/common/db/mongo"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tracelog"
-	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"math"
-	"strconv"
-	"strings"
-
-	"github.com/go-redis/redis/v8"
-	"github.com/golang/protobuf/proto"
 )
 
-type SeqCheckInterface interface {
-	ClearAll() error
+
+type ClearMsgTool struct {
+	msgInterface   controller.MsgInterface
+	userInterface  controller.UserInterface
+	groupInterface controller.GroupInterface
 }
 
-type ClearMsgCronTask struct {
-	msgModel   controller.MsgInterface
-	userModel  controller.UserInterface
-	groupModel controller.GroupInterface
-	cache      cache.Cache
-}
-
-func (c *ClearMsgCronTask) getCronTaskOperationID() string {
+func (c *ClearMsgTool) getCronTaskOperationID() string {
 	return cronTaskOperationID + utils.OperationIDGenerator()
 }
 
-func (c *ClearMsgCronTask) ClearAll() {
+func (c *ClearMsgTool) ClearAll() {
 	operationID := c.getCronTaskOperationID()
 	ctx := context.Background()
 	tracelog.SetOperationID(ctx, operationID)
-	log.NewInfo(operationID, "========================= start del cron task =========================")
+	log.NewInfo(operationID, "============================ start del cron task ============================")
 	var err error
-	userIDList, err := c.userModel.GetAllUserID(ctx)
+	userIDList, err := c.userInterface.GetAllUserID(ctx)
 	if err == nil {
-		c.StartClearMsg(operationID, userIDList)
+		c.ClearUsersMsg(ctx, userIDList)
 	} else {
 		log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
 	}
 	// working group msg clear
-	workingGroupIDList, err := im_mysql_model.GetGroupIDListByGroupType(constant.WorkingGroup)
+	workingGroupIDList, err := c.groupInterface.GetGroupIDsByGroupType(ctx, constant.WorkingGroup)
 	if err == nil {
-		c.StartClearWorkingGroupMsg(operationID, workingGroupIDList)
+		c.ClearSuperGroupMsg(ctx, workingGroupIDList)
 	} else {
 		log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
 	}
-
-	log.NewInfo(operationID, "========================= start del cron finished =========================")
+	log.NewInfo(operationID, "============================ start del cron finished ============================")
 }
 
-func (c *ClearMsgCronTask) StartClearMsg(operationID string, userIDList []string) {
-	log.NewDebug(operationID, utils.GetSelfFuncName(), "userIDList: ", userIDList)
+func (c *ClearMsgTool) ClearUsersMsg(ctx context.Context, userIDList []string) {
 	for _, userID := range userIDList {
-		if err := DeleteUserMsgsAndSetMinSeq(operationID, userID); err != nil {
-			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), userID)
+		if err := c.msgInterface.DeleteUserMsgsAndSetMinSeq(ctx, userID, int64(config.Config.Mongo.DBRetainChatRecords * 24 *60 *60)); err != nil {
+			log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), err.Error(), userID)
 		}
-		if err := checkMaxSeqWithMongo(operationID, userID, constant.WriteDiffusion); err != nil {
-			log.NewError(operationID, utils.GetSelfFuncName(), userID, err)
-		}
-	}
-}
-
-func (c *ClearMsgCronTask) StartClearWorkingGroupMsg(operationID string, workingGroupIDList []string) {
-	log.NewDebug(operationID, utils.GetSelfFuncName(), "workingGroupIDList: ", workingGroupIDList)
-	for _, groupID := range workingGroupIDList {
-		userIDList, err := rocksCache.GetGroupMemberIDListFromCache(groupID)
+		minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err := c.msgInterface.GetUserMinMaxSeqInMongoAndCache(ctx, userID)
 		if err != nil {
-			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID)
+			log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), err.Error(), "GetUserMinMaxSeqInMongoAndCache failed", userID)
 			continue
 		}
-		log.NewDebug(operationID, utils.GetSelfFuncName(), "groupID:", groupID, "workingGroupIDList:", userIDList)
-		if err := DeleteUserSuperGroupMsgsAndSetMinSeq(operationID, groupID, userIDList); err != nil {
-			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID, userIDList)
-		}
-		if err := checkMaxSeqWithMongo(operationID, groupID, constant.ReadDiffusion); err != nil {
-			log.NewError(operationID, utils.GetSelfFuncName(), groupID, err)
-		}
+		if
 	}
 }
 
-func checkMaxSeqWithMongo(operationID, sourceID string, diffusionType int) error {
+func (c *ClearMsgTool) ClearSuperGroupMsg(ctx context.Context, workingGroupIDList []string) {
+	for _, groupID := range workingGroupIDList {
+		userIDs, err := c.groupInterface.FindGroupMemberUserID(ctx, groupID)
+		if err != nil {
+			log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "FindGroupMemberUserID", err.Error(), groupID)
+			continue
+		}
+		if err := c.msgInterface.DeleteUserSuperGroupMsgsAndSetMinSeq(ctx, groupID, userIDs, int64(config.Config.Mongo.DBRetainChatRecords * 24 *60 *60)); err != nil {
+			//log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID, userIDList)
+		}
+		minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err := c.msgInterface.GetSuperGroupMinMaxSeqInMongoAndCache(ctx, groupID)
+
+	}
+}
+
+func (c *ClearMsgTool) checkMaxSeqWithMongo(ctx context.Context, sourceID string, diffusionType int) error {
 	var seqRedis uint64
 	var err error
 	if diffusionType == constant.WriteDiffusion {

internal/crontask/cron_task.go

@@ -19,11 +19,11 @@ func StartCronTask(userID, workingGroupID string) {
 	fmt.Println("cron task start, config", config.Config.Mongo.ChatRecordsClearTime)
 	if userID != "" {
 		operationID := getCronTaskOperationID()
-		StartClearMsg(operationID, []string{userID})
+		ClearUsersMsg(operationID, []string{userID})
 	}
 	if workingGroupID != "" {
 		operationID := getCronTaskOperationID()
-		StartClearWorkingGroupMsg(operationID, []string{workingGroupID})
+		ClearSuperGroupMsg(operationID, []string{workingGroupID})
 	}
 	if userID != "" || workingGroupID != "" {
 		fmt.Println("clear msg finished")

internal/msggateway/batch_push.go

@@ -2,7 +2,6 @@ package msggateway
 
 import (
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdkws "Open_IM/pkg/proto/sdkws"

internal/msggateway/init.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"sync"
 
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 
 	"github.com/go-playground/validator/v10"
 )

internal/msggateway/logic.go

@@ -3,7 +3,6 @@ package msggateway
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/prome"
 	pbChat "Open_IM/pkg/proto/msg"

internal/msggateway/new/compressor.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"io/ioutil"
-	"open_im_sdk/pkg/utils"
 )
 
 type Compressor interface {

internal/msggateway/new/encoder.go

@@ -3,7 +3,6 @@ package new
 import (
 	"bytes"
 	"encoding/gob"
-	"open_im_sdk/pkg/utils"
 )
 
 type Encoder interface {

internal/msggateway/relay_rpc_server.go

@@ -12,15 +12,13 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+	"github.com/golang/protobuf/proto"
+	"github.com/gorilla/websocket"
+	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/golang/protobuf/proto"
-	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-
-	"github.com/gorilla/websocket"
-	"google.golang.org/grpc"
 )
 
 type RPCServer struct {

internal/msggateway/ws_server.go

@@ -3,9 +3,8 @@ package msggateway
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 	"Open_IM/pkg/common/tokenverify"
 	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"

internal/objstorage/controller.go

@@ -0,0 +1,232 @@
+package objstorage
+
+import (
+	"bytes"
+	"context"
+	"crypto/md5"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"log"
+	"math/rand"
+	"path"
+	"strconv"
+	"time"
+)
+
+func NewController(i Interface, kv KV) (*Controller, error) {
+	if err := i.Init(); err != nil {
+		return nil, err
+	}
+	return &Controller{
+		i:  i,
+		kv: kv,
+	}, nil
+}
+
+type Controller struct {
+	i Interface
+	//i  *minioImpl
+	kv KV
+}
+
+func (c *Controller) key(v string) string {
+	return "OBJECT_STORAGE:" + c.i.Name() + ":" + v
+}
+
+func (c *Controller) putKey(v string) string {
+	return c.key("put:" + v)
+}
+
+func (c *Controller) pathKey(v string) string {
+	return c.key("path:" + v)
+}
+
+func (c *Controller) ApplyPut(ctx context.Context, args *FragmentPutArgs) (*PutAddr, error) {
+	if data, err := c.kv.Get(ctx, c.pathKey(args.Hash)); err == nil {
+		// 服务器已存在
+		var src BucketFile
+		if err := json.Unmarshal([]byte(data), &src); err != nil {
+			return nil, err
+		}
+		var bucket string
+		if args.ClearTime <= 0 {
+			bucket = c.i.PermanentBucket()
+		} else {
+			bucket = c.i.ClearBucket()
+		}
+		dst := &BucketFile{
+			Bucket: bucket,
+			Name:   args.Name,
+		}
+		// 直接拷贝一份
+		err := c.i.CopyObjetInfo(ctx, &src, dst)
+		if err == nil {
+			info, err := c.i.GetObjectInfo(ctx, dst)
+			if err != nil {
+				return nil, err
+			}
+			return &PutAddr{
+				ResourceURL: info.URL,
+			}, nil
+		} else if !c.i.IsNotFound(err) {
+			return nil, err
+		}
+	} else if !c.kv.IsNotFound(err) {
+		return nil, err
+	}
+	// 上传逻辑
+	name := args.Name
+	effective := time.Now().Add(args.EffectiveTime)
+	prefix := c.Prefix(&args.PutArgs)
+	var pack int64
+	if args.FragmentSize <= 0 || args.Size <= args.FragmentSize {
+		pack = 1
+	} else {
+		pack = args.Size / args.FragmentSize
+		if args.Size%args.FragmentSize > 0 {
+			pack++
+		}
+	}
+	p := path.Join(path.Dir(args.Name), time.Now().Format("20060102"))
+	info := putInfo{
+		Bucket:       c.i.UploadBucket(),
+		Fragments:    make([]string, 0, pack),
+		FragmentSize: args.FragmentSize,
+		Name:         name,
+		Hash:         args.Hash,
+		Size:         args.Size,
+	}
+	if args.ClearTime > 0 {
+		t := time.Now().Add(args.ClearTime).UnixMilli()
+		info.ClearTime = &t
+	}
+	putURLs := make([]string, 0, pack)
+	for i := int64(1); i <= pack; i++ {
+		name := prefix + "_" + strconv.FormatInt(i, 10) + path.Ext(args.Name)
+		name = path.Join(p, name)
+		info.Fragments = append(info.Fragments, name)
+		args.Name = name
+		put, err := c.i.ApplyPut(ctx, &ApplyPutArgs{
+			Bucket:    info.Bucket,
+			Name:      name,
+			Effective: args.EffectiveTime,
+			Header:    args.Header,
+		})
+		if err != nil {
+			return nil, err
+		}
+		putURLs = append(putURLs, put.URL)
+	}
+	data, err := json.Marshal(&info)
+	if err != nil {
+		return nil, err
+	}
+	if err := c.kv.Set(ctx, c.putKey(prefix), string(data), args.EffectiveTime); err != nil {
+		return nil, err
+	}
+	var fragmentSize int64
+	if pack == 1 {
+		fragmentSize = args.Size
+	} else {
+		fragmentSize = args.FragmentSize
+	}
+	return &PutAddr{
+		PutURLs:       putURLs,
+		FragmentSize:  fragmentSize,
+		PutID:         prefix,
+		EffectiveTime: effective,
+	}, nil
+}
+
+func (c *Controller) ConfirmPut(ctx context.Context, putID string) (*ObjectInfo, error) {
+	data, err := c.kv.Get(ctx, c.putKey(putID))
+	if err != nil {
+		return nil, err
+	}
+	var info putInfo
+	if err := json.Unmarshal([]byte(data), &info); err != nil {
+		return nil, err
+	}
+	var total int64
+	src := make([]BucketFile, len(info.Fragments))
+	for i, fragment := range info.Fragments {
+		state, err := c.i.GetObjectInfo(ctx, &BucketFile{
+			Bucket: info.Bucket,
+			Name:   fragment,
+		})
+		if err != nil {
+			return nil, err
+		}
+		total += state.Size
+		src[i] = BucketFile{
+			Bucket: info.Bucket,
+			Name:   fragment,
+		}
+	}
+	if total != info.Size {
+		return nil, fmt.Errorf("incomplete upload %d/%d", total, info.Size)
+	}
+	var dst *BucketFile
+	if info.ClearTime == nil {
+		dst = &BucketFile{
+			Bucket: c.i.PermanentBucket(),
+			Name:   info.Name,
+		}
+	} else {
+		dst = &BucketFile{
+			Bucket: c.i.ClearBucket(),
+			Name:   info.Name,
+		}
+	}
+	if err := c.i.MergeObjectInfo(ctx, src, dst); err != nil { // SourceInfo 0 is too small (2) and it is not the last part
+		return nil, err
+	}
+	obj, err := c.i.GetObjectInfo(ctx, dst)
+	if err != nil {
+		return nil, err
+	}
+	go func() {
+		err := c.kv.Del(ctx, c.putKey(putID))
+		if err != nil {
+			log.Println("del key:", err)
+		}
+		for _, b := range src {
+			err = c.i.DeleteObjetInfo(ctx, &b)
+			if err != nil {
+				log.Println("del obj:", err)
+			}
+		}
+	}()
+	return obj, nil
+}
+
+func (c *Controller) Prefix(args *PutArgs) string {
+	buf := bytes.NewBuffer(nil)
+	buf.WriteString(args.Name)
+	buf.WriteString("~~~@~@~~~")
+	buf.WriteString(strconv.FormatInt(args.Size, 10))
+	buf.WriteString(",")
+	buf.WriteString(args.Hash)
+	buf.WriteString(",")
+	buf.WriteString(strconv.FormatInt(int64(args.ClearTime), 10))
+	buf.WriteString(",")
+	buf.WriteString(strconv.FormatInt(int64(args.EffectiveTime), 10))
+	buf.WriteString(",")
+	buf.WriteString(c.i.Name())
+	r := make([]byte, 16)
+	rand.Read(r)
+	buf.Write(r)
+	md5v := md5.Sum(buf.Bytes())
+	return hex.EncodeToString(md5v[:])
+}
+
+type putInfo struct {
+	Bucket       string
+	Fragments    []string
+	FragmentSize int64
+	Size         int64
+	Name         string
+	Hash         string
+	ClearTime    *int64
+}

internal/objstorage/kv.go

@@ -0,0 +1,49 @@
+package objstorage
+
+import (
+	"context"
+	"github.com/go-redis/redis/v8"
+	"log"
+	"time"
+)
+
+type KV interface {
+	Get(ctx context.Context, key string) (string, error)
+	Set(ctx context.Context, key string, val string, expiration time.Duration) error
+	Del(ctx context.Context, key string) error
+	IsNotFound(err error) bool
+}
+
+func NewKV() KV {
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     "",
+		Username: "",
+		Password: "",
+	})
+	return &redisImpl{
+		rdb: rdb,
+	}
+}
+
+type redisImpl struct {
+	rdb *redis.Client
+}
+
+func (r *redisImpl) Del(ctx context.Context, key string) error {
+	log.Println("redis del", key)
+	return r.rdb.Del(ctx, key).Err()
+}
+
+func (r *redisImpl) Get(ctx context.Context, key string) (string, error) {
+	log.Println("redis get", key)
+	return r.rdb.Get(ctx, key).Result()
+}
+
+func (r *redisImpl) Set(ctx context.Context, key string, val string, expiration time.Duration) error {
+	log.Println("redis set", key, val, expiration.String())
+	return r.rdb.Set(ctx, key, val, expiration).Err()
+}
+
+func (r *redisImpl) IsNotFound(err error) bool {
+	return err == redis.Nil
+}

internal/objstorage/main.go

@@ -0,0 +1,112 @@
+package objstorage
+
+import (
+	"bytes"
+	"context"
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"path"
+	"time"
+)
+
+func HttpPut(url string, body io.Reader) error {
+	req, err := http.NewRequest(http.MethodPut, url, body)
+	if err != nil {
+		return err
+	}
+	client := http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("http [%s] %s", resp.Status, data)
+	}
+	if len(data) > 0 {
+		log.Println("[http body]", string(data))
+	}
+	return nil
+}
+
+func Md5(p []byte) string {
+	t := md5.Sum(p)
+	return hex.EncodeToString(t[:])
+}
+
+func Main() {
+	ctx := context.Background()
+	c, err := NewController(&minioImpl{}, NewKV())
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	name := "hello.txt"
+	data := []byte("hello world")
+
+	userID := "10000"
+
+	name = path.Join("user_"+userID, name)
+
+	addr, err := c.ApplyPut(ctx, &FragmentPutArgs{
+		PutArgs: PutArgs{
+			Name:          name,
+			Size:          int64(len(data)),
+			Hash:          Md5(data),
+			EffectiveTime: time.Second * 60 * 60,
+		},
+		FragmentSize: 2,
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+	fmt.Println()
+	fmt.Println()
+
+	if addr.ResourceURL != "" {
+		log.Println("服务器已经存在")
+		return
+	}
+	var (
+		start int
+		end   = int(addr.FragmentSize)
+	)
+
+	for _, u := range addr.PutURLs {
+		if start >= len(data) {
+			break
+		}
+		if end > len(data) {
+			end = len(data)
+		}
+		_ = u
+		page := data[start:end]
+		fmt.Print(string(page))
+		start += int(addr.FragmentSize)
+		end += int(addr.FragmentSize)
+		err = HttpPut(u, bytes.NewReader(page))
+		if err != nil {
+			log.Fatalln(err)
+		}
+	}
+	fmt.Println()
+	fmt.Println()
+
+	fmt.Println("[PUT_ID]", addr.PutID)
+
+	info, err := c.ConfirmPut(ctx, addr.PutID)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	log.Printf("%+v\n", info)
+
+	log.Println("success")
+}

internal/objstorage/minio.go

@@ -0,0 +1,143 @@
+package objstorage
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"github.com/minio/minio-go"
+	"net/url"
+	"time"
+)
+
+//func NewMinio() Interface {
+//	return &minioImpl{}
+//}
+
+type minioImpl struct {
+	uploadBucket    string // 上传桶
+	permanentBucket string // 永久桶
+	clearBucket     string // 自动清理桶
+	client          *minio.Client
+}
+
+func (m *minioImpl) Init() error {
+	client, err := minio.New("127.0.0.1:9000", "minioadmin", "minioadmin", false)
+	if err != nil {
+		return fmt.Errorf("minio client error: %w", err)
+	}
+	m.client = client
+	m.uploadBucket = "upload"
+	m.permanentBucket = "permanent"
+	m.clearBucket = "clear"
+	return nil
+}
+
+func (m *minioImpl) Name() string {
+	return "minio"
+}
+
+func (m *minioImpl) UploadBucket() string {
+	return m.uploadBucket
+}
+
+func (m *minioImpl) PermanentBucket() string {
+	return m.permanentBucket
+}
+
+func (m *minioImpl) ClearBucket() string {
+	return m.clearBucket
+}
+
+func (m *minioImpl) urlReplace(u *url.URL) {
+
+}
+
+func (m *minioImpl) ApplyPut(ctx context.Context, args *ApplyPutArgs) (*PutRes, error) {
+	if args.Effective <= 0 {
+		return nil, errors.New("EffectiveTime <= 0")
+	}
+	_, err := m.GetObjectInfo(ctx, &BucketFile{
+		Bucket: m.uploadBucket,
+		Name:   args.Name,
+	})
+	if err == nil {
+		return nil, fmt.Errorf("minio bucket %s name %s already exists", args.Bucket, args.Name)
+	} else if !m.IsNotFound(err) {
+		return nil, err
+	}
+	effective := time.Now().Add(args.Effective)
+	u, err := m.client.PresignedPutObject(m.uploadBucket, args.Name, args.Effective)
+	if err != nil {
+		return nil, fmt.Errorf("minio apply error: %w", err)
+	}
+	m.urlReplace(u)
+	return &PutRes{
+		URL:           u.String(),
+		Bucket:        m.uploadBucket,
+		Name:          args.Name,
+		EffectiveTime: effective,
+	}, nil
+}
+
+func (m *minioImpl) GetObjectInfo(ctx context.Context, args *BucketFile) (*ObjectInfo, error) {
+	info, err := m.client.StatObject(args.Bucket, args.Name, minio.StatObjectOptions{})
+	if err != nil {
+		return nil, err
+	}
+	return &ObjectInfo{
+		URL:  "", // todo
+		Size: info.Size,
+		Hash: info.ETag,
+	}, nil
+}
+
+func (m *minioImpl) CopyObjetInfo(ctx context.Context, src *BucketFile, dst *BucketFile) error {
+	destination, err := minio.NewDestinationInfo(dst.Bucket, dst.Name, nil, nil)
+	if err != nil {
+		return err
+	}
+	return m.client.CopyObject(destination, minio.NewSourceInfo(src.Bucket, src.Name, nil))
+}
+
+func (m *minioImpl) DeleteObjetInfo(ctx context.Context, info *BucketFile) error {
+	return m.client.RemoveObject(info.Bucket, info.Name)
+}
+
+func (m *minioImpl) MoveObjetInfo(ctx context.Context, src *BucketFile, dst *BucketFile) error {
+	if err := m.CopyObjetInfo(ctx, src, dst); err != nil {
+		return err
+	}
+	return m.DeleteObjetInfo(ctx, src)
+}
+
+func (m *minioImpl) MergeObjectInfo(ctx context.Context, src []BucketFile, dst *BucketFile) error {
+	switch len(src) {
+	case 0:
+		return errors.New("src empty")
+	case 1:
+		return m.CopyObjetInfo(ctx, &src[0], dst)
+	}
+	destination, err := minio.NewDestinationInfo(dst.Bucket, dst.Name, nil, nil)
+	if err != nil {
+		return err
+	}
+	sources := make([]minio.SourceInfo, len(src))
+	for i, s := range src {
+		sources[i] = minio.NewSourceInfo(s.Bucket, s.Name, nil)
+	}
+	return m.client.ComposeObject(destination, sources) // todo
+}
+
+func (m *minioImpl) IsNotFound(err error) bool {
+	if err == nil {
+		return false
+	}
+	switch e := err.(type) {
+	case minio.ErrorResponse:
+		return e.StatusCode == 404 && e.Code == "NoSuchKey"
+	case *minio.ErrorResponse:
+		return e.StatusCode == 404 && e.Code == "NoSuchKey"
+	default:
+		return false
+	}
+}

internal/objstorage/oo.go

@@ -0,0 +1,18 @@
+package objstorage
+
+import "context"
+
+type Interface interface {
+	Init() error
+	Name() string
+	UploadBucket() string
+	PermanentBucket() string
+	ClearBucket() string
+	ApplyPut(ctx context.Context, args *ApplyPutArgs) (*PutRes, error)
+	GetObjectInfo(ctx context.Context, args *BucketFile) (*ObjectInfo, error)
+	CopyObjetInfo(ctx context.Context, src *BucketFile, dst *BucketFile) error
+	DeleteObjetInfo(ctx context.Context, info *BucketFile) error
+	MoveObjetInfo(ctx context.Context, src *BucketFile, dst *BucketFile) error
+	MergeObjectInfo(ctx context.Context, src []BucketFile, dst *BucketFile) error
+	IsNotFound(err error) bool
+}

internal/objstorage/pub.go

@@ -0,0 +1,69 @@
+package objstorage
+
+import (
+	"net/http"
+	"time"
+)
+
+type PutRes struct {
+	URL           string
+	Bucket        string
+	Name          string
+	EffectiveTime time.Time
+}
+
+type FragmentPutArgs struct {
+	PutArgs
+	FragmentSize int64 // 分片大小
+}
+
+type PutArgs struct {
+	Name          string        // 文件名
+	Size          int64         // 大小
+	Hash          string        // md5
+	Prefix        string        // 前缀
+	ClearTime     time.Duration // 自动清理时间
+	EffectiveTime time.Duration // 申请有效时间
+	Header        http.Header   // header
+}
+
+type BucketFile struct {
+	Bucket string `json:"bucket"`
+	Name   string `json:"name"`
+}
+
+type ObjectInfo struct {
+	URL  string
+	Size int64
+	Hash string
+}
+
+//type PutSpace struct {
+//	URL           string
+//	EffectiveTime time.Time
+//}
+
+type PutAddr struct {
+	ResourceURL   string
+	PutID         string
+	FragmentSize  int64
+	EffectiveTime time.Time
+	PutURLs       []string
+}
+
+type KVData struct {
+	Bucket string `json:"bucket"`
+	Name   string `json:"name"`
+}
+
+type PutResp struct {
+	URL  string
+	Time *time.Time
+}
+
+type ApplyPutArgs struct {
+	Bucket    string
+	Name      string
+	Effective time.Duration // 申请有效时间
+	Header    http.Header   // header
+}

internal/push/fcm/push.go

@@ -3,7 +3,6 @@ package fcm
 import (
 	"Open_IM/internal/push"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"context"
 	go_redis "github.com/go-redis/redis/v8"

internal/push/getui/push.go

@@ -3,7 +3,6 @@ package getui
 import (
 	"Open_IM/internal/push"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/utils"
 	"bytes"

internal/push/logic/init.go

@@ -15,7 +15,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/kafka"
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 	"Open_IM/pkg/statistics"
 	"fmt"
 )

internal/push/logic/push_rpc_server.go

@@ -3,10 +3,9 @@ package logic
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
+
 	"Open_IM/pkg/common/log"
-	prome "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/getcdv3"
+	prome "Open_IM/pkg/common/prome"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
 	"context"

internal/push/logic/push_to_client.go

@@ -10,9 +10,8 @@ import (
 	"Open_IM/internal/push"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/getcdv3"
+
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
 	pbRtc "Open_IM/pkg/proto/rtc"
@@ -20,7 +19,7 @@ import (
 	"context"
 	"strings"
 
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 
 	"github.com/golang/protobuf/proto"
 )

internal/push/logic/tpns.go

@@ -1,10 +1,7 @@
 package logic
 
 import (
-	tpns "Open_IM/internal/push/sdk/tpns-server-sdk-go/go"
 	"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/auth"
-	"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/common"
-	"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/req"
 	"Open_IM/pkg/common/config"
 )
 

internal/rpc/conversation/conversaion.go

@@ -8,12 +8,10 @@ import (
 	"Open_IM/pkg/common/db/controller"
 	"Open_IM/pkg/common/db/relation"
 	tableRelation "Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/db/unrelation"
+
 	"Open_IM/pkg/common/log"
-	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/getcdv3"
+	promePkg "Open_IM/pkg/common/prome"
 	pbConversation "Open_IM/pkg/proto/conversation"
-	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/dtm-labs/rockscache"

internal/rpc/msg/callback.go

@@ -32,7 +32,7 @@ func toCommonCallback(ctx context.Context, msg *pbChat.SendMsgReq, command strin
 		AtUserIDList:     msg.MsgData.AtUserIDList,
 		SenderFaceURL:    msg.MsgData.SenderFaceURL,
 		Content:          utils.GetContent(msg.MsgData),
-		Seq:              msg.MsgData.Seq,
+		Seq:              uint32(msg.MsgData.Seq),
 		Ex:               msg.MsgData.Ex,
 	}
 }

internal/rpc/msg/delete.go

@@ -9,7 +9,7 @@ import (
 
 func (m *msgServer) DelMsgList(ctx context.Context, req *common.DelMsgListReq) (*common.DelMsgListResp, error) {
 	resp := &common.DelMsgListResp{}
-	if err := m.MsgInterface.DelMsgFromCache(ctx, req.UserID, req.SeqList); err != nil {
+	if _, err := m.MsgInterface.DelMsgBySeqs(ctx, req.UserID, req.SeqList); err != nil {
 		return nil, err
 	}
 	DeleteMessageNotification(ctx, req.UserID, req.SeqList)
@@ -21,11 +21,14 @@ func (m *msgServer) DelSuperGroupMsg(ctx context.Context, req *msg.DelSuperGroup
 	if err := tokenverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
-	maxSeq, err := m.MsgInterface.GetGroupMaxSeq(ctx, req.GroupID)
-	if err != nil {
-		return nil, err
-	}
-	if err := m.MsgInterface.SetGroupUserMinSeq(ctx, req.GroupID, maxSeq); err != nil {
+	//maxSeq, err := m.MsgInterface.GetGroupMaxSeq(ctx, req.GroupID)
+	//if err != nil {
+	//	return nil, err
+	//}
+	//if err := m.MsgInterface.SetGroupUserMinSeq(ctx, req.GroupID, maxSeq); err != nil {
+	//	return nil, err
+	//}
+	if err := m.MsgInterface.DeleteUserSuperGroupMsgsAndSetMinSeq(ctx, req.GroupID, req.UserID, 0); err != nil {
 		return nil, err
 	}
 	return resp, nil
@@ -36,8 +39,11 @@ func (m *msgServer) ClearMsg(ctx context.Context, req *msg.ClearMsgReq) (*msg.Cl
 	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
-	if err := m.MsgInterface.DelUserAllSeq(ctx, req.UserID); err != nil {
+	if err := m.MsgInterface.CleanUpUserMsg(ctx, req.UserID); err != nil {
 		return nil, err
 	}
+	//if err := m.MsgInterface.DelUserAllSeq(ctx, req.UserID); err != nil {
+	//	return nil, err
+	//}
 	return resp, nil
 }

internal/rpc/msg/extend_msg.go

@@ -3,7 +3,6 @@ package msg
 import (
 	"Open_IM/internal/common/notification"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdkws"

internal/rpc/msg/extend_msg_callback.go

@@ -48,52 +48,51 @@ func CallbackDeleteMessageReactionExtensions(setReq *msg.DeleteMessageListReacti
 		MsgFirstModifyTime:    setReq.MsgFirstModifyTime,
 	}
 	resp := &cbapi.CallbackDeleteMessageReactionExtResp{}
-	defer log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), req, *resp)
 	return http.CallBackPostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg)
 }
 
-//func CallbackGetMessageListReactionExtensions(getReq *msg.GetMessageListReactionExtensionsReq) error {
-//	if !config.Config.Callback.CallbackAfterSendGroupMsg.Enable {
-//		return nil
-//	}
-//	req := cbapi.CallbackGetMessageListReactionExtReq{
-//		OperationID:     getReq.OperationID,
-//		CallbackCommand: constant.CallbackGetMessageListReactionExtensionsCommand,
-//		SourceID:        getReq.SourceID,
-//		OpUserID:        getReq.OpUserID,
-//		SessionType:     getReq.SessionType,
-//		TypeKeyList:     getReq.TypeKeyList,
-//		MessageKeyList:  getReq.MessageReactionKeyList,
-//	}
-//	resp := &cbApi.CallbackGetMessageListReactionExtResp{CommonCallbackResp: &callbackResp}
-//	defer log.NewDebug(getReq.OperationID, utils.GetSelfFuncName(), req, *resp)
-//	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackGetMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil {
-//		callbackResp.ErrCode = http2.StatusInternalServerError
-//		callbackResp.ErrMsg = err.Error()
-//	}
-//	return resp
-//}
-//func callbackAddMessageReactionExtensions(setReq *msg.AddMessageReactionExtensionsReq) *cb.CallbackAddMessageReactionExtResp {
-//	callbackResp := cbapi.CommonCallbackResp{OperationID: setReq.OperationID}
-//	log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), setReq.String())
-//	req := cbapi.CallbackAddMessageReactionExtReq{
-//		OperationID:           setReq.OperationID,
-//		CallbackCommand:       constant.CallbackAddMessageListReactionExtensionsCommand,
-//		SourceID:              setReq.SourceID,
-//		OpUserID:              setReq.OpUserID,
-//		SessionType:           setReq.SessionType,
-//		ReactionExtensionList: setReq.ReactionExtensionList,
-//		ClientMsgID:           setReq.ClientMsgID,
-//		IsReact:               setReq.IsReact,
-//		IsExternalExtensions:  setReq.IsExternalExtensions,
-//		MsgFirstModifyTime:    setReq.MsgFirstModifyTime,
-//	}
-//	resp := &cbapi.CallbackAddMessageReactionExtResp{CommonCallbackResp: &callbackResp}
-//	defer log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), req, *resp, *resp.CommonCallbackResp, resp.IsReact, resp.MsgFirstModifyTime)
-//	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackAddMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil {
-//		callbackResp.ErrCode = http2.StatusInternalServerError
-//		callbackResp.ErrMsg = err.Error()
-//	}
-//	return resp
-//
-//}
+func CallbackGetMessageListReactionExtensions(getReq *msg.GetMessageListReactionExtensionsReq) error {
+	if !config.Config.Callback.CallbackAfterSendGroupMsg.Enable {
+		return nil
+	}
+	req := cbapi.CallbackGetMessageListReactionExtReq{
+		OperationID:     getReq.OperationID,
+		CallbackCommand: constant.CallbackGetMessageListReactionExtensionsCommand,
+		SourceID:        getReq.SourceID,
+		OpUserID:        getReq.OpUserID,
+		SessionType:     getReq.SessionType,
+		TypeKeyList:     getReq.TypeKeyList,
+		MessageKeyList:  getReq.MessageReactionKeyList,
+	}
+	resp := &cbApi.CallbackGetMessageListReactionExtResp{CommonCallbackResp: &callbackResp}
+	defer log.NewDebug(getReq.OperationID, utils.GetSelfFuncName(), req, *resp)
+	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackGetMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil {
+		callbackResp.ErrCode = http2.StatusInternalServerError
+		callbackResp.ErrMsg = err.Error()
+	}
+	return resp
+}
+
+func callbackAddMessageReactionExtensions(setReq *msg.AddMessageReactionExtensionsReq) *cb.CallbackAddMessageReactionExtResp {
+	callbackResp := cbapi.CommonCallbackResp{}
+	req := cbapi.CallbackAddMessageReactionExtReq{
+		OperationID:           setReq.OperationID,
+		CallbackCommand:       constant.CallbackAddMessageListReactionExtensionsCommand,
+		SourceID:              setReq.SourceID,
+		OpUserID:              setReq.OpUserID,
+		SessionType:           setReq.SessionType,
+		ReactionExtensionList: setReq.ReactionExtensionList,
+		ClientMsgID:           setReq.ClientMsgID,
+		IsReact:               setReq.IsReact,
+		IsExternalExtensions:  setReq.IsExternalExtensions,
+		MsgFirstModifyTime:    setReq.MsgFirstModifyTime,
+	}
+	resp := &cbapi.CallbackAddMessageReactionExtResp{CommonCallbackResp: &callbackResp}
+	defer log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), req, *resp, *resp.CommonCallbackResp, resp.IsReact, resp.MsgFirstModifyTime)
+	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackAddMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil {
+		callbackResp.ErrCode = http2.StatusInternalServerError
+		callbackResp.ErrMsg = err.Error()
+	}
+	return resp
+
+}

internal/rpc/msg/lock.go

@@ -1,7 +1,6 @@
 package msg
 
 import (
-	"Open_IM/pkg/common/db"
 	"time"
 )
 

internal/rpc/msg/send_pull.go

@@ -2,7 +2,7 @@ package msg
 
 import (
 	"Open_IM/pkg/common/constant"
-	promePkg "Open_IM/pkg/common/prometheus"
+	promePkg "Open_IM/pkg/common/prome"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdkws"

internal/rpc/msg/server.go

@@ -9,7 +9,7 @@ import (
 	discoveryRegistry "Open_IM/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/openKeeper"
 
-	promePkg "Open_IM/pkg/common/prometheus"
+	promePkg "Open_IM/pkg/common/prome"
 	"Open_IM/pkg/proto/msg"
 	"google.golang.org/grpc"
 )

internal/startrpc/start.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/middleware"
-	promePkg "Open_IM/pkg/common/prometheus"
+	promePkg "Open_IM/pkg/common/prome"
 	"flag"
 	"fmt"
 	"github.com/OpenIMSDK/openKeeper"