合并app登录权限分支

fys-admin/pom.xml

@@ -105,6 +105,7 @@
             <artifactId>fys-app</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

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<String> perms = new HashSet<>();
         loginUser.setMenuPermission(perms);
         loginUser.setRolePermission(perms);
-        List<AppRoleVo> roles = roleService.selectRolesByUserId(userId);
+        List<AppRoleVo> roles = appRoleService.selectRolesByUserId(userId);
         loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
         return loginUser;
     }

pom.xml

@@ -355,7 +355,16 @@
                 <artifactId>fys-generator</artifactId>
                 <version>${revision}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.fuyuanshen</groupId>
+                <artifactId>fys-app</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fuyuanshen</groupId>
+                <artifactId>fys-equipment</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fuyuanshen</groupId>
                 <artifactId>fys-demo</artifactId>