diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 90e93f28..8761f8ad 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -397,4 +397,8 @@ ALTER TABLE sys_user_agent MODIFY COLUMN `sys_org_code` varchar(64) NULL COMMENT ALTER TABLE sys_user MODIFY COLUMN `type_id` varchar(64) NULL COMMENT '人员类型,000正式员工、002外部用户、001劳务工等'; -- 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 + MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`; + +-- 2024-09-19 市场法规清单-标准添加排序号字段 +ALTER TABLE `laws_market_standard_detail` + ADD COLUMN `order_no` float NULL COMMENT '排序号'; diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index bf7091f5..677423b7 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 - + + + + + + @@ -222,8 +222,21 @@ commons-codec commons-codec + + xerces + xercesImpl + + + commons-compress + org.apache.commons + + + org.apache.commons + commons-compress + 1.26.0 + 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){ diff --git a/laws-base/laws-base-tools/pom.xml b/laws-base/laws-base-tools/pom.xml index 3f4b5fd3..59ea7f02 100644 --- a/laws-base/laws-base-tools/pom.xml +++ b/laws-base/laws-base-tools/pom.xml @@ -15,13 +15,38 @@ 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 spring-boot-starter-data-redis + + + netty-codec + io.netty + + + + io.netty + netty-codec + 4.1.94.Final + + org.apache.commons commons-pool2 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; - } -} diff --git a/laws-modules/pom.xml b/laws-modules/pom.xml index 772aa121..788bd6e6 100644 --- a/laws-modules/pom.xml +++ b/laws-modules/pom.xml @@ -39,6 +39,19 @@ mybatis org.mybatis + + org.apache.commons + commons-email + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-web + + @@ -102,6 +115,17 @@ 2.2.3 jdk15 + + + commons-collections + commons-collections + + + + + + commons-beanutils + commons-beanutils org.springframework diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index 418d338c..98574c2b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -304,7 +304,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,data.getManifestId()); - queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getId); + queryLawsMarketStandardDetail.orderByAsc(LawsMarketStandardDetail::getOrderNo); + queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getCreateTime); List listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail); if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ data.setList(listLawsMarketStandardDetail); 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; } 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 f7461304..c0012a61 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 @@ -1614,6 +1614,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/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 @@