TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-22 14:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现点击访问日志显示详情窗口

Browse Source
This commit is contained in:
刘祥超
2020-11-02 21:15:31 +08:00
parent 6d22dac060
commit 858485881b
4 changed files with 145 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/rpc/services/service_http_firewall_rule_set.go
View File

@@ -52,7 +52,7 @@ func (this *HTTPFirewallRuleSetService) UpdateHTTPFirewallRuleSetIsOn(ctx contex
}
// 查找规则集配置
func (this *HTTPFirewallRuleSetService) FindHTTPFirewallRuleSetConfig(ctx context.Context, req *pb.FindHTTPFirewallRuleSetConfigRequest) (*pb.FindHTTPFirewallRuleSetConfigResponse, error) {
func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSetConfig(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleSetConfigRequest) (*pb.FindEnabledHTTPFirewallRuleSetConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -64,11 +64,40 @@ func (this *HTTPFirewallRuleSetService) FindHTTPFirewallRuleSetConfig(ctx contex
return nil, err
}
if config == nil {
return &pb.FindHTTPFirewallRuleSetConfigResponse{FirewallRuleSetJSON: nil}, nil
return &pb.FindEnabledHTTPFirewallRuleSetConfigResponse{FirewallRuleSetJSON: nil}, nil
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindHTTPFirewallRuleSetConfigResponse{FirewallRuleSetJSON: configJSON}, nil
return &pb.FindEnabledHTTPFirewallRuleSetConfigResponse{FirewallRuleSetJSON: configJSON}, nil
}
// 查找规则集
func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSet(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleSetRequest) (*pb.FindEnabledHTTPFirewallRuleSetResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
set, err := models.SharedHTTPFirewallRuleSetDAO.FindEnabledHTTPFirewallRuleSet(req.FirewallRuleSetId)
if err != nil {
return nil, err
}
if set == nil {
return &pb.FindEnabledHTTPFirewallRuleSetResponse{
FirewallRuleSet: nil,
}, nil
}
return &pb.FindEnabledHTTPFirewallRuleSetResponse{
FirewallRuleSet: &pb.HTTPFirewallRuleSet{
Id: int64(set.Id),
Name: set.Name,
IsOn: set.IsOn == 1,
Description: set.Description,
Code: set.Code,
},
}, nil
}