blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 18:36:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenxu12345 2021-12-28 14:10:49 +08:00
commit 4223b2d0f0
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/chat/send_msg.go
View File

@ -44,7 +44,7 @@ func newUserSendMsgReq(token string, params *paramsUserSendMsg) *pbChat.SendMsgR
GroupID: params.Data.GroupID, GroupID: params.Data.GroupID,
ClientMsgID: params.Data.ClientMsgID, ClientMsgID: params.Data.ClientMsgID,
SenderPlatformID: params.SenderPlatformID, SenderPlatformID: params.SenderPlatformID,
SenderNickName: params.SenderNickName, SenderNickname: params.SenderNickName,
SenderFaceURL: params.SenderFaceURL, SenderFaceURL: params.SenderFaceURL,
SessionType: params.Data.SessionType, SessionType: params.Data.SessionType,
MsgFrom: params.Data.MsgFrom, MsgFrom: params.Data.MsgFrom,

9
pkg/common/db/redisModel.go
View File

@ -91,10 +91,15 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s
_, err := d.Exec("hmset", key, redis.Args{}.Add().AddFlat(m)...) _, err := d.Exec("hmset", key, redis.Args{}.Add().AddFlat(m)...)
return err return err
} }
func (d *DataBases) DeleteTokenByUidPid(userID string, platformID int32, fields []string) error {
key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
_, err := d.Exec("HDEL", key, redis.Args{}.Add().AddFlat(fields)...)
return err
}
func (d *DataBases) SetSingleConversationMsgOpt(userID, conversationID string, opt int) error { func (d *DataBases) SetSingleConversationMsgOpt(userID, conversationID string, opt int) error {
key := conversationReceiveMessageOpt + userID key := conversationReceiveMessageOpt + userID
_, err1 := d.Exec("HSet", key, conversationID, opt) _, err := d.Exec("HSet", key, conversationID, opt)
return err1 return err
} }
func (d *DataBases) GetSingleConversationMsgOpt(userID, conversationID string) (int, error) { func (d *DataBases) GetSingleConversationMsgOpt(userID, conversationID string) (int, error) {
key := conversationReceiveMessageOpt + userID key := conversationReceiveMessageOpt + userID

16
pkg/common/token_verify/jwt_token.go
View File

@ -6,6 +6,7 @@ import (
commonDB "Open_IM/pkg/common/db" commonDB "Open_IM/pkg/common/db"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"github.com/garyburd/redigo/redis"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
"time" "time"
) )
@ -43,6 +44,21 @@ func CreateToken(userID string, platformID int32) (string, int64, error) {
if err != nil { if err != nil {
return "", 0, err return "", 0, err
} }
//remove Invalid token
m, err := commonDB.DB.GetTokenMapByUidPid(userID, constant.PlatformIDToName(platformID))
if err != nil && err != redis.ErrNil {
return "", 0, err
}
var deleteTokenKey []string
for k, v := range m {
if v != constant.NormalToken {
deleteTokenKey = append(deleteTokenKey, k)
}
}
err = commonDB.DB.DeleteTokenByUidPid(userID, platformID, deleteTokenKey)
if err != nil {
return "", 0, err
}
err = commonDB.DB.AddTokenFlag(userID, platformID, tokenString, constant.NormalToken) err = commonDB.DB.AddTokenFlag(userID, platformID, tokenString, constant.NormalToken)
if err != nil { if err != nil {
return "", 0, err return "", 0, err