权限 表结构重构

src/main/java/cn/quantgroup/cashloanflowboss/api/role/entity/Role.java

@@ -36,7 +36,7 @@ public class Role extends Primary implements UnaryOperator<Role> {
     //@Column(name = "permissions")
     //private List<Permission> permissions;
     /**
-     * 用户角色列表
+     * 权限
      */
     @OneToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "role_permission_mapping", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "permission_id"))

src/main/java/cn/quantgroup/cashloanflowboss/component/security/SecurityInterceptor.java

 package cn.quantgroup.cashloanflowboss.component.security;
 
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
+import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
 import cn.quantgroup.cashloanflowboss.core.exception.ApplicationException;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -19,7 +21,7 @@ public class SecurityInterceptor extends ApplicationObjectSupport implements Met
         Security security = invocation.getMethod().getAnnotation(Security.class);
 
         if (!this.getApplicationContext().getBean(SecurityHandler.class).doAuthentication(invocation, security.authorityId(), security.authorities())) {
-            throw new ApplicationException("认证失败");
+            return Result.buildFial(ApplicationStatus.INVALID_AUTHORITY);
         }
 
         return invocation.proceed();

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationSecurityHandler.java

@@ -7,10 +7,13 @@ import cn.quantgroup.cashloanflowboss.component.security.SecurityHandler;
 import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
+import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -32,13 +35,28 @@ public class ApplicationSecurityHandler implements SecurityHandler {
         boolean superAdministrator = principal.isSuperAdministrator();
 
         boolean anyMatch = principal.getRoles().stream().anyMatch(role -> {
-            Stream<Role> iterate = Stream.iterate(role, Role::getParent);
-            return Objects.nonNull(iterate) && iterate.anyMatch(_role -> this.checkAuthority(authorityId, _role));
+            List<Role> roleList = getRoleAndParent(role);
+            return roleList.stream().anyMatch(_role -> this.checkAuthority(authorityId, _role));
         });
         return  superAdministrator || anyMatch;
 
     }
 
+    private List<Role> getRoleAndParent(Role role) {
+        if (role == null) {
+            return new ArrayList<>();
+        }
+
+        List<Role> list = new ArrayList<>();
+        list.add(role);
+
+        while (role.getParent() != null) {
+            role = role.getParent();
+            list.add(role);
+        }
+        return list;
+    }
+
     /**
      * 检查权限
      *
@@ -47,7 +65,10 @@ public class ApplicationSecurityHandler implements SecurityHandler {
      * @return
      */
     private boolean checkAuthority(String authorityId, Role role) {
-        return Objects.nonNull(role) && CollectionUtils.isNotEmpty(role.getPermissions()) && role.getPermissions().parallelStream().anyMatch(permission -> permission.getName().equals(authorityId));
+        if (role == null) {
+            return false;
+        }
+        return CollectionUtils.isNotEmpty(role.getPermissions()) && role.getPermissions().parallelStream().anyMatch(permission -> permission.getName().equals(authorityId));
     }
 
 }