feat: ApplicationVersion move chat (#2813)

* fix: GroupApplicationAcceptedNotification * fix: GroupApplicationAcceptedNotification * fix: NotificationUserInfoUpdate * cicd: robot automated Change * fix: component * fix: getConversationInfo * feat: cron task * feat: cron task * feat: cron task * feat: cron task * feat: cron task * fix: minio config url recognition error * update gomake version * update gomake version * fix: seq conversion bug * fix: redis pipe exec * fix: ImportFriends * fix: A large number of logs keysAndValues length is not even * feat: mark read aggregate write * feat: online status supports redis cluster * feat: online status supports redis cluster * feat: online status supports redis cluster * merge * merge * read seq is written to mongo * read seq is written to mongo * fix: invitation to join group notification * fix: friend op_user_id * feat: optimizing asynchronous context * feat: optimizing memamq size * feat: add GetSeqMessage * feat: GroupApplicationAgreeMemberEnterNotification * feat: GroupApplicationAgreeMemberEnterNotification * feat: go.mod * feat: go.mod * feat: join group notification and get seq * feat: join group notification and get seq * feat: avoid pulling messages from sessions with a large number of max seq values of 0 * feat: API supports gzip * go.mod * fix: nil pointer error on close * fix: listen error * fix: listen error * update go.mod * feat: add log * fix: token parse token value * fix: GetMsgBySeqs boundary issues * fix: sn_ not sort * fix: sn_ not sort * fix: sn_ not sort * fix: jssdk add * fix: jssdk support * fix: jssdk support * fix: jssdk support * fix: the message I sent is not set to read seq in mongodb * fix: cannot modify group member avatars * fix: MemberEnterNotification * fix: MemberEnterNotification * fix: MsgData status * feat: add ApplicationVersion * feat: ApplicationVersion move chat --------- Co-authored-by: withchao <withchao@users.noreply.github.com>
2026-05-07 10:35:59 +08:00 · 2024-10-30 17:12:33 +08:00
parent 2bbd1bcfe9
commit f707069089
12 changed files with 15 additions and 425 deletions
@@ -1,136 +0,0 @@
-package third
-
-import (
-	"context"
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
-	"github.com/openimsdk/protocol/third"
-	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/utils/datautil"
-	"github.com/redis/go-redis/v9"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"time"
-)
-
-func IsNotFound(err error) bool {
-	switch errs.Unwrap(err) {
-	case redis.Nil, mongo.ErrNoDocuments:
-		return true
-	default:
-		return false
-	}
-}
-
-func (t *thirdServer) db2pbApplication(val *model.Application) *third.ApplicationVersion {
-	return &third.ApplicationVersion{
-		Id:         val.ID.Hex(),
-		Platform:   val.Platform,
-		Version:    val.Version,
-		Url:        val.Url,
-		Text:       val.Text,
-		Force:      val.Force,
-		Latest:     val.Latest,
-		Hot:        val.Hot,
-		CreateTime: val.CreateTime.UnixMilli(),
-	}
-}
-
-func (t *thirdServer) getLatestApplicationVersion(ctx context.Context, platform string, hot bool) (*third.ApplicationVersion, error) {
-	res, err := t.applicationDatabase.LatestVersion(ctx, platform, hot)
-	if err == nil {
-		return t.db2pbApplication(res), nil
-	} else if IsNotFound(err) {
-		return nil, nil
-	} else {
-		return nil, err
-	}
-}
-
-func (t *thirdServer) LatestApplicationVersion(ctx context.Context, req *third.LatestApplicationVersionReq) (*third.LatestApplicationVersionResp, error) {
-	var (
-		resp third.LatestApplicationVersionResp
-		err  error
-	)
-	resp.Version, err = t.getLatestApplicationVersion(ctx, req.Platform, false)
-	if err != nil {
-		return nil, err
-	}
-	resp.Hot, err = t.getLatestApplicationVersion(ctx, req.Platform, true)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (t *thirdServer) AddApplicationVersion(ctx context.Context, req *third.AddApplicationVersionReq) (*third.AddApplicationVersionResp, error) {
-	if err := authverify.CheckAdmin(ctx, t.config.Share.IMAdminUserID); err != nil {
-		return nil, err
-	}
-	val := &model.Application{
-		ID:         primitive.NewObjectID(),
-		Platform:   req.Platform,
-		Version:    req.Version,
-		Url:        req.Url,
-		Text:       req.Text,
-		Force:      req.Force,
-		Latest:     req.Latest,
-		Hot:        req.Hot,
-		CreateTime: time.Now(),
-	}
-	if err := t.applicationDatabase.AddVersion(ctx, val); err != nil {
-		return nil, err
-	}
-	return &third.AddApplicationVersionResp{}, nil
-}
-
-func (t *thirdServer) UpdateApplicationVersion(ctx context.Context, req *third.UpdateApplicationVersionReq) (*third.UpdateApplicationVersionResp, error) {
-	if err := authverify.CheckAdmin(ctx, t.config.Share.IMAdminUserID); err != nil {
-		return nil, err
-	}
-	oid, err := primitive.ObjectIDFromHex(req.Id)
-	if err != nil {
-		return nil, errs.ErrArgs.WrapMsg("invalid id " + err.Error())
-	}
-	update := make(map[string]any)
-	putUpdate(update, "platform", req.Platform)
-	putUpdate(update, "version", req.Version)
-	putUpdate(update, "url", req.Url)
-	putUpdate(update, "text", req.Text)
-	putUpdate(update, "force", req.Force)
-	putUpdate(update, "latest", req.Latest)
-	putUpdate(update, "hot", req.Hot)
-	if err := t.applicationDatabase.UpdateVersion(ctx, oid, update); err != nil {
-		return nil, err
-	}
-	return &third.UpdateApplicationVersionResp{}, nil
-}
-
-func (t *thirdServer) DeleteApplicationVersion(ctx context.Context, req *third.DeleteApplicationVersionReq) (*third.DeleteApplicationVersionResp, error) {
-	if err := authverify.CheckAdmin(ctx, t.config.Share.IMAdminUserID); err != nil {
-		return nil, err
-	}
-	ids := make([]primitive.ObjectID, 0, len(req.Id))
-	for _, id := range req.Id {
-		oid, err := primitive.ObjectIDFromHex(id)
-		if err != nil {
-			return nil, errs.ErrArgs.WrapMsg("invalid id " + err.Error())
-		}
-		ids = append(ids, oid)
-	}
-	if err := t.applicationDatabase.DeleteVersion(ctx, ids); err != nil {
-		return nil, err
-	}
-	return &third.DeleteApplicationVersionResp{}, nil
-}
-
-func (t *thirdServer) PageApplicationVersion(ctx context.Context, req *third.PageApplicationVersionReq) (*third.PageApplicationVersionResp, error) {
-	total, res, err := t.applicationDatabase.PageVersion(ctx, req.Platform, req.Pagination)
-	if err != nil {
-		return nil, err
-	}
-	return &third.PageApplicationVersionResp{
-		Total:    total,
-		Versions: datautil.Slice(res, t.db2pbApplication),
-	}, nil
-}
@@ -38,13 +38,12 @@ import (
 )

 type thirdServer struct {
-	thirdDatabase       controller.ThirdDatabase
-	s3dataBase          controller.S3Database
-	userRpcClient       rpcclient.UserRpcClient
-	defaultExpire       time.Duration
-	config              *Config
-	minio               *minio.Minio
-	applicationDatabase controller.ApplicationDatabase
+	thirdDatabase controller.ThirdDatabase
+	s3dataBase    controller.S3Database
+	userRpcClient rpcclient.UserRpcClient
+	defaultExpire time.Duration
+	config        *Config
+	minio         *minio.Minio
 }

 type Config struct {
@@ -75,10 +74,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	if err != nil {
 		return err
 	}
-	applicationMgo, err := mgo.NewApplicationMgo(mgocli.GetDB())
-	if err != nil {
-		return err
-	}

 	// Select the oss method according to the profile policy
 	enable := config.RpcConfig.Object.Enable
@@ -104,13 +99,12 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	}
 	localcache.InitLocalCache(&config.LocalCacheConfig)
 	third.RegisterThirdServer(server, &thirdServer{
-		thirdDatabase:       controller.NewThirdDatabase(redis.NewThirdCache(rdb), logdb),
-		userRpcClient:       rpcclient.NewUserRpcClient(client, config.Share.RpcRegisterName.User, config.Share.IMAdminUserID),
-		s3dataBase:          controller.NewS3Database(rdb, o, s3db),
-		defaultExpire:       time.Hour * 24 * 7,
-		config:              config,
-		minio:               minioCli,
-		applicationDatabase: controller.NewApplicationDatabase(applicationMgo, redis.NewApplicationRedisCache(applicationMgo, rdb)),
+		thirdDatabase: controller.NewThirdDatabase(redis.NewThirdCache(rdb), logdb),
+		userRpcClient: rpcclient.NewUserRpcClient(client, config.Share.RpcRegisterName.User, config.Share.IMAdminUserID),
+		s3dataBase:    controller.NewS3Database(rdb, o, s3db),
+		defaultExpire: time.Hour * 24 * 7,
+		config:        config,
+		minio:         minioCli,
 	})
 	return nil
 }