From 457ec516f72056b0a9363dbb005a8382a59d8930 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 21 Mar 2021 11:09:44 +0800
Subject: [PATCH] 个人信息添加手机&邮箱重复验证
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java | 74 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
index 600a154..767cab7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
@@ -16,32 +16,46 @@
{
if (request == null)
{
- return "unknown";
- }
- String ip = request.getHeader("x-forwarded-for");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Forwarded-For");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Real-IP");
+ return null;
}
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+ String ip = null;
+
+ // X-Forwarded-For：Squid 服务代理
+ String ipAddresses = request.getHeader("X-Forwarded-For");
+ if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+ {
+ // Proxy-Client-IP：apache 服务代理
+ ipAddresses = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+ {
+ // WL-Proxy-Client-IP：weblogic 服务代理
+ ipAddresses = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+ {
+ // HTTP_CLIENT_IP：有些代理服务器
+ ipAddresses = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
+ {
+ // X-Real-IP：nginx服务代理
+ ipAddresses = request.getHeader("X-Real-IP");
+ }
+
+ // 有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
+ if (ipAddresses != null && ipAddresses.length() != 0)
+ {
+ ip = ipAddresses.split(",")[0];
+ }
+
+ // 还是不能获取到，最后再通过request.getRemoteAddr();获取
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses))
{
ip = request.getRemoteAddr();
}
-
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
+ return ip.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ip;
}
public static boolean internalIp(String ip)
@@ -110,8 +124,9 @@
{
case 1:
l = Long.parseLong(elements[0]);
- if ((l < 0L) || (l > 4294967295L))
+ if ((l < 0L) || (l > 4294967295L)){
return null;
+ }
bytes[0] = (byte) (int) (l >> 24 & 0xFF);
bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
@@ -119,12 +134,14 @@
break;
case 2:
l = Integer.parseInt(elements[0]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[0] = (byte) (int) (l & 0xFF);
l = Integer.parseInt(elements[1]);
- if ((l < 0L) || (l > 16777215L))
+ if ((l < 0L) || (l > 16777215L)) {
return null;
+ }
bytes[1] = (byte) (int) (l >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
@@ -133,13 +150,15 @@
for (i = 0; i < 2; ++i)
{
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
l = Integer.parseInt(elements[2]);
- if ((l < 0L) || (l > 65535L))
+ if ((l < 0L) || (l > 65535L)) {
return null;
+ }
bytes[2] = (byte) (int) (l >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
@@ -147,8 +166,9 @@
for (i = 0; i < 4; ++i)
{
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
break;
--
Gitblit v1.9.3