最低版本要求jdk17, 升级spring boot3.0

gz-yami · Mar 16, 2023 · 324d91b · 324d91b
1 parent 07f919b
commit 324d91b
Show file tree

Hide file tree

Showing 84 changed files with 248 additions and 455 deletions.
diff --git a/README.md b/README.md
@@ -45,21 +45,20 @@ uni-app：https://gitee.com/gz-yami/mall4uni
 
 ## 技术选型
 
-| 技术                   | 版本     | 说明                           |
-|----------------------|--------|------------------------------|
-| Spring Boot          | 2.7.0  | MVC核心框架                      |
-| Spring Security web  | 2.7.0  | web应用安全防护                    |
-| MyBatis              | 3.5.0  | ORM框架                        |
-| MyBatisPlus          | 3.1.0  | 基于mybatis，使用lambda表达式的       |
-| spring-doc           | 1.6.9  | 接口文档工具                       |
-| Hibernator-Validator | 6.0.17 | 验证框架                         |
-| redisson             | 3.10.6 | 对redis进行封装、集成分布式锁等           |
-| hikari               | 3.2.0  | 数据库连接池                       |
-| logback              | 1.2.11 | log日志工具                      |
-| orika                | 1.5.4  | 更快的bean复制工具                  |
-| lombok               | 1.18.8 | 简化对象封装工具                     |
-| hutool               | 5.7.22 | 更适合国人的java工具集                |
-| knife4j              | 4.0.0  | 基于swagger，更便于国人使用的swagger ui |
+| 技术                  | 版本      | 说明                           |
+|---------------------|---------|------------------------------|
+| Spring Boot         | 3.0.4   | MVC核心框架                      |
+| Spring Security web | 3.0.4   | web应用安全防护                    |
+| MyBatis             | 3.5.10  | ORM框架                        |
+| MyBatisPlus         | 3.5.3.1 | 基于mybatis，使用lambda表达式的       |
+| spring-doc          | 2.0.0   | 接口文档工具                       |
+| jakarta-validation  | 3.0.2   | 验证框架                         |
+| redisson            | 3.19.3  | 对redis进行封装、集成分布式锁等           |
+| hikari              | 5.0.1   | 数据库连接池                       |
+| logback             | 1.4.5   | log日志工具                      |
+| lombok              | 1.18.26 | 简化对象封装工具                     |
+| hutool              | 5.8.15  | 更适合国人的java工具集                |
+| knife4j             | 4.0.0   | 基于swagger，更便于国人使用的swagger ui |
 
 
 通过阿里的代码规范扫描工具（Alibaba Java Coding Guidelines plugin），扫描无异常：

diff --git a/db/Dockerfile b/db/Dockerfile
@@ -1,7 +1,6 @@
 FROM mysql:5.7
 
