TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-01-06 03:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

服务日志：增加区域信息

Browse Source
This commit is contained in:
GoEdgeLab
2021-01-13 17:00:09 +08:00
parent d27db90ea2
commit d64a66c48d
11 changed files with 131 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/web/actions/default/log/exportExcel.go
View File

@@ -68,21 +68,21 @@ func (this *ExportExcelAction) RunGet(params struct {
this.ErrorPage(err)
return
}
if regionResp.Region != nil {
if regionResp.IpRegion != nil {
pieces := []string{}
if len(regionResp.Region.Country) > 0 {
pieces = append(pieces, regionResp.Region.Country)
if len(regionResp.IpRegion.Country) > 0 {
pieces = append(pieces, regionResp.IpRegion.Country)
}
if len(regionResp.Region.Province) > 0 && !lists.ContainsString(pieces, regionResp.Region.Province) {
pieces = append(pieces, regionResp.Region.Province)
if len(regionResp.IpRegion.Province) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.Province) {
pieces = append(pieces, regionResp.IpRegion.Province)
}
if len(regionResp.Region.City) > 0 && !lists.ContainsString(pieces, regionResp.Region.City) && !lists.ContainsString(pieces, strings.TrimSuffix(regionResp.Region.Province, "市")) {
pieces = append(pieces, regionResp.Region.City)
if len(regionResp.IpRegion.City) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.City) && !lists.ContainsString(pieces, strings.TrimSuffix(regionResp.IpRegion.Province, "市")) {
pieces = append(pieces, regionResp.IpRegion.City)
}
regionName = strings.Join(pieces, " ")
if len(regionResp.Region.Isp) > 0 {
ispName = regionResp.Region.Isp
if len(regionResp.IpRegion.Isp) > 0 {
ispName = regionResp.IpRegion.Isp
}
}

17
internal/web/actions/default/log/index.go
View File

@@ -71,19 +71,10 @@ func (this *IndexAction) RunGet(params struct {
this.ErrorPage(err)
return
}
if regionResp.Region != nil {
pieces := []string{}
if len(regionResp.Region.Country) > 0 {
pieces = append(pieces, regionResp.Region.Country)
}
if len(regionResp.Region.Province) > 0 && !lists.ContainsString(pieces, regionResp.Region.Province) {
pieces = append(pieces, regionResp.Region.Province)
}
if len(regionResp.Region.City) > 0 && !lists.ContainsString(pieces, regionResp.Region.City) && !lists.ContainsString(pieces, strings.TrimSuffix(regionResp.Region.Province, "市")) {
pieces = append(pieces, regionResp.Region.City)
}
if len(regionResp.Region.Isp) > 0 && !lists.ContainsString(pieces, regionResp.Region.Isp) {
pieces = append(pieces, "| "+regionResp.Region.Isp)
if regionResp.IpRegion != nil {
pieces := []string{regionResp.IpRegion.Summary}
if len(regionResp.IpRegion.Isp) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.Isp) {
pieces = append(pieces, "| "+regionResp.IpRegion.Isp)
}
regionName = strings.Join(pieces, " ")
}

26
internal/web/actions/default/servers/server/log/history.go
View File

@@ -3,6 +3,7 @@ package log
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/lists"
timeutil "github.com/iwind/TeaGo/utils/time"
"regexp"
"strings"
@@ -34,6 +35,8 @@ func (this *HistoryAction) RunGet(params struct {
this.Data["hasError"] = params.HasError
day := params.Day
ipList := []string{}
if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
day = strings.ReplaceAll(day, "-", "")
size := int64(10)
@@ -56,6 +59,13 @@ func (this *HistoryAction) RunGet(params struct {
this.Data["accessLogs"] = []interface{}{}
} else {
this.Data["accessLogs"] = resp.AccessLogs
for _, accessLog := range resp.AccessLogs {
if len(accessLog.RemoteAddr) > 0 {
if !lists.ContainsString(ipList, accessLog.RemoteAddr) {
ipList = append(ipList, accessLog.RemoteAddr)
}
}
}
}
this.Data["hasMore"] = resp.HasMore
this.Data["nextRequestId"] = resp.RequestId
@@ -83,5 +93,21 @@ func (this *HistoryAction) RunGet(params struct {
}
}
// 根据IP查询区域
regionMap := map[string]string{} // ip => region
if len(ipList) > 0 {
resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
if err != nil {
this.ErrorPage(err)
return
}
if resp.IpRegionMap != nil {
for ip, region := range resp.IpRegionMap {
regionMap[ip] = region.Summary
}
}
}
this.Data["regions"] = regionMap
this.Show()
}

26
internal/web/actions/default/servers/server/log/index.go
View File

@@ -4,6 +4,7 @@ import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/lists"
timeutil "github.com/iwind/TeaGo/utils/time"
)
@@ -45,9 +46,18 @@ func (this *IndexAction) RunPost(params struct {
return
}
ipList := []string{}
accessLogs := accessLogsResp.AccessLogs
if len(accessLogs) == 0 {
accessLogs = []*pb.HTTPAccessLog{}
} else {
for _, accessLog := range accessLogs {
if len(accessLog.RemoteAddr) > 0 {
if !lists.ContainsString(ipList, accessLog.RemoteAddr) {
ipList = append(ipList, accessLog.RemoteAddr)
}
}
}
}
this.Data["accessLogs"] = accessLogs
if len(accessLogs) > 0 {
@@ -57,5 +67,21 @@ func (this *IndexAction) RunPost(params struct {
}
this.Data["hasMore"] = accessLogsResp.HasMore
// 根据IP查询区域
regionMap := map[string]string{} // ip => region
if len(ipList) > 0 {
resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
if err != nil {
this.ErrorPage(err)
return
}
if resp.IpRegionMap != nil {
for ip, region := range resp.IpRegionMap {
regionMap[ip] = region.Summary
}
}
}
this.Data["regions"] = regionMap
this.Success()
}

25
internal/web/actions/default/servers/server/log/today.go
View File

@@ -3,6 +3,7 @@ package log
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/lists"
timeutil "github.com/iwind/TeaGo/utils/time"
)
@@ -37,10 +38,18 @@ func (this *TodayAction) RunGet(params struct {
return
}
ipList := []string{}
if len(resp.AccessLogs) == 0 {
this.Data["accessLogs"] = []interface{}{}
} else {
this.Data["accessLogs"] = resp.AccessLogs
for _, accessLog := range resp.AccessLogs {
if len(accessLog.RemoteAddr) > 0 {
if !lists.ContainsString(ipList, accessLog.RemoteAddr) {
ipList = append(ipList, accessLog.RemoteAddr)
}
}
}
}
this.Data["hasMore"] = resp.HasMore
this.Data["nextRequestId"] = resp.RequestId
@@ -67,5 +76,21 @@ func (this *TodayAction) RunGet(params struct {
}
}
// 根据IP查询区域
regionMap := map[string]string{} // ip => region
if len(ipList) > 0 {
resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
if err != nil {
this.ErrorPage(err)
return
}
if resp.IpRegionMap != nil {
for ip, region := range resp.IpRegionMap {
regionMap[ip] = region.Summary
}
}
}
this.Data["regions"] = regionMap
this.Show()
}

18
internal/web/actions/default/servers/server/log/viewPopup.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/maps"
"net/http"
"strings"
)
type ViewPopupAction struct {
@@ -90,23 +89,10 @@ func (this *ViewPopupAction) RunGet(params struct {
this.ErrorPage(err)
return
}
region := regionResp.Region
region := regionResp.IpRegion
if region != nil {
pieces := []string{}
if len(region.Country) > 0 {
pieces = append(pieces, region.Country)
}
if len(region.Region) > 0 {
pieces = append(pieces, region.Region)
}
if len(region.Province) > 0 {
pieces = append(pieces, region.Province)
}
if len(region.City) > 0 {
pieces = append(pieces, region.City)
}
regionMap = maps.Map{
"full": strings.Join(pieces, " "),
"full": region.Summary,
"isp": region.Isp,
}
}

6
internal/web/helpers/utils.go
View File

@@ -78,13 +78,13 @@ func checkIPWithoutCache(config *systemconfigs.SecurityConfig, ipAddr string) bo
logs.Println("[USER_MUST_AUTH][ERROR]" + err.Error())
return false
}
if resp.Region == nil {
if resp.IpRegion == nil {
return true
}
if len(config.AllowCountryIds) > 0 && !lists.ContainsInt64(config.AllowCountryIds, resp.Region.CountryId) {
if len(config.AllowCountryIds) > 0 && !lists.ContainsInt64(config.AllowCountryIds, resp.IpRegion.CountryId) {
return false
}
if len(config.AllowProvinceIds) > 0 && !lists.ContainsInt64(config.AllowProvinceIds, resp.Region.ProvinceId) {
if len(config.AllowProvinceIds) > 0 && !lists.ContainsInt64(config.AllowProvinceIds, resp.IpRegion.ProvinceId) {
return false
}
}