✏️ fix some runtime errors

coffee-autoconfigures/coffee-autoconfigure-rest-security/src/main/java/site/zido/coffee/autoconfigure/security/rest/RestSecurityAutoConfiguration.java

@@ -1,12 +1,9 @@
 package site.zido.coffee.autoconfigure.security.rest;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.security.SecurityDataConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SpringBootWebSecurityConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.WebSecurityEnablerConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,8 +30,6 @@
 @Import({SpringBootRestSecurityConfiguration.class,
         RestSecurityEnableConfiguration.class,
         SecurityDataConfiguration.class})
-@EnableAutoConfiguration(exclude = {SecurityAutoConfiguration.class,
-        SecurityFilterAutoConfiguration.class})
 public class RestSecurityAutoConfiguration {
 
     @Bean

coffee-autoconfigures/coffee-autoconfigure-rest-security/src/main/java/site/zido/coffee/autoconfigure/security/rest/WebSecurityAutoFilter.java

@@ -0,0 +1,25 @@
+package site.zido.coffee.autoconfigure.security.rest;
+
+import org.springframework.boot.autoconfigure.AutoConfigurationImportFilter;
+import org.springframework.boot.autoconfigure.AutoConfigurationMetadata;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class WebSecurityAutoFilter implements AutoConfigurationImportFilter {
+    private static final Set<String> SHOULD_SKIP = new HashSet<>(
+            Arrays.asList("org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration",
+                    "org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration")
+    );
+
+    @Override
+    public boolean[] match(String[] classNames, AutoConfigurationMetadata metadata) {
+        boolean[] matches = new boolean[classNames.length];
+
+        for (int i = 0; i < classNames.length; i++) {
+            matches[i] = !SHOULD_SKIP.contains(classNames[i]);
+        }
+        return matches;
+    }
+}

coffee-autoconfigures/coffee-autoconfigure-rest-security/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   site.zido.coffee.autoconfigure.security.rest.RestSecurityAutoConfiguration,\
-  site.zido.coffee.autoconfigure.security.rest.RestSecurityFilterAutoConfiguration
+  site.zido.coffee.autoconfigure.security.rest.RestSecurityFilterAutoConfiguration
+org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=\
+  site.zido.coffee.autoconfigure.security.rest.WebSecurityAutoFilter

coffee-autoconfigures/coffee-autoconfigure-web/src/main/java/site/zido/coffee/autoconfigure/web/GlobalResultEnablerConfiguration.java

@@ -0,0 +1,9 @@
+package site.zido.coffee.autoconfigure.web;
+
+import org.springframework.context.annotation.Configuration;
+import site.zido.coffee.mvc.rest.EnableGlobalResult;
+
+@EnableGlobalResult
+@Configuration
+public class GlobalResultEnablerConfiguration {
+}

coffee-modules/coffee-core/src/main/java/site/zido/coffee/core/utils/IdWorker.java

@@ -112,6 +112,7 @@ private static long getDataCenterId(long maxDataCenterId) {
 
     /**
      * 效率稍低
+     *
      * @return id
      */
     public synchronized long nextWithSync() {

coffee-modules/coffee-core/src/test/java/site/zido/coffee/core/common/utils/SystemClockTest.java

@@ -10,6 +10,6 @@ public void testClock() throws InterruptedException {
         long now = SystemClock.now();
         Thread.sleep(2);
         long last = SystemClock.now();
-        Assert.assertNotEquals(now,last);
+        Assert.assertNotEquals(now, last);
     }
 }

coffee-modules/coffee-extra/src/main/java/site/zido/coffee/extra/limiter/MemoryFrequencyLimiter.java

@@ -3,7 +3,10 @@
 import net.jcip.annotations.GuardedBy;
 import net.jcip.annotations.ThreadSafe;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**

coffee-modules/coffee-extra/src/main/java/site/zido/coffee/extra/lock/AbstractDistributedLock.java

@@ -33,7 +33,7 @@ public abstract class AbstractDistributedLock implements Lock, Serializable, Dis
         Runtime.getRuntime().addShutdownHook(new Thread(AbstractDistributedLock::releaseAll));
     }
 
-    public static void releaseAll(){
+    public static void releaseAll() {
         log.debug("try release distributed locks:number[{}]", CONTAINER.size());
         for (AbstractDistributedLock lock : CONTAINER) {
             lock.destroy();

coffee-modules/coffee-extra/src/main/java/site/zido/coffee/extra/lock/DistributedRedisLock.java

@@ -74,7 +74,7 @@ private void initValue() {
                 this.value = (IdWorker.nextId() + "").getBytes(USE_CHARSET);
             }
         } finally {
-            RedisConnectionUtils.releaseConnection(connection, connectionFactory,false);
+            RedisConnectionUtils.releaseConnection(connection, connectionFactory, false);
         }
     }
 
@@ -95,7 +95,7 @@ public boolean doTryLock() {
             }
             return false;
         } finally {
-            RedisConnectionUtils.releaseConnection(connection, connectionFactory,false);
+            RedisConnectionUtils.releaseConnection(connection, connectionFactory, false);
         }
     }
 
