feat(商城): 代码优化

waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/shop/CommentController.java

@@ -6,10 +6,10 @@ import com.wayn.common.base.controller.BaseController;
 import com.wayn.common.core.domain.shop.Comment;
 import com.wayn.common.core.service.shop.ICommentService;
 import com.wayn.common.util.R;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**

waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/tool/EmailConfigController.java

@@ -6,11 +6,10 @@ import com.wayn.common.core.service.tool.IMailConfigService;
 import com.wayn.common.enums.ReturnCodeEnum;
 import com.wayn.common.util.R;
 import com.wayn.common.util.mail.MailUtil;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 @RestController
 @AllArgsConstructor
 @RequestMapping("tool/email")

waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/tool/QiniuController.java

@@ -10,12 +10,12 @@ import com.wayn.common.core.service.tool.IQiniuConfigService;
 import com.wayn.common.core.service.tool.IQiniuContentService;
 import com.wayn.common.enums.ReturnCodeEnum;
 import com.wayn.common.util.R;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 import java.io.IOException;
 
 @RestController

waynboot-common/pom.xml

@@ -145,6 +145,12 @@
             <version>3.2.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>com.wayn</groupId>
             <artifactId>waynboot-data-redis</artifactId>

waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Banner.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.ShopBaseEntity;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Channel.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.ShopBaseEntity;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Goods.java

@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.wayn.common.base.entity.ShopBaseEntity;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import lombok.*;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;

waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsProduct.java

@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.wayn.common.base.entity.ShopBaseEntity;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;

waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsSpecification.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.ShopBaseEntity;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/system/Dept.java

@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.BaseEntity;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;

waynboot-common/src/main/java/com/wayn/common/core/domain/system/Dict.java

@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.BaseEntity;
 import com.wayn.common.enums.domain.StatusConverter;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/system/Menu.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.BaseEntity;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;

waynboot-common/src/main/java/com/wayn/common/core/domain/system/Role.java

@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.BaseEntity;
 import com.wayn.common.enums.domain.StatusConverter;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.util.List;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/system/User.java

@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.wayn.common.base.entity.BaseEntity;
 import com.wayn.common.enums.domain.SexConverter;
 import com.wayn.common.enums.domain.StatusConverter;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.io.Serial;
 import java.util.List;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/tool/EmailConfig.java

@@ -3,9 +3,9 @@ package com.wayn.common.core.domain.tool;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/tool/QiniuConfig.java

@@ -3,9 +3,9 @@ package com.wayn.common.core.domain.tool;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 

waynboot-common/src/main/java/com/wayn/common/core/domain/vo/GoodsSaveRelatedVO.java

@@ -4,10 +4,9 @@ import com.wayn.common.core.domain.shop.Goods;
 import com.wayn.common.core.domain.shop.GoodsAttribute;
 import com.wayn.common.core.domain.shop.GoodsProduct;
 import com.wayn.common.core.domain.shop.GoodsSpecification;
+import jakarta.validation.Valid;
 import lombok.Data;
 
-import javax.validation.Valid;
-
 @Data
 public class GoodsSaveRelatedVO {
     @Valid

waynboot-common/src/main/java/com/wayn/common/core/domain/vo/SendMailVO.java

@@ -1,9 +1,9 @@
 package com.wayn.common.core.domain.vo;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;

waynboot-common/src/main/java/com/wayn/common/core/domain/vo/ShipVO.java

@@ -1,10 +1,9 @@
 package com.wayn.common.core.domain.vo;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * 订单发货VO
  */

waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CommentController.java

@@ -9,14 +9,13 @@ import com.wayn.common.core.domain.vo.CommentVO;
 import com.wayn.common.core.service.shop.ICommentService;
 import com.wayn.common.util.R;
 import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 @RestController
 @AllArgsConstructor
 @RequestMapping("comment")

waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchController.java

@@ -17,6 +17,7 @@ import com.wayn.mobile.api.domain.SearchHistory;
 import com.wayn.mobile.api.service.ISearchHistoryService;
 import com.wayn.mobile.framework.manager.thread.AsyncManager;
 import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotEmpty;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;