upgrade spring boot 2.3 to 2.4

framework/pom.xml

@@ -15,6 +15,17 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java

@@ -30,7 +30,7 @@ import java.io.Serializable;
 public class LimitInterceptor {
     private RedisTemplate<String, Serializable> redisTemplate;
 
-    private DefaultRedisScript<Number> limitScript;
+    private DefaultRedisScript<Long> limitScript;
 
     @Autowired
     public void setRedisTemplate(RedisTemplate redisTemplate) {
@@ -38,7 +38,7 @@ public class LimitInterceptor {
     }
 
     @Autowired
-    public void setLimitScript(DefaultRedisScript<Number> limitScript) {
+    public void setLimitScript(DefaultRedisScript<Long> limitScript) {
         this.limitScript = limitScript;
     }
 

framework/src/main/java/cn/lili/cache/script/LuaScript.java

@@ -33,10 +33,10 @@ public class LuaScript {
      * @return
      */
     @Bean
-    public DefaultRedisScript<Number> limitScript() {
-        DefaultRedisScript<Number> redisScript = new DefaultRedisScript<>();
+    public DefaultRedisScript<Long> limitScript() {
+        DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
         redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("script/limit.lua")));
-        redisScript.setResultType(Number.class);
+        redisScript.setResultType(Long.class);
         return redisScript;
     }
 }

framework/src/main/java/cn/lili/common/security/SecurityBean.java

@@ -7,6 +7,9 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 /**
  * SecurityBean
  *
@@ -19,8 +22,7 @@ public class SecurityBean {
 
     @Bean
     public BCryptPasswordEncoder passwordEncoder() {
-        BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
-        return bCryptPasswordEncoder;
+        return new BCryptPasswordEncoder();
     }
 
     /**
@@ -33,7 +35,8 @@ public class SecurityBean {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
-        config.addAllowedOrigin(CorsConfiguration.ALL);
+//        config.addAllowedOrigin(CorsConfiguration.ALL);
+        config.setAllowedOriginPatterns(Collections.singletonList(CorsConfiguration.ALL));
         config.addAllowedHeader(CorsConfiguration.ALL);
         config.addAllowedMethod(CorsConfiguration.ALL);
         source.registerCorsConfiguration("/**", config);

framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java

@@ -1,7 +1,6 @@
 package cn.lili.elasticsearch.config;
 
 import cn.hutool.core.convert.Convert;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;

framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java

@@ -17,7 +17,7 @@ import java.util.List;
  **/
 @Data
 @Builder
-@Component
+@Component("elasticsearchProperties")
 @NoArgsConstructor
 @AllArgsConstructor
 @ConfigurationProperties(prefix = "lili.data.elasticsearch")

framework/src/test/java/cn/lili/test/RedisLimiterHelperTest.java

@@ -4,10 +4,10 @@ import cn.lili.modules.order.order.entity.dos.OrderItem;
 import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.statistics.serviceimpl.OrderStatisticsDataServiceImpl;
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
  * @since 2020-06-13 12:17
  */
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class RedisLimiterHelperTest {
 

framework/src/test/java/cn/lili/test/script/ScriptTest.java

@@ -1,7 +1,7 @@
 package cn.lili.test.script;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -12,7 +12,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.scripting.support.ResourceScriptSource;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -27,7 +27,7 @@ import java.util.List;
  * @since
  * 2020-02-22 20:26
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 @Transactional(rollbackFor = Exception.class)
 @Rollback()