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

支持更多的分组全局设置功能

Browse Source
This commit is contained in:
刘祥超
2021-10-07 16:47:21 +08:00
parent 7b1efe65d5
commit 5cf1f9bf33
6 changed files with 161 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
internal/rpc/services/service_server_group.go
View File

@@ -386,11 +386,7 @@ func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Con
}
if group == nil {
return &pb.FindEnabledServerGroupConfigInfoResponse{
HasHTTPReverseProxy: false,
HasTCPReverseProxy: false,
HasUDPReverseProxy: false,
}, nil
return &pb.FindEnabledServerGroupConfigInfoResponse{}, nil
}
var result = &pb.FindEnabledServerGroupConfigInfoResponse{
@@ -424,5 +420,58 @@ func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Con
result.HasUDPReverseProxy = ref.IsPrior
}
config, err := models.SharedServerGroupDAO.ComposeGroupConfig(tx, int64(group.Id), nil)
if err != nil {
return nil, err
}
if config != nil {
var webConfig = config.Web
if webConfig != nil {
result.HasRootConfig = webConfig != nil && webConfig.Root != nil && webConfig.Root.IsPrior
result.HasWAFConfig = webConfig != nil && webConfig.FirewallRef != nil && webConfig.FirewallRef.IsPrior
result.HasCacheConfig = webConfig != nil && webConfig.Cache != nil && webConfig.Cache.IsPrior
result.HasCharsetConfig = webConfig != nil && webConfig.Charset != nil && webConfig.Charset.IsPrior
result.HasAccessLogConfig = webConfig != nil && webConfig.AccessLogRef != nil && webConfig.AccessLogRef.IsPrior
result.HasStatConfig = webConfig != nil && webConfig.StatRef != nil && webConfig.StatRef.IsPrior
result.HasCompressionConfig = webConfig != nil && webConfig.Compression != nil && webConfig.Compression.IsPrior
result.HasWebsocketConfig = webConfig != nil && webConfig.WebsocketRef != nil && webConfig.WebsocketRef.IsPrior
result.HasRequestHeadersConfig = webConfig != nil && webConfig.RequestHeaderPolicyRef != nil && webConfig.RequestHeaderPolicyRef.IsPrior
result.HasResponseHeadersConfig = webConfig != nil && webConfig.ResponseHeaderPolicyRef != nil && webConfig.ResponseHeaderPolicyRef.IsPrior
result.HasWebPConfig = webConfig != nil && webConfig.WebP != nil && webConfig.WebP.IsPrior
result.HasRemoteAddrConfig = webConfig != nil && webConfig.RemoteAddr != nil && webConfig.RemoteAddr.IsPrior
}
}
return result, nil
}
// FindAndInitServerGroupWebConfig 初始化Web设置
func (this *ServerGroupService) FindAndInitServerGroupWebConfig(ctx context.Context, req *pb.FindAndInitServerGroupWebConfigRequest) (*pb.FindAndInitServerGroupWebConfigResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
webId, err := models.SharedServerGroupDAO.FindGroupWebId(tx, req.ServerGroupId)
if err != nil {
return nil, err
}
if webId == 0 {
webId, err = models.SharedServerGroupDAO.InitGroupWeb(tx, req.ServerGroupId)
if err != nil {
return nil, err
}
}
webConfig, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, nil)
if err != nil {
return nil, err
}
webConfigJSON, err := json.Marshal(webConfig)
if err != nil {
return nil, err
}
return &pb.FindAndInitServerGroupWebConfigResponse{WebJSON: webConfigJSON}, nil
}