From 48570fcb7fda88665b7faf1223af50b8e806826b Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Tue, 12 May 2020 17:10:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?= =?UTF-8?q?=20v2.5=20beta=20=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #350 2.5 Beta 详情：https://www.ydyno.com/archives/1225.html --- eladmin-common/pom.xml | 2 +- eladmin-system/pom.xml | 4 ++-- .../me/zhengjie/modules/quartz/utils/ExecutionJob.java | 1 + .../zhengjie/modules/security/security/TokenProvider.java | 3 ++- .../modules/system/service/impl/MenuServiceImpl.java | 2 +- .../modules/system/service/impl/MonitorServiceImpl.java | 2 +- eladmin-tools/pom.xml | 4 ++-- .../java/me/zhengjie/service/impl/AliPayServiceImpl.java | 1 - pom.xml | 7 +++---- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml index 1d4b5f77..fe766923 100644 --- a/eladmin-common/pom.xml +++ b/eladmin-common/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - 5.0.6 + 5.3.4 eladmin-common diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index ec1c0a0c..a782e023 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -13,7 +13,7 @@ 核心模块 - 0.10.6 + 0.11.1 5.5.0 @@ -84,7 +84,7 @@ com.github.oshi oshi-core - 4.7.1 + 5.0.1 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java index c8224ca9..c79488ab 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java @@ -43,6 +43,7 @@ import java.util.concurrent.*; * @date 2019-01-07 */ @Async +@SuppressWarnings({"unchecked","all"}) public class ExecutionJob extends QuartzJobBean { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java index 8e21b3af..1c2e7267 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java @@ -76,8 +76,9 @@ public class TokenProvider implements InitializingBean { } Authentication getAuthentication(String token) { - Claims claims = Jwts.parser() + Claims claims = Jwts.parserBuilder() .setSigningKey(key) + .build() .parseClaimsJws(token) .getBody(); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index 3f43f8c2..ee1386f1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -92,7 +92,7 @@ public class MenuServiceImpl implements MenuService { } @Override - @Cacheable(key = "#p0") + @Cacheable public List findByRoles(List roles) { Set roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet()); LinkedHashSet menus = menuRepository.findByRoles_IdInAndTypeNotOrderByMenuSortAsc(roleIds, 2); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java index 31c11f61..0d2aea58 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java @@ -72,7 +72,7 @@ public class MonitorServiceImpl implements MonitorService { private Map getDiskInfo(OperatingSystem os) { Map diskInfo = new LinkedHashMap<>(); FileSystem fileSystem = os.getFileSystem(); - OSFileStore[] fsArray = fileSystem.getFileStores(); + List fsArray = fileSystem.getFileStores(); for (OSFileStore fs : fsArray){ diskInfo.put("total", fs.getTotalSpace() > 0 ? FileUtil.getSize(fs.getTotalSpace()) : "?"); long used = fs.getTotalSpace() - fs.getUsableSpace(); diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index a4d6b778..4218b531 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -13,9 +13,9 @@ 工具模块 - 1.4.7 + 1.5.0-b01 [7.2.0, 7.2.99] - 3.1.0 + 4.9.153.ALL diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java index b035ee04..00e31c8b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java @@ -40,7 +40,6 @@ import java.util.Optional; @Service @RequiredArgsConstructor @CacheConfig(cacheNames = "alipay") -@SuppressWarnings("all") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class AliPayServiceImpl implements AliPayService { diff --git a/pom.xml b/pom.xml index c9bcbabd..95cc8ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -30,13 +30,12 @@ UTF-8 UTF-8 1.8 - 2.9.0 1.16 2.9.2 1.2.68 - 1.1.14 + 1.1.22 2.5.0 - 1.2.0.Final + 1.3.1.Final @@ -201,7 +200,7 @@ eu.bitwalker UserAgentUtils - 1.20 + 1.21