From b1deb14d87fa96cfae8d44c0db9b641855557abc Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Mon, 15 Aug 2016 17:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EisApiSupport=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?api=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/authorize/AuthorizeValidatorConfig.java    |  7 +++++++
 .../validator/SimpleAuthorizeValidatorConfig.java   | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java
index 0ecf02428..ee012c73e 100644
--- a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java
+++ b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java
@@ -17,7 +17,13 @@ public interface AuthorizeValidatorConfig {
     AuthorizeValidatorConfig setMod(Authorize.MOD mod);
 
     AuthorizeValidatorConfig addExpression(String expression, String language);
+
+    AuthorizeValidatorConfig setApiSupport(boolean apiSupport);
+
+    boolean isApiSupport();
+
     boolean isEmpty();
+
     default AuthorizeValidatorConfig addAnnotation(Set<Authorize> authorizes) {
         Set<String> modules = new LinkedHashSet<>();
         Set<String> roles = new LinkedHashSet<>();
@@ -28,6 +34,7 @@ public interface AuthorizeValidatorConfig {
             actions.addAll(Arrays.asList(tmp.action()));
             setMod(tmp.mod());
             addExpression(tmp.expression(), tmp.expressionLanguage());
+            setApiSupport(tmp.api());
         });
         setActions(actions).setModules(modules).setRoles(roles);
         return this;
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java
index 7488c5553..e5b2d5907 100644
--- a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java
+++ b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java
@@ -20,6 +20,13 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig
     protected Set<String> actions;
     protected Set<Expression> expressions = new LinkedHashSet<>();
     protected Authorize.MOD mod;
+    protected boolean apiSupport;
+
+    @Override
+    public AuthorizeValidatorConfig setApiSupport(boolean apiSupport) {
+        this.apiSupport = apiSupport;
+        return this;
+    }
 
     @Override
     public AuthorizeValidatorConfig setModules(Set<String> modules) {
@@ -84,6 +91,10 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig
         return expressions;
     }
 
+    public boolean isApiSupport() {
+        return apiSupport;
+    }
+
     public void setExpressions(Set<Expression> expressions) {
         this.expressions = expressions;
     }
@@ -94,7 +105,7 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig
 
     @Override
     public boolean isEmpty() {
-        return getModules().isEmpty() && getRoles().isEmpty()  && getExpressions().isEmpty();
+        return getModules().isEmpty() && getRoles().isEmpty() && getExpressions().isEmpty();
     }
 
     public static class Expression {