交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/ConsultAskerIpRegionResolver.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.Ip2RegionUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 
 /**
@@ -31,27 +32,40 @@ public class ConsultAskerIpRegionResolver
         {
             return "内网区";
         }
-        if (!RuoYiConfig.isAddressEnabled())
-        {
-            return "未知区";
-        }
         try
         {
             String rspStr = HttpUtils.sendGet(AddressUtils.IP_URL, "ip=" + normalized + "&json=true", Constants.GBK);
             if (StringUtils.isEmpty(rspStr))
             {
-                log.warn("IP 区县解析失败: {}", normalized);
-                return "未知区";
+                log.warn("IP 区县在线解析失败，尝试 ip2region: {}", normalized);
+                return resolveDistrictLabelByIp2Region(normalized);
             }
             JSONObject obj = JSON.parseObject(rspStr);
             String district = firstNonEmpty(obj.getString("region"), obj.getString("city"), obj.getString("pro"));
+            if (StringUtils.isEmpty(district))
+            {
+                log.warn("IP 区县在线解析无结果，尝试 ip2region: {}", normalized);
+                return resolveDistrictLabelByIp2Region(normalized);
+            }
             return formatDistrictLabel(district);
         }
         catch (Exception ex)
         {
-            log.warn("IP 区县解析异常 ip={}: {}", normalized, ex.getMessage());
+            log.warn("IP 区县在线解析异常 ip={}，尝试 ip2region: {}", normalized, ex.getMessage());
+            return resolveDistrictLabelByIp2Region(normalized);
+        }
+    }
+
+    private String resolveDistrictLabelByIp2Region(String ip)
+    {
+        String region = Ip2RegionUtils.searchRegion(ip);
+        String district = Ip2RegionUtils.extractDistrictName(region);
+        if (StringUtils.isEmpty(district))
+        {
+            log.warn("IP 区县 ip2region 解析失败: {}", ip);
             return "未知区";
         }
+        return formatDistrictLabel(district);
     }
 
     static String formatDistrictLabel(String raw)
@@ -61,14 +75,10 @@ public class ConsultAskerIpRegionResolver
             return "未知区";
         }
         String name = raw.trim();
-        if (name.endsWith("区"))
+        if (name.endsWith("区") || name.endsWith("县"))
         {
             return name;
         }
-        if (name.endsWith("县"))
-        {
-            return name.substring(0, name.length() - 1) + "区";
-        }
         if (name.endsWith("市") || name.endsWith("州") || name.endsWith("盟"))
         {
             return name;

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/support/ConsultAskerIpRegionResolverTest.java

@@ -1,9 +1,11 @@
 package com.ruoyi.web.modules.diagnosis.support;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import com.ruoyi.common.utils.ip.Ip2RegionUtils;
 
 @DisplayName("ConsultAskerIpRegionResolver")
 class ConsultAskerIpRegionResolverTest
@@ -17,4 +19,20 @@ class ConsultAskerIpRegionResolverTest
         assertEquals("那曲市", ConsultAskerIpRegionResolver.formatDistrictLabel("那曲市"));
         assertEquals("未知区", ConsultAskerIpRegionResolver.formatDistrictLabel(""));
     }
+
+    @Test
+    @DisplayName("ip2region 区县名提取")
+    void extractDistrictNameFromIp2Region()
+    {
+        assertEquals("深圳市", Ip2RegionUtils.extractDistrictName("中国|广东省|深圳市|电信|CN"));
+        assertEquals("Brisbane", Ip2RegionUtils.extractDistrictName("Australia|Queensland|Brisbane|0|AU"));
+    }
+
+    @Test
+    @DisplayName("ip2region 离线查询")
+    void searchRegionOffline()
+    {
+        String region = Ip2RegionUtils.searchRegion("114.114.114.114");
+        assertNotNull(region);
+    }
 }

pom.xml

@@ -30,6 +30,7 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <ip2region.version>3.3.7</ip2region.version>
         <!-- override dependency version -->
         <tomcat.version>9.0.112</tomcat.version>
         <logback.version>1.2.13</logback.version>
@@ -183,6 +184,13 @@
                 <version>${kaptcha.version}</version>
             </dependency>
 
+            <!-- 离线 IP 归属地 -->
+            <dependency>
+                <groupId>org.lionsoul</groupId>
+                <artifactId>ip2region</artifactId>
+                <version>${ip2region.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>

ruoyi-common/pom.xml

@@ -113,6 +113,12 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!-- 离线 IP 归属地 -->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/Ip2RegionUtils.java

@@ -0,0 +1,130 @@
+package com.ruoyi.common.utils.ip;
+
+import java.io.InputStream;
+import org.lionsoul.ip2region.service.Config;
+import org.lionsoul.ip2region.service.Ip2Region;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * ip2region 离线 IP 归属地查询工具。
+ */
+public final class Ip2RegionUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(Ip2RegionUtils.class);
+
+    private static final String XDB_CLASSPATH = "/ip2region/ip2region_v4.xdb";
+
+    private static volatile Ip2Region ip2Region;
+
+    private static volatile boolean initAttempted;
+
+    private Ip2RegionUtils()
+    {
+    }
+
+    /**
+     * 查询 IP 归属地原始字符串，格式：Country|Province|City|ISP|Code。
+     */
+    public static String searchRegion(String ip)
+    {
+        if (StringUtils.isEmpty(ip))
+        {
+            return null;
+        }
+        Ip2Region service = getIp2Region();
+        if (service == null)
+        {
+            return null;
+        }
+        try
+        {
+            return service.search(ip.trim());
+        }
+        catch (Exception ex)
+        {
+            log.warn("ip2region 查询失败 ip={}: {}", ip, ex.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 从 ip2region 结果中提取可用于区县展示的名称。
+     */
+    public static String extractDistrictName(String region)
+    {
+        if (StringUtils.isEmpty(region))
+        {
+            return null;
+        }
+        String[] parts = region.split("\\|");
+        String city = parts.length > 2 ? nullIfZero(parts[2]) : null;
+        String province = parts.length > 1 ? nullIfZero(parts[1]) : null;
+        String country = parts.length > 0 ? nullIfZero(parts[0]) : null;
+        return firstNonEmpty(city, province, country);
+    }
+
+    private static Ip2Region getIp2Region()
+    {
+        if (!initAttempted)
+        {
+            synchronized (Ip2RegionUtils.class)
+            {
+                if (!initAttempted)
+                {
+                    initAttempted = true;
+                    ip2Region = createIp2Region();
+                }
+            }
+        }
+        return ip2Region;
+    }
+
+    private static Ip2Region createIp2Region()
+    {
+        try (InputStream inputStream = Ip2RegionUtils.class.getResourceAsStream(XDB_CLASSPATH))
+        {
+            if (inputStream == null)
+            {
+                log.warn("ip2region 数据库未找到: {}", XDB_CLASSPATH);
+                return null;
+            }
+            Config v4Config = Config.custom()
+                    .setCachePolicy(Config.BufferCache)
+                    .setXdbInputStream(inputStream)
+                    .asV4();
+            return Ip2Region.create(v4Config, null);
+        }
+        catch (Exception ex)
+        {
+            log.error("ip2region 初始化失败", ex);
+            return null;
+        }
+    }
+
+    private static String nullIfZero(String value)
+    {
+        if (StringUtils.isEmpty(value) || "0".equals(value.trim()))
+        {
+            return null;
+        }
+        return value.trim();
+    }
+
+    private static String firstNonEmpty(String... values)
+    {
+        if (values == null)
+        {
+            return null;
+        }
+        for (String value : values)
+        {
+            if (StringUtils.isNotEmpty(value))
+            {
+                return value;
+            }
+        }
+        return null;
+    }
+}