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

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

Browse Source
This commit is contained in:
GoEdgeLab
2020-11-02 21:15:31 +08:00
parent cd1109b387
commit 613eebf195
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_group.go
View File

@@ -60,7 +60,7 @@ func (this *HTTPFirewallRuleGroupService) UpdateHTTPFirewallRuleGroup(ctx contex
}
// 获取分组配置
func (this *HTTPFirewallRuleGroupService) FindHTTPFirewallRuleGroupConfig(ctx context.Context, req *pb.FindHTTPFirewallRuleGroupConfigRequest) (*pb.FindHTTPFirewallRuleGroupConfigResponse, error) {
func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroupConfig(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleGroupConfigRequest) (*pb.FindEnabledHTTPFirewallRuleGroupConfigResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
@@ -72,13 +72,42 @@ func (this *HTTPFirewallRuleGroupService) FindHTTPFirewallRuleGroupConfig(ctx co
return nil, err
}
if groupConfig == nil {
return &pb.FindHTTPFirewallRuleGroupConfigResponse{FirewallRuleGroupJSON: nil}, nil
return &pb.FindEnabledHTTPFirewallRuleGroupConfigResponse{FirewallRuleGroupJSON: nil}, nil
}
groupConfigJSON, err := json.Marshal(groupConfig)
if err != nil {
return nil, err
}
return &pb.FindHTTPFirewallRuleGroupConfigResponse{FirewallRuleGroupJSON: groupConfigJSON}, nil
return &pb.FindEnabledHTTPFirewallRuleGroupConfigResponse{FirewallRuleGroupJSON: groupConfigJSON}, nil
}
// 获取分组信息
func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroup(ctx context.Context, req *pb.FindEnabledHTTPFirewallRuleGroupRequest) (*pb.FindEnabledHTTPFirewallRuleGroupResponse, error) {
// 校验请求
_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
if err != nil {
return nil, err
}
group, err := models.SharedHTTPFirewallRuleGroupDAO.FindEnabledHTTPFirewallRuleGroup(req.FirewallRuleGroupId)
if err != nil {
return nil, err
}
if group == nil {
return &pb.FindEnabledHTTPFirewallRuleGroupResponse{
FirewallRuleGroup: nil,
}, nil
}
return &pb.FindEnabledHTTPFirewallRuleGroupResponse{
FirewallRuleGroup: &pb.HTTPFirewallRuleGroup{
Id: int64(group.Id),
Name: group.Name,
IsOn: group.IsOn == 1,
Description: group.Description,
Code: group.Code,
},
}, nil
}
// 修改分组的规则集