blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-30 22:42:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
withchao 2023-01-06 14:06:25 +08:00
commit 692ec1f8c2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/common/constant/error.go
View File

@ -31,6 +31,7 @@ var (
ErrInternalServer = ErrInfo{ServerInternalError, "ServerInternalError", ""} ErrInternalServer = ErrInfo{ServerInternalError, "ServerInternalError", ""}
ErrNetwork = ErrInfo{NetworkError, "NetworkError", ""} ErrNetwork = ErrInfo{NetworkError, "NetworkError", ""}
ErrNoPermission = ErrInfo{NoPermissionError, "NoPermissionError", ""} ErrNoPermission = ErrInfo{NoPermissionError, "NoPermissionError", ""}
ErrIdentity = ErrInfo{IdentityError, "IdentityError", ""}
ErrCallback = ErrInfo{ErrMsg: "CallbackError"} ErrCallback = ErrInfo{ErrMsg: "CallbackError"}
ErrCallbackContinue = ErrInfo{ErrMsg: "CallbackContinueError"} ErrCallbackContinue = ErrInfo{ErrMsg: "CallbackContinueError"}
@ -141,6 +142,8 @@ const (
DefaultOtherError = 90006 //其他错误 DefaultOtherError = 90006 //其他错误
DataError = 90007 //数据错误 DataError = 90007 //数据错误
IdentityError = 90008 // 身份错误 非管理员token，且token中userID与请求userID不一致
) )
// 账号错误码 // 账号错误码

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

@ -8,6 +8,7 @@ import (
"Open_IM/pkg/common/trace_log" "Open_IM/pkg/common/trace_log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"context" "context"
"github.com/OpenIMSDK/open_utils"
"time" "time"
go_redis "github.com/go-redis/redis/v8" go_redis "github.com/go-redis/redis/v8"
@ -161,7 +162,7 @@ func CheckAccessV2(ctx context.Context, OpUserID string, OwnerUserID string) (er
if OpUserID == OwnerUserID { if OpUserID == OwnerUserID {
return nil return nil
} }
return utils.Wrap(constant.ErrData, "") return utils.Wrap(constant.ErrData, open_utils.GetSelfFuncName())
} }
func GetUserIDFromToken(token string, operationID string) (bool, string, string) { func GetUserIDFromToken(token string, operationID string) (bool, string, string) {