TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-07 18:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
刘祥超
2022-07-22 15:05:30 +08:00
parent 876c631c85
commit fe511ae7e5
72 changed files with 675 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/rpc/services/service_base.go
View File

@@ -32,7 +32,7 @@ func (this *BaseService) ValidateAdmin(ctx context.Context) (adminId int64, err
}
// ValidateAdminAndUser 校验管理员和用户
func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminId int64, requireUserId int64) (adminId int64, userId int64, err error) {
func (this *BaseService) ValidateAdminAndUser(ctx context.Context) (adminId int64, userId int64, err error) {
reqUserType, _, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
if err != nil {
return
@@ -47,20 +47,12 @@ func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminI
err = errors.New("invalid 'adminId'")
return
}
if requireAdminId > 0 && adminId != requireAdminId {
err = this.PermissionError()
return
}
case rpcutils.UserTypeUser:
userId = reqUserId
if requireUserId >= 0 && userId <= 0 {
if userId < 0 { // 允许等于0
err = errors.New("invalid 'userId'")
return
}
if requireUserId > 0 && userId != requireUserId {
err = this.PermissionError()
return
}
default:
err = errors.New("invalid user type")
}