From 9e6b2a12650c5a6d24be3de8c078d31e7548750e Mon Sep 17 00:00:00 2001 From: "yuhong0206@sina.cn" Date: Mon, 29 Mar 2021 08:56:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BB=E5=8F=96excel=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20if(row=20=3D=3D=20null)=20{=20=20=20=20=20continue;=20}=20?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=80=82=E9=98=B2=E6=AD=A2=E6=9C=89=E6=97=B6?= =?UTF-8?q?=E5=80=99Excel=E8=A1=A8=E4=B8=AD=E6=9C=89=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=8C=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index dcba68e0..15612b9a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -229,6 +229,10 @@ public class ExcelUtil { // 从第2行开始取数据,默认第一行是表头. Row row = sheet.getRow(i); + if(row == null) + { + continue; + } T entity = null; for (Map.Entry entry : fieldsMap.entrySet()) { From ec627704b2793a02d176f177a88a244ba4f53495 Mon Sep 17 00:00:00 2001 From: "yuhong0206@sina.cn" Date: Mon, 29 Mar 2021 08:58:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 15612b9a..dcba68e0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -229,10 +229,6 @@ public class ExcelUtil { // 从第2行开始取数据,默认第一行是表头. Row row = sheet.getRow(i); - if(row == null) - { - continue; - } T entity = null; for (Map.Entry entry : fieldsMap.entrySet()) { From 9b9c1b999fe0b1e21c038a1d5227609071fd7aa4 Mon Sep 17 00:00:00 2001 From: "yuhong0206@sina.cn" Date: Mon, 29 Mar 2021 09:00:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=BB=E5=8F=96excel=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20if(row=20=3D=3D=20null)=20{=20=20=20=20=20continue;=20}=20?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=80=82=E9=98=B2=E6=AD=A2=E6=9C=89=E6=97=B6?= =?UTF-8?q?=E5=80=99Excel=E8=A1=A8=E4=B8=AD=E6=9C=89=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=8C=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index dcba68e0..15612b9a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -229,6 +229,10 @@ public class ExcelUtil { // 从第2行开始取数据,默认第一行是表头. Row row = sheet.getRow(i); + if(row == null) + { + continue; + } T entity = null; for (Map.Entry entry : fieldsMap.entrySet()) { From 347f36ceff777b252bda45229cee54bf12a31aeb Mon Sep 17 00:00:00 2001 From: wangyuanyang Date: Mon, 29 Mar 2021 10:17:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:RepeatedlyRequestWrapper.ServletInputSt?= =?UTF-8?q?ream=20=E5=AE=9E=E7=8E=B0available=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/filter/RepeatedlyRequestWrapper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java index 9ad6f494..0c011e25 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java @@ -67,6 +67,11 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { } + + @Override + public int available() throws IOException { + return body.length; + } }; } } From 6ca7870393b0be1e9088bf9e0d5bd1e68901e689 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 30 Mar 2021 15:30:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/filter/RepeatedlyRequestWrapper.java | 14 ++++++-------- .../java/com/ruoyi/common/utils/StringUtils.java | 2 +- .../com/ruoyi/common/utils/html/EscapeUtil.java | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java index 0c011e25..caacba63 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java @@ -38,18 +38,21 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper @Override public ServletInputStream getInputStream() throws IOException { - final ByteArrayInputStream bais = new ByteArrayInputStream(body); - return new ServletInputStream() { - @Override public int read() throws IOException { return bais.read(); } + @Override + public int available() throws IOException + { + return body.length; + } + @Override public boolean isFinished() { @@ -67,11 +70,6 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { } - - @Override - public int available() throws IOException { - return body.length; - } }; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java index 36b3e098..1f0d0725 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -312,7 +312,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils } /** - * 下划线转驼峰命名 + * 驼峰转下划线命名 */ public static String toUnderScoreCase(String str) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java index 121681b4..65fd7920 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java @@ -22,7 +22,7 @@ public class EscapeUtil // special HTML characters TEXT['\''] = "'".toCharArray(); // 单引号 - TEXT['"'] = """.toCharArray(); // 单引号 + TEXT['"'] = """.toCharArray(); // 双引号 TEXT['&'] = "&".toCharArray(); // &符 TEXT['<'] = "<".toCharArray(); // 小于号 TEXT['>'] = ">".toCharArray(); // 大于号