Procházet zdrojové kódy

update 更新ip2region版本 优化IP未知地区占位符为0的情况

疯狂的狮子Li před 5 měsíci
rodič
revize
04436c7393

+ 1 - 1
pom.xml

@@ -44,7 +44,7 @@
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <justauth.version>1.16.7</justauth.version>
         <!-- 离线IP地址定位库 -->
-        <ip2region.version>3.3.2</ip2region.version>
+        <ip2region.version>3.3.4</ip2region.version>
         <!-- 临时修复 fastjson 漏洞 -->
         <fastjson.version>1.2.83</fastjson.version>
         <!-- OSS 配置 -->

+ 4 - 4
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;

binární
ruoyi-common/ruoyi-common-web/src/main/resources/ip2region_v4.xdb