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

实现路径规则部分功能

Browse Source
This commit is contained in:
GoEdgeLab
2020-09-21 19:51:56 +08:00
parent 62b9efe0e6
commit 8a1cfa92ca
17 changed files with 415 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rpc/services/service_api_node.go
View File

@@ -41,7 +41,7 @@ func (this *APINodeService) UpdateAPINode(ctx context.Context, req *pb.UpdateAPI
}
// 删除API节点
func (this *APINodeService) DeleteAPINode(ctx context.Context, req *pb.DeleteAPINodeRequest) (*pb.DeleteAPINodeResponse, error) {
func (this *APINodeService) DeleteAPINode(ctx context.Context, req *pb.DeleteAPINodeRequest) (*pb.RPCDeleteSuccess, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
@@ -52,7 +52,7 @@ func (this *APINodeService) DeleteAPINode(ctx context.Context, req *pb.DeleteAPI
return nil, err
}
return &pb.DeleteAPINodeResponse{}, nil
return &pb.RPCDeleteSuccess{}, nil
}
// 列出所有可用API节点

2
internal/rpc/services/service_http_header.go
View File

@@ -57,5 +57,5 @@ func (this *HTTPHeaderService) FindEnabledHTTPHeaderConfig(ctx context.Context,
return nil, err
}
return &pb.FindEnabledHTTPHeaderConfigResponse{Config: configData}, nil
return &pb.FindEnabledHTTPHeaderConfigResponse{HeaderJSON: configData}, nil
}

2
internal/rpc/services/service_http_header_policy.go
View File

@@ -28,7 +28,7 @@ func (this *HTTPHeaderPolicyService) FindEnabledHTTPHeaderPolicyConfig(ctx conte
return nil, err
}
return &pb.FindEnabledHTTPHeaderPolicyConfigResponse{Config: configData}, nil
return &pb.FindEnabledHTTPHeaderPolicyConfigResponse{HeaderPolicyJSON: configData}, nil
}
// 创建策略

155
internal/rpc/services/service_http_location.go Normal file
View File

@@ -0,0 +1,155 @@
package services
import (
"context"
"encoding/json"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
)
type HTTPLocationService struct {
}
// 创建路径规则
func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb.CreateHTTPLocationRequest) (*pb.CreateHTTPLocationResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
locationId, err := models.SharedHTTPLocationDAO.CreateLocation(req.ParentId, req.Name, req.Pattern, req.Description, req.IsBreak)
if err != nil {
return nil, err
}
return &pb.CreateHTTPLocationResponse{LocationId: locationId}, nil
}
// 修改路径规则
func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb.UpdateHTTPLocationRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
err = models.SharedHTTPLocationDAO.UpdateLocation(req.LocationId, req.Name, req.Pattern, req.Description, req.IsOn, req.IsBreak)
if err != nil {
return nil, err
}
return rpcutils.RPCUpdateSuccess()
}
// 查找路径规则配置
func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Context, req *pb.FindEnabledHTTPLocationConfigRequest) (*pb.FindEnabledHTTPLocationConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
config, err := models.SharedHTTPLocationDAO.ComposeLocationConfig(req.LocationId)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindEnabledHTTPLocationConfigResponse{LocationJSON: configJSON}, nil
}
// 删除路径规则
func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb.DeleteHTTPLocationRequest) (*pb.RPCDeleteSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
err = models.SharedHTTPLocationDAO.DisableHTTPLocation(req.LocationId)
if err != nil {
return nil, err
}
return rpcutils.RPCDeleteSuccess()
}
// 查找反向代理设置
func (this *HTTPLocationService) FindAndInitHTTPLocationReverseProxyConfig(ctx context.Context, req *pb.FindAndInitHTTPLocationReverseProxyConfigRequest) (*pb.FindAndInitHTTPLocationReverseProxyConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
reverseProxyRef, err := models.SharedHTTPLocationDAO.FindLocationReverseProxy(req.LocationId)
if err != nil {
return nil, err
}
if reverseProxyRef == nil || reverseProxyRef.ReverseProxyId <= 0 {
reverseProxyId, err := models.SharedReverseProxyDAO.CreateReverseProxy(nil, nil, nil)
if err != nil {
return nil, err
}
reverseProxyRef = &serverconfigs.ReverseProxyRef{
IsOn: false,
ReverseProxyId: reverseProxyId,
}
}
reverseProxyConfig, err := models.SharedReverseProxyDAO.ComposeReverseProxyConfig(reverseProxyRef.ReverseProxyId)
if err != nil {
return nil, err
}
refJSON, err := json.Marshal(reverseProxyRef)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(reverseProxyConfig)
if err != nil {
return nil, err
}
return &pb.FindAndInitHTTPLocationReverseProxyConfigResponse{
ReverseProxyJSON: configJSON,
ReverseProxyRefJSON: refJSON,
}, nil
}
// 初始化Web设置
func (this *HTTPLocationService) FindAndInitHTTPLocationWebConfig(ctx context.Context, req *pb.FindAndInitHTTPLocationWebConfigRequest) (*pb.FindAndInitHTTPLocationWebConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
webId, err := models.SharedHTTPLocationDAO.FindLocationWebId(req.LocationId)
if err != nil {
return nil, err
}
if webId <= 0 {
webId, err = models.SharedHTTPWebDAO.CreateWeb("")
if err != nil {
return nil, err
}
}
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(webId)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindAndInitHTTPLocationWebConfigResponse{
WebJSON: configJSON,
}, nil
}

