From 46a1695292f0ad4f9618aed1faa551eb94468ae1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 23 二月 2020 15:43:50 +0800
Subject: [PATCH] 修复地址开关无效问题
---
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index d70351f..2709f45 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.framework.config.RuoYiConfig;
/**
* 获取地址类
@@ -25,17 +26,20 @@
{
return "内网IP";
}
- String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
- if (StringUtils.isEmpty(rspStr))
+ if (RuoYiConfig.isAddressEnabled())
{
- log.error("获取地理位置异常 {}", ip);
- return address;
+ String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
+ if (StringUtils.isEmpty(rspStr))
+ {
+ log.error("获取地理位置异常 {}", ip);
+ return address;
+ }
+ 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;
}
- 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;
}
}
--
Gitblit v1.9.2