diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index 802bb4207..f2b7fe11f 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -140,7 +140,7 @@ func ManagementSendMsg(c *gin.Context) { } log.NewInfo("", data, params) token := c.Request.Header.Get("token") - claims, err := token_verify.ParseToken(token) + claims, err := token_verify.ParseToken(token, params.OperationID) if err != nil { log.NewError(params.OperationID, "parse token failed", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""}) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index de189a048..6cd321d07 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -571,6 +571,6 @@ func Notification(n *NotificationMsg) { if err != nil { log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), err.Error()) } else if reply.ErrCode != 0 { - log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String()) + log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), reply.ErrCode, reply.ErrMsg) } } diff --git a/internal/utils/jwt_token_test.go b/internal/utils/jwt_token_test.go index 571836d39..da53a2a36 100644 --- a/internal/utils/jwt_token_test.go +++ b/internal/utils/jwt_token_test.go @@ -76,7 +76,7 @@ func Test_ParseToken(t *testing.T) { uid := "1" platform := int32(1) tokenString, _, _ := token_verify.CreateToken(uid, platform) - claims, err := token_verify.ParseToken(tokenString) + claims, err := token_verify.ParseToken(tokenString, "") if err == nil { assert.Equal(t, claims.UID, uid) } diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 21334a7a8..28d6cf314 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -101,7 +101,7 @@ func GetClaimFromToken(tokensString string) (*Claims, error) { } func IsAppManagerAccess(token string, OpUserID string) bool { - claims, err := ParseToken(token) + claims, err := ParseToken(token, "") if err != nil { return false } @@ -130,7 +130,7 @@ func CheckAccess(OpUserID string, OwnerUserID string) bool { } func GetUserIDFromToken(token string, operationID string) (bool, string) { - claims, err := ParseToken(token) + claims, err := ParseToken(token, operationID) if err != nil { log.Error(operationID, "ParseToken failed, ", err.Error(), token) return false, "" @@ -138,21 +138,21 @@ func GetUserIDFromToken(token string, operationID string) (bool, string) { return true, claims.UID } -func ParseToken(tokensString string) (claims *Claims, err error) { +func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { - log.NewError("", "token validate err", err.Error()) + log.NewError(operationID, "token validate err", err.Error(), tokensString) return nil, err } m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform) if err != nil { - log.NewError("", "get token from redis err", err.Error()) + log.NewError(operationID, "get token from redis err", err.Error(), tokensString) return nil, &constant.ErrTokenInvalid } if m == nil { - log.NewError("", "get token from redis err", "m is nil") + log.NewError(operationID, "get token from redis err", "m is nil", tokensString) return nil, &constant.ErrTokenInvalid } if v, ok := m[tokensString]; ok { @@ -195,7 +195,7 @@ func ParseRedisInterfaceToken(redisToken interface{}) (*Claims, error) { //Validation token, false means failure, true means successful verification func VerifyToken(token, uid string) (bool, error) { - claims, err := ParseToken(token) + claims, err := ParseToken(token, "") if err != nil { return false, err } @@ -207,7 +207,7 @@ func VerifyToken(token, uid string) (bool, error) { return true, nil } func WsVerifyToken(token, uid string, platformID string) (bool, error, string) { - claims, err := ParseToken(token) + claims, err := ParseToken(token, "") if err != nil { return false, err, "parse token err" }