首页修改

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -41,6 +41,8 @@ public interface LauncherConstant {
 	 * nacos dev 地址
 	 */
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
+//内网
+//	String NACOS_DEV_ADDR = "192.168.1.218:8848";
 
 	/**
 	 * nacos prod 地址

blade-ops/blade-resource/src/main/resources/application.yml

@@ -7,7 +7,7 @@ oss:
   enabled: true
   name: minio
   tenant-mode: true
-  endpoint: http://127.0.0.1:9000
+  endpoint: http://192.168.1.218:9000
   access-key: D99KGE6ZTQXSATTJWU24
   secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
-  bucket-name: bladex
+  bucket-name: cyzh

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -66,7 +66,7 @@ public interface ISysClient {
 	String PARAM_VALUE = API_PREFIX + "/param-value";
 	String REGION = API_PREFIX + "/region";
 	String MENU_LAZY_LIST = API_PREFIX + "/getMenuLazyList";
-	String MENU_ROUTES = API_PREFIX + "/routes";
+	String MENU_CUSTOM_ROUTES = API_PREFIX + "/getCustomRoutes";
 
 	/**
 	 * 获取菜单
@@ -273,7 +273,7 @@ public interface ISysClient {
 	/**
 	 * 前端菜单数据
 	 */
-//	@PostMapping(MENU_ROUTES)
-//	List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId);
+	@PostMapping(MENU_CUSTOM_ROUTES)
+	List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId);
 
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -143,10 +143,10 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
-//	@Override
-//	public List<MenuVO> getCustomRoutes(BladeUser user, Long topMenuId) {
-//		return null;
-//	}
+	@Override
+	public List<MenuVO> getCustomRoutes(BladeUser user, Long topMenuId) {
+		return null;
+	}
 
 
 }

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

@@ -182,6 +182,17 @@ public class MenuController extends BladeController {
 		return R.data(list);
 	}
 
+	/**
+	 * 前端菜单数据
+	 */
+	@GetMapping("/getCustomRoutes")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
+	public List<MenuVO> getCustomRoutes(BladeUser user, Long topMenuId) {
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
+		return list;
+	}
+
 	/**
 	 * 前端按钮数据
 	 */

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -186,12 +186,12 @@ public class SysClient implements ISysClient {
 	/**
 	 * 前端菜单数据
 	 */
-//	@Override
-//	@PostMapping(MENU_ROUTES)
-//	public List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId) {
-//		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
-//		return list;
-//	}
+	@Override
+	@PostMapping(MENU_CUSTOM_ROUTES)
+	public List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId) {
+		List<MenuVO> list = menuService.getCustomRoutes((user == null) ? null : user.getRoleId(), topMenuId);
+		return list;
+	}
 
 
 }

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

@@ -59,6 +59,10 @@ public interface IMenuService extends IService<Menu> {
 	 */
 	List<MenuVO> routes(String roleId, Long topMenuId);
 
+
+	//首页常用菜单
+	List<MenuVO> getCustomRoutes(String roleId, Long topMenuId);
+
 	/**
 	 * 按钮树形结构
 	 *

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

@@ -92,6 +92,22 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		return buildRoutes(allMenus, roleMenus);
 	}
 
+	/**
+	 * 首页常用菜单
+	 * @param roleId
+	 * @param topMenuId
+	 * @return
+	 */
+	@Override
+	public List<MenuVO> getCustomRoutes(String roleId, Long topMenuId) {
+		if (StringUtil.isBlank(roleId)) {
+			return null;
+		}
+		List<Menu> allMenus = baseMapper.allMenu();
+		List<Menu> roleMenus = (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId);
+		return buildRoutes(allMenus, roleMenus);
+	}
+
 	private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus) {
 		List<Menu> routes = new LinkedList<>(roleMenus);
 		roleMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));

script/docker/app/docker-compose.yml

@@ -5,7 +5,7 @@ services:
   ###===================================  以下为中间件模块  =========================================###
   ####################################################################################################
 
-  nacos:
+  :
     image: nacos/nacos-server:1.3.2
     hostname: "nacos-standalone"
     environment: