From 103579421ccff84cd6b67074cf8b51e4e408521c Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Tue, 1 Jul 2025 14:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6app=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fys-admin/pom.xml | 3 ++- .../com/fuyuanshen/app/service/AppLoginService.java | 4 ++-- pom.xml | 11 ++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fys-admin/pom.xml b/fys-admin/pom.xml index e4c1fb2..62479bb 100644 --- a/fys-admin/pom.xml +++ b/fys-admin/pom.xml @@ -66,7 +66,7 @@ - + com.fuyuanshen fys-equipment @@ -105,6 +105,7 @@ fys-app + de.codecentric spring-boot-admin-starter-client diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java index 688816b..ddb3bd1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java @@ -54,7 +54,7 @@ public class AppLoginService { private Integer lockTime; private final ISysTenantService tenantService; - private final IAppRoleService roleService; + private final IAppRoleService appRoleService; /** @@ -119,7 +119,7 @@ public class AppLoginService { Set perms = new HashSet<>(); loginUser.setMenuPermission(perms); loginUser.setRolePermission(perms); - List roles = roleService.selectRolesByUserId(userId); + List roles = appRoleService.selectRolesByUserId(userId); loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); return loginUser; } diff --git a/pom.xml b/pom.xml index 596eafc..0d75793 100644 --- a/pom.xml +++ b/pom.xml @@ -355,7 +355,16 @@ fys-generator ${revision} - + + com.fuyuanshen + fys-app + ${revision} + + + com.fuyuanshen + fys-equipment + ${revision} + com.fuyuanshen fys-demo