Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 OpenIM-Gordon
|
6f49519053 | ||
|
OpenIM-Gordon
|
3ecde781bb |
@@ -15,9 +15,10 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
_ "net/http/pprof"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
|
||||||
"github.com/openimsdk/tools/system/program"
|
"github.com/openimsdk/tools/system/program"
|
||||||
_ "net/http/pprof"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -5,4 +5,9 @@ etcd:
|
|||||||
username: ''
|
username: ''
|
||||||
password: ''
|
password: ''
|
||||||
|
|
||||||
|
zookeeper:
|
||||||
|
schema: openim
|
||||||
|
address: [ localhost:12181 ]
|
||||||
|
username: ''
|
||||||
|
password: ''
|
||||||
|
|
||||||
|
|||||||
+1
-14
@@ -13,17 +13,4 @@ rpcRegisterName:
|
|||||||
imAdminUserID: [ imAdmin ]
|
imAdminUserID: [ imAdmin ]
|
||||||
|
|
||||||
# 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
|
# 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
|
||||||
multiLogin:
|
multiLoginPolicy: 1
|
||||||
policy: 1
|
|
||||||
maxNumOneEnd: 30
|
|
||||||
customizeLoginNum:
|
|
||||||
ios: 1
|
|
||||||
android: 1
|
|
||||||
windows: 1
|
|
||||||
osx: 1
|
|
||||||
web: 1
|
|
||||||
miniWeb: 1
|
|
||||||
linux: 1
|
|
||||||
aPad: 1
|
|
||||||
iPad: 1
|
|
||||||
admin: 1
|
|
||||||
|
|||||||
+13
-1
@@ -43,6 +43,19 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- openim
|
- openim
|
||||||
|
|
||||||
|
zookeeper:
|
||||||
|
image: "${ZOOKEEPER_IMAGE}"
|
||||||
|
container_name: zookeeper
|
||||||
|
ports:
|
||||||
|
- "12181:2181"
|
||||||
|
environment:
|
||||||
|
#JVMFLAGS: "-Xms32m -Xmx128m"
|
||||||
|
TZ: "Asia/Shanghai"
|
||||||
|
ALLOW_ANONYMOUS_LOGIN: "yes"
|
||||||
|
restart: always
|
||||||
|
networks:
|
||||||
|
- openim
|
||||||
|
|
||||||
etcd:
|
etcd:
|
||||||
image: "${ETCD_IMAGE}"
|
image: "${ETCD_IMAGE}"
|
||||||
container_name: etcd
|
container_name: etcd
|
||||||
@@ -129,7 +142,6 @@ services:
|
|||||||
# image: ${PROMETHEUS_IMAGE}
|
# image: ${PROMETHEUS_IMAGE}
|
||||||
# container_name: prometheus
|
# container_name: prometheus
|
||||||
# restart: always
|
# restart: always
|
||||||
# user: root
|
|
||||||
# volumes:
|
# volumes:
|
||||||
# - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
|
# - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
|
||||||
# - ./config/instance-down-rules.yml:/etc/prometheus/instance-down-rules.yml
|
# - ./config/instance-down-rules.yml:/etc/prometheus/instance-down-rules.yml
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ require (
|
|||||||
github.com/gorilla/websocket v1.5.1
|
github.com/gorilla/websocket v1.5.1
|
||||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
|
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/openimsdk/protocol v0.0.72-alpha.46
|
github.com/openimsdk/protocol v0.0.72
|
||||||
github.com/openimsdk/tools v0.0.50-alpha.16
|
github.com/openimsdk/tools v0.0.50-alpha.16
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/prometheus/client_golang v1.18.0
|
github.com/prometheus/client_golang v1.18.0
|
||||||
|
|||||||
@@ -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/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 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
|
||||||
github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
|
github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
|
||||||
github.com/openimsdk/protocol v0.0.72-alpha.46 h1:1LZlfEHLzw1F4afFmqBczmXKJWm5rUQ+yr8rJ4oyEAc=
|
github.com/openimsdk/protocol v0.0.72 h1:K+vslwaR7lDXyBzb07UuEQITaqsgighz7NyXVIWsu6A=
|
||||||
github.com/openimsdk/protocol v0.0.72-alpha.46/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
|
github.com/openimsdk/protocol v0.0.72/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 h1:bC1AQvJMuOHtZm8LZRvN8L5mH1Ws2VYdL+TLTs1iGSc=
|
||||||
github.com/openimsdk/tools v0.0.50-alpha.16/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
|
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=
|
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
||||||
|
|||||||
+32
-90
@@ -1,15 +1,11 @@
|
|||||||
package jssdk
|
package jssdk
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/openimsdk/protocol/conversation"
|
"github.com/openimsdk/protocol/conversation"
|
||||||
"github.com/openimsdk/protocol/group"
|
|
||||||
"github.com/openimsdk/protocol/jssdk"
|
|
||||||
"github.com/openimsdk/protocol/msg"
|
"github.com/openimsdk/protocol/msg"
|
||||||
"github.com/openimsdk/protocol/relation"
|
|
||||||
"github.com/openimsdk/protocol/sdkws"
|
"github.com/openimsdk/protocol/sdkws"
|
||||||
"github.com/openimsdk/protocol/user"
|
"github.com/openimsdk/tools/a2r"
|
||||||
"github.com/openimsdk/tools/mcontext"
|
"github.com/openimsdk/tools/mcontext"
|
||||||
"github.com/openimsdk/tools/utils/datautil"
|
"github.com/openimsdk/tools/utils/datautil"
|
||||||
"sort"
|
"sort"
|
||||||
@@ -20,22 +16,16 @@ const (
|
|||||||
defaultGetActiveConversation = 100
|
defaultGetActiveConversation = 100
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewJSSdkApi(user user.UserClient, friend relation.FriendClient, group group.GroupClient, msg msg.MsgClient, conv conversation.ConversationClient) *JSSdk {
|
func NewJSSdkApi(msg msg.MsgClient, conv conversation.ConversationClient) *JSSdk {
|
||||||
return &JSSdk{
|
return &JSSdk{
|
||||||
user: user,
|
msg: msg,
|
||||||
friend: friend,
|
conv: conv,
|
||||||
group: group,
|
|
||||||
msg: msg,
|
|
||||||
conv: conv,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type JSSdk struct {
|
type JSSdk struct {
|
||||||
user user.UserClient
|
msg msg.MsgClient
|
||||||
friend relation.FriendClient
|
conv conversation.ConversationClient
|
||||||
group group.GroupClient
|
|
||||||
msg msg.MsgClient
|
|
||||||
conv conversation.ConversationClient
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *JSSdk) GetActiveConversations(c *gin.Context) {
|
func (x *JSSdk) GetActiveConversations(c *gin.Context) {
|
||||||
@@ -46,71 +36,25 @@ func (x *JSSdk) GetConversations(c *gin.Context) {
|
|||||||
call(c, x.getConversations)
|
call(c, x.getConversations)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *JSSdk) fillConversations(ctx context.Context, conversations []*jssdk.ConversationMsg) error {
|
func (x *JSSdk) getActiveConversations(ctx *gin.Context) (*ConversationsResp, error) {
|
||||||
if len(conversations) == 0 {
|
req, err := a2r.ParseRequest[ActiveConversationsReq](ctx)
|
||||||
return nil
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
var (
|
|
||||||
userIDs []string
|
|
||||||
groupIDs []string
|
|
||||||
)
|
|
||||||
for _, c := range conversations {
|
|
||||||
if c.Conversation.GroupID == "" {
|
|
||||||
userIDs = append(userIDs, c.Conversation.UserID)
|
|
||||||
} else {
|
|
||||||
groupIDs = append(groupIDs, c.Conversation.GroupID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
userMap map[string]*sdkws.UserInfo
|
|
||||||
friendMap map[string]*relation.FriendInfoOnly
|
|
||||||
groupMap map[string]*sdkws.GroupInfo
|
|
||||||
)
|
|
||||||
if len(userIDs) > 0 {
|
|
||||||
users, err := field(ctx, x.user.GetDesignateUsers, &user.GetDesignateUsersReq{UserIDs: userIDs}, (*user.GetDesignateUsersResp).GetUsersInfo)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
friends, err := field(ctx, x.friend.GetFriendInfo, &relation.GetFriendInfoReq{OwnerUserID: conversations[0].Conversation.OwnerUserID, FriendUserIDs: userIDs}, (*relation.GetFriendInfoResp).GetFriendInfos)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
userMap = datautil.SliceToMap(users, (*sdkws.UserInfo).GetUserID)
|
|
||||||
friendMap = datautil.SliceToMap(friends, (*relation.FriendInfoOnly).GetFriendUserID)
|
|
||||||
}
|
|
||||||
if len(groupIDs) > 0 {
|
|
||||||
resp, err := x.group.GetGroupsInfo(ctx, &group.GetGroupsInfoReq{GroupIDs: groupIDs})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
groupMap = datautil.SliceToMap(resp.GroupInfos, (*sdkws.GroupInfo).GetGroupID)
|
|
||||||
}
|
|
||||||
for _, c := range conversations {
|
|
||||||
if c.Conversation.GroupID == "" {
|
|
||||||
c.User = userMap[c.Conversation.UserID]
|
|
||||||
c.Friend = friendMap[c.Conversation.UserID]
|
|
||||||
} else {
|
|
||||||
c.Group = groupMap[c.Conversation.GroupID]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActiveConversationsReq) (*jssdk.GetActiveConversationsResp, error) {
|
|
||||||
if req.Count <= 0 || req.Count > maxGetActiveConversation {
|
if req.Count <= 0 || req.Count > maxGetActiveConversation {
|
||||||
req.Count = defaultGetActiveConversation
|
req.Count = defaultGetActiveConversation
|
||||||
}
|
}
|
||||||
req.OwnerUserID = mcontext.GetOpUserID(ctx)
|
opUserID := mcontext.GetOpUserID(ctx)
|
||||||
conversationIDs, err := field(ctx, x.conv.GetConversationIDs,
|
conversationIDs, err := field(ctx, x.conv.GetConversationIDs,
|
||||||
&conversation.GetConversationIDsReq{UserID: req.OwnerUserID}, (*conversation.GetConversationIDsResp).GetConversationIDs)
|
&conversation.GetConversationIDsReq{UserID: opUserID}, (*conversation.GetConversationIDsResp).GetConversationIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(conversationIDs) == 0 {
|
if len(conversationIDs) == 0 {
|
||||||
return &jssdk.GetActiveConversationsResp{}, nil
|
return &ConversationsResp{}, nil
|
||||||
}
|
}
|
||||||
readSeq, err := field(ctx, x.msg.GetHasReadSeqs,
|
readSeq, err := field(ctx, x.msg.GetHasReadSeqs,
|
||||||
&msg.GetHasReadSeqsReq{UserID: req.OwnerUserID, ConversationIDs: conversationIDs}, (*msg.SeqsInfoResp).GetMaxSeqs)
|
&msg.GetHasReadSeqsReq{UserID: opUserID, ConversationIDs: conversationIDs}, (*msg.SeqsInfoResp).GetMaxSeqs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -120,24 +64,24 @@ func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActive
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(activeConversation) == 0 {
|
if len(activeConversation) == 0 {
|
||||||
return &jssdk.GetActiveConversationsResp{}, nil
|
return &ConversationsResp{}, nil
|
||||||
}
|
}
|
||||||
sortConversations := sortActiveConversations{
|
sortConversations := sortActiveConversations{
|
||||||
Conversation: activeConversation,
|
Conversation: activeConversation,
|
||||||
}
|
}
|
||||||
if len(activeConversation) > 1 {
|
if len(activeConversation) > 1 {
|
||||||
pinnedConversationIDs, err := field(ctx, x.conv.GetPinnedConversationIDs,
|
pinnedConversationIDs, err := field(ctx, x.conv.GetPinnedConversationIDs,
|
||||||
&conversation.GetPinnedConversationIDsReq{UserID: req.OwnerUserID}, (*conversation.GetPinnedConversationIDsResp).GetConversationIDs)
|
&conversation.GetPinnedConversationIDsReq{UserID: opUserID}, (*conversation.GetPinnedConversationIDsResp).GetConversationIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
sortConversations.PinnedConversationIDs = datautil.SliceSet(pinnedConversationIDs)
|
sortConversations.PinnedConversationIDs = datautil.SliceSet(pinnedConversationIDs)
|
||||||
}
|
}
|
||||||
sort.Sort(&sortConversations)
|
sort.Sort(&sortConversations)
|
||||||
sortList := sortConversations.Top(int(req.Count))
|
sortList := sortConversations.Top(req.Count)
|
||||||
conversations, err := field(ctx, x.conv.GetConversations,
|
conversations, err := field(ctx, x.conv.GetConversations,
|
||||||
&conversation.GetConversationsReq{
|
&conversation.GetConversationsReq{
|
||||||
OwnerUserID: req.OwnerUserID,
|
OwnerUserID: opUserID,
|
||||||
ConversationIDs: datautil.Slice(sortList, func(c *msg.ActiveConversation) string {
|
ConversationIDs: datautil.Slice(sortList, func(c *msg.ActiveConversation) string {
|
||||||
return c.ConversationID
|
return c.ConversationID
|
||||||
})}, (*conversation.GetConversationsResp).GetConversations)
|
})}, (*conversation.GetConversationsResp).GetConversations)
|
||||||
@@ -146,7 +90,7 @@ func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActive
|
|||||||
}
|
}
|
||||||
msgs, err := field(ctx, x.msg.GetSeqMessage,
|
msgs, err := field(ctx, x.msg.GetSeqMessage,
|
||||||
&msg.GetSeqMessageReq{
|
&msg.GetSeqMessageReq{
|
||||||
UserID: req.OwnerUserID,
|
UserID: opUserID,
|
||||||
Conversations: datautil.Slice(sortList, func(c *msg.ActiveConversation) *msg.ConversationSeqs {
|
Conversations: datautil.Slice(sortList, func(c *msg.ActiveConversation) *msg.ConversationSeqs {
|
||||||
return &msg.ConversationSeqs{
|
return &msg.ConversationSeqs{
|
||||||
ConversationID: c.ConversationID,
|
ConversationID: c.ConversationID,
|
||||||
@@ -160,7 +104,7 @@ func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActive
|
|||||||
conversationMap := datautil.SliceToMap(conversations, func(c *conversation.Conversation) string {
|
conversationMap := datautil.SliceToMap(conversations, func(c *conversation.Conversation) string {
|
||||||
return c.ConversationID
|
return c.ConversationID
|
||||||
})
|
})
|
||||||
resp := make([]*jssdk.ConversationMsg, 0, len(sortList))
|
resp := make([]ConversationMsg, 0, len(sortList))
|
||||||
for _, c := range sortList {
|
for _, c := range sortList {
|
||||||
conv, ok := conversationMap[c.ConversationID]
|
conv, ok := conversationMap[c.ConversationID]
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -170,16 +114,13 @@ func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActive
|
|||||||
if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
|
if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
|
||||||
lastMsg = msgList.Msgs[0]
|
lastMsg = msgList.Msgs[0]
|
||||||
}
|
}
|
||||||
resp = append(resp, &jssdk.ConversationMsg{
|
resp = append(resp, ConversationMsg{
|
||||||
Conversation: conv,
|
Conversation: conv,
|
||||||
LastMsg: lastMsg,
|
LastMsg: lastMsg,
|
||||||
MaxSeq: c.MaxSeq,
|
MaxSeq: c.MaxSeq,
|
||||||
ReadSeq: readSeq[c.ConversationID],
|
ReadSeq: readSeq[c.ConversationID],
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if err := x.fillConversations(ctx, resp); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var unreadCount int64
|
var unreadCount int64
|
||||||
for _, c := range activeConversation {
|
for _, c := range activeConversation {
|
||||||
count := c.MaxSeq - readSeq[c.ConversationID]
|
count := c.MaxSeq - readSeq[c.ConversationID]
|
||||||
@@ -187,20 +128,24 @@ func (x *JSSdk) getActiveConversations(ctx context.Context, req *jssdk.GetActive
|
|||||||
unreadCount += count
|
unreadCount += count
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return &jssdk.GetActiveConversationsResp{
|
return &ConversationsResp{
|
||||||
Conversations: resp,
|
Conversations: resp,
|
||||||
UnreadCount: unreadCount,
|
UnreadCount: unreadCount,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *JSSdk) getConversations(ctx context.Context, req *jssdk.GetConversationsReq) (*jssdk.GetConversationsResp, error) {
|
func (x *JSSdk) getConversations(ctx *gin.Context) (*ConversationsResp, error) {
|
||||||
|
req, err := a2r.ParseRequest[conversation.GetConversationsReq](ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
req.OwnerUserID = mcontext.GetOpUserID(ctx)
|
req.OwnerUserID = mcontext.GetOpUserID(ctx)
|
||||||
conversations, err := field(ctx, x.conv.GetConversations, &conversation.GetConversationsReq{OwnerUserID: req.OwnerUserID, ConversationIDs: req.ConversationIDs}, (*conversation.GetConversationsResp).GetConversations)
|
conversations, err := field(ctx, x.conv.GetConversations, req, (*conversation.GetConversationsResp).GetConversations)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(conversations) == 0 {
|
if len(conversations) == 0 {
|
||||||
return &jssdk.GetConversationsResp{}, nil
|
return &ConversationsResp{}, nil
|
||||||
}
|
}
|
||||||
req.ConversationIDs = datautil.Slice(conversations, func(c *conversation.Conversation) string {
|
req.ConversationIDs = datautil.Slice(conversations, func(c *conversation.Conversation) string {
|
||||||
return c.ConversationID
|
return c.ConversationID
|
||||||
@@ -232,22 +177,19 @@ func (x *JSSdk) getConversations(ctx context.Context, req *jssdk.GetConversation
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
resp := make([]*jssdk.ConversationMsg, 0, len(conversations))
|
resp := make([]ConversationMsg, 0, len(conversations))
|
||||||
for _, c := range conversations {
|
for _, c := range conversations {
|
||||||
var lastMsg *sdkws.MsgData
|
var lastMsg *sdkws.MsgData
|
||||||
if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
|
if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
|
||||||
lastMsg = msgList.Msgs[0]
|
lastMsg = msgList.Msgs[0]
|
||||||
}
|
}
|
||||||
resp = append(resp, &jssdk.ConversationMsg{
|
resp = append(resp, ConversationMsg{
|
||||||
Conversation: c,
|
Conversation: c,
|
||||||
LastMsg: lastMsg,
|
LastMsg: lastMsg,
|
||||||
MaxSeq: maxSeqs[c.ConversationID],
|
MaxSeq: maxSeqs[c.ConversationID],
|
||||||
ReadSeq: readSeqs[c.ConversationID],
|
ReadSeq: readSeqs[c.ConversationID],
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if err := x.fillConversations(ctx, resp); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var unreadCount int64
|
var unreadCount int64
|
||||||
for conversationID, maxSeq := range maxSeqs {
|
for conversationID, maxSeq := range maxSeqs {
|
||||||
count := maxSeq - readSeqs[conversationID]
|
count := maxSeq - readSeqs[conversationID]
|
||||||
@@ -255,7 +197,7 @@ func (x *JSSdk) getConversations(ctx context.Context, req *jssdk.GetConversation
|
|||||||
unreadCount += count
|
unreadCount += count
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return &jssdk.GetConversationsResp{
|
return &ConversationsResp{
|
||||||
Conversations: resp,
|
Conversations: resp,
|
||||||
UnreadCount: unreadCount,
|
UnreadCount: unreadCount,
|
||||||
}, nil
|
}, nil
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package jssdk
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/openimsdk/protocol/conversation"
|
||||||
|
"github.com/openimsdk/protocol/sdkws"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ActiveConversationsReq struct {
|
||||||
|
Count int `json:"count"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ConversationMsg struct {
|
||||||
|
Conversation *conversation.Conversation `json:"conversation"`
|
||||||
|
LastMsg *sdkws.MsgData `json:"lastMsg"`
|
||||||
|
MaxSeq int64 `json:"maxSeq"`
|
||||||
|
ReadSeq int64 `json:"readSeq"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ConversationsResp struct {
|
||||||
|
UnreadCount int64 `json:"unreadCount"`
|
||||||
|
Conversations []ConversationMsg `json:"conversations"`
|
||||||
|
}
|
||||||
@@ -3,14 +3,8 @@ package jssdk
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/openimsdk/tools/a2r"
|
|
||||||
"github.com/openimsdk/tools/apiresp"
|
"github.com/openimsdk/tools/apiresp"
|
||||||
"github.com/openimsdk/tools/checker"
|
|
||||||
"github.com/openimsdk/tools/errs"
|
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/protobuf/proto"
|
|
||||||
"io"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A, opts ...grpc.CallOption) (*B, error), req *A, get func(*B) C) (C, error) {
|
func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A, opts ...grpc.CallOption) (*B, error), req *A, get func(*B) C) (C, error) {
|
||||||
@@ -22,56 +16,11 @@ func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A
|
|||||||
return get(resp), nil
|
return get(resp), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func call[A, B any](c *gin.Context, fn func(ctx context.Context, req *A) (*B, error)) {
|
func call[R any](c *gin.Context, fn func(ctx *gin.Context) (R, error)) {
|
||||||
var isJSON bool
|
resp, err := fn(c)
|
||||||
switch contentType := c.GetHeader("Content-Type"); {
|
|
||||||
case contentType == "":
|
|
||||||
isJSON = true
|
|
||||||
case strings.Contains(contentType, "application/json"):
|
|
||||||
isJSON = true
|
|
||||||
case strings.Contains(contentType, "application/protobuf"):
|
|
||||||
case strings.Contains(contentType, "application/x-protobuf"):
|
|
||||||
default:
|
|
||||||
apiresp.GinError(c, errs.ErrArgs.WrapMsg("unsupported content type"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var req *A
|
|
||||||
if isJSON {
|
|
||||||
var err error
|
|
||||||
req, err = a2r.ParseRequest[A](c)
|
|
||||||
if err != nil {
|
|
||||||
apiresp.GinError(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
body, err := io.ReadAll(c.Request.Body)
|
|
||||||
if err != nil {
|
|
||||||
apiresp.GinError(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
req = new(A)
|
|
||||||
if err := proto.Unmarshal(body, any(req).(proto.Message)); err != nil {
|
|
||||||
apiresp.GinError(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := checker.Validate(&req); err != nil {
|
|
||||||
apiresp.GinError(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
resp, err := fn(c, req)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
apiresp.GinError(c, err)
|
apiresp.GinError(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if isJSON {
|
apiresp.GinSuccess(c, resp)
|
||||||
apiresp.GinSuccess(c, resp)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
body, err := proto.Marshal(any(resp).(proto.Message))
|
|
||||||
if err != nil {
|
|
||||||
apiresp.GinError(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
apiresp.GinSuccess(c, body)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/openimsdk/protocol/msg"
|
||||||
|
"sort"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestName(t *testing.T) {
|
||||||
|
val := sortActiveConversations{
|
||||||
|
Conversation: []*msg.ActiveConversation{
|
||||||
|
{
|
||||||
|
ConversationID: "100",
|
||||||
|
LastTime: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ConversationID: "200",
|
||||||
|
LastTime: 200,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ConversationID: "300",
|
||||||
|
LastTime: 300,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ConversationID: "400",
|
||||||
|
LastTime: 400,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
//PinnedConversationIDs: map[string]struct{}{
|
||||||
|
// "100": {},
|
||||||
|
// "300": {},
|
||||||
|
//},
|
||||||
|
}
|
||||||
|
sort.Sort(&val)
|
||||||
|
t.Log(val)
|
||||||
|
|
||||||
|
}
|
||||||
@@ -77,7 +77,7 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
|
|||||||
r.Use(prommetricsGin(), gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(authRpc))
|
r.Use(prommetricsGin(), gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(authRpc))
|
||||||
u := NewUserApi(*userRpc)
|
u := NewUserApi(*userRpc)
|
||||||
m := NewMessageApi(messageRpc, userRpc, config.Share.IMAdminUserID)
|
m := NewMessageApi(messageRpc, userRpc, config.Share.IMAdminUserID)
|
||||||
j := jssdk.NewJSSdkApi(userRpc.Client, friendRpc.Client, groupRpc.Client, messageRpc.Client, conversationRpc.Client)
|
j := jssdk.NewJSSdkApi(messageRpc.Client, conversationRpc.Client)
|
||||||
userRouterGroup := r.Group("/user")
|
userRouterGroup := r.Group("/user")
|
||||||
{
|
{
|
||||||
userRouterGroup.POST("/user_register", u.UserRegister)
|
userRouterGroup.POST("/user_register", u.UserRegister)
|
||||||
|
|||||||
@@ -15,7 +15,8 @@
|
|||||||
package msggateway
|
package msggateway
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"bytes"
|
||||||
|
"encoding/gob"
|
||||||
|
|
||||||
"github.com/openimsdk/tools/errs"
|
"github.com/openimsdk/tools/errs"
|
||||||
)
|
)
|
||||||
@@ -32,17 +33,19 @@ func NewGobEncoder() *GobEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (g *GobEncoder) Encode(data any) ([]byte, error) {
|
func (g *GobEncoder) Encode(data any) ([]byte, error) {
|
||||||
b, err := json.Marshal(data)
|
buff := bytes.Buffer{}
|
||||||
if err != nil {
|
enc := gob.NewEncoder(&buff)
|
||||||
return nil, errs.New("Encoder.Encode failed", "action", "encode")
|
if err := enc.Encode(data); err != nil {
|
||||||
|
return nil, errs.WrapMsg(err, "GobEncoder.Encode failed", "action", "encode")
|
||||||
}
|
}
|
||||||
return b, nil
|
return buff.Bytes(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GobEncoder) Decode(encodeData []byte, decodeData any) error {
|
func (g *GobEncoder) Decode(encodeData []byte, decodeData any) error {
|
||||||
err := json.Unmarshal(encodeData, decodeData)
|
buff := bytes.NewBuffer(encodeData)
|
||||||
if err != nil {
|
dec := gob.NewDecoder(buff)
|
||||||
return errs.New("Encoder.Decode failed", "action", "decode")
|
if err := dec.Decode(decodeData); err != nil {
|
||||||
|
return errs.WrapMsg(err, "GobEncoder.Decode failed", "action", "decode")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
package msggateway
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestGobEncoder_Encode(t *testing.T) {
|
|
||||||
encoder := NewGobEncoder()
|
|
||||||
|
|
||||||
// 测试用例1: 编码 []byte 数据
|
|
||||||
inputData := []byte("test data")
|
|
||||||
encodedData, err := encoder.Encode(inputData)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("expected no error, got %v", err)
|
|
||||||
}
|
|
||||||
if string(encodedData) != string(inputData) {
|
|
||||||
t.Fatalf("expected encoded data to be '%s', got '%s'", inputData, encodedData)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 测试用例2: 编码非 []byte 数据
|
|
||||||
nonByteData := "string data"
|
|
||||||
_, err = encoder.Encode(nonByteData)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatalf("expected an error when encoding non-byte data, got none")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGobEncoder_Decode(t *testing.T) {
|
|
||||||
encoder := NewGobEncoder()
|
|
||||||
|
|
||||||
// 测试用例1: 解码到 []byte 数据
|
|
||||||
encodedData := []byte("test data")
|
|
||||||
var decodedData []byte
|
|
||||||
err := encoder.Decode(encodedData, &decodedData)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("expected no error, got %v", err)
|
|
||||||
}
|
|
||||||
if string(decodedData) != string(encodedData) {
|
|
||||||
t.Fatalf("expected decoded data to be '%s', got '%s'", encodedData, decodedData)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 测试用例2: 解码到非 []byte 数据
|
|
||||||
var nonByteData string
|
|
||||||
err = encoder.Decode(encodedData, &nonByteData)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatalf("expected an error when decoding to non-byte data, got none")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -155,7 +155,6 @@ func (s *Server) pushToUser(ctx context.Context, userID string, msgData *sdkws.M
|
|||||||
(client.IsBackground && client.PlatformID != constant.IOSPlatformID) {
|
(client.IsBackground && client.PlatformID != constant.IOSPlatformID) {
|
||||||
err := client.PushMessage(ctx, msgData)
|
err := client.PushMessage(ctx, msgData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.ZWarn(ctx, "online push msg failed", err, "userID", userID, "platformID", client.PlatformID)
|
|
||||||
userPlatform.ResultCode = int64(servererrs.ErrPushMsgErr.Code())
|
userPlatform.ResultCode = int64(servererrs.ErrPushMsgErr.Code())
|
||||||
} else {
|
} else {
|
||||||
if _, ok := s.pushTerminal[client.PlatformID]; ok {
|
if _, ok := s.pushTerminal[client.PlatformID]; ok {
|
||||||
|
|||||||
@@ -90,19 +90,6 @@ func (ws *WsServer) ChangeOnlineStatus(concurrent int) {
|
|||||||
if _, err := ws.userClient.Client.SetUserOnlineStatus(ctx, req); err != nil {
|
if _, err := ws.userClient.Client.SetUserOnlineStatus(ctx, req); err != nil {
|
||||||
log.ZError(ctx, "update user online status", err)
|
log.ZError(ctx, "update user online status", err)
|
||||||
}
|
}
|
||||||
for _, ss := range req.Status {
|
|
||||||
for _, online := range ss.Online {
|
|
||||||
client, _, _ := ws.clients.Get(ss.UserID, int(online))
|
|
||||||
back := false
|
|
||||||
if len(client) > 0 {
|
|
||||||
back = client[0].IsBackground
|
|
||||||
}
|
|
||||||
ws.webhookAfterUserOnline(ctx, &ws.msgGatewayConfig.WebhooksConfig.AfterUserOnline, ss.UserID, int(online), back, ss.ConnID)
|
|
||||||
}
|
|
||||||
for _, offline := range ss.Offline {
|
|
||||||
ws.webhookAfterUserOffline(ctx, &ws.msgGatewayConfig.WebhooksConfig.AfterUserOffline, ss.UserID, int(offline), ss.ConnID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i < concurrent; i++ {
|
for i := 0; i < concurrent; i++ {
|
||||||
|
|||||||
@@ -1,3 +1,17 @@
|
|||||||
|
// Copyright © 2023 OpenIM. All rights reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
package msggateway
|
package msggateway
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -198,6 +212,7 @@ func (ws *WsServer) sendUserOnlineInfoToOtherNode(ctx context.Context, client *C
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
wg := errgroup.Group{}
|
wg := errgroup.Group{}
|
||||||
wg.SetLimit(concurrentRequest)
|
wg.SetLimit(concurrentRequest)
|
||||||
|
|
||||||
@@ -306,32 +321,8 @@ func (ws *WsServer) KickUserConn(client *Client) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Client, newClient *Client) {
|
func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Client, newClient *Client) {
|
||||||
kickTokenFunc := func(kickClients []*Client) {
|
switch ws.msgGatewayConfig.Share.MultiLoginPolicy {
|
||||||
var kickTokens []string
|
|
||||||
ws.clients.DeleteClients(newClient.UserID, kickClients)
|
|
||||||
for _, c := range kickClients {
|
|
||||||
kickTokens = append(kickTokens, c.token)
|
|
||||||
err := c.KickOnlineMessage()
|
|
||||||
if err != nil {
|
|
||||||
log.ZWarn(c.ctx, "KickOnlineMessage", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ctx := mcontext.WithMustInfoCtx(
|
|
||||||
[]string{newClient.ctx.GetOperationID(), newClient.ctx.GetUserID(),
|
|
||||||
constant.PlatformIDToName(newClient.PlatformID), newClient.ctx.GetConnID()},
|
|
||||||
)
|
|
||||||
if _, err := ws.authClient.KickTokens(ctx, kickTokens); err != nil {
|
|
||||||
log.ZWarn(newClient.ctx, "kickTokens err", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch ws.msgGatewayConfig.Share.MultiLogin.Policy {
|
|
||||||
case constant.DefalutNotKick:
|
case constant.DefalutNotKick:
|
||||||
case constant.WebAndOther:
|
|
||||||
if constant.PlatformIDToClass(newClient.PlatformID) == constant.WebPlatformStr {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fallthrough
|
|
||||||
case constant.PCAndOther:
|
case constant.PCAndOther:
|
||||||
if constant.PlatformIDToClass(newClient.PlatformID) == constant.TerminalPC {
|
if constant.PlatformIDToClass(newClient.PlatformID) == constant.TerminalPC {
|
||||||
return
|
return
|
||||||
@@ -356,35 +347,6 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
|
|||||||
log.ZWarn(newClient.ctx, "InvalidateToken err", err, "userID", newClient.UserID,
|
log.ZWarn(newClient.ctx, "InvalidateToken err", err, "userID", newClient.UserID,
|
||||||
"platformID", newClient.PlatformID)
|
"platformID", newClient.PlatformID)
|
||||||
}
|
}
|
||||||
case constant.PcMobileAndWeb:
|
|
||||||
clients, ok := ws.clients.GetAll(newClient.UserID)
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
kickClients []*Client
|
|
||||||
)
|
|
||||||
for _, client := range clients {
|
|
||||||
if constant.PlatformIDToClass(client.PlatformID) == constant.PlatformIDToClass(newClient.PlatformID) {
|
|
||||||
kickClients = append(kickClients, client)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package push
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/openimsdk/protocol/sdkws"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestName(t *testing.T) {
|
||||||
|
var c ConsumerHandler
|
||||||
|
c.readCh = make(chan *sdkws.MarkAsReadTips)
|
||||||
|
|
||||||
|
go c.loopRead()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for i := 0; ; i++ {
|
||||||
|
seq := int64(i + 1)
|
||||||
|
if seq%3 == 0 {
|
||||||
|
seq = 1
|
||||||
|
}
|
||||||
|
c.readCh <- &sdkws.MarkAsReadTips{
|
||||||
|
ConversationID: "c100",
|
||||||
|
MarkAsReadUserID: "u100",
|
||||||
|
HasReadSeq: seq,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {}
|
||||||
|
}
|
||||||
@@ -23,13 +23,10 @@ import (
|
|||||||
"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
|
"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/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
|
||||||
"github.com/openimsdk/tools/log"
|
|
||||||
"github.com/openimsdk/tools/mcontext"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
geTUI = "getui"
|
geTUI = "geTui"
|
||||||
firebase = "fcm"
|
firebase = "fcm"
|
||||||
jPush = "jpush"
|
jPush = "jpush"
|
||||||
)
|
)
|
||||||
@@ -41,7 +38,6 @@ type OfflinePusher interface {
|
|||||||
|
|
||||||
func NewOfflinePusher(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPath string) (OfflinePusher, error) {
|
func NewOfflinePusher(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPath string) (OfflinePusher, error) {
|
||||||
var offlinePusher OfflinePusher
|
var offlinePusher OfflinePusher
|
||||||
pushConf.Enable = strings.ToLower(pushConf.Enable)
|
|
||||||
switch pushConf.Enable {
|
switch pushConf.Enable {
|
||||||
case geTUI:
|
case geTUI:
|
||||||
offlinePusher = getui.NewClient(pushConf, cache)
|
offlinePusher = getui.NewClient(pushConf, cache)
|
||||||
@@ -51,7 +47,6 @@ func NewOfflinePusher(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPa
|
|||||||
offlinePusher = jpush.NewClient(pushConf)
|
offlinePusher = jpush.NewClient(pushConf)
|
||||||
default:
|
default:
|
||||||
offlinePusher = dummy.NewClient()
|
offlinePusher = dummy.NewClient()
|
||||||
log.ZWarn(mcontext.WithMustInfoCtx([]string{"push start", "admin", "admin", ""}), "Unknown push config", nil)
|
|
||||||
}
|
}
|
||||||
return offlinePusher, nil
|
return offlinePusher, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,9 +55,6 @@ func (o *OfflinePushConsumerHandler) handleMsg2OfflinePush(ctx context.Context,
|
|||||||
log.ZError(ctx, "offline push msg is empty", errs.New("offlinePushMsg is empty"), "userIDs", offlinePushMsg.UserIDs, "msg", offlinePushMsg.MsgData)
|
log.ZError(ctx, "offline push msg is empty", errs.New("offlinePushMsg is empty"), "userIDs", offlinePushMsg.UserIDs, "msg", offlinePushMsg.MsgData)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if offlinePushMsg.MsgData.Status == constant.MsgStatusSending {
|
|
||||||
offlinePushMsg.MsgData.Status = constant.MsgStatusSendSuccess
|
|
||||||
}
|
|
||||||
log.ZInfo(ctx, "receive to OfflinePush MQ", "userIDs", offlinePushMsg.UserIDs, "msg", offlinePushMsg.MsgData)
|
log.ZInfo(ctx, "receive to OfflinePush MQ", "userIDs", offlinePushMsg.UserIDs, "msg", offlinePushMsg.MsgData)
|
||||||
|
|
||||||
err := o.offlinePushMsg(ctx, offlinePushMsg.MsgData, offlinePushMsg.UserIDs)
|
err := o.offlinePushMsg(ctx, offlinePushMsg.MsgData, offlinePushMsg.UserIDs)
|
||||||
|
|||||||
@@ -194,9 +194,6 @@ func (c *ConsumerHandler) shouldPushOffline(_ context.Context, msg *sdkws.MsgDat
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *ConsumerHandler) GetConnsAndOnlinePush(ctx context.Context, msg *sdkws.MsgData, pushToUserIDs []string) ([]*msggateway.SingleMsgToUserResults, error) {
|
func (c *ConsumerHandler) GetConnsAndOnlinePush(ctx context.Context, msg *sdkws.MsgData, pushToUserIDs []string) ([]*msggateway.SingleMsgToUserResults, error) {
|
||||||
if msg != nil && msg.Status == constant.MsgStatusSending {
|
|
||||||
msg.Status = constant.MsgStatusSendSuccess
|
|
||||||
}
|
|
||||||
onlineUserIDs, offlineUserIDs, err := c.onlineCache.GetUsersOnline(ctx, pushToUserIDs)
|
onlineUserIDs, offlineUserIDs, err := c.onlineCache.GetUsersOnline(ctx, pushToUserIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
|
|||||||
redis2.NewTokenCacheModel(rdb, config.RpcConfig.TokenPolicy.Expire),
|
redis2.NewTokenCacheModel(rdb, config.RpcConfig.TokenPolicy.Expire),
|
||||||
config.Share.Secret,
|
config.Share.Secret,
|
||||||
config.RpcConfig.TokenPolicy.Expire,
|
config.RpcConfig.TokenPolicy.Expire,
|
||||||
config.Share.MultiLogin,
|
config.Share.MultiLoginPolicy,
|
||||||
),
|
),
|
||||||
config: config,
|
config: config,
|
||||||
})
|
})
|
||||||
@@ -230,10 +230,3 @@ func (s *authServer) InvalidateToken(ctx context.Context, req *pbauth.Invalidate
|
|||||||
}
|
}
|
||||||
return &pbauth.InvalidateTokenResp{}, nil
|
return &pbauth.InvalidateTokenResp{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *authServer) KickTokens(ctx context.Context, req *pbauth.KickTokensReq) (*pbauth.KickTokensResp, error) {
|
|
||||||
if err := s.authDatabase.BatchSetTokenMapByUidPid(ctx, req.Tokens); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &pbauth.KickTokensResp{}, nil
|
|
||||||
}
|
|
||||||
|
|||||||
+25
-54
@@ -465,7 +465,7 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = g.notification.GroupApplicationAgreeMemberEnterNotification(ctx, req.GroupID, opUserID, req.InvitedUserIDs...); err != nil {
|
if err = g.notification.MemberEnterNotification(ctx, req.GroupID, req.InvitedUserIDs...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &pbgroup.InviteUserToGroupResp{}, nil
|
return &pbgroup.InviteUserToGroupResp{}, nil
|
||||||
@@ -1485,6 +1485,9 @@ func (g *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGr
|
|||||||
return nil, errs.ErrNoPermission.WrapMsg("no op user id")
|
return nil, errs.ErrNoPermission.WrapMsg("no op user id")
|
||||||
}
|
}
|
||||||
isAppManagerUid := authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID)
|
isAppManagerUid := authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID)
|
||||||
|
for i := range req.Members {
|
||||||
|
req.Members[i].FaceURL = nil
|
||||||
|
}
|
||||||
groupMembers := make(map[string][]*pbgroup.SetGroupMemberInfo)
|
groupMembers := make(map[string][]*pbgroup.SetGroupMemberInfo)
|
||||||
for i, member := range req.Members {
|
for i, member := range req.Members {
|
||||||
if member.RoleLevel != nil {
|
if member.RoleLevel != nil {
|
||||||
@@ -1526,61 +1529,29 @@ func (g *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGr
|
|||||||
case 0:
|
case 0:
|
||||||
if !isAppManagerUid {
|
if !isAppManagerUid {
|
||||||
roleLevel := dbMembers[opUserIndex].RoleLevel
|
roleLevel := dbMembers[opUserIndex].RoleLevel
|
||||||
var (
|
if roleLevel != constant.GroupOwner {
|
||||||
dbSelf = &model.GroupMember{}
|
switch roleLevel {
|
||||||
reqSelf *pbgroup.SetGroupMemberInfo
|
case constant.GroupAdmin:
|
||||||
)
|
for _, member := range dbMembers {
|
||||||
switch roleLevel {
|
if member.RoleLevel == constant.GroupOwner {
|
||||||
case constant.GroupOwner:
|
return nil, errs.ErrNoPermission.WrapMsg("admin can not change group owner")
|
||||||
for _, member := range dbMembers {
|
}
|
||||||
if member.UserID == opUserID {
|
if member.RoleLevel == constant.GroupAdmin && member.UserID != opUserID {
|
||||||
dbSelf = member
|
return nil, errs.ErrNoPermission.WrapMsg("admin can not change other group admin")
|
||||||
break
|
}
|
||||||
}
|
}
|
||||||
}
|
case constant.GroupOrdinaryUsers:
|
||||||
case constant.GroupAdmin:
|
for _, member := range dbMembers {
|
||||||
for _, member := range dbMembers {
|
if !(member.RoleLevel == constant.GroupOrdinaryUsers && member.UserID == opUserID) {
|
||||||
if member.UserID == opUserID {
|
return nil, errs.ErrNoPermission.WrapMsg("ordinary users can not change other role level")
|
||||||
dbSelf = member
|
}
|
||||||
}
|
}
|
||||||
if member.RoleLevel == constant.GroupOwner {
|
default:
|
||||||
return nil, errs.ErrNoPermission.WrapMsg("admin can not change group owner")
|
for _, member := range dbMembers {
|
||||||
|
if member.RoleLevel >= roleLevel {
|
||||||
|
return nil, errs.ErrNoPermission.WrapMsg("can not change higher role level")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if member.RoleLevel == constant.GroupAdmin && member.UserID != opUserID {
|
|
||||||
return nil, errs.ErrNoPermission.WrapMsg("admin can not change other group admin")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case constant.GroupOrdinaryUsers:
|
|
||||||
for _, member := range dbMembers {
|
|
||||||
if member.UserID == opUserID {
|
|
||||||
dbSelf = member
|
|
||||||
}
|
|
||||||
if !(member.RoleLevel == constant.GroupOrdinaryUsers && member.UserID == opUserID) {
|
|
||||||
return nil, errs.ErrNoPermission.WrapMsg("ordinary users can not change other role level")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
for _, member := range dbMembers {
|
|
||||||
if member.UserID == opUserID {
|
|
||||||
dbSelf = member
|
|
||||||
}
|
|
||||||
if member.RoleLevel >= roleLevel {
|
|
||||||
return nil, errs.ErrNoPermission.WrapMsg("can not change higher role level")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, member := range req.Members {
|
|
||||||
if member.UserID == opUserID {
|
|
||||||
reqSelf = member
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if reqSelf != nil && reqSelf.RoleLevel != nil {
|
|
||||||
if reqSelf.RoleLevel.GetValue() > dbSelf.RoleLevel {
|
|
||||||
return nil, errs.ErrNoPermission.WrapMsg("can not improve role level by self")
|
|
||||||
}
|
|
||||||
if roleLevel == constant.GroupOwner {
|
|
||||||
return nil, errs.ErrArgs.WrapMsg("group owner can not change own role level") // Prevent the absence of a group owner
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1621,7 +1592,7 @@ func (g *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGr
|
|||||||
g.notification.GroupMemberSetToOrdinaryUserNotification(ctx, member.GroupID, member.UserID)
|
g.notification.GroupMemberSetToOrdinaryUserNotification(ctx, member.GroupID, member.UserID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if member.Nickname != nil || member.FaceURL != nil || member.Ex != nil || member.RoleLevel != nil {
|
if member.Nickname != nil || member.FaceURL != nil || member.Ex != nil {
|
||||||
g.notification.GroupMemberInfoSetNotification(ctx, member.GroupID, member.UserID)
|
g.notification.GroupMemberInfoSetNotification(ctx, member.GroupID, member.UserID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ import (
|
|||||||
"github.com/openimsdk/tools/utils/datautil"
|
"github.com/openimsdk/tools/utils/datautil"
|
||||||
"github.com/openimsdk/tools/utils/stringutil"
|
"github.com/openimsdk/tools/utils/stringutil"
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// GroupApplicationReceiver
|
// GroupApplicationReceiver
|
||||||
@@ -573,51 +572,8 @@ func (g *GroupNotificationSender) GroupApplicationAgreeMemberEnterNotification(c
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, groupID string, entrantUserID string) error {
|
func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, groupID string, entrantUserID ...string) error {
|
||||||
var err error
|
return g.GroupApplicationAgreeMemberEnterNotification(ctx, groupID, "", entrantUserID...)
|
||||||
defer func() {
|
|
||||||
if err != nil {
|
|
||||||
log.ZError(ctx, stringutil.GetFuncName(1)+" failed", err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
if !g.config.RpcConfig.EnableHistoryForNewMembers {
|
|
||||||
conversationID := msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, groupID)
|
|
||||||
maxSeq, err := g.msgRpcClient.GetConversationMaxSeq(ctx, conversationID)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if _, err = g.msgRpcClient.SetUserConversationsMinSeq(ctx, &msg.SetUserConversationsMinSeqReq{
|
|
||||||
UserIDs: []string{entrantUserID},
|
|
||||||
ConversationID: conversationID,
|
|
||||||
Seq: maxSeq,
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := g.conversationRpcClient.GroupChatFirstCreateConversation(ctx, groupID, []string{entrantUserID}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var group *sdkws.GroupInfo
|
|
||||||
group, err = g.getGroupInfo(ctx, groupID)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
user, err := g.getGroupMember(ctx, groupID, entrantUserID)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
tips := &sdkws.MemberEnterTips{
|
|
||||||
Group: group,
|
|
||||||
EntrantUser: user,
|
|
||||||
OperationTime: time.Now().UnixMilli(),
|
|
||||||
}
|
|
||||||
g.setVersion(ctx, &tips.GroupMemberVersion, &tips.GroupMemberVersionID, database.GroupMemberVersionName, tips.Group.GroupID)
|
|
||||||
g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberEnterNotification, tips)
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GroupNotificationSender) GroupDismissedNotification(ctx context.Context, tips *sdkws.GroupDismissedTips) {
|
func (g *GroupNotificationSender) GroupDismissedNotification(ctx context.Context, tips *sdkws.GroupDismissedTips) {
|
||||||
|
|||||||
@@ -273,14 +273,7 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *relation.SetFri
|
|||||||
return &relation.SetFriendRemarkResp{}, nil
|
return &relation.SetFriendRemarkResp{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *friendServer) GetFriendInfo(ctx context.Context, req *relation.GetFriendInfoReq) (*relation.GetFriendInfoResp, error) {
|
// ok.
|
||||||
friends, err := s.db.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &relation.GetFriendInfoResp{FriendInfos: convert.FriendOnlyDB2PbOnly(friends)}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *friendServer) GetDesignatedFriends(ctx context.Context, req *relation.GetDesignatedFriendsReq) (resp *relation.GetDesignatedFriendsResp, err error) {
|
func (s *friendServer) GetDesignatedFriends(ctx context.Context, req *relation.GetDesignatedFriendsReq) (resp *relation.GetDesignatedFriendsResp, err error) {
|
||||||
resp = &relation.GetDesignatedFriendsResp{}
|
resp = &relation.GetDesignatedFriendsResp{}
|
||||||
if datautil.Duplicate(req.FriendUserIDs) {
|
if datautil.Duplicate(req.FriendUserIDs) {
|
||||||
|
|||||||
@@ -361,29 +361,11 @@ type AfterConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Share struct {
|
type Share struct {
|
||||||
Secret string `mapstructure:"secret"`
|
Secret string `mapstructure:"secret"`
|
||||||
RpcRegisterName RpcRegisterName `mapstructure:"rpcRegisterName"`
|
RpcRegisterName RpcRegisterName `mapstructure:"rpcRegisterName"`
|
||||||
IMAdminUserID []string `mapstructure:"imAdminUserID"`
|
IMAdminUserID []string `mapstructure:"imAdminUserID"`
|
||||||
MultiLogin MultiLogin `mapstructure:"multiLogin"`
|
MultiLoginPolicy int `mapstructure:"multiLoginPolicy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type MultiLogin struct {
|
|
||||||
Policy int `mapstructure:"policy"`
|
|
||||||
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 {
|
type RpcRegisterName struct {
|
||||||
User string `mapstructure:"user"`
|
User string `mapstructure:"user"`
|
||||||
Friend string `mapstructure:"friend"`
|
Friend string `mapstructure:"friend"`
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
|
||||||
"github.com/openimsdk/protocol/relation"
|
|
||||||
|
|
||||||
"github.com/openimsdk/protocol/sdkws"
|
"github.com/openimsdk/protocol/sdkws"
|
||||||
"github.com/openimsdk/tools/utils/datautil"
|
"github.com/openimsdk/tools/utils/datautil"
|
||||||
@@ -36,7 +35,9 @@ func FriendPb2DB(friend *sdkws.FriendInfo) *model.Friend {
|
|||||||
return dbFriend
|
return dbFriend
|
||||||
}
|
}
|
||||||
|
|
||||||
func FriendDB2Pb(ctx context.Context, friendDB *model.Friend, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) (*sdkws.FriendInfo, error) {
|
func FriendDB2Pb(ctx context.Context, friendDB *model.Friend,
|
||||||
|
getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
|
||||||
|
) (*sdkws.FriendInfo, error) {
|
||||||
users, err := getUsers(ctx, []string{friendDB.FriendUserID})
|
users, err := getUsers(ctx, []string{friendDB.FriendUserID})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -52,7 +53,11 @@ func FriendDB2Pb(ctx context.Context, friendDB *model.Friend, getUsers func(ctx
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func FriendsDB2Pb(ctx context.Context, friendsDB []*model.Friend, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) (friendsPb []*sdkws.FriendInfo, err error) {
|
func FriendsDB2Pb(
|
||||||
|
ctx context.Context,
|
||||||
|
friendsDB []*model.Friend,
|
||||||
|
getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
|
||||||
|
) (friendsPb []*sdkws.FriendInfo, err error) {
|
||||||
if len(friendsDB) == 0 {
|
if len(friendsDB) == 0 {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@@ -81,21 +86,7 @@ func FriendsDB2Pb(ctx context.Context, friendsDB []*model.Friend, getUsers func(
|
|||||||
friendsPb = append(friendsPb, friendPb)
|
friendsPb = append(friendsPb, friendPb)
|
||||||
}
|
}
|
||||||
return friendsPb, nil
|
return friendsPb, nil
|
||||||
}
|
|
||||||
|
|
||||||
func FriendOnlyDB2PbOnly(friendsDB []*model.Friend) []*relation.FriendInfoOnly {
|
|
||||||
return datautil.Slice(friendsDB, func(f *model.Friend) *relation.FriendInfoOnly {
|
|
||||||
return &relation.FriendInfoOnly{
|
|
||||||
OwnerUserID: f.OwnerUserID,
|
|
||||||
FriendUserID: f.FriendUserID,
|
|
||||||
Remark: f.Remark,
|
|
||||||
CreateTime: f.CreateTime.UnixMilli(),
|
|
||||||
AddSource: f.AddSource,
|
|
||||||
OperatorUserID: f.OperatorUserID,
|
|
||||||
Ex: f.Ex,
|
|
||||||
IsPinned: f.IsPinned,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func FriendRequestDB2Pb(ctx context.Context, friendRequests []*model.FriendRequest, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) ([]*sdkws.FriendRequest, error) {
|
func FriendRequestDB2Pb(ctx context.Context, friendRequests []*model.FriendRequest, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) ([]*sdkws.FriendRequest, error) {
|
||||||
|
|||||||
+1
-18
@@ -1,9 +1,6 @@
|
|||||||
package cachekey
|
package cachekey
|
||||||
|
|
||||||
import (
|
import "github.com/openimsdk/protocol/constant"
|
||||||
"github.com/openimsdk/protocol/constant"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
const (
|
||||||
UidPidToken = "UID_PID_TOKEN_STATUS:"
|
UidPidToken = "UID_PID_TOKEN_STATUS:"
|
||||||
@@ -12,17 +9,3 @@ const (
|
|||||||
func GetTokenKey(userID string, platformID int) string {
|
func GetTokenKey(userID string, platformID int) string {
|
||||||
return UidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
|
return UidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetAllPlatformTokenKey(userID string) []string {
|
|
||||||
res := make([]string, len(constant.PlatformID2Name))
|
|
||||||
for k := range constant.PlatformID2Name {
|
|
||||||
res[k-1] = GetTokenKey(userID, k)
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetPlatformIDByTokenKey(key string) int {
|
|
||||||
splitKey := strings.Split(key, ":")
|
|
||||||
platform := splitKey[len(splitKey)-1]
|
|
||||||
return constant.PlatformNameToID(platform)
|
|
||||||
}
|
|
||||||
|
|||||||
+14
-50
@@ -1,3 +1,17 @@
|
|||||||
|
// Copyright © 2023 OpenIM. All rights reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
package redis
|
package redis
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -7,7 +21,6 @@ import (
|
|||||||
"github.com/openimsdk/tools/errs"
|
"github.com/openimsdk/tools/errs"
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/redis/go-redis/v9"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -54,43 +67,6 @@ func (c *tokenCache) GetTokensWithoutError(ctx context.Context, userID string, p
|
|||||||
return mm, nil
|
return mm, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *tokenCache) GetAllTokensWithoutError(ctx context.Context, userID string) (map[int]map[string]int, error) {
|
|
||||||
var (
|
|
||||||
res = make(map[int]map[string]int)
|
|
||||||
resLock = sync.Mutex{}
|
|
||||||
)
|
|
||||||
|
|
||||||
keys := cachekey.GetAllPlatformTokenKey(userID)
|
|
||||||
if err := ProcessKeysBySlot(ctx, c.rdb, keys, func(ctx context.Context, slot int64, keys []string) error {
|
|
||||||
pipe := c.rdb.Pipeline()
|
|
||||||
mapRes := make([]*redis.MapStringStringCmd, len(keys))
|
|
||||||
for i, key := range keys {
|
|
||||||
mapRes[i] = pipe.HGetAll(ctx, key)
|
|
||||||
}
|
|
||||||
_, err := pipe.Exec(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for i, m := range mapRes {
|
|
||||||
mm := make(map[string]int)
|
|
||||||
for k, v := range m.Val() {
|
|
||||||
state, err := strconv.Atoi(v)
|
|
||||||
if err != nil {
|
|
||||||
return errs.WrapMsg(err, "redis token value is not int", "value", v, "userID", userID)
|
|
||||||
}
|
|
||||||
mm[k] = state
|
|
||||||
}
|
|
||||||
resLock.Lock()
|
|
||||||
res[cachekey.GetPlatformIDByTokenKey(keys[i])] = mm
|
|
||||||
resLock.Unlock()
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *tokenCache) SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error {
|
func (c *tokenCache) SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error {
|
||||||
mm := make(map[string]any)
|
mm := make(map[string]any)
|
||||||
for k, v := range m {
|
for k, v := range m {
|
||||||
@@ -99,18 +75,6 @@ func (c *tokenCache) SetTokenMapByUidPid(ctx context.Context, userID string, pla
|
|||||||
return errs.Wrap(c.rdb.HSet(ctx, cachekey.GetTokenKey(userID, platformID), mm).Err())
|
return errs.Wrap(c.rdb.HSet(ctx, cachekey.GetTokenKey(userID, platformID), mm).Err())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *tokenCache) BatchSetTokenMapByUidPid(ctx context.Context, tokens map[string]map[string]int) error {
|
|
||||||
pipe := c.rdb.Pipeline()
|
|
||||||
for k, v := range tokens {
|
|
||||||
pipe.HSet(ctx, k, v)
|
|
||||||
}
|
|
||||||
_, err := pipe.Exec(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return errs.Wrap(err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *tokenCache) DeleteTokenByUidPid(ctx context.Context, userID string, platformID int, fields []string) error {
|
func (c *tokenCache) DeleteTokenByUidPid(ctx context.Context, userID string, platformID int, fields []string) error {
|
||||||
return errs.Wrap(c.rdb.HDel(ctx, cachekey.GetTokenKey(userID, platformID), fields...).Err())
|
return errs.Wrap(c.rdb.HDel(ctx, cachekey.GetTokenKey(userID, platformID), fields...).Err())
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-2
@@ -9,8 +9,6 @@ type TokenModel interface {
|
|||||||
// SetTokenFlagEx set token and flag with expire time
|
// SetTokenFlagEx set token and flag with expire time
|
||||||
SetTokenFlagEx(ctx context.Context, userID string, platformID int, token string, flag int) error
|
SetTokenFlagEx(ctx context.Context, userID string, platformID int, token string, flag int) error
|
||||||
GetTokensWithoutError(ctx context.Context, userID string, platformID int) (map[string]int, error)
|
GetTokensWithoutError(ctx context.Context, userID string, platformID int) (map[string]int, error)
|
||||||
GetAllTokensWithoutError(ctx context.Context, userID string) (map[int]map[string]int, error)
|
|
||||||
SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error
|
SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error
|
||||||
BatchSetTokenMapByUidPid(ctx context.Context, tokens map[string]map[string]int) error
|
|
||||||
DeleteTokenByUidPid(ctx context.Context, userID string, platformID int, fields []string) error
|
DeleteTokenByUidPid(ctx context.Context, userID string, platformID int, fields []string) error
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,21 @@
|
|||||||
|
// Copyright © 2023 OpenIM. All rights reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
package controller
|
package controller
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/cachekey"
|
|
||||||
"github.com/openimsdk/tools/log"
|
"github.com/openimsdk/tools/log"
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v4"
|
"github.com/golang-jwt/jwt/v4"
|
||||||
@@ -20,41 +32,18 @@ type AuthDatabase interface {
|
|||||||
// Create token
|
// Create token
|
||||||
CreateToken(ctx context.Context, userID string, platformID int) (string, error)
|
CreateToken(ctx context.Context, userID string, platformID int) (string, error)
|
||||||
|
|
||||||
BatchSetTokenMapByUidPid(ctx context.Context, tokens []string) error
|
|
||||||
|
|
||||||
SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error
|
SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error
|
||||||
}
|
}
|
||||||
|
|
||||||
type multiLoginConfig struct {
|
|
||||||
Policy int
|
|
||||||
MaxNumOneEnd int
|
|
||||||
CustomizeLoginNum map[int]int
|
|
||||||
}
|
|
||||||
|
|
||||||
type authDatabase struct {
|
type authDatabase struct {
|
||||||
cache cache.TokenModel
|
cache cache.TokenModel
|
||||||
accessSecret string
|
accessSecret string
|
||||||
accessExpire int64
|
accessExpire int64
|
||||||
multiLogin multiLoginConfig
|
multiLoginPolicy int
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAuthDatabase(cache cache.TokenModel, accessSecret string, accessExpire int64, multiLogin config.MultiLogin) AuthDatabase {
|
func NewAuthDatabase(cache cache.TokenModel, accessSecret string, accessExpire int64, policy int) AuthDatabase {
|
||||||
return &authDatabase{cache: cache, accessSecret: accessSecret, accessExpire: accessExpire, multiLogin: multiLoginConfig{
|
return &authDatabase{cache: cache, accessSecret: accessSecret, accessExpire: accessExpire, multiLoginPolicy: policy}
|
||||||
Policy: multiLogin.Policy,
|
|
||||||
MaxNumOneEnd: multiLogin.MaxNumOneEnd,
|
|
||||||
CustomizeLoginNum: map[int]int{
|
|
||||||
constant.IOSPlatformID: multiLogin.CustomizeLoginNum.IOS,
|
|
||||||
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,
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the result is empty.
|
// If the result is empty.
|
||||||
@@ -66,38 +55,22 @@ func (a *authDatabase) SetTokenMapByUidPid(ctx context.Context, userID string, p
|
|||||||
return a.cache.SetTokenMapByUidPid(ctx, userID, platformID, m)
|
return a.cache.SetTokenMapByUidPid(ctx, userID, platformID, m)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *authDatabase) BatchSetTokenMapByUidPid(ctx context.Context, tokens []string) error {
|
|
||||||
setMap := make(map[string]map[string]int)
|
|
||||||
for _, token := range tokens {
|
|
||||||
claims, err := tokenverify.GetClaimFromToken(token, authverify.Secret(a.accessSecret))
|
|
||||||
key := cachekey.GetTokenKey(claims.UserID, claims.PlatformID)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
if v, ok := setMap[key]; ok {
|
|
||||||
v[token] = constant.KickedToken
|
|
||||||
} else {
|
|
||||||
setMap[key] = map[string]int{
|
|
||||||
token: constant.KickedToken,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if err := a.cache.BatchSetTokenMapByUidPid(ctx, setMap); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create Token.
|
// Create Token.
|
||||||
func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformID int) (string, error) {
|
func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformID int) (string, error) {
|
||||||
tokens, err := a.cache.GetAllTokensWithoutError(ctx, userID)
|
// todo: get all platform token
|
||||||
|
tokens, err := a.cache.GetTokensWithoutError(ctx, userID, platformID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
deleteTokenKey, kickedTokenKey, err := a.checkToken(ctx, tokens, platformID)
|
var deleteTokenKey []string
|
||||||
if err != nil {
|
var kickedTokenKey []string
|
||||||
return "", err
|
for k, v := range tokens {
|
||||||
|
t, err := tokenverify.GetClaimFromToken(k, authverify.Secret(a.accessSecret))
|
||||||
|
if err != nil || v != constant.NormalToken {
|
||||||
|
deleteTokenKey = append(deleteTokenKey, k)
|
||||||
|
} else if a.checkKickToken(ctx, platformID, t) {
|
||||||
|
kickedTokenKey = append(kickedTokenKey, k)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(deleteTokenKey) != 0 {
|
if len(deleteTokenKey) != 0 {
|
||||||
err = a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
|
err = a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
|
||||||
@@ -105,6 +78,16 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const adminTokenMaxNum = 30
|
||||||
|
if platformID == constant.AdminPlatformID {
|
||||||
|
if len(kickedTokenKey) > adminTokenMaxNum {
|
||||||
|
kickedTokenKey = kickedTokenKey[:len(kickedTokenKey)-adminTokenMaxNum]
|
||||||
|
} else {
|
||||||
|
kickedTokenKey = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(kickedTokenKey) != 0 {
|
if len(kickedTokenKey) != 0 {
|
||||||
for _, k := range kickedTokenKey {
|
for _, k := range kickedTokenKey {
|
||||||
err := a.cache.SetTokenFlagEx(ctx, userID, platformID, k, constant.KickedToken)
|
err := a.cache.SetTokenFlagEx(ctx, userID, platformID, k, constant.KickedToken)
|
||||||
@@ -128,140 +111,22 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
|
|||||||
return tokenString, nil
|
return tokenString, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *authDatabase) checkToken(ctx context.Context, tokens map[int]map[string]int, platformID int) ([]string, []string, error) {
|
func (a *authDatabase) checkKickToken(ctx context.Context, platformID int, token *tokenverify.Claims) bool {
|
||||||
// todo: Move the logic for handling old data to another location.
|
switch a.multiLoginPolicy {
|
||||||
var (
|
|
||||||
loginTokenMap = make(map[int][]string) // The length of the value of the map must be greater than 0
|
|
||||||
deleteToken = make([]string, 0)
|
|
||||||
kickToken = make([]string, 0)
|
|
||||||
adminToken = make([]string, 0)
|
|
||||||
unkickTerminal = ""
|
|
||||||
)
|
|
||||||
|
|
||||||
for plfID, tks := range tokens {
|
|
||||||
for k, v := range tks {
|
|
||||||
_, err := tokenverify.GetClaimFromToken(k, authverify.Secret(a.accessSecret))
|
|
||||||
if err != nil || v != constant.NormalToken {
|
|
||||||
deleteToken = append(deleteToken, k)
|
|
||||||
} else {
|
|
||||||
if plfID != constant.AdminPlatformID {
|
|
||||||
loginTokenMap[plfID] = append(loginTokenMap[plfID], k)
|
|
||||||
} else {
|
|
||||||
adminToken = append(adminToken, k)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch a.multiLogin.Policy {
|
|
||||||
case constant.DefalutNotKick:
|
case constant.DefalutNotKick:
|
||||||
for plt, ts := range loginTokenMap {
|
return false
|
||||||
l := len(ts)
|
|
||||||
if platformID == plt {
|
|
||||||
l++
|
|
||||||
}
|
|
||||||
limit := a.multiLogin.MaxNumOneEnd
|
|
||||||
if l > limit {
|
|
||||||
kickToken = append(kickToken, ts[:l-limit]...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case constant.AllLoginButSameTermKick:
|
|
||||||
for plt, ts := range loginTokenMap {
|
|
||||||
kickToken = append(kickToken, ts[:len(ts)-1]...)
|
|
||||||
if plt == platformID {
|
|
||||||
kickToken = append(kickToken, ts[len(ts)-1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case constant.SingleTerminalLogin:
|
|
||||||
for _, ts := range loginTokenMap {
|
|
||||||
kickToken = append(kickToken, ts...)
|
|
||||||
}
|
|
||||||
case constant.WebAndOther:
|
|
||||||
unkickTerminal = constant.WebPlatformStr
|
|
||||||
fallthrough
|
|
||||||
case constant.PCAndOther:
|
case constant.PCAndOther:
|
||||||
if unkickTerminal == "" {
|
if constant.PlatformIDToClass(platformID) == constant.TerminalPC ||
|
||||||
unkickTerminal = constant.TerminalPC
|
constant.PlatformIDToClass(token.PlatformID) == constant.TerminalPC {
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
if constant.PlatformIDToClass(platformID) != unkickTerminal {
|
return true
|
||||||
for plt, ts := range loginTokenMap {
|
case constant.AllLoginButSameTermKick:
|
||||||
if constant.PlatformIDToClass(plt) != unkickTerminal {
|
if platformID == token.PlatformID {
|
||||||
kickToken = append(kickToken, ts...)
|
return true
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
var (
|
|
||||||
preKick []string
|
|
||||||
isReserve = true
|
|
||||||
)
|
|
||||||
for plt, ts := range loginTokenMap {
|
|
||||||
if constant.PlatformIDToClass(plt) != unkickTerminal {
|
|
||||||
// Keep a token from another end
|
|
||||||
if isReserve {
|
|
||||||
isReserve = false
|
|
||||||
kickToken = append(kickToken, ts[:len(ts)-1]...)
|
|
||||||
preKick = append(preKick, ts[len(ts)-1])
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
// Prioritize keeping Android
|
|
||||||
if plt == constant.AndroidPlatformID {
|
|
||||||
kickToken = append(kickToken, preKick...)
|
|
||||||
kickToken = append(kickToken, ts[:len(ts)-1]...)
|
|
||||||
} else {
|
|
||||||
kickToken = append(kickToken, ts...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case constant.PcMobileAndWeb:
|
|
||||||
var (
|
|
||||||
reserved = make(map[string]bool)
|
|
||||||
)
|
|
||||||
|
|
||||||
for plt, ts := range loginTokenMap {
|
|
||||||
if constant.PlatformIDToClass(plt) == constant.PlatformIDToClass(platformID) {
|
|
||||||
kickToken = append(kickToken, ts...)
|
|
||||||
} else {
|
|
||||||
if !reserved[constant.PlatformIDToClass(plt)] {
|
|
||||||
reserved[constant.PlatformIDToClass(plt)] = true
|
|
||||||
kickToken = append(kickToken, ts[:len(ts)-1]...)
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
kickToken = append(kickToken, ts...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
case constant.Customize:
|
|
||||||
if a.multiLogin.CustomizeLoginNum[platformID] <= 0 {
|
|
||||||
return nil, nil, errs.New("Do not allow login on this end").Wrap()
|
|
||||||
}
|
|
||||||
for plt, ts := range loginTokenMap {
|
|
||||||
l := len(ts)
|
|
||||||
if platformID == plt {
|
|
||||||
l++
|
|
||||||
}
|
|
||||||
// a.multiLogin.CustomizeLoginNum[platformID] must > 0
|
|
||||||
limit := min(a.multiLogin.CustomizeLoginNum[plt], a.multiLogin.MaxNumOneEnd)
|
|
||||||
if l > limit {
|
|
||||||
kickToken = append(kickToken, ts[:l-limit]...)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return false
|
||||||
default:
|
default:
|
||||||
return nil, nil, errs.New("unknown multiLogin policy").Wrap()
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
var adminTokenMaxNum = a.multiLogin.MaxNumOneEnd
|
|
||||||
if a.multiLogin.Policy == constant.Customize {
|
|
||||||
adminTokenMaxNum = a.multiLogin.CustomizeLoginNum[constant.AdminPlatformID]
|
|
||||||
}
|
|
||||||
l := len(adminToken)
|
|
||||||
if platformID == constant.AdminPlatformID {
|
|
||||||
l++
|
|
||||||
}
|
|
||||||
if l > adminTokenMaxNum {
|
|
||||||
kickToken = append(kickToken, adminToken[:l-adminTokenMaxNum]...)
|
|
||||||
}
|
|
||||||
return deleteToken, kickToken, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package controller
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"github.com/openimsdk/protocol/constant"
|
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
|
||||||
@@ -84,9 +83,6 @@ func (db *msgTransferDatabase) BatchInsertChat2DB(ctx context.Context, conversat
|
|||||||
IOSBadgeCount: msg.OfflinePushInfo.IOSBadgeCount,
|
IOSBadgeCount: msg.OfflinePushInfo.IOSBadgeCount,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if msg.Status == constant.MsgStatusSending {
|
|
||||||
msg.Status = constant.MsgStatusSendSuccess
|
|
||||||
}
|
|
||||||
msgs[i] = &model.MsgDataModel{
|
msgs[i] = &model.MsgDataModel{
|
||||||
SendID: msg.SendID,
|
SendID: msg.SendID,
|
||||||
RecvID: msg.RecvID,
|
RecvID: msg.RecvID,
|
||||||
@@ -258,7 +254,7 @@ func (db *msgTransferDatabase) BatchInsertChat2Cache(ctx context.Context, conver
|
|||||||
|
|
||||||
func (db *msgTransferDatabase) setHasReadSeqs(ctx context.Context, conversationID string, userSeqMap map[string]int64) error {
|
func (db *msgTransferDatabase) setHasReadSeqs(ctx context.Context, conversationID string, userSeqMap map[string]int64) error {
|
||||||
for userID, seq := range userSeqMap {
|
for userID, seq := range userSeqMap {
|
||||||
if err := db.seqUser.SetUserReadSeqToDB(ctx, conversationID, userID, seq); err != nil {
|
if err := db.seqUser.SetUserReadSeq(ctx, conversationID, userID, seq); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-16
@@ -16,8 +16,8 @@ package rpcclient
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/openimsdk/protocol/auth"
|
"github.com/openimsdk/protocol/auth"
|
||||||
|
pbAuth "github.com/openimsdk/protocol/auth"
|
||||||
"github.com/openimsdk/tools/discovery"
|
"github.com/openimsdk/tools/discovery"
|
||||||
"github.com/openimsdk/tools/system/program"
|
"github.com/openimsdk/tools/system/program"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
@@ -38,8 +38,8 @@ type Auth struct {
|
|||||||
discov discovery.SvcDiscoveryRegistry
|
discov discovery.SvcDiscoveryRegistry
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Auth) ParseToken(ctx context.Context, token string) (*auth.ParseTokenResp, error) {
|
func (a *Auth) ParseToken(ctx context.Context, token string) (*pbAuth.ParseTokenResp, error) {
|
||||||
req := auth.ParseTokenReq{
|
req := pbAuth.ParseTokenReq{
|
||||||
Token: token,
|
Token: token,
|
||||||
}
|
}
|
||||||
resp, err := a.Client.ParseToken(ctx, &req)
|
resp, err := a.Client.ParseToken(ctx, &req)
|
||||||
@@ -49,8 +49,8 @@ func (a *Auth) ParseToken(ctx context.Context, token string) (*auth.ParseTokenRe
|
|||||||
return resp, err
|
return resp, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Auth) InvalidateToken(ctx context.Context, preservedToken, userID string, platformID int) (*auth.InvalidateTokenResp, error) {
|
func (a *Auth) InvalidateToken(ctx context.Context, preservedToken, userID string, platformID int) (*pbAuth.InvalidateTokenResp, error) {
|
||||||
req := auth.InvalidateTokenReq{
|
req := pbAuth.InvalidateTokenReq{
|
||||||
PreservedToken: preservedToken,
|
PreservedToken: preservedToken,
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
PlatformID: int32(platformID),
|
PlatformID: int32(platformID),
|
||||||
@@ -61,14 +61,3 @@ func (a *Auth) InvalidateToken(ctx context.Context, preservedToken, userID strin
|
|||||||
}
|
}
|
||||||
return resp, err
|
return resp, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Auth) KickTokens(ctx context.Context, tokens []string) (*auth.KickTokensResp, error) {
|
|
||||||
req := auth.KickTokensReq{
|
|
||||||
Tokens: tokens,
|
|
||||||
}
|
|
||||||
resp, err := a.Client.KickTokens(ctx, &req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return resp, err
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user