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

pkg/common/log/file_line_hk.go

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

pkg/common/token_verify/jwt_token.go

@@ -55,10 +55,12 @@ func CreateToken(userID string, platformID int32) (string, int64, error) {
 			deleteTokenKey = append(deleteTokenKey, k)
 		}
 	}
+	if len(deleteTokenKey) != 0 {
 		err = commonDB.DB.DeleteTokenByUidPid(userID, platformID, deleteTokenKey)
 		if err != nil {
 			return "", 0, err
 		}
+	}
 	err = commonDB.DB.AddTokenFlag(userID, platformID, tokenString, constant.NormalToken)
 	if err != nil {
 		return "", 0, err