移除Aac注解中的权限部分；恢复core-cache默认softValues配置

Signed-off-by: luoshi <luoshi@qmth.com.cn>

core-cache/src/main/java/com/qmth/boot/core/cache/config/CacheAutoConfiguration.java

@@ -24,7 +24,7 @@ import java.time.Duration;
  */
 @Configuration
 @EnableCaching
-@ComponentScan("com.qmth.boot.core.cache.*")
+@ComponentScan("com.qmth.boot.core.cache")
 public class CacheAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(CacheAutoConfiguration.class);
@@ -71,8 +71,8 @@ public class CacheAutoConfiguration {
     }
 
     private Caffeine<Object, Object> buildCaffeineConfig(Duration expireAfterWrite) {
-        //暂不开启softValues
-        Caffeine<Object, Object> caffeine = Caffeine.newBuilder();
+        //默认开启softValues
+        Caffeine<Object, Object> caffeine = Caffeine.newBuilder().softValues();
         //写入失效时长大于0时才启用
         if (expireAfterWrite.toMillis() > 0) {
             caffeine = caffeine.expireAfterWrite(expireAfterWrite);

core-security/src/main/java/com/qmth/boot/core/security/annotation/Permission.java

@@ -1,20 +0,0 @@
-package com.qmth.boot.core.security.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 自定义权限配置
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface Permission {
-
-    /**
-     * 允许的数据范围
-     *
-     * @return
-     */
-    Class clazz();
-
-}

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

@@ -1,10 +1,8 @@
 package com.qmth.boot.api.annotation;
 
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.core.security.annotation.Permission;
 import com.qmth.boot.tools.signature.SignatureType;
 
-import javax.validation.constraints.Null;
 import java.lang.annotation.*;
 
 /**
@@ -64,11 +62,4 @@ public @interface Aac {
      */
     SignatureType[] signType() default {};
 
-    /**
-     * 接口定义需要的权限
-     *
-     * @return
-     */
-    Permission permit() default @Permission(clazz = Null.class);
-
 }

starter-api/src/main/java/com/qmth/boot/api/config/ApiConfigService.java

@@ -9,14 +9,11 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.method.HandlerMethod;
 
-import javax.validation.constraints.Null;
 import java.lang.reflect.Method;
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
 @Component
@@ -28,12 +25,9 @@ public class ApiConfigService implements ApplicationListener<ContextRefreshedEve
 
     private Map<Method, AacConfig> configMap;
 
-    private Map<String, Object> uriPermissionMap;
-
     public ApiConfigService(ApiProperties apiProperties) {
         this.apiProperties = apiProperties;
         this.configMap = new HashMap<>();
-        this.uriPermissionMap = new HashMap<>();
     }
 
     public AacConfig getAacConfig(HandlerMethod handlerMethod) {
@@ -51,69 +45,23 @@ public class ApiConfigService implements ApplicationListener<ContextRefreshedEve
             for (Object bean : beans.values()) {
                 init(bean);
             }
-            log.info("ApiConfigService inited, aac method count={}, uri permission count={}", configMap.size(),
-                    uriPermissionMap.size());
+            log.info("ApiConfigService inited, aac method count={}", configMap.size());
         }
     }
 
     private void init(Object bean) {
         Class<?> clazz = AopUtils.getTargetClass(bean);
-        String[] parentUri = null;
-        RequestMapping parentMapping = AnnotationUtils.findAnnotation(clazz, RequestMapping.class);
-        if (parentMapping != null) {
-            parentUri = parentMapping.value();
-        }
-        if (parentUri == null || parentUri.length == 0) {
-            parentUri = new String[] { "" };
-        }
         Method[] methods = clazz.getMethods();
         for (Method method : methods) {
-            String[] uri = new String[] { "" };
-            RequestMapping rm = AnnotationUtils.findAnnotation(method, RequestMapping.class);
-            PostMapping post = AnnotationUtils.findAnnotation(method, PostMapping.class);
-            GetMapping get = AnnotationUtils.findAnnotation(method, GetMapping.class);
-            PutMapping put = AnnotationUtils.findAnnotation(method, PutMapping.class);
-            DeleteMapping delete = AnnotationUtils.findAnnotation(method, DeleteMapping.class);
-            if (rm != null) {
-                uri = rm.value();
-            } else if (post != null) {
-                uri = post.value();
-            } else if (get != null) {
-                uri = get.value();
-            } else if (put != null) {
-                uri = put.value();
-            } else if (delete != null) {
-                uri = delete.value();
-            } else {
-                continue;
-            }
-            initMethod(clazz, method, parentUri, uri);
+            initMethod(clazz, method);
         }
     }
 
-    private void initMethod(Class<?> clazz, Method method, String[] prefixs, String[] uris) {
+    private void initMethod(Class<?> clazz, Method method) {
         AacConfig ac = new AacConfig(apiProperties);
         ac.merge(new AacConfig(AnnotationUtils.findAnnotation(clazz, Aac.class)));
         ac.merge(new AacConfig(AnnotationUtils.findAnnotation(method, Aac.class)));
         configMap.put(method, ac);
-
-        Aac aac = AnnotationUtils.findAnnotation(method, Aac.class);
-        if (aac != null && !aac.permit().clazz().equals(Null.class)) {
-            List<String> uriList = concat(prefixs, uris);
-            for (String uri : uriList) {
-                uriPermissionMap.put(uri, aac.permit());
-            }
-        }
         log.debug("Api method inited, {}:{}", clazz.getName(), method.getName());
     }
-
-    private List<String> concat(String[] prefixs, String[] uris) {
-        List<String> result = new LinkedList<>();
-        for (String prefix : prefixs) {
-            for (String uri : uris) {
-                result.add(prefix.concat(uri));
-            }
-        }
-        return result;
-    }
 }