From 124b11c062aa7693aa8819653790c89c4a49afb6 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 11 Jul 2023 19:37:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0APP=E8=8F=9C=E5=8D=95=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/auth/AuthApplication.java | 4 +++- blade-gateway/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/application-dev.yml | 14 +++++++------- .../src/main/resources/application.yml | 2 +- .../org/springblade/system/vo/CheckedTreeVO.java | 5 +++++ .../system/controller/AppMenuController.java | 14 +------------- .../system/controller/MenuController.java | 1 + 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java index 8c18654b..3c145e0b 100644 --- a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java +++ b/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); } } diff --git a/blade-gateway/src/main/resources/bootstrap.yml b/blade-gateway/src/main/resources/bootstrap.yml index 5c9f4fd5..907d6ad2 100644 --- a/blade-gateway/src/main/resources/bootstrap.yml +++ b/blade-gateway/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 80 + port: 9999 spring: cloud: diff --git a/blade-ops/blade-swagger/src/main/resources/application-dev.yml b/blade-ops/blade-swagger/src/main/resources/application-dev.yml index 0c29bbe3..cd2d9dd0 100644 --- a/blade-ops/blade-swagger/src/main/resources/application-dev.yml +++ b/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 - location: /blade-desk/v2/api-docs + uri: 192.168.2.97:9999 + 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: 工厂模块 - uri: 127.0.0.1 - location: /logpm-factory/v2/api-docs +# - name: 工厂模块 +# uri: 192.168.2.97:9999 +# location: /logpm-factory/v2/api-docs diff --git a/blade-ops/blade-swagger/src/main/resources/application.yml b/blade-ops/blade-swagger/src/main/resources/application.yml index 79ad80d2..2354fe3e 100644 --- a/blade-ops/blade-swagger/src/main/resources/application.yml +++ b/blade-ops/blade-swagger/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 18000 + port: 19000 knife4j: enableAggregation: true cloud: diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/CheckedTreeVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/CheckedTreeVO.java index f9f199cd..3d46c330 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/CheckedTreeVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/CheckedTreeVO.java @@ -30,6 +30,11 @@ public class CheckedTreeVO { private List menu; + /** + * app菜单 + */ + private List appMenu; + private List dataScope; private List apiScope; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AppMenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AppMenuController.java index b3758223..e8b77e16 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AppMenuController.java +++ b/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 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); - } + /** * 获取顶部菜单树形结构 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java index 348f54f3..1dd42b4a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java +++ b/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 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));