[代码完善](v2.5): v2.5 beta 更新系统部分依赖

elunez · elunez · commit 48570fcb7fda · 2020-05-12T17:10:27.000+08:00
Closes elunez#350 2.5 Beta 详情：https://www.ydyno.com/archives/1225.html
diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <hutool.version>5.0.6</hutool.version>
+        <hutool.version>5.3.4</hutool.version>
     </properties>
 
     <artifactId>eladmin-common</artifactId>
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
@@ -13,7 +13,7 @@
     <name>核心模块</name>
 
     <properties>
-        <jjwt.version>0.10.6</jjwt.version>
+        <jjwt.version>0.11.1</jjwt.version>
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.5.0</jna.version>
     </properties>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>4.7.1</version>
+            <version>5.0.1</version>
         </dependency>
 
     </dependencies>
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
@@ -43,6 +43,7 @@
  * @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
@@ -76,8 +76,9 @@ public String createToken(Authentication authentication) {
    }
 
    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
@@ -92,7 +92,7 @@ public MenuDto findById(long id) {
     }
 
     @Override
-    @Cacheable(key = "#p0")
+    @Cacheable
     public List<MenuDto> findByRoles(List<RoleSmallDto> roles) {
         Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());
         LinkedHashSet<Menu> 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
@@ -72,7 +72,7 @@ public Map<String,Object> getServers(){
     private Map<String,Object> getDiskInfo(OperatingSystem os) {
         Map<String,Object> diskInfo = new LinkedHashMap<>();
         FileSystem fileSystem = os.getFileSystem();
-        OSFileStore[] fsArray = fileSystem.getFileStores();
+        List<OSFileStore> 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
@@ -13,9 +13,9 @@
     <name>工具模块</name>
 
     <properties>
-        <mail.version>1.4.7</mail.version>
+        <mail.version>1.5.0-b01</mail.version>
         <qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
-        <alipay.version>3.1.0</alipay.version>
+        <alipay.version>4.9.153.ALL</alipay.version>
     </properties>
 
     <dependencies>
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
@@ -40,7 +40,6 @@
 @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
@@ -30,13 +30,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <jedis.version>2.9.0</jedis.version>
         <log4jdbc.version>1.16</log4jdbc.version>
         <swagger.version>2.9.2</swagger.version>
         <fastjson.version>1.2.68</fastjson.version>
-        <druid.version>1.1.14</druid.version>
+        <druid.version>1.1.22</druid.version>
         <commons-pool2.version>2.5.0</commons-pool2.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <mapstruct.version>1.3.1.Final</mapstruct.version>
     </properties>
 
     <dependencies>
@@ -201,7 +200,7 @@
         <dependency>
             <groupId>eu.bitwalker</groupId>
             <artifactId>UserAgentUtils</artifactId>
-            <version>1.20</version>
+            <version>1.21</version>
         </dependency>
     </dependencies>
 

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,9 @@ public String createToken(Authentication authentication) {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`Authentication getAuthentication(String token) {`
`79`		`- Claims claims = Jwts.parser()`
	`79`	`+ Claims claims = Jwts.parserBuilder()`
`80`	`80`	`.setSigningKey(key)`
	`81`	`+ .build()`
`81`	`82`	`.parseClaimsJws(token)`
`82`	`83`	`.getBody();`
`83`	`84`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public MenuDto findById(long id) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- @Cacheable(key = "#p0")`
	`95`	`+ @Cacheable`
`96`	`96`	`public List<MenuDto> findByRoles(List<RoleSmallDto> roles) {`
`97`	`97`	`Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());`
`98`	`98`	`LinkedHashSet<Menu> menus = menuRepository.findByRoles_IdInAndTypeNotOrderByMenuSortAsc(roleIds, 2);`