浏览代码

优化默认返回

RuoYi 6 年之前
父节点
当前提交
e5c9aca10f
共有 2 个文件被更改,包括 11 次插入19 次删除
  1. 0 6
      pom.xml
  2. 11 13
      src/main/java/com/ruoyi/common/utils/AddressUtils.java

+ 0 - 6
pom.xml

@@ -86,12 +86,6 @@
 			<optional>true</optional> <!-- 表示依赖不会传递 -->
 			<optional>true</optional> <!-- 表示依赖不会传递 -->
 		</dependency>
 		</dependency>
 
 
-		<!-- thymeleaf网页解析 -->
-		<dependency>
-			<groupId>net.sourceforge.nekohtml</groupId>
-			<artifactId>nekohtml</artifactId>
-		</dependency>
-
 		<!-- Mysql驱动包 -->
 		<!-- Mysql驱动包 -->
 		<dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<groupId>mysql</groupId>

+ 11 - 13
src/main/java/com/ruoyi/common/utils/AddressUtils.java

@@ -19,22 +19,20 @@ public class AddressUtils
 
 
     public static String getRealAddressByIP(String ip)
     public static String getRealAddressByIP(String ip)
     {
     {
-        String address = "";
-        try
+        String address = "XX XX";
+        if (RuoYiConfig.isAddressEnabled())
         {
         {
-            if (RuoYiConfig.isAddressEnabled())
+            String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
+            if (StringUtils.isEmpty(rspStr))
             {
             {
-                address = HttpUtils.sendPost(IP_URL, "ip=" + ip);
-                JSONObject json = JSONObject.parseObject(address);
-                JSONObject object = json.getObject("data", JSONObject.class);
-                String region = object.getString("region");
-                String city = object.getString("city");
-                address = region + " " + city;
+                log.error("获取地理位置异常 {}", ip);
+                return address;
             }
             }
-        }
-        catch (Exception e)
-        {
-            log.error("获取地理位置异常:", e);
+            JSONObject obj = JSONObject.parseObject(rspStr);
+            JSONObject data = obj.getObject("data", JSONObject.class);
+            String region = data.getString("region");
+            String city = data.getString("city");
+            address = region + " " + city;
         }
         }
         return address;
         return address;
     }
     }