新增merge属性，方法注解可不与类上的合并

zhou-hao · zhou-hao · commit 7485db4ac792 · 2016-11-07T11:17:50.000+08:00
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java
@@ -24,9 +24,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-/**
- * Created by zhouhao on 16-4-28.
- */
 public class AopAuthorizeValidator extends SimpleAuthorizeValidator {
 
     private HttpSessionManager httpSessionManager;
@@ -57,7 +54,7 @@ protected AuthorizeValidatorConfig getConfig(ProceedingJoinPoint pjp) {
                 return null;
             }
             Set<Authorize> authorizes = new LinkedHashSet<>();
-            if (classAuth != null) {
+            if (classAuth != null && (methodAuth == null || methodAuth.merge())) {
                 if (classAuth.anonymous()) return null;
                 authorizes.add(classAuth);
             }
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/annotation/Authorize.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/annotation/Authorize.java
@@ -56,9 +56,18 @@
 
     /**
      * 可匿名访问
-     * @return 是否可匿名访问,匿名访问将不用登录
+     *
+     * @return 是否可匿名访问, 匿名访问将不用登录
      */
     boolean anonymous() default false;
+
+    /**
+     * 是否合并类上的注解
+     *
+     * @return 是否合并类上的注解
+     */
+    boolean merge() default true;
+
     /**
      * 验证模式，在使用多个验证条件时有效
      *
