upgrade spring boot 2.3 to 2.4

buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java

@@ -10,10 +10,10 @@ import cn.lili.modules.order.cart.service.CartService;
 import cn.lili.modules.payment.service.PaymentService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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.List;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * @author paulG
  * @since 2020/11/14
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class CartTest {
 

buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java

@@ -7,10 +7,10 @@ import cn.lili.modules.goods.service.BrandService;
 import com.xkcoding.http.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.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.io.*;
 import java.net.URL;
@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2020/11/14
  **/
 @Slf4j
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class FileTest {
 

buyer-api/src/test/java/cn/lili/buyer/test/cart/MemberCouponTest.java

@@ -1,18 +1,19 @@
 package cn.lili.buyer.test.cart;
 
 import cn.lili.modules.promotion.service.MemberCouponService;
-import org.junit.Assert;
 import org.junit.jupiter.api.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 static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author paulG
  * @since 2020/11/27
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class MemberCouponTest {
 
@@ -22,7 +23,7 @@ class MemberCouponTest {
     @Test
     void receiveCoupon() {
         memberCouponService.receiveCoupon("1333318596239843328", "1326834797335306240", "1");
-        Assert.assertTrue(true);
+        assertTrue(true);
     }
 
 

consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java

@@ -5,15 +5,15 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
 import org.junit.jupiter.api.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;
 
 /**
  * 订单库存扣减
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class CartTest {
 

consumer/src/test/java/cn/lili/buyer/test/cart/MemberStatisticsTest.java

@@ -2,13 +2,13 @@ package cn.lili.buyer.test.cart;
 
 import cn.lili.timetask.handler.impl.statistics.MemberStatisticsExecute;
 import org.junit.jupiter.api.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;
 
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class MemberStatisticsTest {
 

consumer/src/test/java/cn/lili/buyer/test/cart/OnlineTest.java

@@ -3,10 +3,10 @@ package cn.lili.buyer.test.cart;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.timetask.handler.impl.statistics.OnlineMemberStatistics;
 import org.junit.jupiter.api.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.Calendar;
 import java.util.Random;
@@ -14,7 +14,7 @@ import java.util.Random;
 /**
  * 订单库存扣减
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class OnlineTest {
 

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()

manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java

@@ -5,11 +5,11 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.modules.statistics.util.StatisticsSuffix;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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.data.redis.core.DefaultTypedTuple;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Date;
 import java.util.Random;
@@ -21,7 +21,7 @@ import java.util.Set;
  * @since v7.0
  * 2021/1/15 16:25
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class CacheTest {
 

manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java

@@ -17,12 +17,13 @@ import cn.lili.modules.search.service.EsGoodsSearchService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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.data.domain.Page;
+import org.springframework.data.elasticsearch.core.SearchPage;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +33,7 @@ import java.util.Map;
  * @author paulG
  * @since 2020/10/14
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class EsTest {
 
@@ -59,7 +60,7 @@ class EsTest {
     void searchGoods() {
         EsGoodsSearchDTO goodsSearchDTO = new EsGoodsSearchDTO();
 //       goodsSearchDTO.setKeyword("黄");
-        goodsSearchDTO.setProp("IETF_HTTP/3");
+//        goodsSearchDTO.setProp("IETF_HTTP/3");
 //       goodsSearchDTO.setPrice("100_20000");
 //       goodsSearchDTO.setStoreCatId(1L);
 //       goodsSearchDTO.setBrandId(123L);
@@ -70,7 +71,7 @@ class EsTest {
         pageVo.setPageSize(100);
         pageVo.setOrder("desc");
         pageVo.setNotConvert(true);
-        Page<EsGoodsIndex> esGoodsIndices = goodsSearchService.searchGoods(goodsSearchDTO, pageVo);
+        SearchPage<EsGoodsIndex> esGoodsIndices = goodsSearchService.searchGoods(goodsSearchDTO, pageVo);
         Assertions.assertNotNull(esGoodsIndices);
         esGoodsIndices.getContent().forEach(System.out::println);
 //       esGoodsIndices.getContent().forEach(i -> {

manager-api/src/test/java/cn/lili/test/order/OrderServiceTest.java

@@ -2,16 +2,16 @@ package cn.lili.test.order;
 
 import cn.lili.modules.order.order.service.OrderService;
 import org.junit.jupiter.api.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;
 
 /**
  * @author paulG
  * @since 2020/12/1
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class OrderServiceTest {
 

manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java

@@ -15,10 +15,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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;
@@ -27,7 +27,7 @@ import java.util.List;
  * @author paulG
  * @since 2020/10/29
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class CouponTest {
 

manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java

@@ -15,10 +15,10 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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;
@@ -27,7 +27,7 @@ import java.util.List;
  * @author paulG
  * @since 2020/10/22
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class FullDiscountTest {
 

manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java

@@ -12,10 +12,10 @@ import cn.lili.modules.promotion.service.PromotionService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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.Map;
 
@@ -23,7 +23,7 @@ import java.util.Map;
  * @author paulG
  * @since 2020/11/23
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class PromotionPriceTest {
 

manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java

@@ -10,10 +10,10 @@ import cn.lili.modules.promotion.service.SeckillApplyService;
 import cn.lili.modules.promotion.service.SeckillService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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;
@@ -22,7 +22,7 @@ import java.util.List;
  * @author paulG
  * @since 2020/10/29
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class SeckillTest {
 

manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java

@@ -6,18 +6,18 @@ import cn.lili.common.properties.RocketmqCustomProperties;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.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.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author paulG
  * @since 2021/1/15
  **/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest
 class MsgExtRocketMqTest {
 

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
+        <version>2.4.10</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
         <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
         <jasypt-version>3.0.0</jasypt-version>
         <neetl-version>2.9.10</neetl-version>
-        <lombok-version>1.18.10</lombok-version>
+        <lombok-version>1.18.20</lombok-version>
         <aliyun-version>4.5.18</aliyun-version>
         <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
         <aliyun-sdk-dysms-version>2.0.1</aliyun-sdk-dysms-version>