Merge remote-tracking branch 'origin/master'

commons/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>hutool-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
@@ -105,12 +110,6 @@
             <version>1.3.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>

commons/src/main/java/com/jzg/commons/entity/po/SysAppManage.java

@@ -3,8 +3,8 @@ package com.jzg.commons.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import javax.validation.constraints.NotBlank;
 
 @Data
 public class SysAppManage extends BaseModel {

commons/src/main/java/com/jzg/commons/entity/vo/AdjustAllRefundInfoVo.java

@@ -3,11 +3,10 @@ package com.jzg.commons.entity.vo;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import com.jzg.commons.entity.orders.po.InsOrdersRisk;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;

commons/src/main/java/com/jzg/commons/entity/vo/SysAppManageVo.java

@@ -4,7 +4,7 @@ package com.jzg.commons.entity.vo;
 import com.jzg.commons.core.base.PageRequest;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Data
 public class SysAppManageVo extends PageRequest {

tenant/organization/src/main/java/com/jzg/organization/service/IWechatCustomerServiceService.java

@@ -1,14 +1,13 @@
 package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.organization.entity.WechatCustomerService;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.organization.entity.vo.WechatCustomerServicePageVo;
 import com.jzg.organization.entity.vo.WechatCustomerServiceQueryVo;
-import com.jzg.organization.entity.vo.WechatCustomerServiceVo;
+import jakarta.validation.constraints.NotBlank;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

tenant/organization/src/main/java/com/jzg/organization/service/SysUserAccountIncomeLogService.java

@@ -1,21 +1,8 @@
 package com.jzg.organization.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.account.po.SysUserAccountIncomeLog;
-import com.jzg.commons.entity.dto.SysUserInfoParam;
-import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
-import com.jzg.commons.entity.po.SysUser;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
-import com.jzg.commons.entity.user.vo.SysTennatVo;
-import com.jzg.commons.entity.vo.*;
-import com.jzg.commons.exception.SystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.constraints.NotBlank;
-import java.util.List;
 
 /**
  * @author Administrator

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -14,7 +14,7 @@ import com.jzg.commons.exception.SystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

tenant/organization/src/main/java/com/jzg/organization/service/WechatCustomerServiceManageService.java

@@ -1,12 +1,12 @@
 package com.jzg.organization.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.jzg.organization.entity.vo.*;
+import com.jzg.organization.entity.vo.WeComDeptVo;
+import com.jzg.organization.entity.vo.WeComUserVo;
+import com.jzg.organization.entity.vo.WechatCustomerServiceDutyRulesVo;
+import com.jzg.organization.entity.vo.WechatCustomerServiceVo;
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**