Merge branch 'openimsdk:main' into main

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.48
+	github.com/openimsdk/protocol v0.0.72-alpha.53
 	github.com/openimsdk/tools v0.0.50-alpha.16
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -319,8 +319,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.48 h1:DVeT8Kej6OjB9bsxQ0q6FU160anwfPuVmAL/1J6VzqM=
-github.com/openimsdk/protocol v0.0.72-alpha.48/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.53 h1:DMzvDd418GaJJLT2Iw+AX+oNc41DROWErXDkZxB+MMM=
+github.com/openimsdk/protocol v0.0.72-alpha.53/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.16 h1:bC1AQvJMuOHtZm8LZRvN8L5mH1Ws2VYdL+TLTs1iGSc=
 github.com/openimsdk/tools v0.0.50-alpha.16/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

internal/api/router.go

@@ -198,13 +198,6 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
 		objectGroup.POST("/initiate_form_data", t.InitiateFormData)
 		objectGroup.POST("/complete_form_data", t.CompleteFormData)
 		objectGroup.GET("/*name", t.ObjectRedirect)
-
-		applicationGroup := r.Group("application")
-		applicationGroup.POST("/add_version", t.AddApplicationVersion)
-		applicationGroup.POST("/update_version", t.UpdateApplicationVersion)
-		applicationGroup.POST("/delete_version", t.DeleteApplicationVersion)
-		applicationGroup.POST("/latest_version", t.LatestApplicationVersion)
-		applicationGroup.POST("/page_versions", t.PageApplicationVersion)
 	}
 	// Message
 	msgGroup := r.Group("/msg")
@@ -297,6 +290,4 @@ func GinParseToken(authRPC *rpcclient.Auth) gin.HandlerFunc {
 var Whitelist = []string{
 	"/auth/get_admin_token",
 	"/auth/parse_token",
-	"/application/latest_version",
-	"/application/page_versions",
 }

internal/api/third.go

@@ -170,23 +170,3 @@ func (o *ThirdApi) SearchLogs(c *gin.Context) {
 func (o *ThirdApi) GetPrometheus(c *gin.Context) {
 	c.Redirect(http.StatusFound, o.GrafanaUrl)
 }
-
-func (o *ThirdApi) LatestApplicationVersion(c *gin.Context) {
-	a2r.Call(third.ThirdClient.LatestApplicationVersion, o.Client, c)
-}
-
-func (o *ThirdApi) AddApplicationVersion(c *gin.Context) {
-	a2r.Call(third.ThirdClient.AddApplicationVersion, o.Client, c)
-}
-
-func (o *ThirdApi) UpdateApplicationVersion(c *gin.Context) {
-	a2r.Call(third.ThirdClient.UpdateApplicationVersion, o.Client, c)
-}
-
-func (o *ThirdApi) DeleteApplicationVersion(c *gin.Context) {
-	a2r.Call(third.ThirdClient.DeleteApplicationVersion, o.Client, c)
-}
-
-func (o *ThirdApi) PageApplicationVersion(c *gin.Context) {
-	a2r.Call(third.ThirdClient.PageApplicationVersion, o.Client, c)
-}

internal/msggateway/ws_server.go

@@ -327,11 +327,6 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 
 	switch ws.msgGatewayConfig.Share.MultiLogin.Policy {
 	case constant.DefalutNotKick:
-	case constant.WebAndOther:
-		if constant.PlatformIDToClass(newClient.PlatformID) == constant.WebPlatformStr {
-			return
-		}
-		fallthrough
 	case constant.PCAndOther:
 		if constant.PlatformIDToClass(newClient.PlatformID) == constant.TerminalPC {
 			return
@@ -356,7 +351,7 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 			log.ZWarn(newClient.ctx, "InvalidateToken err", err, "userID", newClient.UserID,
 				"platformID", newClient.PlatformID)
 		}
-	case constant.PcMobileAndWeb:
+	case constant.AllLoginButSameClassKick:
 		clients, ok := ws.clients.GetAll(newClient.UserID)
 		if !ok {
 			return
@@ -370,21 +365,6 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 			}
 		}
 		kickTokenFunc(kickClients)
-
-	case constant.SingleTerminalLogin:
-		clients, ok := ws.clients.GetAll(newClient.UserID)
-		if !ok {
-			return
-		}
-		var (
-			kickClients []*Client
-		)
-		for _, client := range clients {
-			kickClients = append(kickClients, client)
-		}
-		kickTokenFunc(kickClients)
-	case constant.Customize:
-		// todo
 	}
 }
 

internal/rpc/group/group.go

@@ -1811,7 +1811,6 @@ func (g *groupServer) GetSpecifiedUserGroupRequestInfo(ctx context.Context, req
 	}
 
 	if req.UserID != opUserID {
-		req.UserID = mcontext.GetOpUserID(ctx)
 		adminIDs, err := g.db.GetGroupRoleLevelMemberIDs(ctx, req.GroupID, constant.GroupAdmin)
 		if err != nil {
 			return nil, err
@@ -1820,10 +1819,11 @@ func (g *groupServer) GetSpecifiedUserGroupRequestInfo(ctx context.Context, req
 		adminIDs = append(adminIDs, owners[0].UserID)
 		adminIDs = append(adminIDs, g.config.Share.IMAdminUserID...)
 
-		if !datautil.Contain(req.UserID, adminIDs...) {
+		if !datautil.Contain(opUserID, adminIDs...) {
 			return nil, errs.ErrNoPermission.WrapMsg("opUser no permission")
 		}
 	}
+
 	requests, err := g.db.FindGroupRequests(ctx, req.GroupID, []string{req.UserID})
 	if err != nil {
 		return nil, err

internal/rpc/third/third.go

@@ -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
 }