1、依赖升级：springboot 2.7.18 -> 3.4.5，springcloud 2021.x -> 2024.x ，其余包同步yudao升级；2、微服务配置简化；

2026-08-12 21:02:08 +08:00 · 2025-07-22 11:39:54 +08:00
parent 799affcecb
commit 20085ffb9f
915 changed files with 3116 additions and 4561 deletions
@@ -24,9 +24,15 @@

        <!-- Web 相关 -->
        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <scope>provided</scope> <!-- 设置为 provided，主要是 PageParam 使用到 -->
+            <groupId>org.springdoc</groupId> <!-- 接口文档：使用最新版本的 Swagger 模型 -->
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <scope>provided</scope> <!-- 设置为 provided，主要是 api 包使用到 -->
        </dependency>

        <!-- 参数校验 -->
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;

@@ -3,8 +3,8 @@ package com.cf.imes.module.system.api.errorcode.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "RPC 服务 - 错误码自动生成 Request DTO")
@Data
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 登录日志")
@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 操作日志")
@@ -3,10 +3,10 @@ package com.cf.imes.module.system.api.logger.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "RPC 服务 - 登录日志创建 Request DTO")
@Data
@@ -3,8 +3,8 @@ package com.cf.imes.module.system.api.logger.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.Map;

@@ -3,8 +3,8 @@ package com.cf.imes.module.system.api.logger.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(name = "RPC 服务 - 系统操作日志 Create Request DTO")
@Data
@@ -8,7 +8,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 邮件发送")
@@ -3,8 +3,8 @@ package com.cf.imes.module.system.api.mail.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;

@Schema(description = "RPC 服务 - 邮件发送给 Admin 或者 Member 用户 Request DTO")
@@ -8,7 +8,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 站内信发送")
@@ -3,8 +3,8 @@ package com.cf.imes.module.system.api.notify.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;

@Schema(description = "RPC 服务 - 站内信发送给 Admin 或者 Member 用户 Request DTO")
@@ -12,7 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - OAuth2.0 令牌")
@@ -5,7 +5,7 @@ import com.cf.imes.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;

-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Map;

@@ -3,7 +3,7 @@ package com.cf.imes.module.system.api.organ.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "管理后台 - 组织是否新增统计")
@Data
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 短信验证码")
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 短信发送")
@@ -6,7 +6,7 @@ import com.cf.imes.module.system.enums.sms.SmsSceneEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;

@Schema(description = "RPC 服务 - 短信验证码的发送 Request DTO")
@Data
@@ -7,8 +7,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "RPC 服务 - 短信验证码的使用 Request DTO")
@Data
@@ -7,8 +7,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "RPC 服务 - 短信验证码的校验 Request DTO")
@Data
@@ -4,7 +4,7 @@ import com.cf.imes.framework.common.validation.Mobile;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Map;

@Schema(description = "RPC 服务 - 短信发送给 Admin 或者 Member 用户 Request DTO")
@@ -12,7 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

-import javax.validation.Valid;
+import jakarta.validation.Valid;

@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory =
@Tag(name = "RPC 服务 - 社交用户")
@@ -8,8 +8,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "RPC 服务 - 取消绑定社交用户 Request DTO")
@Data
@@ -9,8 +9,8 @@ import lombok.Data;

 import lombok.NoArgsConstructor;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "RPC 服务 - 取消绑定社交用户 Request DTO")
@Data
@@ -6,8 +6,8 @@ package com.cf.imes.module.system.validation.org;
 * @date: 2024/8/19 9:56
 */

-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.*;

 /**
@@ -3,8 +3,8 @@ package com.cf.imes.module.system.validation.org;
 import cn.hutool.core.util.ObjectUtil;
 import com.cf.imes.framework.common.enums.OrderStatisticsUnit;

-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;

 /**
 * 生产单统计维度单位入参校验器
@@ -18,12 +18,6 @@
    </description>

    <dependencies>
-        <!-- Spring Cloud 基础 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>com.cf.imes</groupId>
            <artifactId>cf-spring-boot-starter-env</artifactId>
@@ -127,12 +121,6 @@
            <artifactId>cf-spring-boot-starter-mq</artifactId>
        </dependency>

-        <!-- 服务保障相关 TODO 晨丰：暂时去掉 -->
-<!--        <dependency>-->
-<!--            <groupId>com.cf.imes</groupId>-->
-<!--            <artifactId>cf-spring-boot-starter-protection</artifactId>-->
-<!--        </dependency>-->
-
        <!-- Test 测试相关 -->
        <dependency>
            <groupId>com.cf.imes</groupId>
@@ -164,8 +152,19 @@

        <!-- 三方云服务相关 -->
        <dependency>
-            <groupId>com.xingyuv</groupId>
-            <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
+            <groupId>me.zhyd.oauth</groupId>
+            <artifactId>JustAuth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
+        </dependency>
+        <dependency>
+            <groupId>com.xkcoding.justauth</groupId>
+            <artifactId>justauth-spring-boot-starter</artifactId>
+            <exclusions>
+                <!-- 移除，避免和项目里的 hutool-all 冲突 -->
+                <exclusion>
+                    <groupId>cn.hutool</groupId>
+                    <artifactId>hutool-core</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <dependency>
@@ -7,7 +7,7 @@ import com.cf.imes.module.system.service.application.ApplicationService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import java.util.Map;

@@ -8,7 +8,7 @@ import com.cf.imes.module.system.service.customplateno.CustomPlateNoSeqService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 /**
 * 自定义板编号序号feign实现类
@@ -7,7 +7,7 @@ import com.cf.imes.module.system.dal.dataobject.datasource.DataSourceDO;
 import com.cf.imes.module.system.dal.mysql.datasource.DataSourceMapper;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Objects;

 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -8,7 +8,7 @@ import com.cf.imes.module.system.service.dept.DeptService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;

@@ -5,7 +5,7 @@ import com.cf.imes.module.system.service.dept.PostService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -9,7 +9,7 @@ import com.cf.imes.module.system.service.dict.DictDataService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -7,7 +7,7 @@ import com.cf.imes.module.system.service.errorcode.ErrorCodeService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;

@@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;

 import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_NO_EXIST;
@@ -6,7 +6,7 @@ import com.cf.imes.module.system.service.logger.LoginLogService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -15,7 +15,7 @@ import com.cf.imes.module.system.service.user.AdminUserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import java.util.List;

@@ -12,7 +12,7 @@ import com.cf.imes.module.system.service.machine.MachineService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import java.util.Collection;
 import java.util.List;
@@ -6,7 +6,7 @@ import com.cf.imes.module.system.service.mail.MailSendService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -6,7 +6,7 @@ import com.cf.imes.module.system.service.notify.NotifySendService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -12,7 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -13,7 +13,7 @@ import com.cf.imes.module.system.service.organ.OrganService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -6,7 +6,7 @@ import com.cf.imes.module.system.service.permission.PermissionService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.Set;

@@ -5,7 +5,7 @@ import com.cf.imes.module.system.service.permission.RoleService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import java.util.ArrayList;
 import java.util.List;
@@ -5,7 +5,7 @@ import com.cf.imes.module.system.service.sensitiveword.SensitiveWordService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.setting.PackageConfigMapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
@@ -8,7 +8,7 @@ import com.cf.imes.module.system.service.sms.SmsCodeService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -6,7 +6,7 @@ import com.cf.imes.module.system.service.sms.SmsSendService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -10,7 +10,7 @@ import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -8,7 +8,7 @@ import com.cf.imes.module.system.service.social.SocialUserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -26,7 +26,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
@@ -9,7 +9,7 @@ import com.cf.imes.module.system.service.user.AdminUserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -16,8 +16,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -3,7 +3,7 @@ package com.cf.imes.module.system.controller.admin.application.vo.application;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "管理后台 - 应用注册表新增/修改 Request VO")
@Data
@@ -47,11 +47,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -10,9 +10,9 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;

-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;

@Schema(description = "管理后台 - 账号密码登录 Request VO，如果登录并绑定社交用户，需要传递 social 开头的参数")
@Data
@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;

-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;

@Schema(description = "管理后台 - 短信验证码校验 ReqVo")
@Data
@@ -7,7 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;

@Schema(description = "管理后台 - 短信验证码的登录 Request VO")
@Data
@@ -9,8 +9,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "管理后台 - 发送手机验证码 Request VO")
@Data
@@ -9,9 +9,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;

@Schema(description = "管理后台 - 社交绑定登录 Request VO，使用 code 授权码 + 账号密码")
@Data
@@ -8,8 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "管理后台 - 社交绑定登录 Request VO，使用 code 授权码 + 账号密码")
@Data
@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;

@Tag(name = "管理后台 - 验证码")
@RestController("adminCaptchaController")
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -3,8 +3,8 @@ package com.cf.imes.module.system.controller.admin.customplateno.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

 /**
 * @author Gqr
@@ -16,9 +16,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;

@@ -6,7 +6,7 @@ import com.cf.imes.module.system.dal.mysql.organ.OrganMapper;
 import com.cf.imes.module.system.dal.mysql.user.AdminUserMapper;
 import org.springframework.context.annotation.Configuration;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;

 import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;

-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "数据源字段新增/修改")
@Data
@@ -17,8 +17,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -20,9 +20,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
@@ -4,7 +4,7 @@ import com.cf.imes.module.system.validation.common.CommonStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 部门列表 Request VO")
@Data
@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 部门创建/修改 Request VO")
@Data
@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 岗位分页 Request VO")
@Data
@@ -5,9 +5,9 @@ import com.cf.imes.module.system.validation.common.CommonStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 岗位创建/修改 Request VO")
@Data
@@ -20,9 +20,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;

@@ -19,9 +19,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 字典类型分页列表 Request VO")
@Data
@@ -6,9 +6,9 @@ import com.cf.imes.module.system.validation.dict.CssClassValid;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 字典数据创建/修改 Request VO")
@Data
@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;

-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;

 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -4,9 +4,9 @@ import com.cf.imes.module.system.validation.common.CommonStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 字典类型创建/修改 Request VO")
@Data
@@ -18,9 +18,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;

@@ -3,7 +3,7 @@ package com.cf.imes.module.system.controller.admin.errorcode.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

@Schema(description = "管理后台 - 错误码创建/修改 Request VO")
@Data
@@ -16,8 +16,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
@@ -7,9 +7,9 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.multipart.MultipartFile;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDate;

 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -4,8 +4,8 @@ package com.cf.imes.module.system.controller.admin.funds.invoice.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;

@Data
 public class InvoiceTitleReqVO {
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -15,8 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -15,8 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;
@@ -3,7 +3,7 @@ package com.cf.imes.module.system.controller.admin.funds.products.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;

@Schema(description = "管理后台 - 产品表 product新增/修改 Request VO")
@Data
@@ -4,7 +4,7 @@ import com.cf.imes.module.system.validation.products.ProductType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;

@Schema(description = "管理后台 - 产品明细表 productDetails新增/修改 Request VO")
@@ -15,8 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;

 import static com.cf.imes.framework.common.pojo.CommonResult.success;

@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.security.PermitAll;
+import jakarta.annotation.security.PermitAll;

 /**
 * @description: 健康检查
@@ -19,10 +19,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;

-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;

 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -3,9 +3,9 @@ package com.cf.imes.module.system.controller.admin.label.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;

@Schema(description = "管理后台 - 标签模板新增/修改 Request VO")
@Data
@@ -13,8 +13,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Map;

--- a/Show More
+++ b/Show More