阶段性提交

This commit is contained in:
刘祥超
2020-09-15 14:44:11 +08:00
parent 512a1ac013
commit 39fc21cf5b
23 changed files with 1496 additions and 78 deletions

View File

@@ -2,6 +2,7 @@ package services
import (
"context"
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
@@ -85,7 +86,7 @@ func (this *OriginServerService) FindEnabledOriginServer(ctx context.Context, re
IsOn: origin.IsOn == 1,
Name: origin.Name,
Addr: &pb.NetworkAddress{
Protocol: addr.Protocol,
Protocol: addr.Protocol.String(),
Host: addr.Host,
PortRange: addr.PortRange,
},
@@ -93,3 +94,23 @@ func (this *OriginServerService) FindEnabledOriginServer(ctx context.Context, re
}
return &pb.FindEnabledOriginServerResponse{Origin: result}, nil
}
// 查找源站配置
func (this *OriginServerService) FindEnabledOriginServerConfig(ctx context.Context, req *pb.FindEnabledOriginServerConfigRequest) (*pb.FindEnabledOriginServerConfigResponse, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
config, err := models.SharedOriginServerDAO.ComposeOriginConfig(req.OriginId)
if err != nil {
return nil, err
}
configData, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindEnabledOriginServerConfigResponse{Config: configData}, nil
}