diff --git a/pom.xml b/pom.xml index c2a1c44b6..03f385f1f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.80 1.16.7 - 3.3.2 + 3.3.4 2.28.22 diff --git a/ruoyi-admin/src/main/resources/ip2region_v4.xdb b/ruoyi-admin/src/main/resources/ip2region_v4.xdb index 6f86c7d9b..707ea3d45 100644 Binary files a/ruoyi-admin/src/main/resources/ip2region_v4.xdb and b/ruoyi-admin/src/main/resources/ip2region_v4.xdb differ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index 5c74a8351..2012cd4ee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -90,9 +90,9 @@ public class RegionUtils { try { String region = ip2Region.search(ipString); if (StringUtils.isBlank(region)) { - region = UNKNOWN_ADDRESS; + return UNKNOWN_ADDRESS; } - return region; + return StringUtils.replace(region, "0", UNKNOWN_ADDRESS); } catch (Exception e) { log.error("IP地址离线获取城市异常 {}", ipString); return UNKNOWN_ADDRESS; @@ -109,9 +109,9 @@ public class RegionUtils { try { String region = ip2Region.search(ipBytes); if (StringUtils.isBlank(region)) { - region = UNKNOWN_ADDRESS; + return UNKNOWN_ADDRESS; } - return region; + return StringUtils.replace(region, "0", UNKNOWN_ADDRESS); } catch (Exception e) { log.error("IP地址离线获取城市异常 {}", Util.ipToString(ipBytes)); return UNKNOWN_ADDRESS;