Selaa lähdekoodia

修改starter-api切换Aac注解中所有BOOL为boolean[]

Signed-off-by: luoshi <luoshi@qmth.com.cn>
luoshi 1 vuosi sitten
vanhempi
commit
ba0a7e59c4

+ 2 - 2
starter-api/src/main/java/com/qmth/boot/api/annotation/Aac.java

@@ -19,7 +19,7 @@ public @interface Aac {
      *
      * @return
      */
-    BOOL strict() default BOOL.NULL;
+    boolean[] strict() default {};
 
     /**
      * 允许的访问来源
@@ -54,7 +54,7 @@ public @interface Aac {
      *
      * @return
      */
-    BOOL auth() default BOOL.NULL;
+    boolean[] auth() default {};
 
     /**
      * 允许的签名类型

+ 0 - 7
starter-api/src/main/java/com/qmth/boot/api/annotation/BOOL.java

@@ -1,7 +0,0 @@
-package com.qmth.boot.api.annotation;
-
-public enum BOOL {
-
-    TRUE, FALSE, NULL;
-
-}

+ 4 - 5
starter-api/src/main/java/com/qmth/boot/api/config/ApiConfig.java

@@ -1,7 +1,6 @@
 package com.qmth.boot.api.config;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.enums.Platform;
 import com.qmth.boot.core.rateLimit.annotation.RateLimit;
 import com.qmth.boot.core.rateLimit.entity.RateLimitRule;
@@ -47,14 +46,14 @@ public class ApiConfig {
         if (annotation == null) {
             return;
         }
-        if (annotation.strict() != BOOL.NULL) {
-            this.strict = (annotation.strict() == BOOL.TRUE);
+        if (annotation.strict().length > 0) {
+            this.strict = annotation.strict()[0];
         }
         if (annotation.platform().length > 0) {
             this.platform = annotation.platform();
         }
-        if (annotation.auth() != BOOL.NULL) {
-            this.auth = (annotation.auth() == BOOL.TRUE);
+        if (annotation.auth().length > 0) {
+            this.auth = annotation.auth()[0];
         }
         if (annotation.ipAllow().length > 0) {
             this.ipAllow = annotation.ipAllow();

+ 1 - 2
starter-api/src/main/java/com/qmth/boot/api/exception/DefaultErrorController.java

@@ -1,7 +1,6 @@
 package com.qmth.boot.api.exception;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @ConditionalOnExpression("${" + ApiConstant.CONFIG_PREFIX + ".error-mapping:true}")
-@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+@Aac(strict = false, auth = false)
 public class DefaultErrorController implements ErrorController, ApiConstant {
 
     private static ExceptionResponseEntity entity = new ExceptionResponseEntity(HttpStatus.NOT_FOUND.value(),