更新到jdk17,springboot3.1, springcloud2022

qmxwby · Aug 28, 2023 · f5f6d53 · f5f6d53
1 parent 00ac919
commit f5f6d53
Show file tree

Hide file tree

Showing 138 changed files with 432 additions and 777 deletions.
diff --git a/doc/基本开发文档/表格分页.md b/doc/基本开发文档/表格分页.md
@@ -166,11 +166,11 @@ public class PageDTO implements IPage {
      * 当前页
      */
     @NotNull(message = "pageNum 不能为空")
-    @Schema(description = "当前页" , required = true)
+    @Schema(description = "当前页" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer pageNum;
 
     @NotNull(message = "pageSize 不能为空")
-    @Schema(description = "每页大小" , required = true)
+    @Schema(description = "每页大小" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer pageSize;
 
     @Schema(description = "排序字段数组，用逗号分割" )

diff --git a/doc/基本开发文档/防范xss攻击.md b/doc/基本开发文档/防范xss攻击.md
diff --git a/doc/接口设计/订单接口-2.md b/doc/接口设计/订单接口-2.md
@@ -40,7 +40,7 @@ public List<Long> submit(Long userId, ShopCartOrderMergerVO mergerOrder) {
 
 ```java
 public List<Order> saveOrder(Long userId, ShopCartOrderMergerVO mergerOrder) {
-        OrderAddr orderAddr = mapperFacade.map(mergerOrder.getUserAddr(), OrderAddr.class);
+        OrderAddr orderAddr = BeanUtil.map(mergerOrder.getUserAddr(), OrderAddr.class);
         // 地址信息
         if (Objects.isNull(orderAddr)) {
             // 请填写收货地址

diff --git a/...d-api/mall4cloud-api-auth/src/main/java/com/mall4j/cloud/api/auth/dto/AuthAccountDTO.java b/...d-api/mall4cloud-api-auth/src/main/java/com/mall4j/cloud/api/auth/dto/AuthAccountDTO.java
@@ -1,7 +1,7 @@
 package com.mall4j.cloud.api.auth.dto;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author FrozenWatermelon

diff --git a/...all4cloud-api-multishop/src/main/java/com/mall4j/cloud/api/multishop/vo/ShopDetailVO.java b/...all4cloud-api-multishop/src/main/java/com/mall4j/cloud/api/multishop/vo/ShopDetailVO.java
@@ -49,10 +49,10 @@ public class ShopDetailVO extends BaseVO{
 	@JsonSerialize(using = ImgJsonSerializer.class)
 	private String mobileBackgroundPic;
 
-	@Schema(description = "用户名" ,required=true)
+	@Schema(description = "用户名" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private String username;
 
-	@Schema(description = "密码" ,required=true)
+	@Schema(description = "密码" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private String password;
 
 	public String getMobileBackgroundPic() {

diff --git a/...cloud-api/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/bo/EsOrderBO.java b/...cloud-api/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/bo/EsOrderBO.java
@@ -11,34 +11,34 @@
  */
 public class EsOrderBO {
 
-    @Schema(description = "订单项" ,required=true)
+    @Schema(description = "订单项" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private List<EsOrderItemBO> orderItems;
 
-    @Schema(description = "用户id" ,required=true)
+    @Schema(description = "用户id" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long userId;
 
-    @Schema(description = "订单号" ,required=true)
+    @Schema(description = "订单号" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
-    @Schema(description = "总价" ,required=true)
+    @Schema(description = "总价" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long actualTotal;
 
-    @Schema(description = "订单状态" ,required=true)
+    @Schema(description = "订单状态" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer status;
 
-    @Schema(description = "配送类型 :无需快递" ,required=true)
+    @Schema(description = "配送类型 :无需快递" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer deliveryType;
 
-    @Schema(description = "店铺名称" ,required=true)
+    @Schema(description = "店铺名称" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private String shopName;
 
-    @Schema(description = "店铺id" ,required=true)
+    @Schema(description = "店铺id" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long shopId;
 
-    @Schema(description = "订单创建时间" ,required=true)
+    @Schema(description = "订单创建时间" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Date createTime;
 
-    @Schema(description = "商品总数" ,required=true)
+    @Schema(description = "商品总数" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer allCount;
 
     @Schema(description = "收货人姓名" )

diff --git a/...d-api/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/bo/EsOrderItemBO.java b/...d-api/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/bo/EsOrderItemBO.java
@@ -9,28 +9,28 @@
  * @date 2021/2/5
  */
 public class EsOrderItemBO {
-    @Schema(description = "商品图片" , required = true)
+    @Schema(description = "商品图片" , requiredMode = Schema.RequiredMode.REQUIRED)
     private String pic;
 
-    @Schema(description = "商品名称" , required = true)
+    @Schema(description = "商品名称" , requiredMode = Schema.RequiredMode.REQUIRED)
     private String spuName;
 
-    @Schema(description = "商品数量" , required = true)
+    @Schema(description = "商品数量" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer count;
 
-    @Schema(description = "商品价格" , required = true)
+    @Schema(description = "商品价格" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Long price;
 
-    @Schema(description = "skuId" , required = true)
+    @Schema(description = "skuId" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Long skuId;
 
-    @Schema(description = "skuName" , required = true)
+    @Schema(description = "skuName" , requiredMode = Schema.RequiredMode.REQUIRED)
     private String skuName;
 
-    @Schema(description = "订单项id" , required = true)
+    @Schema(description = "订单项id" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderItemId;
 
-    @Schema(description = "商品id" , required = true)
+    @Schema(description = "商品id" , requiredMode = Schema.RequiredMode.REQUIRED)
     private Long spuId;
 
     /**

diff --git a/...i/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/dto/DeliveryOrderDTO.java b/...i/mall4cloud-api-order/src/main/java/com/mall4j/cloud/api/order/dto/DeliveryOrderDTO.java
@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -17,11 +17,11 @@ public class DeliveryOrderDTO{
 	private Long deliveryOrderId;
 
 	@NotNull(message="订单号不能为空")
-	@Schema(description = "订单号" ,required=true)
+	@Schema(description = "订单号" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Long orderId;
 
 	@NotNull(message="发货方式不能为空")
-	@Schema(description = "发货方式" ,required=true)
+	@Schema(description = "发货方式" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Integer deliveryType;
 
 	private List<DeliveryOrderItemDTO> selectOrderItems;

diff --git a/...all4cloud-api-product/src/main/java/com/mall4j/cloud/api/product/dto/ShopCartItemDTO.java b/...all4cloud-api-product/src/main/java/com/mall4j/cloud/api/product/dto/ShopCartItemDTO.java
@@ -2,8 +2,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 购物车物品参数
@@ -14,20 +14,20 @@
 public class ShopCartItemDTO {
 
 	@NotNull(message = "产品ID不能为空")
-	@Schema(description = "产品ID" ,required=true)
+	@Schema(description = "产品ID" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Long spuId;
 
 	@NotNull(message = "skuId不能为空")
-	@Schema(description = "skuId" ,required=true)
+	@Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Long skuId;
 
 	@NotNull(message = "商品数量不能为空")
 	@Min(value = 1,message = "商品数量不能为空")
-	@Schema(description = "商品数量" ,required=true)
+	@Schema(description = "商品数量" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Integer count;
 
 	@NotNull(message = "店铺id不能为空")
-	@Schema(description = "店铺id" ,required=true)
+	@Schema(description = "店铺id" ,requiredMode = Schema.RequiredMode.REQUIRED)
 	private Long shopId;
 
 	public Long getSpuId() {

diff --git a/...all4cloud-api-product/src/main/java/com/mall4j/cloud/api/product/dto/SkuStockLockDTO.java b/...all4cloud-api-product/src/main/java/com/mall4j/cloud/api/product/dto/SkuStockLockDTO.java
@@ -2,8 +2,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author FrozenWatermelon
@@ -12,20 +12,20 @@
 public class SkuStockLockDTO {
 
     @NotNull(message = "产品ID不能为空")
-    @Schema(description = "产品ID" ,required=true)
+    @Schema(description = "产品ID" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long spuId;
 
     @NotNull(message = "skuId不能为空")
-    @Schema(description = "skuId" ,required=true)
+    @Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long skuId;
 
     @NotNull(message = "orderId不能为空")
-    @Schema(description = "orderId" ,required=true)
+    @Schema(description = "orderId" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
     @NotNull(message = "商品数量不能为空")
     @Min(value = 1,message = "商品数量不能为空")
-    @Schema(description = "商品数量" ,required=true)
+    @Schema(description = "商品数量" ,requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer count;
 
     public SkuStockLockDTO() {

diff --git a/...i/mall4cloud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/CheckPermissionDTO.java b/...i/mall4cloud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/CheckPermissionDTO.java
@@ -1,7 +1,7 @@
 package com.mall4j.cloud.api.rbac.dto;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author FrozenWatermelon

diff --git a/...ud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/ClearUserPermissionsCacheDTO.java b/...ud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/ClearUserPermissionsCacheDTO.java
@@ -1,6 +1,6 @@
 package com.mall4j.cloud.api.rbac.dto;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author FrozenWatermelon

diff --git a/...loud-api/mall4cloud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/UserRoleDTO.java b/...loud-api/mall4cloud-api-rbac/src/main/java/com/mall4j/cloud/api/rbac/dto/UserRoleDTO.java
@@ -1,7 +1,7 @@
 package com.mall4j.cloud.api.rbac.dto;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**