From 6ed424f89e0bb7f0611b89a2ee947b6e0b1c089b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 10:19:17 +0800
Subject: [PATCH] add 增加 邮箱验证码发送接口 add 增加 邮箱登陆接口
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java
index 15c3085..ffef66f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java
@@ -1,12 +1,7 @@
package com.ruoyi.common.core.utils.ip;
-import cn.hutool.core.lang.Dict;
import cn.hutool.core.net.NetUtil;
import cn.hutool.http.HtmlUtil;
-import cn.hutool.http.HttpUtil;
-import com.ruoyi.common.core.config.RuoYiConfig;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.utils.JsonUtils;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -21,40 +16,18 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class AddressUtils {
- // IP鍦板潃鏌ヨ
- public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
-
// 鏈煡鍦板潃
public static final String UNKNOWN = "XX XX";
public static String getRealAddressByIP(String ip) {
- String address = UNKNOWN;
if (StringUtils.isBlank(ip)) {
- return address;
+ return UNKNOWN;
}
// 鍐呯綉涓嶆煡璇�
ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
if (NetUtil.isInnerIP(ip)) {
return "鍐呯綉IP";
}
- if (RuoYiConfig.isAddressEnabled()) {
- try {
- String rspStr = HttpUtil.createGet(IP_URL)
- .body("ip=" + ip + "&json=true", Constants.GBK)
- .execute()
- .body();
- if (StringUtils.isEmpty(rspStr)) {
- log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
- return UNKNOWN;
- }
- Dict obj = JsonUtils.parseMap(rspStr);
- String region = obj.getStr("pro");
- String city = obj.getStr("city");
- return String.format("%s %s", region, city);
- } catch (Exception e) {
- log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
- }
- }
- return UNKNOWN;
+ return RegionUtils.getCityInfo(ip);
}
}
--
Gitblit v1.9.3