From f94b46fb588312e2730a7613f6723b75115e677c Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 21:17:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelist.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelist.md b/changelist.md index 85463e0..58ad6a3 100644 --- a/changelist.md +++ b/changelist.md @@ -1,3 +1,9 @@ +3.7.8 版本说明： + + 1、去除parent依赖关系 + 2、放弃使用fastjson统一使用jackson + 3、core优化 + 3.7.7 版本说明： 1、弃用rabbit-jedis From 823d5f044b992e6aa3ec481f54a4b299fc77843e Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 22:26:58 +0800 Subject: [PATCH 2/6] update --- pom.xml | 28 +++++++++++-------- rabbit-cache-pom/rabbit-redisson/pom.xml | 8 ++++++ .../rabbit-core-spring-boot-starter/pom.xml | 4 --- .../core/export/package-info.java | 1 - .../rabbit-web-spring-boot-starter/pom.xml | 4 --- 5 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 rabbit-core-pom/rabbit-core/src/main/java/com/scloudic/rabbitframework/core/export/package-info.java diff --git a/pom.xml b/pom.xml index 5c96474..1e22179 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.10.1 3.0.0-M1 3.0.0-M7 - 5.3.34 + 5.3.31 3.1.0 2.1 1.2 @@ -35,19 +35,19 @@ 2.6 1.9.4 1.1 - 1.10 + 1.17.0 1.2 - 2.8.0 + 2.16.1 3.1.1 3.1.3 2.3.29 1.2.17 8.0.33 3.4 - 5.2.0 + 5.2.5 4.1.2 1.1 - 2.3.0.0 + 2.5.3.1 6.0.17.Final 3.17.4 3.14.2 @@ -56,12 +56,13 @@ 2.7.18 2.3.1 3.25.0-GA - 3.0.5 + 3.3.4 3.2 1.7.36 2.15.1 2.17.2 2.0 + 1.12.10 rabbit-framework rabbit-framework @@ -86,6 +87,16 @@ + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + org.apache.logging.log4j log4j-api @@ -275,11 +286,6 @@ poi-ooxml-schemas ${poi-ooxml-schemas.version} - - org.apache.poi - poi-scratchpad - ${org.apache.poi.version} - org.apache.commons diff --git a/rabbit-cache-pom/rabbit-redisson/pom.xml b/rabbit-cache-pom/rabbit-redisson/pom.xml index ff6b52a..6c3a294 100644 --- a/rabbit-cache-pom/rabbit-redisson/pom.xml +++ b/rabbit-cache-pom/rabbit-redisson/pom.xml @@ -43,6 +43,14 @@ + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + de.ruedigermoeller fst diff --git a/rabbit-core-pom/rabbit-core-spring-boot-starter/pom.xml b/rabbit-core-pom/rabbit-core-spring-boot-starter/pom.xml index 113d208..75ad3b5 100644 --- a/rabbit-core-pom/rabbit-core-spring-boot-starter/pom.xml +++ b/rabbit-core-pom/rabbit-core-spring-boot-starter/pom.xml @@ -18,10 +18,6 @@ org.springframework.boot spring-boot-starter - - org.springframework.boot - spring-boot-starter-test - org.springframework.boot spring-boot-starter-log4j2 diff --git a/rabbit-core-pom/rabbit-core/src/main/java/com/scloudic/rabbitframework/core/export/package-info.java b/rabbit-core-pom/rabbit-core/src/main/java/com/scloudic/rabbitframework/core/export/package-info.java deleted file mode 100644 index 2387f5c..0000000 --- a/rabbit-core-pom/rabbit-core/src/main/java/com/scloudic/rabbitframework/core/export/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.scloudic.rabbitframework.core.export; \ No newline at end of file diff --git a/rabbit-web-pom/rabbit-web-spring-boot-starter/pom.xml b/rabbit-web-pom/rabbit-web-spring-boot-starter/pom.xml index ad087e3..d352efe 100644 --- a/rabbit-web-pom/rabbit-web-spring-boot-starter/pom.xml +++ b/rabbit-web-pom/rabbit-web-spring-boot-starter/pom.xml @@ -14,10 +14,6 @@ rabbit-web ${project.version} - - org.springframework.boot - spring-boot-starter-tomcat - org.springframework.boot spring-boot-starter From 3f12eeeca0fc51d69d47401120b6d352a9621d64 Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 22:33:32 +0800 Subject: [PATCH 3/6] update --- .../springboot/configure/SecurityFilterAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java b/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java index 5afa576..1f5d678 100644 --- a/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java +++ b/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java @@ -137,7 +137,7 @@ protected SecurityFilterFactoryBean rabbitSecurityFilterFactoryBean() throws Exc @Bean(name = "filterSecurityFilterRegistrationBean") @ConditionalOnMissingBean protected FilterRegistrationBean filterSecurityFilterRegistrationBean() throws Exception { - logger.debug("安全过滤器加载"); + logger.debug("security filter loading...."); FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); filterRegistrationBean.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.ERROR); From 045afbde9a4944117532faf8d7ad1a323a28df95 Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 22:33:50 +0800 Subject: [PATCH 4/6] update --- .../springboot/configure/SecurityFilterAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java b/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java index 1f5d678..0d0357d 100644 --- a/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java +++ b/rabbit-security-pom/rabbit-security-spring-boot-starter/src/main/java/com/scloudic/rabbitframework/security/springboot/configure/SecurityFilterAutoConfiguration.java @@ -137,7 +137,7 @@ protected SecurityFilterFactoryBean rabbitSecurityFilterFactoryBean() throws Exc @Bean(name = "filterSecurityFilterRegistrationBean") @ConditionalOnMissingBean protected FilterRegistrationBean filterSecurityFilterRegistrationBean() throws Exception { - logger.debug("security filter loading...."); + logger.info("security filter loading...."); FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); filterRegistrationBean.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.ERROR); From 8749e4b21351b87d0d13e9cfb895d32f30192830 Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 22:36:50 +0800 Subject: [PATCH 5/6] update --- .../xss/XssHttpServletRequestWrapper.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java index 619cc46..7f2dc68 100644 --- a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java +++ b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java @@ -46,29 +46,29 @@ public ServletInputStream getInputStream() throws IOException { //xss过滤 if (jsonFilter) { json = xssEncode(json); + final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); + return new ServletInputStream() { + @Override + public boolean isFinished() { + return true; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener readListener) { + } + + @Override + public int read() throws IOException { + return bis.read(); + } + }; } - final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); - return new ServletInputStream() { - @Override - public boolean isFinished() { - return true; - } - - @Override - public boolean isReady() { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - - @Override - public int read() throws IOException { - return bis.read(); - } - }; + return super.getInputStream(); } @Override From 89a3e2d8a0f4265901638da127488d6ce86df5bc Mon Sep 17 00:00:00 2001 From: liangjy <28554768@qq.com> Date: Sat, 4 May 2024 22:51:51 +0800 Subject: [PATCH 6/6] update --- .../xss/XssHttpServletRequestWrapper.java | 24 +++++-------------- .../rabbitframework/web/utils/WebUtils.java | 19 ++++++++------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java index 7f2dc68..eb4d124 100644 --- a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java +++ b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/filter/xss/XssHttpServletRequestWrapper.java @@ -36,15 +36,13 @@ public ServletInputStream getInputStream() throws IOException { if (!MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(super.getHeader(HttpHeaders.CONTENT_TYPE))) { return super.getInputStream(); } - - //为空，直接返回 - String json = IOUtils.toString(super.getInputStream(), "utf-8"); - if (StringUtils.isBlank(json)) { - return super.getInputStream(); - } - //xss过滤 if (jsonFilter) { + //为空，直接返回 + String json = IOUtils.toString(super.getInputStream(), "utf-8"); + if (StringUtils.isBlank(json)) { + return super.getInputStream(); + } json = xssEncode(json); final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); return new ServletInputStream() { @@ -175,17 +173,7 @@ private String xssEncode(String input) { public HttpServletRequest getOrgRequest() { return orgRequest; } - - /** - * 获取最原始的request - */ - public static HttpServletRequest getOrgRequest(HttpServletRequest request) { - if (request instanceof XssHttpServletRequestWrapper) { - return ((XssHttpServletRequestWrapper) request).getOrgRequest(); - } - return request; - } - + public void setJsonFilter(boolean jsonFilter) { this.jsonFilter = jsonFilter; } diff --git a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/utils/WebUtils.java b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/utils/WebUtils.java index d639441..0c2f46d 100644 --- a/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/utils/WebUtils.java +++ b/rabbit-web-pom/rabbit-web/src/main/java/com/scloudic/rabbitframework/web/utils/WebUtils.java @@ -1,7 +1,5 @@ package com.scloudic.rabbitframework.web.utils; -import javax.servlet.http.HttpServletRequest; - import com.scloudic.rabbitframework.core.utils.StringUtils; import com.scloudic.rabbitframework.web.filter.xss.XssHttpServletRequestWrapper; import org.slf4j.Logger; @@ -9,6 +7,7 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; +import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; public class WebUtils { @@ -59,15 +58,17 @@ public static HttpServletRequest getOrigRequest(HttpServletRequest request) { request = getRequest(); } if (request instanceof XssHttpServletRequestWrapper) { - request = XssHttpServletRequestWrapper.getOrgRequest(request); + request = ((XssHttpServletRequestWrapper) request).getOrgRequest(); } - try { - if (request.getClass().getName().equals("com.scloudic.rabbitframework.security.web.servlet.SecurityHttpServletRequest")) { - Method method = request.getClass().getMethod("getOrgRequest"); - request = (HttpServletRequest) method.invoke(request); + if (request == null) { + try { + if (request.getClass().getName().equals("com.scloudic.rabbitframework.security.web.servlet.SecurityHttpServletRequest")) { + Method method = request.getClass().getMethod("getOrgRequest"); + request = (HttpServletRequest) method.invoke(request); + } + } catch (Exception e) { + logger.error(e.getMessage(), e); } - } catch (Exception e) { - logger.error(e.getMessage(), e); } return request; }