@@ -110,7 +110,7 @@ public void doUnlock() {
         try {
             connection.eval(DEL_SCRIPT_BYTES, ReturnType.VALUE, 1, keysAndArgs);
         } finally {
-            RedisConnectionUtils.releaseConnection(connection, connectionFactory,false);
+            RedisConnectionUtils.releaseConnection(connection, connectionFactory, false);
         }
     }
 

coffee-modules/coffee-extra/src/test/java/limiter/RedisFrequencyLimiterTest.java

@@ -1,6 +1,5 @@
 package limiter;
 
-import site.zido.coffee.extra.limiter.RedisFrequencyLimiter;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -9,6 +8,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.embedded.RedisServer;
+import site.zido.coffee.extra.limiter.RedisFrequencyLimiter;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

coffee-modules/coffee-rest-security/src/main/java/site/zido/coffee/security/RestSecurityConfigurationAdapter.java

@@ -291,7 +291,7 @@ static final class AuthenticationManagerDelegator implements AuthenticationManag
             Assert.notNull(delegateBuilder, "delegateBuilder cannot be null");
             Field parentAuthMgrField = ReflectionUtils.findField(
                     AuthenticationManagerBuilder.class, "parentAuthenticationManager");
-            Assert.notNull(parentAuthMgrField,"cannot reachable");
+            Assert.notNull(parentAuthMgrField, "cannot reachable");
             ReflectionUtils.makeAccessible(parentAuthMgrField);
             beanNames = getAuthenticationManagerBeanNames(context);
             validateBeanCycle(

coffee-modules/coffee-rest-security/src/main/java/site/zido/coffee/security/authentication/phone/CodeValidator.java

@@ -9,8 +9,9 @@ public interface CodeValidator {
 
     /**
      * 验证code
+     *
      * @param originalCode 原code
-     * @param inputCode 输入的code
+     * @param inputCode    输入的code
      * @return true/false
      */
     boolean validate(String originalCode, String inputCode);

coffee-modules/coffee-rest-security/src/main/java/site/zido/coffee/security/authentication/phone/PhoneCodeService.java

@@ -10,7 +10,7 @@ public interface PhoneCodeService {
      * 发送验证码
      *
      * @param phone 手机号
-     * @param code   验证码
+     * @param code  验证码
      */
     void sendCode(String phone, String code);
 }

coffee-modules/coffee-rest-security/src/main/java/site/zido/coffee/security/configurers/RestSecurityContextConfigurer.java

@@ -10,8 +10,6 @@
 import site.zido.coffee.security.token.JwtRefreshFilter;
 import site.zido.coffee.security.token.JwtSecurityContextRepository;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * 使用token提供用户信息存储
  * <p>

coffee-modules/coffee-webmvc/src/main/java/site/zido/coffee/mvc/common/HttpResponseBodyConfiguration.java

@@ -3,7 +3,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import site.zido.coffee.mvc.rest.DefaultHttpResponseBodyFactory;
-import site.zido.coffee.mvc.rest.GlobalExceptionAdvice;
 import site.zido.coffee.mvc.rest.HttpResponseBodyFactory;
 
 @Configuration

coffee-modules/pom.xml

@@ -17,6 +17,5 @@
         <module>coffee-webmvc</module>
         <module>coffee-extra</module>
         <module>coffee-rest-security</module>
-        <module>coffee-data-jpa</module>
     </modules>
 </project>

examples/Production/pom.xml

@@ -36,10 +36,6 @@
             <groupId>site.zido</groupId>
             <artifactId>coffee-spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>site.zido</groupId>
-            <artifactId>coffee-data-jpa</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

examples/Production/src/main/java/site/zido/demo/config/AuthConfig.java

@@ -20,7 +20,6 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 认证配置类，restful风格，使用jwt方案
@@ -61,7 +60,7 @@ protected void configure(RestHttpSecurity http) throws Exception {
             System.out.printf("phone:%s,code:%s\n", phone, code);
         }).and()
                 //自定义jwt的超时时间
-                .securityContext().jwt().jwtExpiration(1, TimeUnit.HOURS);
+                .securityContext().jwt();
     }
 
     /**