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

优化IPBox访问日志查询

Browse Source
This commit is contained in:
GoEdgeLab
2022-04-17 16:23:52 +08:00
parent 9d2eb11e1f
commit 03301a47c0
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
internal/web/actions/default/servers/ipbox/index.go
View File

@@ -20,8 +20,6 @@ func (this *IndexAction) Init() {
func (this *IndexAction) RunGet(params struct {
Ip string
Partition int32 `default:"-1"`
}) {
this.Data["ip"] = params.Ip
@@ -104,36 +102,37 @@ func (this *IndexAction) RunGet(params struct {
this.Data["publicBlackIPLists"] = publicBlackIPListMaps
// 访问日志
accessLogsResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
Partition: params.Partition,
Day: timeutil.Format("Ymd"),
Ip: params.Ip,
Size: 20,
})
if err != nil {
this.ErrorPage(err)
return
}
var accessLogs = accessLogsResp.HttpAccessLogs
if len(accessLogs) == 0 {
// 查询昨天
accessLogsResp, err = this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
Partition: params.Partition,
Day: timeutil.Format("Ymd", time.Now().AddDate(0, 0, -1)),
Ip: params.Ip,
Size: 20,
})
var hasAccessLogs = false
for _, day := range []string{timeutil.Format("Ymd"), timeutil.Format("Ymd", time.Now().AddDate(0, 0, -1))} {
partitionsResp, err := this.RPC().HTTPAccessLogRPC().FindHTTPAccessLogPartitions(this.AdminContext(), &pb.FindHTTPAccessLogPartitionsRequest{Day: day})
if err != nil {
this.ErrorPage(err)
return
}
accessLogs = accessLogsResp.HttpAccessLogs
for _, partition := range partitionsResp.ReversePartitions {
accessLogsResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
Partition: partition,
Day: day,
Ip: params.Ip,
Size: 20,
})
if err != nil {
this.ErrorPage(err)
return
}
if len(accessLogs) == 0 {
accessLogs = []*pb.HTTPAccessLog{}
var accessLogs = accessLogsResp.HttpAccessLogs
if len(accessLogs) > 0 {
this.Data["accessLogs"] = accessLogs
hasAccessLogs = true
break
}
}
}
this.Data["accessLogs"] = accessLogs
if !hasAccessLogs {
this.Data["accessLogs"] = []interface{}{}
}
this.Show()
}