mirror of https://github.com/elunez/eladmin
[代码完善](v2.5): v2.5 beta 更新系统部分依赖
Closes #350 2.5 Beta 详情:https://www.ydyno.com/archives/1225.htmlpull/372/head
parent
d1777411bf
commit
48570fcb7f
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<properties>
|
<properties>
|
||||||
<hutool.version>5.0.6</hutool.version>
|
<hutool.version>5.3.4</hutool.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<artifactId>eladmin-common</artifactId>
|
<artifactId>eladmin-common</artifactId>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<name>核心模块</name>
|
<name>核心模块</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<jjwt.version>0.10.6</jjwt.version>
|
<jjwt.version>0.11.1</jjwt.version>
|
||||||
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
|
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
|
||||||
<jna.version>5.5.0</jna.version>
|
<jna.version>5.5.0</jna.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.oshi</groupId>
|
<groupId>com.github.oshi</groupId>
|
||||||
<artifactId>oshi-core</artifactId>
|
<artifactId>oshi-core</artifactId>
|
||||||
<version>4.7.1</version>
|
<version>5.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
@ -43,6 +43,7 @@ import java.util.concurrent.*;
|
||||||
* @date 2019-01-07
|
* @date 2019-01-07
|
||||||
*/
|
*/
|
||||||
@Async
|
@Async
|
||||||
|
@SuppressWarnings({"unchecked","all"})
|
||||||
public class ExecutionJob extends QuartzJobBean {
|
public class ExecutionJob extends QuartzJobBean {
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||||
|
|
|
@ -76,8 +76,9 @@ public class TokenProvider implements InitializingBean {
|
||||||
}
|
}
|
||||||
|
|
||||||
Authentication getAuthentication(String token) {
|
Authentication getAuthentication(String token) {
|
||||||
Claims claims = Jwts.parser()
|
Claims claims = Jwts.parserBuilder()
|
||||||
.setSigningKey(key)
|
.setSigningKey(key)
|
||||||
|
.build()
|
||||||
.parseClaimsJws(token)
|
.parseClaimsJws(token)
|
||||||
.getBody();
|
.getBody();
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class MenuServiceImpl implements MenuService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Cacheable(key = "#p0")
|
@Cacheable
|
||||||
public List<MenuDto> findByRoles(List<RoleSmallDto> roles) {
|
public List<MenuDto> findByRoles(List<RoleSmallDto> roles) {
|
||||||
Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());
|
Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());
|
||||||
LinkedHashSet<Menu> menus = menuRepository.findByRoles_IdInAndTypeNotOrderByMenuSortAsc(roleIds, 2);
|
LinkedHashSet<Menu> menus = menuRepository.findByRoles_IdInAndTypeNotOrderByMenuSortAsc(roleIds, 2);
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class MonitorServiceImpl implements MonitorService {
|
||||||
private Map<String,Object> getDiskInfo(OperatingSystem os) {
|
private Map<String,Object> getDiskInfo(OperatingSystem os) {
|
||||||
Map<String,Object> diskInfo = new LinkedHashMap<>();
|
Map<String,Object> diskInfo = new LinkedHashMap<>();
|
||||||
FileSystem fileSystem = os.getFileSystem();
|
FileSystem fileSystem = os.getFileSystem();
|
||||||
OSFileStore[] fsArray = fileSystem.getFileStores();
|
List<OSFileStore> fsArray = fileSystem.getFileStores();
|
||||||
for (OSFileStore fs : fsArray){
|
for (OSFileStore fs : fsArray){
|
||||||
diskInfo.put("total", fs.getTotalSpace() > 0 ? FileUtil.getSize(fs.getTotalSpace()) : "?");
|
diskInfo.put("total", fs.getTotalSpace() > 0 ? FileUtil.getSize(fs.getTotalSpace()) : "?");
|
||||||
long used = fs.getTotalSpace() - fs.getUsableSpace();
|
long used = fs.getTotalSpace() - fs.getUsableSpace();
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
<name>工具模块</name>
|
<name>工具模块</name>
|
||||||
|
|
||||||
<properties>
|
<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>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -40,7 +40,6 @@ import java.util.Optional;
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@CacheConfig(cacheNames = "alipay")
|
@CacheConfig(cacheNames = "alipay")
|
||||||
@SuppressWarnings("all")
|
|
||||||
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
|
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
|
||||||
public class AliPayServiceImpl implements AliPayService {
|
public class AliPayServiceImpl implements AliPayService {
|
||||||
|
|
||||||
|
|
7
pom.xml
7
pom.xml
|
@ -30,13 +30,12 @@
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<jedis.version>2.9.0</jedis.version>
|
|
||||||
<log4jdbc.version>1.16</log4jdbc.version>
|
<log4jdbc.version>1.16</log4jdbc.version>
|
||||||
<swagger.version>2.9.2</swagger.version>
|
<swagger.version>2.9.2</swagger.version>
|
||||||
<fastjson.version>1.2.68</fastjson.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>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -201,7 +200,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.bitwalker</groupId>
|
<groupId>eu.bitwalker</groupId>
|
||||||
<artifactId>UserAgentUtils</artifactId>
|
<artifactId>UserAgentUtils</artifactId>
|
||||||
<version>1.20</version>
|
<version>1.21</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue