TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-10 17:30:29 +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
}
}