-MAINTAINER opgames([email protected])
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-COPY ./db/yami_shop.sql /docker-entrypoint-initdb.d
+COPY ./db/yami_shop.sql /docker-entrypoint-initdb.d
diff --git a/doc/接口设计/3. 订单设计-提交订单.md b/doc/接口设计/3. 订单设计-提交订单.md
@@ -70,7 +70,7 @@ public class SubmitOrderListener {
 
 ```java
 // 把订单地址保存到数据库
-UserAddrOrder userAddrOrder = mapperFacade.map(mergerOrder.getUserAddr(), UserAddrOrder.class);
+UserAddrOrder userAddrOrder = BeanUtil.copyProperties(mergerOrder.getUserAddr(), UserAddrOrder.class);
 if (userAddrOrder == null) {
     throw new YamiShopBindException("请填写收货地址");
 }

diff --git a/pom.xml b/pom.xml
@@ -22,24 +22,22 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-        <spring-boot.version>2.7.0</spring-boot.version>
-        <java.version>1.8</java.version>
+        <spring-boot.version>3.0.4</spring-boot.version>
+        <java.version>17</java.version>
         <guava.version>31.1-jre</guava.version>
-        <hutool.version>5.7.22</hutool.version>
+        <hutool.version>5.8.15</hutool.version>
         <jsoup.version>1.15.3</jsoup.version>
         <poi.version>5.2.3</poi.version>
         <qiniu.version>7.2.18</qiniu.version>
-        <weixin.version>3.5.0</weixin.version>
-        <orika.version>1.5.4</orika.version>
         <aliyun-core.version>4.3.9</aliyun-core.version>
         <aliyun-dysmsapi.version>1.1.0</aliyun-dysmsapi.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
-        <redisson.version>3.12.5</redisson.version>
+        <redisson.version>3.19.3</redisson.version>
         <transmittable-thread-local.version>2.12.1</transmittable-thread-local.version>
         <log4j.version>2.17.2</log4j.version>
         <knife4j.version>4.0.0</knife4j.version>
         <xxl-job.version>2.3.1</xxl-job.version>
-        <spring-cloud-commons.version>3.1.1</spring-cloud-commons.version>
+        <spring-cloud-commons.version>4.0.1</spring-cloud-commons.version>
     </properties>
 
     <dependencyManagement>
@@ -58,26 +56,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-pay</artifactId>
-                <version>${weixin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-miniapp</artifactId>
-                <version>${weixin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-mp</artifactId>
-                <version>${weixin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ma.glasnost.orika</groupId>
-                <artifactId>orika-core</artifactId>
-                <version>${orika.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>aliyun-java-sdk-core</artifactId>
@@ -169,11 +147,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/yami-shop-admin/Dockerfile b/yami-shop-admin/Dockerfile
@@ -1,6 +1,5 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM openjdk:17.0.2
 
-MAINTAINER opgames([email protected])
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
@@ -12,4 +11,4 @@ ADD ./yami-shop-admin/target/yami-shop-admin-0.0.1-SNAPSHOT.jar ./
 
 EXPOSE 8085
 
-CMD java -jar -Xms512m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC -Dspring.profiles.active=docker yami-shop-admin-0.0.1-SNAPSHOT.jar
+CMD java -jar -Xms512m -Xmx512m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC -Dspring.profiles.active=docker yami-shop-admin-0.0.1-SNAPSHOT.jar
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
@@ -13,7 +13,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AdminLoginController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AdminLoginController.java
@@ -31,12 +31,11 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yami.shop.common.response.ServerResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Objects;
 

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Objects;
 
 /**

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Objects;
 
 

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -61,7 +61,7 @@ public ServerResponseEntity<HotSearch> info(@PathVariable("id") Long id){
 		HotSearch hotSearch = hotSearchService.getById(id);
 		return ServerResponseEntity.success(hotSearch);
 	}
-	
+
 	/**
 	 * 保存
 	 */
@@ -75,7 +75,7 @@ public ServerResponseEntity<Void> save(@RequestBody @Valid HotSearch hotSearch){
 		hotSearchService.removeHotSearchDtoCacheByShopId(SecurityUtils.getSysUser().getShopId());
 		return ServerResponseEntity.success();
 	}
-	
+
 	/**
 	 * 修改
 	 */

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
@@ -24,7 +24,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Date;
 import java.util.Objects;
 

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Date;
 
 /**

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
@@ -37,8 +37,8 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Date;

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java
@@ -24,7 +24,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Arrays;
 import java.util.Objects;
 

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java
@@ -18,7 +18,7 @@
 import com.yami.shop.service.ProdCommService;
 import lombok.AllArgsConstructor;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +30,6 @@
 import com.yami.shop.common.util.PageParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import java.util.ArrayList;
 import java.util.Date;
 
 /**

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java
@@ -25,7 +25,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -136,4 +136,4 @@ public ServerResponseEntity<List<ProdTag>> listTagList() {
     }
 
 
-}
+}
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java
@@ -22,7 +22,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 分组标签引用

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
@@ -26,12 +26,12 @@
 import com.yami.shop.service.ProdTagReferenceService;
 import com.yami.shop.service.ProductService;
 import com.yami.shop.service.SkuService;
-import ma.glasnost.orika.MapperFacade;
+import cn.hutool.core.bean.BeanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -49,8 +49,6 @@ public class ProductController {
     @Autowired
     private ProductService productService;
 
-    @Autowired
-    private MapperFacade mapperFacade;
 
     @Autowired
     private SkuService skuService;
@@ -103,7 +101,7 @@ public ServerResponseEntity<Product> info(@PathVariable("prodId") Long prodId) {
     public ServerResponseEntity<String> save(@Valid @RequestBody ProductParam productParam) {
         checkParam(productParam);
 
-        Product product = mapperFacade.map(productParam, Product.class);
+        Product product = BeanUtil.copyProperties(productParam, Product.class);
         product.setDeliveryMode(Json.toJsonString(productParam.getDeliveryModeVo()));
         product.setShopId(SecurityUtils.getSysUser().getShopId());
         product.setUpdateTime(new Date());
@@ -130,7 +128,7 @@ public ServerResponseEntity<String> update(@Valid @RequestBody ProductParam prod
         List<Sku> dbSkus = skuService.listByProdId(dbProduct.getProdId());
 
 
-        Product product = mapperFacade.map(productParam, Product.class);
+        Product product = BeanUtil.copyProperties(productParam, Product.class);
         product.setDeliveryMode(Json.toJsonString(productParam.getDeliveryModeVo()));
         product.setUpdateTime(new Date());