TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2025-11-04 05:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

自定义页面增加是否“启用系统自定义页面”选项

Browse Source
This commit is contained in:
刘祥超
2024-05-03 09:35:12 +08:00
parent bd9727cb58
commit 8ca6553ac5
6 changed files with 844 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/rpc.json
View File

@@ -3289,6 +3289,15 @@
],
"isDeprecated": false
},
{
"name": "updateHTTPWebGlobalPagesEnabled",
"requestMessageName": "UpdateHTTPWebGlobalPagesEnabledRequest",
"responseMessageName": "RPCSuccess",
"code": "rpc updateHTTPWebGlobalPagesEnabled(UpdateHTTPWebGlobalPagesEnabledRequest) returns (RPCSuccess);",
"doc": "更改系统自定义页面启用状态",
"roles": [],
"isDeprecated": false
},
{
"name": "updateHTTPWebAccessLog",
"requestMessageName": "UpdateHTTPWebAccessLogRequest",
@@ -22664,6 +22673,11 @@
"code": "message UpdateHTTPWebFirewallRequest {\n\tint64 httpWebId = 1;\n\tbytes firewallJSON = 2; // @link json:http_firewall_ref\n}",
"doc": "更改防火墙设置"
},
{
"name": "UpdateHTTPWebGlobalPagesEnabledRequest",
"code": "message UpdateHTTPWebGlobalPagesEnabledRequest {\n\tint64 httpWebId = 1; // Web ID\n\tbool isEnabled = 2; // 是否启用\n}",
"doc": "更改系统自定义页面启用状态"
},
{
"name": "UpdateHTTPWebHLSRequest",
"code": "message UpdateHTTPWebHLSRequest {\n\tint64 httpWebId = 1; // Web配置ID\n\tbytes hlsJSON = 2; // HLS配置\n}",

1375
pkg/rpc/pb/service_http_web.pb.go
View File

File diff suppressed because it is too large Load Diff

121
pkg/rpc/pb/service_http_web_grpc.pb.go
View File

@@ -19,47 +19,48 @@ import (
const _ = grpc.SupportPackageIsVersion7
const (
HTTPWebService_CreateHTTPWeb_FullMethodName = "/pb.HTTPWebService/createHTTPWeb"
HTTPWebService_FindEnabledHTTPWeb_FullMethodName = "/pb.HTTPWebService/findEnabledHTTPWeb"
HTTPWebService_FindEnabledHTTPWebConfig_FullMethodName = "/pb.HTTPWebService/findEnabledHTTPWebConfig"
HTTPWebService_UpdateHTTPWeb_FullMethodName = "/pb.HTTPWebService/updateHTTPWeb"
HTTPWebService_UpdateHTTPWebCompression_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCompression"
HTTPWebService_UpdateHTTPWebOptimization_FullMethodName = "/pb.HTTPWebService/updateHTTPWebOptimization"
HTTPWebService_UpdateHTTPWebWebP_FullMethodName = "/pb.HTTPWebService/updateHTTPWebWebP"
HTTPWebService_UpdateHTTPWebRemoteAddr_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRemoteAddr"
HTTPWebService_UpdateHTTPWebCharset_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCharset"
HTTPWebService_UpdateHTTPWebRequestHeader_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestHeader"
HTTPWebService_UpdateHTTPWebResponseHeader_FullMethodName = "/pb.HTTPWebService/updateHTTPWebResponseHeader"
HTTPWebService_UpdateHTTPWebShutdown_FullMethodName = "/pb.HTTPWebService/updateHTTPWebShutdown"
HTTPWebService_UpdateHTTPWebPages_FullMethodName = "/pb.HTTPWebService/updateHTTPWebPages"
HTTPWebService_UpdateHTTPWebAccessLog_FullMethodName = "/pb.HTTPWebService/updateHTTPWebAccessLog"
HTTPWebService_UpdateHTTPWebStat_FullMethodName = "/pb.HTTPWebService/updateHTTPWebStat"
HTTPWebService_UpdateHTTPWebCache_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCache"
HTTPWebService_UpdateHTTPWebFirewall_FullMethodName = "/pb.HTTPWebService/updateHTTPWebFirewall"
HTTPWebService_UpdateHTTPWebLocations_FullMethodName = "/pb.HTTPWebService/updateHTTPWebLocations"
HTTPWebService_UpdateHTTPWebRedirectToHTTPS_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRedirectToHTTPS"
HTTPWebService_UpdateHTTPWebWebsocket_FullMethodName = "/pb.HTTPWebService/updateHTTPWebWebsocket"
HTTPWebService_UpdateHTTPWebFastcgi_FullMethodName = "/pb.HTTPWebService/updateHTTPWebFastcgi"
HTTPWebService_UpdateHTTPWebRewriteRules_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRewriteRules"
HTTPWebService_UpdateHTTPWebHostRedirects_FullMethodName = "/pb.HTTPWebService/updateHTTPWebHostRedirects"
HTTPWebService_FindHTTPWebHostRedirects_FullMethodName = "/pb.HTTPWebService/findHTTPWebHostRedirects"
HTTPWebService_UpdateHTTPWebAuth_FullMethodName = "/pb.HTTPWebService/updateHTTPWebAuth"
HTTPWebService_UpdateHTTPWebCommon_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCommon"
HTTPWebService_UpdateHTTPWebRequestLimit_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestLimit"
HTTPWebService_FindHTTPWebRequestLimit_FullMethodName = "/pb.HTTPWebService/findHTTPWebRequestLimit"
HTTPWebService_UpdateHTTPWebRequestScripts_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestScripts"
HTTPWebService_FindHTTPWebRequestScripts_FullMethodName = "/pb.HTTPWebService/findHTTPWebRequestScripts"
HTTPWebService_UpdateHTTPWebUAM_FullMethodName = "/pb.HTTPWebService/updateHTTPWebUAM"
HTTPWebService_FindHTTPWebUAM_FullMethodName = "/pb.HTTPWebService/findHTTPWebUAM"
HTTPWebService_UpdateHTTPWebCC_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCC"
HTTPWebService_FindHTTPWebCC_FullMethodName = "/pb.HTTPWebService/findHTTPWebCC"
HTTPWebService_UpdateHTTPWebReferers_FullMethodName = "/pb.HTTPWebService/updateHTTPWebReferers"
HTTPWebService_FindHTTPWebReferers_FullMethodName = "/pb.HTTPWebService/findHTTPWebReferers"
HTTPWebService_UpdateHTTPWebUserAgent_FullMethodName = "/pb.HTTPWebService/updateHTTPWebUserAgent"
HTTPWebService_FindHTTPWebUserAgent_FullMethodName = "/pb.HTTPWebService/findHTTPWebUserAgent"
HTTPWebService_UpdateHTTPWebHLS_FullMethodName = "/pb.HTTPWebService/updateHTTPWebHLS"
HTTPWebService_FindHTTPWebHLS_FullMethodName = "/pb.HTTPWebService/findHTTPWebHLS"
HTTPWebService_FindServerIdWithHTTPWebId_FullMethodName = "/pb.HTTPWebService/findServerIdWithHTTPWebId"
HTTPWebService_CreateHTTPWeb_FullMethodName = "/pb.HTTPWebService/createHTTPWeb"
HTTPWebService_FindEnabledHTTPWeb_FullMethodName = "/pb.HTTPWebService/findEnabledHTTPWeb"
HTTPWebService_FindEnabledHTTPWebConfig_FullMethodName = "/pb.HTTPWebService/findEnabledHTTPWebConfig"
HTTPWebService_UpdateHTTPWeb_FullMethodName = "/pb.HTTPWebService/updateHTTPWeb"
HTTPWebService_UpdateHTTPWebCompression_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCompression"
HTTPWebService_UpdateHTTPWebOptimization_FullMethodName = "/pb.HTTPWebService/updateHTTPWebOptimization"
HTTPWebService_UpdateHTTPWebWebP_FullMethodName = "/pb.HTTPWebService/updateHTTPWebWebP"
HTTPWebService_UpdateHTTPWebRemoteAddr_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRemoteAddr"
HTTPWebService_UpdateHTTPWebCharset_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCharset"
HTTPWebService_UpdateHTTPWebRequestHeader_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestHeader"
HTTPWebService_UpdateHTTPWebResponseHeader_FullMethodName = "/pb.HTTPWebService/updateHTTPWebResponseHeader"
HTTPWebService_UpdateHTTPWebShutdown_FullMethodName = "/pb.HTTPWebService/updateHTTPWebShutdown"
HTTPWebService_UpdateHTTPWebPages_FullMethodName = "/pb.HTTPWebService/updateHTTPWebPages"
HTTPWebService_UpdateHTTPWebGlobalPagesEnabled_FullMethodName = "/pb.HTTPWebService/updateHTTPWebGlobalPagesEnabled"
HTTPWebService_UpdateHTTPWebAccessLog_FullMethodName = "/pb.HTTPWebService/updateHTTPWebAccessLog"
HTTPWebService_UpdateHTTPWebStat_FullMethodName = "/pb.HTTPWebService/updateHTTPWebStat"
HTTPWebService_UpdateHTTPWebCache_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCache"
HTTPWebService_UpdateHTTPWebFirewall_FullMethodName = "/pb.HTTPWebService/updateHTTPWebFirewall"
HTTPWebService_UpdateHTTPWebLocations_FullMethodName = "/pb.HTTPWebService/updateHTTPWebLocations"
HTTPWebService_UpdateHTTPWebRedirectToHTTPS_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRedirectToHTTPS"
HTTPWebService_UpdateHTTPWebWebsocket_FullMethodName = "/pb.HTTPWebService/updateHTTPWebWebsocket"
HTTPWebService_UpdateHTTPWebFastcgi_FullMethodName = "/pb.HTTPWebService/updateHTTPWebFastcgi"
HTTPWebService_UpdateHTTPWebRewriteRules_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRewriteRules"
HTTPWebService_UpdateHTTPWebHostRedirects_FullMethodName = "/pb.HTTPWebService/updateHTTPWebHostRedirects"
HTTPWebService_FindHTTPWebHostRedirects_FullMethodName = "/pb.HTTPWebService/findHTTPWebHostRedirects"
HTTPWebService_UpdateHTTPWebAuth_FullMethodName = "/pb.HTTPWebService/updateHTTPWebAuth"
HTTPWebService_UpdateHTTPWebCommon_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCommon"
HTTPWebService_UpdateHTTPWebRequestLimit_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestLimit"
HTTPWebService_FindHTTPWebRequestLimit_FullMethodName = "/pb.HTTPWebService/findHTTPWebRequestLimit"
HTTPWebService_UpdateHTTPWebRequestScripts_FullMethodName = "/pb.HTTPWebService/updateHTTPWebRequestScripts"
HTTPWebService_FindHTTPWebRequestScripts_FullMethodName = "/pb.HTTPWebService/findHTTPWebRequestScripts"
HTTPWebService_UpdateHTTPWebUAM_FullMethodName = "/pb.HTTPWebService/updateHTTPWebUAM"
HTTPWebService_FindHTTPWebUAM_FullMethodName = "/pb.HTTPWebService/findHTTPWebUAM"
HTTPWebService_UpdateHTTPWebCC_FullMethodName = "/pb.HTTPWebService/updateHTTPWebCC"
HTTPWebService_FindHTTPWebCC_FullMethodName = "/pb.HTTPWebService/findHTTPWebCC"
HTTPWebService_UpdateHTTPWebReferers_FullMethodName = "/pb.HTTPWebService/updateHTTPWebReferers"
HTTPWebService_FindHTTPWebReferers_FullMethodName = "/pb.HTTPWebService/findHTTPWebReferers"
HTTPWebService_UpdateHTTPWebUserAgent_FullMethodName = "/pb.HTTPWebService/updateHTTPWebUserAgent"
HTTPWebService_FindHTTPWebUserAgent_FullMethodName = "/pb.HTTPWebService/findHTTPWebUserAgent"
HTTPWebService_UpdateHTTPWebHLS_FullMethodName = "/pb.HTTPWebService/updateHTTPWebHLS"
HTTPWebService_FindHTTPWebHLS_FullMethodName = "/pb.HTTPWebService/findHTTPWebHLS"
HTTPWebService_FindServerIdWithHTTPWebId_FullMethodName = "/pb.HTTPWebService/findServerIdWithHTTPWebId"
)
// HTTPWebServiceClient is the client API for HTTPWebService service.
@@ -92,6 +93,8 @@ type HTTPWebServiceClient interface {
UpdateHTTPWebShutdown(ctx context.Context, in *UpdateHTTPWebShutdownRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
// 更改Pages
UpdateHTTPWebPages(ctx context.Context, in *UpdateHTTPWebPagesRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
// 更改系统自定义页面启用状态
UpdateHTTPWebGlobalPagesEnabled(ctx context.Context, in *UpdateHTTPWebGlobalPagesEnabledRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
// 更改访问日志配置
UpdateHTTPWebAccessLog(ctx context.Context, in *UpdateHTTPWebAccessLogRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
// 更改统计配置
@@ -275,6 +278,15 @@ func (c *hTTPWebServiceClient) UpdateHTTPWebPages(ctx context.Context, in *Updat
return out, nil
}
func (c *hTTPWebServiceClient) UpdateHTTPWebGlobalPagesEnabled(ctx context.Context, in *UpdateHTTPWebGlobalPagesEnabledRequest, opts ...grpc.CallOption) (*RPCSuccess, error) {
out := new(RPCSuccess)
err := c.cc.Invoke(ctx, HTTPWebService_UpdateHTTPWebGlobalPagesEnabled_FullMethodName, in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *hTTPWebServiceClient) UpdateHTTPWebAccessLog(ctx context.Context, in *UpdateHTTPWebAccessLogRequest, opts ...grpc.CallOption) (*RPCSuccess, error) {
out := new(RPCSuccess)
err := c.cc.Invoke(ctx, HTTPWebService_UpdateHTTPWebAccessLog_FullMethodName, in, out, opts...)
@@ -557,6 +569,8 @@ type HTTPWebServiceServer interface {
UpdateHTTPWebShutdown(context.Context, *UpdateHTTPWebShutdownRequest) (*RPCSuccess, error)
// 更改Pages
UpdateHTTPWebPages(context.Context, *UpdateHTTPWebPagesRequest) (*RPCSuccess, error)
// 更改系统自定义页面启用状态
UpdateHTTPWebGlobalPagesEnabled(context.Context, *UpdateHTTPWebGlobalPagesEnabledRequest) (*RPCSuccess, error)
// 更改访问日志配置
UpdateHTTPWebAccessLog(context.Context, *UpdateHTTPWebAccessLogRequest) (*RPCSuccess, error)
// 更改统计配置
@@ -658,6 +672,9 @@ func (UnimplementedHTTPWebServiceServer) UpdateHTTPWebShutdown(context.Context,
func (UnimplementedHTTPWebServiceServer) UpdateHTTPWebPages(context.Context, *UpdateHTTPWebPagesRequest) (*RPCSuccess, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPWebPages not implemented")
}
func (UnimplementedHTTPWebServiceServer) UpdateHTTPWebGlobalPagesEnabled(context.Context, *UpdateHTTPWebGlobalPagesEnabledRequest) (*RPCSuccess, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPWebGlobalPagesEnabled not implemented")
}
func (UnimplementedHTTPWebServiceServer) UpdateHTTPWebAccessLog(context.Context, *UpdateHTTPWebAccessLogRequest) (*RPCSuccess, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPWebAccessLog not implemented")
}
@@ -988,6 +1005,24 @@ func _HTTPWebService_UpdateHTTPWebPages_Handler(srv interface{}, ctx context.Con
return interceptor(ctx, in, info, handler)
}
func _HTTPWebService_UpdateHTTPWebGlobalPagesEnabled_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateHTTPWebGlobalPagesEnabledRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(HTTPWebServiceServer).UpdateHTTPWebGlobalPagesEnabled(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: HTTPWebService_UpdateHTTPWebGlobalPagesEnabled_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(HTTPWebServiceServer).UpdateHTTPWebGlobalPagesEnabled(ctx, req.(*UpdateHTTPWebGlobalPagesEnabledRequest))
}
return interceptor(ctx, in, info, handler)
}
func _HTTPWebService_UpdateHTTPWebAccessLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateHTTPWebAccessLogRequest)
if err := dec(in); err != nil {
@@ -1551,6 +1586,10 @@ var HTTPWebService_ServiceDesc = grpc.ServiceDesc{
MethodName: "updateHTTPWebPages",
Handler: _HTTPWebService_UpdateHTTPWebPages_Handler,
},
{
MethodName: "updateHTTPWebGlobalPagesEnabled",
Handler: _HTTPWebService_UpdateHTTPWebGlobalPagesEnabled_Handler,
},
{
MethodName: "updateHTTPWebAccessLog",
Handler: _HTTPWebService_UpdateHTTPWebAccessLog_Handler,

9
pkg/rpc/protos/service_http_web.proto
View File

@@ -47,6 +47,9 @@ service HTTPWebService {
// 更改Pages
rpc updateHTTPWebPages (UpdateHTTPWebPagesRequest) returns (RPCSuccess);
// 更改系统自定义页面启用状态
rpc updateHTTPWebGlobalPagesEnabled(UpdateHTTPWebGlobalPagesEnabledRequest) returns (RPCSuccess);
// 更改访问日志配置
rpc updateHTTPWebAccessLog (UpdateHTTPWebAccessLogRequest) returns (RPCSuccess);
@@ -219,6 +222,12 @@ message UpdateHTTPWebPagesRequest {
bytes pagesJSON = 2;
}
// 更改系统自定义页面启用状态
message UpdateHTTPWebGlobalPagesEnabledRequest {
int64 httpWebId = 1; // Web ID
bool isEnabled = 2; // 是否启用
}
// 更改访问日志配置
message UpdateHTTPWebAccessLogRequest {
int64 httpWebId = 1;

21
pkg/serverconfigs/http_web_config.go
View File

@@ -7,16 +7,17 @@ import (
)
type HTTPWebConfig struct {
Id int64 `yaml:"id" json:"id"` // ID
IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用
Locations []*HTTPLocationConfig `yaml:"locations" json:"locations"` // 路径规则 TODO
LocationRefs []*HTTPLocationRef `yaml:"locationRefs" json:"locationRefs"` // 路径规则应用
Compression *HTTPCompressionConfig `yaml:"compression" json:"compression"` // 压缩配置
Optimization *HTTPPageOptimizationConfig `yaml:"optimization" json:"optimization"` // 页面优化配置
WebP *WebPImageConfig `yaml:"webp" json:"webp"` // WebP配置
Charset *HTTPCharsetConfig `yaml:"charset" json:"charset"` // 字符编码
Shutdown *HTTPShutdownConfig `yaml:"shutdown" json:"shutdown"` // 临时关闭配置
Pages []*HTTPPageConfig `yaml:"pages" json:"pages"` // 特殊页面配置
Id int64 `yaml:"id" json:"id"` // ID
IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用
Locations []*HTTPLocationConfig `yaml:"locations" json:"locations"` // 路径规则 TODO
LocationRefs []*HTTPLocationRef `yaml:"locationRefs" json:"locationRefs"` // 路径规则应用
Compression *HTTPCompressionConfig `yaml:"compression" json:"compression"` // 压缩配置
Optimization *HTTPPageOptimizationConfig `yaml:"optimization" json:"optimization"` // 页面优化配置
WebP *WebPImageConfig `yaml:"webp" json:"webp"` // WebP配置
Charset *HTTPCharsetConfig `yaml:"charset" json:"charset"` // 字符编码
Shutdown *HTTPShutdownConfig `yaml:"shutdown" json:"shutdown"` // 临时关闭配置
Pages []*HTTPPageConfig `yaml:"pages" json:"pages"` // 特殊页面配置
EnableGlobalPages bool `yaml:"enableGlobalPages" json:"enableGlobalPages"` // 启用系统配置的自定义页面
RedirectToHttps *HTTPRedirectToHTTPSConfig `yaml:"redirectToHTTPS" json:"redirectToHTTPS"` // 是否自动跳转到Https
Root *HTTPRootConfig `yaml:"root" json:"root"` // 资源根目录

1
pkg/serverconfigs/server_config.go
View File

@@ -173,6 +173,7 @@ func (this *ServerConfig) Init(ctx context.Context) (results []error) {
// pages
if len(groupWeb.Pages) > 0 || (groupWeb.Shutdown != nil && groupWeb.Shutdown.IsOn) {
this.Web.EnableGlobalPages = groupWeb.EnableGlobalPages
this.Web.Pages = groupWeb.Pages
this.Web.Shutdown = groupWeb.Shutdown
}