升级oshi到最新版本6.3.2
This commit is contained in:
parent
9aae863ce3
commit
3b8a68c4cf
2
pom.xml
2
pom.xml
|
@ -25,7 +25,7 @@
|
||||||
<mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
|
<mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
|
||||||
<pagehelper.boot.version>1.4.5</pagehelper.boot.version>
|
<pagehelper.boot.version>1.4.5</pagehelper.boot.version>
|
||||||
<fastjson.version>2.0.16</fastjson.version>
|
<fastjson.version>2.0.16</fastjson.version>
|
||||||
<oshi.version>6.3.0</oshi.version>
|
<oshi.version>6.3.2</oshi.version>
|
||||||
<commons.io.version>2.11.0</commons.io.version>
|
<commons.io.version>2.11.0</commons.io.version>
|
||||||
<commons.fileupload.version>1.4</commons.fileupload.version>
|
<commons.fileupload.version>1.4</commons.fileupload.version>
|
||||||
<commons.collections.version>3.2.2</commons.collections.version>
|
<commons.collections.version>3.2.2</commons.collections.version>
|
||||||
|
|
|
@ -71,11 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService
|
||||||
public List<SysDept> buildDeptTree(List<SysDept> depts)
|
public List<SysDept> buildDeptTree(List<SysDept> depts)
|
||||||
{
|
{
|
||||||
List<SysDept> returnList = new ArrayList<SysDept>();
|
List<SysDept> returnList = new ArrayList<SysDept>();
|
||||||
List<Long> tempList = new ArrayList<Long>();
|
List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
|
||||||
for (SysDept dept : depts)
|
|
||||||
{
|
|
||||||
tempList.add(dept.getDeptId());
|
|
||||||
}
|
|
||||||
for (SysDept dept : depts)
|
for (SysDept dept : depts)
|
||||||
{
|
{
|
||||||
// 如果是顶级节点, 遍历该父节点的所有子节点
|
// 如果是顶级节点, 遍历该父节点的所有子节点
|
||||||
|
|
|
@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
||||||
public List<SysMenu> buildMenuTree(List<SysMenu> menus)
|
public List<SysMenu> buildMenuTree(List<SysMenu> menus)
|
||||||
{
|
{
|
||||||
List<SysMenu> returnList = new ArrayList<SysMenu>();
|
List<SysMenu> returnList = new ArrayList<SysMenu>();
|
||||||
List<Long> tempList = new ArrayList<Long>();
|
List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
|
||||||
for (SysMenu dept : menus)
|
|
||||||
{
|
|
||||||
tempList.add(dept.getMenuId());
|
|
||||||
}
|
|
||||||
for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
|
for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
|
||||||
{
|
{
|
||||||
SysMenu menu = (SysMenu) iterator.next();
|
SysMenu menu = (SysMenu) iterator.next();
|
||||||
|
@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService
|
||||||
/**
|
/**
|
||||||
* 递归列表
|
* 递归列表
|
||||||
*
|
*
|
||||||
* @param list
|
* @param list 分类表
|
||||||
* @param t
|
* @param t 子节点
|
||||||
*/
|
*/
|
||||||
private void recursionFn(List<SysMenu> list, SysMenu t)
|
private void recursionFn(List<SysMenu> list, SysMenu t)
|
||||||
{
|
{
|
||||||
|
@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
||||||
/**
|
/**
|
||||||
* 内链域名特殊字符替换
|
* 内链域名特殊字符替换
|
||||||
*
|
*
|
||||||
* @return
|
* @return 替换后的内链域名
|
||||||
*/
|
*/
|
||||||
public String innerLinkReplaceEach(String path)
|
public String innerLinkReplaceEach(String path)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue