阶段性提交

This commit is contained in:
刘祥超
2020-12-23 09:52:50 +08:00
parent 88bbde47ec
commit 7efce621b0
8 changed files with 247 additions and 146 deletions

View File

@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/maps"
)
@@ -40,11 +39,14 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi
// 修改源站
func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOriginRequest) (*pb.RPCSuccess, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
if userId > 0 {
// TODO 校验权限
}
if req.Addr == nil {
return nil, errors.New("'addr' can not be nil")
}
@@ -63,11 +65,15 @@ func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOrigi
// 查找单个源站信息
func (this *OriginService) FindEnabledOrigin(ctx context.Context, req *pb.FindEnabledOriginRequest) (*pb.FindEnabledOriginResponse, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
if userId > 0 {
// TODO 校验权限
}
origin, err := models.SharedOriginDAO.FindEnabledOrigin(req.OriginId)
if err != nil {
return nil, err
@@ -98,11 +104,15 @@ func (this *OriginService) FindEnabledOrigin(ctx context.Context, req *pb.FindEn
// 查找源站配置
func (this *OriginService) FindEnabledOriginConfig(ctx context.Context, req *pb.FindEnabledOriginConfigRequest) (*pb.FindEnabledOriginConfigResponse, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
if userId > 0 {
// TODO 校验权限
}
config, err := models.SharedOriginDAO.ComposeOriginConfig(req.OriginId)
if err != nil {
return nil, err