优化权限提示

zhou-hao · zhou-hao · commit d389d05f56a4 · 2020-12-14T14:48:26.000+08:00
diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizeDefinition.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizeDefinition.java
@@ -1,6 +1,8 @@
 package org.hswebframework.web.authorization.define;
 
 
+import java.util.StringJoiner;
+
 /**
  * 权限控制定义,定义权限控制的方式
  *
@@ -18,4 +20,13 @@ public interface AuthorizeDefinition {
     Phased getPhased();
 
     boolean isEmpty();
+
+    default String getDescription() {
+        ResourcesDefinition res = getResources();
+        StringJoiner joiner = new StringJoiner(";");
+        for (ResourceDefinition resource : res.getResources()) {
+            joiner.add(resource.getId() + ":" + String.join(",", resource.getActionIds()));
+        }
+        return joiner.toString();
+    }
 }
diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/exception/AccessDenyException.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/exception/AccessDenyException.java
@@ -26,8 +26,11 @@ public AccessDenyException(String message) {
         super(message);
     }
 
+    public AccessDenyException(String message, String code) {
+        this(message, code, null);
+    }
     public AccessDenyException(String message, Throwable cause) {
-        this(message,"access_denied", cause);
+        this(message, "access_denied", cause);
     }
 
     public AccessDenyException(String message, String code, Throwable cause) {
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java
@@ -106,7 +106,7 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def
         ResourcesDefinition resources = definition.getResources();
 
         if (!resources.hasPermission(authentication.getPermissions())) {
-            throw new AccessDenyException();
+            throw new AccessDenyException(definition.getMessage(),definition.getDescription());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,11 @@ public AccessDenyException(String message) {`
`26`	`26`	`super(message);`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ public AccessDenyException(String message, String code) {`
	`30`	`+ this(message, code, null);`
	`31`	`+ }`
`29`	`32`	`public AccessDenyException(String message, Throwable cause) {`
`30`		`- this(message,"access_denied", cause);`
	`33`	`+ this(message, "access_denied", cause);`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public AccessDenyException(String message, String code, Throwable cause) {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def`
`106`	`106`	`ResourcesDefinition resources = definition.getResources();`
`107`	`107`
`108`	`108`	`if (!resources.hasPermission(authentication.getPermissions())) {`
`109`		`- throw new AccessDenyException();`
	`109`	`+ throw new AccessDenyException(definition.getMessage(),definition.getDescription());`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`