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