blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-11 05:46:27 +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 18:23:03 +08:00
commit 12df670681
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/common/log/file_line_hk.go
View File

@ -24,7 +24,7 @@ func (f *fileHook) Levels() []logrus.Level {
} }
func (f *fileHook) Fire(entry *logrus.Entry) error { func (f *fileHook) Fire(entry *logrus.Entry) error {
entry.Data["FilePath"] = findCaller(5) entry.Data["FilePath"] = findCaller(6)
return nil return nil
} }

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

@ -55,10 +55,12 @@ func CreateToken(userID string, platformID int32) (string, int64, error) {
deleteTokenKey = append(deleteTokenKey, k) deleteTokenKey = append(deleteTokenKey, k)
} }
} }
if len(deleteTokenKey) != 0 {
err = commonDB.DB.DeleteTokenByUidPid(userID, platformID, deleteTokenKey) err = commonDB.DB.DeleteTokenByUidPid(userID, platformID, deleteTokenKey)
if err != nil { if err != nil {
return "", 0, err 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