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

Closes #350

2.5 Beta 详情:https://www.ydyno.com/archives/1225.html
pull/372/head
ZhengJie 2020-05-12 17:10:27 +08:00
parent d1777411bf
commit 48570fcb7f
9 changed files with 13 additions and 13 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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());

View File

@ -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();

View File

@ -92,7 +92,7 @@ public class MenuServiceImpl implements MenuService {
}
@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);

View File

@ -72,7 +72,7 @@ public class MonitorServiceImpl implements MonitorService {
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();

View File

@ -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>

View File

@ -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 {

View File

@ -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>