作者 RuoYi

升级oshi到最新版本6.3.2

@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version> 25 <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
26 <pagehelper.boot.version>1.4.5</pagehelper.boot.version> 26 <pagehelper.boot.version>1.4.5</pagehelper.boot.version>
27 <fastjson.version>2.0.16</fastjson.version> 27 <fastjson.version>2.0.16</fastjson.version>
28 - <oshi.version>6.3.0</oshi.version> 28 + <oshi.version>6.3.2</oshi.version>
29 <commons.io.version>2.11.0</commons.io.version> 29 <commons.io.version>2.11.0</commons.io.version>
30 <commons.fileupload.version>1.4</commons.fileupload.version> 30 <commons.fileupload.version>1.4</commons.fileupload.version>
31 <commons.collections.version>3.2.2</commons.collections.version> 31 <commons.collections.version>3.2.2</commons.collections.version>
@@ -71,11 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService @@ -71,11 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService
71 public List<SysDept> buildDeptTree(List<SysDept> depts) 71 public List<SysDept> buildDeptTree(List<SysDept> depts)
72 { 72 {
73 List<SysDept> returnList = new ArrayList<SysDept>(); 73 List<SysDept> returnList = new ArrayList<SysDept>();
74 - List<Long> tempList = new ArrayList<Long>();  
75 - for (SysDept dept : depts)  
76 - {  
77 - tempList.add(dept.getDeptId());  
78 - } 74 + List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
79 for (SysDept dept : depts) 75 for (SysDept dept : depts)
80 { 76 {
81 // 如果是顶级节点, 遍历该父节点的所有子节点 77 // 如果是顶级节点, 遍历该父节点的所有子节点
@@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService @@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService
223 public List<SysMenu> buildMenuTree(List<SysMenu> menus) 223 public List<SysMenu> buildMenuTree(List<SysMenu> menus)
224 { 224 {
225 List<SysMenu> returnList = new ArrayList<SysMenu>(); 225 List<SysMenu> returnList = new ArrayList<SysMenu>();
226 - List<Long> tempList = new ArrayList<Long>();  
227 - for (SysMenu dept : menus)  
228 - {  
229 - tempList.add(dept.getMenuId());  
230 - } 226 + List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
231 for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();) 227 for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
232 { 228 {
233 SysMenu menu = (SysMenu) iterator.next(); 229 SysMenu menu = (SysMenu) iterator.next();
@@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService @@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService
479 /** 475 /**
480 * 递归列表 476 * 递归列表
481 * 477 *
482 - * @param list  
483 - * @param t 478 + * @param list 分类表
  479 + * @param t 子节点
484 */ 480 */
485 private void recursionFn(List<SysMenu> list, SysMenu t) 481 private void recursionFn(List<SysMenu> list, SysMenu t)
486 { 482 {
@@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService @@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService
525 /** 521 /**
526 * 内链域名特殊字符替换 522 * 内链域名特殊字符替换
527 * 523 *
528 - * @return 524 + * @return 替换后的内链域名
529 */ 525 */
530 public String innerLinkReplaceEach(String path) 526 public String innerLinkReplaceEach(String path)
531 { 527 {