github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化默认返回

pull/24/MERGE
RuoYi 2018-08-18 20:32:07 +08:00
parent f096e03342
commit e5c9aca10f
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -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>

24
src/main/java/com/ruoyi/common/utils/AddressUtils.java
View File

@ -19,22 +19,20 @@ public class AddressUtils
public static String getRealAddressByIP(String ip) public static String getRealAddressByIP(String ip)
{ {
String address = ""; String address = "XX XX";
try 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); log.error("获取地理位置异常 {}", ip);
JSONObject json = JSONObject.parseObject(address); return address;
JSONObject object = json.getObject("data", JSONObject.class);
String region = object.getString("region");
String city = object.getString("city");
address = region + " " + city;
} }
} JSONObject obj = JSONObject.parseObject(rspStr);
catch (Exception e) JSONObject data = obj.getObject("data", JSONObject.class);
{ String region = data.getString("region");
log.error("获取地理位置异常:", e); String city = data.getString("city");
address = region + " " + city;
} }
return address; return address;
} }