fix: del login Policy (#2825)

* fix: del login Policy

* feat: offline push

* feat: offline push

* fix: err

* fix: err

config/openim-push.yml

@@ -13,8 +13,8 @@ prometheus:
   ports: [ 12170, 12171, 12172, 12173, 12174, 12175, 12176, 12177, 12178, 12179, 12180, 12182, 12183, 12184, 12185, 12186 ]
 
 maxConcurrentWorkers: 3
-#Use geTui for offline push notifications, or choose fcm or jpush; corresponding configuration settings must be specified.
+#Use geTui for offline push notifications, or choose fcm or jpns; corresponding configuration settings must be specified.
-enable: geTui
+enable:
 geTui:
   pushUrl: https://restapi.getui.com/v2/$appId
   masterSecret:

config/share.yml

@@ -15,15 +15,4 @@ imAdminUserID: [ imAdmin ]
 # 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
 multiLogin:
   policy: 1
-  maxNumOneEnd: 30
+  maxNumOneEnd: 30
-  customizeLoginNum:
-    ios: 1
-    android: 1
-    windows: 1
-    osx: 1
-    web: 1
-    miniWeb: 1
-    linux: 1
-    aPad: 1
-    iPad: 1
-    admin: 1

go.mod

@@ -14,7 +14,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.54
+	github.com/openimsdk/protocol v0.0.72-alpha.55
 	github.com/openimsdk/tools v0.0.50-alpha.32
 	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.54 h1:opato7N4QjjRq/SHD54bDSVBpOEEDp1VLWVk5Os2A9s=
+github.com/openimsdk/protocol v0.0.72-alpha.55 h1:9PPWPHvkFk3neBSbNr+IoOdKIFjxTvEqUfMK/TEq1+8=
-github.com/openimsdk/protocol v0.0.72-alpha.54/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.55/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.32 h1:JEsUFHFnaYg230TG+Ke3SUnaA2h44t4kABAzEdv5VZw=
 github.com/openimsdk/tools v0.0.50-alpha.32/go.mod h1:r5U6RbxcR4xhKb2fhTmKGC9Yt5LcErHBVt3lhXQIHSo=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

internal/push/offlinepush/dummy/push.go

@@ -29,5 +29,6 @@ type Dummy struct {
 
 func (d *Dummy) Push(ctx context.Context, userIDs []string, title, content string, opts *options.Opts) error {
 	log.ZDebug(ctx, "dummy push")
+	log.ZWarn(ctx, "Dummy push", nil, "ps", "The offline push is not configured. To configure it, please go to config/openim-push.yml.")
 	return nil
 }

internal/push/offlinepush/offlinepusher.go

@@ -23,8 +23,6 @@ import (
 	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/mcontext"
 	"strings"
 )
 
@@ -51,7 +49,6 @@ func NewOfflinePusher(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPa
 		offlinePusher = jpush.NewClient(pushConf)
 	default:
 		offlinePusher = dummy.NewClient()
-		log.ZWarn(mcontext.WithMustInfoCtx([]string{"push start", "admin", "admin", ""}), "Unknown push config", nil)
 	}
 	return offlinePusher, nil
 }

internal/rpc/msg/as_read.go

@@ -16,6 +16,7 @@ package msg
 
 import (
 	"context"
+	"errors"
 
 	cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
 	"github.com/openimsdk/protocol/constant"
@@ -108,7 +109,7 @@ func (m *msgServer) MarkMsgsAsRead(ctx context.Context, req *msg.MarkMsgsAsReadR
 		return nil, err
 	}
 	currentHasReadSeq, err := m.MsgDatabase.GetHasReadSeq(ctx, req.UserID, req.ConversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && errors.Is(err, redis.Nil) {
 		return nil, err
 	}
 	if hasReadSeq > currentHasReadSeq {
@@ -136,7 +137,7 @@ func (m *msgServer) MarkConversationAsRead(ctx context.Context, req *msg.MarkCon
 		return nil, err
 	}
 	hasReadSeq, err := m.MsgDatabase.GetHasReadSeq(ctx, req.UserID, req.ConversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && errors.Is(err, redis.Nil) {
 		return nil, err
 	}
 	var seqs []int64

internal/rpc/msg/seq.go

@@ -16,15 +16,15 @@ package msg
 
 import (
 	"context"
+	"errors"
 	pbmsg "github.com/openimsdk/protocol/msg"
-	"github.com/openimsdk/tools/errs"
 	"github.com/redis/go-redis/v9"
 	"sort"
 )
 
 func (m *msgServer) GetConversationMaxSeq(ctx context.Context, req *pbmsg.GetConversationMaxSeqReq) (*pbmsg.GetConversationMaxSeqResp, error) {
 	maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && errors.Is(err, redis.Nil) {
 		return nil, err
 	}
 	return &pbmsg.GetConversationMaxSeqResp{MaxSeq: maxSeq}, nil

pkg/common/config/config.go

@@ -369,20 +369,8 @@ type Share struct {
 }
 
 type MultiLogin struct {
-	Policy            int `mapstructure:"policy"`
+	Policy       int `mapstructure:"policy"`
-	MaxNumOneEnd      int `mapstructure:"maxNumOneEnd"`
+	MaxNumOneEnd int `mapstructure:"maxNumOneEnd"`
-	CustomizeLoginNum struct {
-		IOS     int `mapstructure:"ios"`
-		Android int `mapstructure:"android"`
-		Windows int `mapstructure:"windows"`
-		OSX     int `mapstructure:"osx"`
-		Web     int `mapstructure:"web"`
-		MiniWeb int `mapstructure:"miniWeb"`
-		Linux   int `mapstructure:"linux"`
-		APad    int `mapstructure:"aPad"`
-		IPad    int `mapstructure:"iPad"`
-		Admin   int `mapstructure:"admin"`
-	} `mapstructure:"customizeLoginNum"`
 }
 
 type RpcRegisterName struct {

pkg/common/storage/controller/auth.go

@@ -25,9 +25,8 @@ type AuthDatabase interface {
 }
 
 type multiLoginConfig struct {
-	Policy            int
+	Policy       int
-	MaxNumOneEnd      int
+	MaxNumOneEnd int
-	CustomizeLoginNum map[int]int
 }
 
 type authDatabase struct {
@@ -42,19 +41,8 @@ func NewAuthDatabase(cache cache.TokenModel, accessSecret string, accessExpire i
 	return &authDatabase{cache: cache, accessSecret: accessSecret, accessExpire: accessExpire, multiLogin: multiLoginConfig{
 		Policy:       multiLogin.Policy,
 		MaxNumOneEnd: multiLogin.MaxNumOneEnd,
-		CustomizeLoginNum: map[int]int{
+	},
-			constant.IOSPlatformID:        multiLogin.CustomizeLoginNum.IOS,
+		adminUserIDs: adminUserIDs,
-			constant.AndroidPlatformID:    multiLogin.CustomizeLoginNum.Android,
-			constant.WindowsPlatformID:    multiLogin.CustomizeLoginNum.Windows,
-			constant.OSXPlatformID:        multiLogin.CustomizeLoginNum.OSX,
-			constant.WebPlatformID:        multiLogin.CustomizeLoginNum.Web,
-			constant.MiniWebPlatformID:    multiLogin.CustomizeLoginNum.MiniWeb,
-			constant.LinuxPlatformID:      multiLogin.CustomizeLoginNum.Linux,
-			constant.AndroidPadPlatformID: multiLogin.CustomizeLoginNum.APad,
-			constant.IPadPlatformID:       multiLogin.CustomizeLoginNum.IPad,
-			constant.AdminPlatformID:      multiLogin.CustomizeLoginNum.Admin,
-		},
-	}, adminUserIDs: adminUserIDs,
 	}
 }
 

pkg/common/storage/controller/msg.go

@@ -372,7 +372,7 @@ func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID strin
 // This ensures that their message retrieval starts from the point they joined.
 func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (int64, int64, []*sdkws.MsgData, error) {
 	userMinSeq, err := db.seqUser.GetUserMinSeq(ctx, conversationID, userID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && errors.Is(err, redis.Nil) {
 		return 0, 0, nil, err
 	}
 	minSeq, err := db.seqConversation.GetMinSeq(ctx, conversationID)