From 0a8347001914b68dedac7c18ccdb89bad0bc22cd Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 20 Sep 2022 23:33:46 +0800 Subject: [PATCH] update proto --- pkg/common/token_verify/jwt_token.go | 15 +-------------- pkg/proto/cache/cache.proto | 1 - 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 20942faf2..ae5fdaceb 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -6,10 +6,10 @@ import ( commonDB "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/utils" + "golang.org/x/oauth2/jwt" "time" go_redis "github.com/go-redis/redis/v8" - "github.com/golang-jwt/jwt/v4" ) //var ( @@ -179,19 +179,6 @@ func ParseTokenGetUserID(token string, operationID string) (error, string) { func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { - //if errors.Is(err, constant.ErrTokenUnknown) { - // errMsg := "GetClaimFromToken failed ErrTokenUnknown " + err.Error() - // log.Error(operationID, errMsg) - //} - //info := err.(constant.ErrInfo) - //log.Error(operationID, "detail info , ", info.ErrCode, info.ErrMsg) - // - //e := errors.Unwrap(err) - //if errors.Is(e, constant.ErrTokenUnknown) { - // errMsg := "ParseToken failed ErrTokenUnknown " + e.Error() - // log.Error(operationID, errMsg) - //} - return nil, utils.Wrap(err, "") } diff --git a/pkg/proto/cache/cache.proto b/pkg/proto/cache/cache.proto index f8bf74524..f6c3c081a 100644 --- a/pkg/proto/cache/cache.proto +++ b/pkg/proto/cache/cache.proto @@ -1,5 +1,4 @@ syntax = "proto3"; -import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto"; option go_package = "./cache;cache"; package cache;