From 37c532941eef135557b14b410ef1c9c68cc9132f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:29:15 +0800 Subject: [PATCH 01/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E6=B2=A1=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-module-system/pom.xml | 23 +++++--- .../jimureport/JimuReportTokenService.java | 56 ------------------- 2 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 laws-module-system/src/main/java/com/jero/config/jimureport/JimuReportTokenService.java diff --git a/laws-module-system/pom.xml b/laws-module-system/pom.xml index 7f23d8c1..ca924543 100644 --- a/laws-module-system/pom.xml +++ b/laws-module-system/pom.xml @@ -41,16 +41,21 @@ jero-system-local-api + + + + + + + + + + + - com.jimureport - spring-boot-starter-jimureport - 1.2.0 - - - autopoi-web - org.jeecgframework - - + org.apache.poi + ooxml-schemas + 1.4 com.github.stuxuhai diff --git a/laws-module-system/src/main/java/com/jero/config/jimureport/JimuReportTokenService.java b/laws-module-system/src/main/java/com/jero/config/jimureport/JimuReportTokenService.java deleted file mode 100644 index 989f8c3f..00000000 --- a/laws-module-system/src/main/java/com/jero/config/jimureport/JimuReportTokenService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jero.config.jimureport; - -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.system.vo.SysUserCacheInfo; -import com.jero.common.util.RedisUtil; -import com.jero.common.util.TokenUtils; -import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - -/** - * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制) - * * 1.自定义获取登录token - * * 2.自定义获取登录用户 - */ -class JimuReportTokenService implements JmReportTokenServiceI { - @Autowired - private ISysBaseAPI sysBaseAPI; - @Autowired - @Lazy - private RedisUtil redisUtil; - - @Override - public String getToken(HttpServletRequest request) { - return TokenUtils.getTokenByRequest(request); - } - - @Override - public String getUsername(String token) { - return JwtUtil.getUsername(token); - } - - @Override - public Boolean verifyToken(String token) { - return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil); - } - - @Override - public Map getUserInfo(String token) { - String username = JwtUtil.getUsername(token); - //此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义 - SysUserCacheInfo userInfo = sysBaseAPI.getCacheUser(username); - Map map = new HashMap<>(); - //设置账号名 - map.put(SYS_USER_CODE, userInfo.getSysUserCode()); - //设置部门编码 - map.put(SYS_ORG_CODE, userInfo.getSysOrgCode()); - // 将所有信息存放至map 解析sql/api会根据map的键值解析 - return map; - } -} From 889f29c028bccd97e13acdcff92d956a07105ca6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:33:15 +0800 Subject: [PATCH 02/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7fastjson=E7=89=88=E6=9C=AC=E5=88=B01.2.83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26388da9..d5eaefce 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ Hoxton.SR8 2.2.3.RELEASE 2.2.0 - 1.2.75 + 1.2.83 3.0.3 2.0.9 42.2.6 From 3738a14384c3b848145013d19706fa369dd01c1d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:34:32 +0800 Subject: [PATCH 03/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7log4j2=E7=89=88=E6=9C=AC=E5=88=B02.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5eaefce..66a5dd22 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.3.4 1.6.1 7.4.0 - 2.15.0 + 2.17.1 6.0.0 9.0.82 From be5ac5f8bb64ce6dfea6c1831663a830ec3cb9e5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:36:25 +0800 Subject: [PATCH 04/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4commons-collections-3.2.jar=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=BF=87=E4=BD=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-modules/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/laws-modules/pom.xml b/laws-modules/pom.xml index 772aa121..702cd42d 100644 --- a/laws-modules/pom.xml +++ b/laws-modules/pom.xml @@ -102,6 +102,17 @@ 2.2.3 jdk15 + + + commons-collections + commons-collections + + + + + + commons-beanutils + commons-beanutils org.springframework From 435a4e5aeab55ec0d0d8c888c820b7d82fba07a2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:37:10 +0800 Subject: [PATCH 05/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4commons-fileupload-1.4.jar=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 66a5dd22..132ed068 100644 --- a/pom.xml +++ b/pom.xml @@ -215,17 +215,17 @@ ${commons-beanutils.version} - - commons-fileupload - commons-fileupload - 1.4 - - - commons-io - commons-io - - - + + + + + + + + + + + From d25bdf72a44863ba4413bab59b1a1ad9098cf5fa Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:41:27 +0800 Subject: [PATCH 06/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4xercesimpl-2.9.1.jar=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-core/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index bf7091f5..6bb8011b 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -222,6 +222,10 @@ commons-codec commons-codec + + + + From 262362b6809ff48b839c51c8234f95436dc86c61 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:42:55 +0800 Subject: [PATCH 07/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-core/pom.xml | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index 6bb8011b..7f503cf6 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -152,26 +152,26 @@ runtime - - com.microsoft.sqlserver - sqljdbc4 - ${sqljdbc4.version} - runtime - + + + + + + - - com.oracle - ojdbc6 - ${ojdbc6.version} - runtime - + + + + + + - - org.postgresql - postgresql - ${postgresql.version} - runtime - + + + + + + From 831977d2d6c04e9800a70e5e6e0e6e252cce3b47 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:48:03 +0800 Subject: [PATCH 08/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4xercesimpl-2.9.1.jar=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-core/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index 7f503cf6..7a77d522 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -222,10 +222,10 @@ commons-codec commons-codec - - - - + + xerces + xercesImpl + From d61634e25b1f31f51384dac566f9e36ceb8744f6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 11:48:27 +0800 Subject: [PATCH 09/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4commons-email-1.4.jar=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-modules/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/laws-modules/pom.xml b/laws-modules/pom.xml index 702cd42d..82415e84 100644 --- a/laws-modules/pom.xml +++ b/laws-modules/pom.xml @@ -39,6 +39,10 @@ mybatis org.mybatis + + org.apache.commons + commons-email + From a85a023082cd0f244f55c5430302182385a59121 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 12:09:09 +0800 Subject: [PATCH 10/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4spring-security-core-5.3.5.release.jar,spring-security?= =?UTF-8?q?-web-5.3.5.release.jar=20=E6=B5=81=E7=A8=8B=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=8C=85=EF=BC=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=B2=A1=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-modules/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/laws-modules/pom.xml b/laws-modules/pom.xml index 82415e84..788bd6e6 100644 --- a/laws-modules/pom.xml +++ b/laws-modules/pom.xml @@ -43,6 +43,15 @@ org.apache.commons commons-email + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-web + + From af5a221530dd7c32c87f2d6a38c75e8880613835 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 12:16:46 +0800 Subject: [PATCH 11/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7shiro=E7=89=88=E6=9C=AC=E5=88=B01.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 132ed068..706b6931 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.6 2.1.0 3.11.2 - 1.8.0 + 1.10.0 3.11.0 3.1.0 1.3.6 From 3df1e8cc41ed554ba9bdce5ea138ab2e2e210ba6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 12:54:23 +0800 Subject: [PATCH 12/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7netty-codec-4.1.53.Final.jar=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=B04.1.94.Final?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-tools/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/laws-base/laws-base-tools/pom.xml b/laws-base/laws-base-tools/pom.xml index 3f4b5fd3..df35db4f 100644 --- a/laws-base/laws-base-tools/pom.xml +++ b/laws-base/laws-base-tools/pom.xml @@ -21,7 +21,19 @@ org.springframework.boot spring-boot-starter-data-redis + + + netty-codec + io.netty + + + + io.netty + netty-codec + 4.1.94.Final + + org.apache.commons commons-pool2 From 1bd0eb86bedaf5054340945d0dcf3421550c0712 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 12 Sep 2024 14:55:58 +0800 Subject: [PATCH 13/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7jackson-databind-2.11.3.jar=E7=89=88=E6=9C=AC=E5=88=B0?= =?UTF-8?q?2.14.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-tools/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/laws-base/laws-base-tools/pom.xml b/laws-base/laws-base-tools/pom.xml index df35db4f..59ea7f02 100644 --- a/laws-base/laws-base-tools/pom.xml +++ b/laws-base/laws-base-tools/pom.xml @@ -15,8 +15,21 @@ org.springframework.boot spring-boot-starter-web + + + jackson-databind + com.fasterxml.jackson.core + + true + + + com.fasterxml.jackson.core + jackson-databind + 2.14.2 + + org.springframework.boot From fa5de1c9c214ae8ce816df4ab334ed5835813fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 13 Sep 2024 11:11:39 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=BC=8F=E6=B4=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 5 +++++ .../jero/modules/split/common/FileUnZip.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 4bd74645..6cedf0c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1581,6 +1581,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PLEASE_UPLOAD_ZIP)); } + String contentType = file.getContentType(); + if (!contentType.contains("zip")) { + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PLEASE_UPLOAD_ZIP)); + } + Path path = Files.createTempDirectory("temp"); File saveDirectory = new File(path.toUri()); if (!saveDirectory.isDirectory()) { diff --git a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 04d24998..098f5de8 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -1,6 +1,9 @@ package com.jero.modules.split.common; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.LanguageEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.MessageUtils; import com.xkcoding.http.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.apache.tools.zip.ZipEntry; @@ -53,6 +56,9 @@ public class FileUnZip { // orgMkdirs = outPath.substring(0, outPath.lastIndexOf('/')); file.mkdirs(); }else{ + if (!isFileSafe(zipEntryName)) { + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR)); + } // orgMkdirs = outPath.substring(0, outPath.lastIndexOf('/')); } //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 @@ -77,6 +83,18 @@ public class FileUnZip { return orgMkdirs; } + private static boolean isFileSafe(String fileName) { + // 添加文件类型检查逻辑 + // 这里仅作为一个示例，实际应用中需要根据需要进行扩展 + String[] unsafeExtensions = {".exe", ".sh", ".bat", ".js"}; + for (String ext : unsafeExtensions) { + if (fileName.endsWith(ext)) { + return false; + } + } + return true; + } + /** * 解压zip文件 * 解决解压文件下有多个文件夹时，读不到orgMkdirs问题 From 79d6fdcce102520c08f1d4d3ecc70f2ad9a5121a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 13 Sep 2024 11:16:11 +0800 Subject: [PATCH 15/27] =?UTF-8?q?fix=E5=AE=89=E5=85=A8=20=E4=B8=8D?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=9A=84=E8=B7=A8=E6=BA=90=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=85=B1=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/filter/cors/CorsFilter.java | 2 +- .../src/main/java/com/jero/config/shiro/filters/JwtFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java index 3d553eb2..4910d02b 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java @@ -73,7 +73,7 @@ public class CorsFilter implements Filter { private void responseInfo(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletResponse httpServletResponse = (HttpServletResponse) response; - httpServletResponse.setHeader("Access-Control-Allow-Origin", ((HttpServletRequest) request).getHeader("Origin")); + httpServletResponse.setHeader("Access-Control-Allow-Origin", originIp); httpServletResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpServletResponse.setHeader("Access-Control-Allow-Methods", "POST,GET"); httpServletResponse.setHeader("Access-Control-Max-Age", "3600"); diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java index 0febf304..88a3b48e 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java @@ -28,7 +28,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { * 默认开启跨域设置（使用单体） * 微服务情况下，此属性设置为false */ - private boolean allowOrigin = true; + private boolean allowOrigin = false; public JwtFilter(){} public JwtFilter(boolean allowOrigin){ From d3f77b31014bba6d1dee99287a1a85ce130b9b46 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 14 Sep 2024 15:10:58 +0800 Subject: [PATCH 16/27] =?UTF-8?q?fix=20=E5=AE=89=E5=85=A8=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7commons-compress=E7=89=88=E6=9C=AC=E5=88=B01.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-core/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index 7a77d522..677423b7 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -226,8 +226,17 @@ xerces xercesImpl + + commons-compress + org.apache.commons + + + org.apache.commons + commons-compress + 1.26.0 + From 636555ff3eff1dbdec352831e8ae241c5f98af94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sat, 14 Sep 2024 17:44:22 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarFileCompareInfoServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index c3c35caa..1c6c3b63 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -26,6 +26,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.system.util.MyStringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -270,6 +271,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl wrapperItemList(List list, String infoId, Map menuMap, String leftOrRight) { List resList = new ArrayList<>(); + List resNullList = new ArrayList<>(); for (SarFileSplitItemsEO itemsEO : list) { SarFileCompareItem item = new SarFileCompareItem(); item.setInfoId(infoId); @@ -277,15 +279,23 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl!Objects.isNull(o.getItemsDisplayNum())).collect(Collectors.toList()); + } + if(!CollectionUtils.isEmpty(resNullList)){ + resList.addAll(resNullList); } - Collections.sort(resList, Comparator.comparingInt(SarFileCompareItem::getItemsDisplayNum)); return resList; } From c15ea897653d170bef1560f76c4a28cbf87615e7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 18 Sep 2024 17:49:03 +0800 Subject: [PATCH 18/27] =?UTF-8?q?fix:=2089973=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=88=E9=AB=98=E7=BA=A7=E7=BB=8F=E7=90=86/=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E5=AE=98=E6=89=B9=E5=87=86=EF=BC=89=20--=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E8=8A=82=E7=82=B9=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=A4=AA=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index d6c3fe4a..29e4ac72 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -377,3 +377,7 @@ ALTER TABLE `sar_file_split_info` ALTER TABLE `laws_evaluation_not_met_library` ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`, ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`; + +-- 2024-09-18 增加法规符合性评估库适用市场字段长度 +ALTER TABLE `laws_conformity_assessment_library` + MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`; \ No newline at end of file From c66ecc84de810e603d42fb983dd45438ac27bfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 19 Sep 2024 14:11:25 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=8F=91=E5=B8=83=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/documenttool/mapper/xml/DocumentSplitMapper.xml | 2 +- .../service/impl/DocumentSplitServiceImpl.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 285b2043..b042d378 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -320,7 +320,7 @@