⚡ 升级依赖

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -23,7 +23,6 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.dto.MenuDTO;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.service.IMenuService;
@@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -154,10 +152,7 @@ public class MenuController extends BladeController {
 	@GetMapping("auth-routes")
 	@ApiOperation(value = "菜单的角色权限", position = 8)
 	public R<List<Kv>> authRoutes(BladeUser user) {
-		List<Kv> list = new ArrayList<>();
-		List<MenuDTO> routes = menuService.authRoutes(Func.toIntList(user.getRoleId()));
-		routes.forEach(route -> list.add(Kv.init().set(route.getPath(), Kv.init().set("authority", Func.toStrArray(route.getAlias())))));
-		return R.data(list);
+		return R.data(menuService.authRoutes(user));
 	}
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java

@@ -17,7 +17,8 @@ package org.springblade.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.system.dto.MenuDTO;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.support.Kv;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.vo.MenuVO;
 
@@ -80,9 +81,9 @@ public interface IMenuService extends IService<Menu> {
 
 	/**
 	 * 获取配置的角色权限
-	 * @param roleIds
+	 * @param user
 	 * @return
 	 */
-	List<MenuDTO> authRoutes(List<Integer> roleIds);
+	List<Kv> authRoutes(BladeUser user);
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -19,7 +19,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.node.ForestNodeMerger;
+import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.dto.MenuDTO;
 import org.springblade.system.entity.Menu;
@@ -31,10 +33,7 @@ import org.springblade.system.vo.MenuVO;
 import org.springblade.system.wrapper.MenuWrapper;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -98,8 +97,14 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<MenuDTO> authRoutes(List<Integer> roleIds) {
-		return baseMapper.authRoutes(roleIds);
+	public List<Kv> authRoutes(BladeUser user) {
+		if (Func.isEmpty(user)) {
+			return null;
+		}
+		List<MenuDTO> routes = baseMapper.authRoutes(Func.toIntList(user.getRoleId()));
+		List<Kv> list = new ArrayList<>();
+		routes.forEach(route -> list.add(Kv.init().set(route.getPath(), Kv.init().set("authority", Func.toStrArray(route.getAlias())))));
+		return list;
 	}
 
 }

doc/nacos/blade.yaml

@@ -18,10 +18,10 @@ spring:
 
 #feign配置
 feign:
-  #hystrix:
-    #enabled: true
-  sentinel:
+  hystrix:
     enabled: true
+  #sentinel:
+    #enabled: true
   okhttp:
     enabled: true
   httpclient:
@@ -39,7 +39,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 720000
+            timeoutInMilliseconds: 5000
 
 #ribbon配置
 ribbon:

pom.xml

@@ -9,13 +9,13 @@
     <packaging>pom</packaging>
 
     <properties>
-        <blade.tool.version>2.0.1</blade.tool.version>
+        <blade.tool.version>2.0.2</blade.tool.version>
         <blade.project.version>2.0.0</blade.project.version>
 
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>
         <swagger.models.version>1.5.21</swagger.models.version>
-        <swagger.bootstrapui.version>1.8.8</swagger.bootstrapui.version>
+        <swagger.bootstrapui.version>1.8.9</swagger.bootstrapui.version>
         <mybatis.plus.version>3.0.7.1</mybatis.plus.version>
         <curator.framework.version>4.0.1</curator.framework.version>
         <protostuff.version>1.6.0</protostuff.version>