From 467557fef3a7013cdbf6c3588a3073775efc8bfe Mon Sep 17 00:00:00 2001
From: 颜奕强 <jyuyyq@163.com>
Date: Mon, 08 Aug 2022 20:29:03 +0800
Subject: [PATCH] update ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java. * update: 数字类型应该转为double输出。若使用string输出，会导致生成的单元格变成文本类型。
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 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..78186ac 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
@@ -12,6 +12,12 @@
*/
public class IpUtils
{
+ /**
+ * 获取客户端IP
+ *
+ * @param request 请求对象
+ * @return IP地址
+ */
public static String getIpAddr(HttpServletRequest request)
{
if (request == null)
@@ -41,15 +47,27 @@
ip = request.getRemoteAddr();
}
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
+ return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
}
+ /**
+ * 检查是否为内部IP地址
+ *
+ * @param ip IP地址
+ * @return 结果
+ */
public static boolean internalIp(String ip)
{
byte[] addr = textToNumericFormatV4(ip);
return internalIp(addr) || "127.0.0.1".equals(ip);
}
+ /**
+ * 检查是否为内部IP地址
+ *
+ * @param addr byte地址
+ * @return 结果
+ */
private static boolean internalIp(byte[] addr)
{
if (StringUtils.isNull(addr) || addr.length < 2)
@@ -111,7 +129,9 @@
case 1:
l = Long.parseLong(elements[0]);
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);
@@ -120,11 +140,15 @@
case 2:
l = Integer.parseInt(elements[0]);
if ((l < 0L) || (l > 255L))
+ {
return null;
+ }
bytes[0] = (byte) (int) (l & 0xFF);
l = Integer.parseInt(elements[1]);
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);
@@ -134,12 +158,16 @@
{
l = Integer.parseInt(elements[i]);
if ((l < 0L) || (l > 255L))
+ {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
l = Integer.parseInt(elements[2]);
if ((l < 0L) || (l > 65535L))
+ {
return null;
+ }
bytes[2] = (byte) (int) (l >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
@@ -148,7 +176,9 @@
{
l = Integer.parseInt(elements[i]);
if ((l < 0L) || (l > 255L))
+ {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
break;
@@ -163,6 +193,11 @@
return bytes;
}
+ /**
+ * 获取IP地址
+ *
+ * @return 本地IP地址
+ */
public static String getHostIp()
{
try
@@ -175,6 +210,11 @@
return "127.0.0.1";
}
+ /**
+ * 获取主机名
+ *
+ * @return 本地主机名
+ */
public static String getHostName()
{
try
@@ -186,4 +226,39 @@
}
return "未知";
}
+
+ /**
+ * 从多级反向代理中获得第一个非unknown IP地址
+ *
+ * @param ip 获得的IP地址
+ * @return 第一个非unknown IP地址
+ */
+ public static String getMultistageReverseProxyIp(String ip)
+ {
+ // 多级反向代理检测
+ if (ip != null && ip.indexOf(",") > 0)
+ {
+ final String[] ips = ip.trim().split(",");
+ for (String subIp : ips)
+ {
+ if (false == isUnknown(subIp))
+ {
+ ip = subIp;
+ break;
+ }
+ }
+ }
+ return ip;
+ }
+
+ /**
+ * 检测给定字符串是否为未知，多用于检测HTTP请求相关
+ *
+ * @param checkString 被检测的字符串
+ * @return 是否未知
+ */
+ public static boolean isUnknown(String checkString)
+ {
+ return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3