2
internal/rpc/services/service_http_page.go
View File

@@ -62,6 +62,6 @@ func (this *HTTPPageService) FindEnabledHTTPPageConfig(ctx context.Context, req
}
return &pb.FindEnabledHTTPPageConfigResponse{
Config: configJSON,
PageJSON: configJSON,
}, nil
}

48
internal/rpc/services/service_http_web.go
View File

@@ -2,6 +2,7 @@ package services
import (
"context"
"encoding/json"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -53,6 +54,26 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find
return &pb.FindEnabledHTTPWebResponse{Web: result}, nil
}
// 查找Web配置
func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *pb.FindEnabledHTTPWebConfigRequest) (*pb.FindEnabledHTTPWebConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(req.WebId)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindEnabledHTTPWebConfigResponse{WebJSON: configJSON}, nil
}
// 修改Web配置
func (this *HTTPWebService) UpdateHTTPWeb(ctx context.Context, req *pb.UpdateHTTPWebRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
@@ -163,7 +184,7 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda
}
// 更改访问日志配置
func (this *HTTPWebService) UpdateHTTPAccessLog(ctx context.Context, req *pb.UpdateHTTPAccessLogRequest) (*pb.RPCUpdateSuccess, error) {
func (this *HTTPWebService) UpdateHTTPWebAccessLog(ctx context.Context, req *pb.UpdateHTTPWebAccessLogRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -178,7 +199,7 @@ func (this *HTTPWebService) UpdateHTTPAccessLog(ctx context.Context, req *pb.Upd
}
// 更改统计配置
func (this *HTTPWebService) UpdateHTTPStat(ctx context.Context, req *pb.UpdateHTTPStatRequest) (*pb.RPCUpdateSuccess, error) {
func (this *HTTPWebService) UpdateHTTPWebStat(ctx context.Context, req *pb.UpdateHTTPWebStatRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -193,7 +214,7 @@ func (this *HTTPWebService) UpdateHTTPStat(ctx context.Context, req *pb.UpdateHT
}
// 更改缓存配置
func (this *HTTPWebService) UpdateHTTPCache(ctx context.Context, req *pb.UpdateHTTPCacheRequest) (*pb.RPCUpdateSuccess, error) {
func (this *HTTPWebService) UpdateHTTPWebCache(ctx context.Context, req *pb.UpdateHTTPWebCacheRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -208,9 +229,8 @@ func (this *HTTPWebService) UpdateHTTPCache(ctx context.Context, req *pb.UpdateH
return rpcutils.RPCUpdateSuccess()
}
// 更改防火墙设置
func (this *HTTPWebService) UpdateHTTPFirewall(ctx context.Context, req *pb.UpdateHTTPFirewallRequest) (*pb.RPCUpdateSuccess, error) {
func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.UpdateHTTPWebFirewallRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -223,4 +243,20 @@ func (this *HTTPWebService) UpdateHTTPFirewall(ctx context.Context, req *pb.Upda
}
return rpcutils.RPCUpdateSuccess()
}
}
// 更改路径规则设置
func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.UpdateHTTPWebLocationsRequest) (*pb.RPCUpdateSuccess, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
err = models.SharedHTTPWebDAO.UpdateWebLocations(req.WebId, req.LocationsJSON)
if err != nil {
return nil, err
}
return rpcutils.RPCUpdateSuccess()
}

2
internal/rpc/services/service_node.go
View File

@@ -289,7 +289,7 @@ func (this *NodeService) ComposeNodeConfig(ctx context.Context, req *pb.ComposeN
return nil, err
}
return &pb.ComposeNodeConfigResponse{ConfigJSON: data}, nil
return &pb.ComposeNodeConfigResponse{NodeJSON: data}, nil
}
// 节点stream

2
internal/rpc/services/service_origin_server.go
View File

@@ -112,5 +112,5 @@ func (this *OriginServerService) FindEnabledOriginServerConfig(ctx context.Conte
return nil, err
}
return &pb.FindEnabledOriginServerConfigResponse{Config: configData}, nil
return &pb.FindEnabledOriginServerConfigResponse{OriginJSON: configData}, nil
}

2
internal/rpc/services/service_reverse_proxy.go
View File

@@ -70,7 +70,7 @@ func (this *ReverseProxyService) FindEnabledReverseProxyConfig(ctx context.Conte
return nil, err
}
return &pb.FindEnabledReverseProxyConfigResponse{Config: configData}, nil
return &pb.FindEnabledReverseProxyConfigResponse{ReverseProxyJSON: configData}, nil
}
// 修改反向代理调度算法

6
internal/rpc/services/service_server.go
View File

@@ -586,11 +586,11 @@ func (this *ServerService) FindAndInitServerReverseProxyConfig(ctx context.Conte
return nil, err
}
return &pb.FindAndInitServerReverseProxyConfigResponse{ReverseProxy: configJSON, ReverseProxyRef: refJSON}, nil
return &pb.FindAndInitServerReverseProxyConfigResponse{ReverseProxyJSON: configJSON, ReverseProxyRefJSON: refJSON}, nil
}
// 初始化Web设置
func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *pb.FindAndInitServerWebRequest) (*pb.FindAndInitServerWebResponse, error) {
func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *pb.FindAndInitServerWebConfigRequest) (*pb.FindAndInitServerWebConfigResponse, error) {
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
@@ -617,5 +617,5 @@ func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *
return nil, err
}
return &pb.FindAndInitServerWebResponse{Config: configJSON}, nil
return &pb.FindAndInitServerWebConfigResponse{WebJSON: configJSON}, nil
}

2
internal/rpc/services/sevice_http_gzip.go
View File

@@ -67,7 +67,7 @@ func (this *HTTPGzipService) FindEnabledHTTPGzipConfig(ctx context.Context, req
if err != nil {
return nil, err
}
return &pb.FindEnabledGzipConfigResponse{Config: configData}, nil
return &pb.FindEnabledGzipConfigResponse{GzipJSON: configData}, nil
}
// 修改Gzip配置

7
internal/rpc/utils/utils.go
View File

@@ -118,7 +118,12 @@ func ValidateRequest(ctx context.Context, userTypes ...UserType) (userType UserT
}
}
// 返回Update信息
// 返回Update成功信息
func RPCUpdateSuccess() (*pb.RPCUpdateSuccess, error) {
return &pb.RPCUpdateSuccess{}, nil
}
// 返回Delete成功信息
func RPCDeleteSuccess() (*pb.RPCDeleteSuccess, error) {
return &pb.RPCDeleteSuccess{}, nil
}