1.增加APP菜单 1.3

blade-auth/src/main/java/org/springblade/auth/AuthApplication.java

@@ -21,6 +21,8 @@ import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.launch.constant.AppConstant;
 
+import java.util.Base64;
+
 /**
  * 用户认证服务器
  *
@@ -30,7 +32,7 @@ import org.springblade.core.launch.constant.AppConstant;
 public class AuthApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args);
+		BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME.concat("-pref"), AuthApplication.class, args);
 	}
 
 }

blade-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 80
+  port: 9999
 
 spring:
   cloud:

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -2,15 +2,15 @@ knife4j:
   cloud:
     routes:
       - name: 授权模块
-        uri: 127.0.0.1
+        uri: 192.168.2.97:9999
         location: /blade-auth/v2/api-docs
       - name: 工作台模块
-        uri: 127.0.0.1
+        uri: 192.168.2.97:9999
-        location: /blade-desk/v2/api-docs
+        location: /blade-desk/v2/api-docssss
       - name: 系统模块
-        uri: 127.0.0.1
+        uri: 192.168.2.97:9999
         location: /blade-system/v2/api-docs
-      - name: 工厂模块
+#      - name: 工厂模块
-        uri: 127.0.0.1
+#        uri: 192.168.2.97:9999
-        location: /logpm-factory/v2/api-docs
+#        location: /logpm-factory/v2/api-docs
 

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

@@ -1,5 +1,5 @@
 server:
-  port: 18000
+  port: 19000
 knife4j:
   enableAggregation: true
   cloud:

blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/CheckedTreeVO.java

@@ -30,6 +30,11 @@ public class CheckedTreeVO {
 
 	private List<String> menu;
 
+	/**
+	 *  app菜单
+	 */
+	private List<String> appMenu;
+
 	private List<String> dataScope;
 
 	private List<String> apiScope;

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

@@ -209,19 +209,7 @@ public class AppMenuController extends BladeController {
 
 
 
-	/**
+
-	 * 获取权限分配树形结构
-	 */
-	@GetMapping("/role-tree-keys")
-	@ApiOperationSupport(order = 13)
-	@ApiOperation(value = "角色所分配的树", notes = "角色所分配的树")
-	public R<CheckedTreeVO> roleTreeKeys(String roleIds) {
-		CheckedTreeVO vo = new CheckedTreeVO();
-		vo.setMenu(menuService.roleTreeKeys(roleIds));
-		vo.setDataScope(menuService.dataScopeTreeKeys(roleIds));
-		vo.setApiScope(menuService.apiScopeTreeKeys(roleIds));
-		return R.data(vo);
-	}
 
 	/**
 	 * 获取顶部菜单树形结构

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

@@ -231,6 +231,7 @@ public class MenuController extends BladeController {
 	@ApiOperation(value = "角色所分配的树", notes = "角色所分配的树")
 	public R<CheckedTreeVO> roleTreeKeys(String roleIds) {
 		CheckedTreeVO vo = new CheckedTreeVO();
+		vo.setAppMenu(appMenuService.roleTreeKeys(roleIds));
 		vo.setMenu(menuService.roleTreeKeys(roleIds));
 		vo.setDataScope(menuService.dataScopeTreeKeys(roleIds));
 		vo.setApiScope(menuService.apiScopeTreeKeys(roleIds));