diff --git a/economic-crime-api/economic-crime-admin/pom.xml b/economic-crime-api/economic-crime-admin/pom.xml
index d1cb897..fa9e6b7 100644
--- a/economic-crime-api/economic-crime-admin/pom.xml
+++ b/economic-crime-api/economic-crime-admin/pom.xml
@@ -10,13 +10,20 @@
economic-crime-admin
3.0.1
- jar
+ war
economic-crime
economic-crime project
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+ provided
+
+
net.lab1024
economic-crime-base
@@ -26,7 +33,7 @@
com.baomidou
- mybatis-plus-spring-boot3-starter
+ mybatis-plus-boot-starter
org.dromara.warm
@@ -35,7 +42,7 @@
org.dromara.warm
- warm-flow-mybatis-plus-sb3-starter
+ warm-flow-mybatis-plus-sb-starter
org.dromara.warm
@@ -45,6 +52,14 @@
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.4.0
+
+ false
+
+
org.springframework.boot
spring-boot-maven-plugin
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
index 2b958cd..94bcf13 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
@@ -7,6 +7,8 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -24,10 +26,16 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@ComponentScan(AdminApplication.COMPONENT_SCAN)
@MapperScan(value = AdminApplication.COMPONENT_SCAN, annotationClass = Mapper.class)
@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
-public class AdminApplication {
+public class AdminApplication extends SpringBootServletInitializer {
public static final String COMPONENT_SCAN = "net.lab1024.sa";
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ return builder.sources(AdminApplication.class)
+ .listeners(new LogVariableListener(), new Ip2RegionListener());
+ }
+
public static void main(String[] args) {
SpringApplication application = new SpringApplication(AdminApplication.class);
// 添加 日志监听器,使 log4j2-spring.xml 可以间接读取到配置文件的属性
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
index 3cb50b2..1baf422 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.config;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.interceptor.AdminInterceptor;
import net.lab1024.sa.base.config.SwaggerConfig;
import org.springframework.context.annotation.Configuration;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
index 61ab3c9..bf0005a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
@@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.strategy.SaAnnotationStrategy;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
import net.lab1024.sa.admin.module.system.login.service.LoginService;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/controller/AlarmReportController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/controller/AlarmReportController.java
index 6155dc2..490d79c 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/controller/AlarmReportController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/controller/AlarmReportController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.alarm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.alarm.domain.form.AlarmAddForm;
import net.lab1024.sa.admin.module.business.alarm.domain.form.AlarmAuditVoteForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAddForm.java
index cf64c5e..1344f26 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAuditVoteForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAuditVoteForm.java
index ce584ec..2441736 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAuditVoteForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmAuditVoteForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewIdForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewIdForm.java
index 45dfb17..f18b3a2 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewIdForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewIdForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewOpinionForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewOpinionForm.java
index 781e66e..b065d72 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewOpinionForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewOpinionForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewUploadForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewUploadForm.java
index 8e1c7d5..6ec7e80 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewUploadForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmNoAcceptReviewUploadForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmUpdateForm.java
index 6196585..bb1ad31 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidApplyForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidApplyForm.java
index b248e02..60429d6 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidApplyForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidApplyForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidAuditForm.java
index 6627a43..05ba26d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/AlarmVoidAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/EvidenceAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/EvidenceAddForm.java
index f8574ff..27901d3 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/EvidenceAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/domain/form/EvidenceAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.alarm.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmAuditSupport.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmAuditSupport.java
index 84663c6..8df0b17 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmAuditSupport.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmAuditSupport.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.alarm.service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmAuditConst;
import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAuditVoteDao;
import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmAuditVoteEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmNoAcceptReviewSupport.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmNoAcceptReviewSupport.java
index 991850a..ca6b63b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmNoAcceptReviewSupport.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmNoAcceptReviewSupport.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.alarm.service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmNoAcceptReviewConst;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmVoidConst;
import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmReportEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmReportService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmReportService.java
index 087cdf6..38ec18b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmReportService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmReportService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.alarm.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAttachmentDao;
import net.lab1024.sa.admin.module.business.alarm.dao.AlarmAuditVoteDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmVoidSupport.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmVoidSupport.java
index 4aa2790..7dfdefd 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmVoidSupport.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/AlarmVoidSupport.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.alarm.service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmSourceConst;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmVoidConst;
import net.lab1024.sa.admin.module.business.alarm.domain.entity.AlarmReportEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/EvidenceMaterialService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/EvidenceMaterialService.java
index 7a92934..58259b5 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/EvidenceMaterialService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/alarm/service/EvidenceMaterialService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.alarm.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.alarm.dao.EvidenceFileDao;
import net.lab1024.sa.admin.module.business.alarm.dao.EvidenceMaterialDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
index dcca8ce..00f49e6 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.category.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
index 4849d60..10c163d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.category.domain.dto;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
index 01b3a1d..1f2ff68 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.category.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
index 49acbcf..6462f5b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.category.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
index d6eed13..cf56512 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.category.manager;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.constant.AdminCacheConst;
import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
index 07ac0be..73eb307 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.category.service;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO;
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
index 27b280d..59cb144 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.category.service;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/controller/DossierController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/controller/DossierController.java
index afc87ef..a6189de 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/controller/DossierController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/controller/DossierController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.dossier.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.dossier.domain.form.*;
import net.lab1024.sa.admin.module.business.dossier.domain.vo.*;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowApplyForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowApplyForm.java
index 2914654..d433184 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowApplyForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowApplyForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowAuditForm.java
index 90e4eee..676790e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowConfirmForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowConfirmForm.java
index 4f90415..24034de 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowConfirmForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowConfirmForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowQueryForm.java
index 331696b..47e7de9 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierBorrowQueryForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyApplyForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyApplyForm.java
index 076b613..e6328c6 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyApplyForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyApplyForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyAuditForm.java
index 40b31b1..345a64f 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyQueryForm.java
index e99ff39..aa64581 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierCopyQueryForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierRegisterForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierRegisterForm.java
index c2be870..ea67fed 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierRegisterForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierRegisterForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnApplyForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnApplyForm.java
index 3905c5c..34e1c67 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnApplyForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnApplyForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnAuditForm.java
index 3357531..e39d32d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierReturnAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierTransferForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierTransferForm.java
index 4c2075a..048d007 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierTransferForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierTransferForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierVolumeForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierVolumeForm.java
index e425c7d..bc85a5c 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierVolumeForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/domain/form/DossierVolumeForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.dossier.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/service/DossierService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/service/DossierService.java
index 8577f03..448a356 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/service/DossierService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/service/DossierService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.dossier.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.dossier.constant.*;
import net.lab1024.sa.admin.module.business.dossier.dao.*;
import net.lab1024.sa.admin.module.business.dossier.domain.entity.*;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/support/DossierNotifySupport.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/support/DossierNotifySupport.java
index 0ce8e54..157ab4b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/support/DossierNotifySupport.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/dossier/support/DossierNotifySupport.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.dossier.support;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
import net.lab1024.sa.base.module.support.message.constant.MessageTypeEnum;
import net.lab1024.sa.base.module.support.message.domain.MessageSendForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
index 50efbf0..cbb79d3 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.goods.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
index 1442f61..00a085d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
@@ -2,9 +2,9 @@ package net.lab1024.sa.admin.module.business.goods.domain.form;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
index ae07176..f116504 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.goods.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
index 476a335..d833391 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.goods.service;
import cn.idev.excel.FastExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
index 988053f..0b3b11d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.oa.bank;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
index 883649a..eb498cf 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.bank;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
index 41ecd20..214fd76 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.oa.bank.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
index c87bee9..1619ba9 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.bank.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
index eb2dad9..38b1ad2 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.oa.enterprise;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
index 24f02ba..09f70db 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.enterprise;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
index 33d63e1..03e25f7 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import lombok.Data;
import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
index 5878e6b..ad62dc2 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
index 55057e1..ac4463e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
index 5488e44..47d4e5e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
index ec5c4c1..eef026b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.oa.invoice;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
index 2cb5456..28b1026 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.invoice;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService;
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
index e663b05..65c66c7 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.oa.invoice.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
index ea82736..243e6b4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.invoice.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/controller/LeaveController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/controller/LeaveController.java
index a1d0942..cae886f 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/controller/LeaveController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/controller/LeaveController.java
@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
/**
* OA 请假申请表 Controller
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveAddForm.java
index 7cb9032..92bc389 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.business.oa.leave.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveUpdateForm.java
index 635c574..f376d35 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/domain/form/LeaveUpdateForm.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.business.oa.leave.domain.form;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/service/LeaveService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/service/LeaveService.java
index 086fb0a..8dd2725 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/service/LeaveService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/leave/service/LeaveService.java
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
/**
* OA 请假申请表 Service
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
index 90237d1..d7f1ec7 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
@@ -1,12 +1,12 @@
package net.lab1024.sa.admin.module.business.oa.notice.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.*;
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
@@ -119,7 +119,7 @@ public class NoticeController {
return noticeEmployeeService.view(
SmartRequestUtil.getRequestUserId(),
noticeId,
- JakartaServletUtil.getClientIP(request),
+ ServletUtil.getClientIP(request),
request.getHeader("User-Agent")
);
}
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
index 8c5e10e..3b21823 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
@@ -2,9 +2,9 @@ package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
index a84ba4a..2829572 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
index c83e837..e24e4ea 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
index 696da75..c8abb8b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
index b835871..cfadfbe 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
index 379106f..a397676 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.oa.notice.manager;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
index 57cde02..0d9bf46 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.notice.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
index 27e486b..f91927e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.oa.notice.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
index 6d65c66..87a25c3 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.oa.notice.service;
import cn.hutool.core.util.StrUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeTypeDao;
import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/controller/PropertyController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/controller/PropertyController.java
index cbcc604..41ffb85 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/controller/PropertyController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/controller/PropertyController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.business.property.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.property.domain.form.*;
import net.lab1024.sa.admin.module.business.property.domain.vo.*;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyAddForm.java
index 8af2837..a8da9a6 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutAuditForm.java
index 48d858d..506c6d4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutSubmitForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutSubmitForm.java
index c8bb39d..3bf43e4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutSubmitForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyCheckoutSubmitForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyInvokeApplyForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyInvokeApplyForm.java
index 2d56144..5adedf4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyInvokeApplyForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyInvokeApplyForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnAuditForm.java
index 9445e72..63ae01b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnSubmitForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnSubmitForm.java
index 55afaf5..c57192f 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnSubmitForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyReturnSubmitForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferAuditForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferAuditForm.java
index 8e9fce4..66964f7 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferAuditForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferAuditForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferConfirmForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferConfirmForm.java
index 276a5c8..2781021 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferConfirmForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferConfirmForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferResubmitForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferResubmitForm.java
index d8c47f4..3b22c12 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferResubmitForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/domain/form/PropertyTransferResubmitForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.business.property.domain.form;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
@Data
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyOmissionService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyOmissionService.java
index 3dcbdf1..3ac796e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyOmissionService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyOmissionService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.property.constant.PropertyOmissionConst;
import net.lab1024.sa.admin.module.business.property.constant.PropertyStatusConst;
import net.lab1024.sa.admin.module.business.property.dao.CasePropertyItemDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyService.java
index 48efaff..af8aa44 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.property.constant.PropertyCheckoutAuditConst;
import net.lab1024.sa.admin.module.business.property.constant.PropertyOperationConst;
import net.lab1024.sa.admin.module.business.property.constant.PropertyReturnAuditConst;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyUnregisteredService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyUnregisteredService.java
index a1ef3b7..c0c965b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyUnregisteredService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/business/property/service/PropertyUnregisteredService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.business.property.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.business.property.constant.CaseSeizureMeasureConst;
import net.lab1024.sa.admin.module.business.property.dao.CaseSeizureDocDao;
import net.lab1024.sa.admin.module.business.property.domain.entity.CaseSeizureDocEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/adapter/AbstractWarmFlowAdapter.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/adapter/AbstractWarmFlowAdapter.java
index 402e169..9bd8d1a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/adapter/AbstractWarmFlowAdapter.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/adapter/AbstractWarmFlowAdapter.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.flow.adapter;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleSelectedVO;
import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/DefController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/DefController.java
index 6768174..98bb0a4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/DefController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/DefController.java
@@ -3,9 +3,9 @@ package net.lab1024.sa.admin.module.flow.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionQueryForm;
import net.lab1024.sa.admin.module.flow.domain.vo.FlowDefinitionVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/ExecuteController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/ExecuteController.java
index 3e840ea..6d446dc 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/ExecuteController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/controller/ExecuteController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.flow.domain.form.ApproveTaskInsForm;
import net.lab1024.sa.admin.module.flow.domain.form.CompleteTaskForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/ApproveTaskInsForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/ApproveTaskInsForm.java
index 3712431..32172de 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/ApproveTaskInsForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/ApproveTaskInsForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.flow.domain.form;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.flow.domain.vo.FlowCopyVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/CompleteTaskForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/CompleteTaskForm.java
index b06cfeb..27424ac 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/CompleteTaskForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/CompleteTaskForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.flow.domain.form;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.flow.domain.vo.FlowCopyVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionAddForm.java
index dea2cf2..405812f 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.flow.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionUpdateForm.java
index ea2902d..970d778 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/FlowDefinitionUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.flow.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/StartProcessForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/StartProcessForm.java
index a1e3d2a..457902c 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/StartProcessForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/domain/form/StartProcessForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.flow.domain.form;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java
index b46050e..d06ddb7 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.flow.handler;
import cn.hutool.core.util.ObjectUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.flow.annoation.ConditionalOnEnable;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/listener/WorkflowGlobalListener.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/listener/WorkflowGlobalListener.java
index ed5a61b..ab9cd02 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/listener/WorkflowGlobalListener.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/listener/WorkflowGlobalListener.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.flow.listener;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.flow.annoation.ConditionalOnEnable;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/FlowDefinitionService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/FlowDefinitionService.java
index bfb7fa8..1d20f75 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/FlowDefinitionService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/FlowDefinitionService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.flow.service;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.flow.dao.FlowDefinitionDao;
import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionAddForm;
import net.lab1024.sa.admin.module.flow.domain.form.FlowDefinitionQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/FlowTaskServiceImpl.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/FlowTaskServiceImpl.java
index 24a468a..a310b79 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/FlowTaskServiceImpl.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/FlowTaskServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import net.lab1024.sa.admin.module.flow.domain.form.ApproveTaskInsForm;
import net.lab1024.sa.admin.module.flow.domain.form.CompleteTaskForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HandlerSelectServiceImpl.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HandlerSelectServiceImpl.java
index 603896d..a49ba6a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HandlerSelectServiceImpl.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HandlerSelectServiceImpl.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.admin.module.flow.service.impl;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.flow.enums.TaskAssigneeEnum;
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentQueryForm;
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HhDefServiceImpl.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HhDefServiceImpl.java
index bb34c5b..91b6266 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HhDefServiceImpl.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/flow/service/impl/HhDefServiceImpl.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.flow.service.impl;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.flow.adapter.WarmFlowAdapter;
import net.lab1024.sa.admin.module.flow.service.HhDefService;
import net.lab1024.sa.admin.module.flow.domain.vo.WarmFlowInteractiveTypeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
index dad539b..ca4b627 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.datascope;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeAndViewTypeVO;
import net.lab1024.sa.admin.module.system.datascope.service.DataScopeService;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
index c0d1564..50fb046 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.datascope;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeSqlConfig;
import net.lab1024.sa.admin.module.system.datascope.service.DataScopeSqlConfigService;
import net.lab1024.sa.base.common.domain.DataScopePlugin;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
index 77d08cb..50bed14 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.datascope.service;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.AdminApplication;
import net.lab1024.sa.admin.module.system.datascope.DataScope;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
index 0a602a3..cbeab8e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.datascope.service;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeTypeEnum;
import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
index 4913f10..5f912df 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.department.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentAddForm;
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentUpdateForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
index bbdf584..d2be9da 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.department.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentQueryForm.java
index 38f4043..d2ba542 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.department.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Size;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
index 07d9138..bad6586 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.department.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
index 3e3c3c5..2889266 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.department.manager;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.constant.AdminCacheConst;
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
index 75d155c..f25ae8e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.department.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentAddForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
index 17bc211..026f757 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.employee.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.employee.domain.form.*;
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
index 7826b2e..afc9568 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import lombok.Data;
import net.lab1024.sa.base.common.enumeration.GenderEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
index 5210558..df65a7a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
@@ -1,9 +1,9 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
index 721f41d..cc1cd98 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Size;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
index b31ae91..b04f139 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
index 3148b66..3b47a4b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import lombok.Data;
import net.lab1024.sa.base.common.enumeration.GenderEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
index 8ae56c5..f23a969 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
index fb56dd6..7b66b1d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
import lombok.Data;
import net.lab1024.sa.base.common.util.SmartVerificationUtil;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
index e87cd7e..ca4012c 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.employee.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
index 39af288..73e9dc2 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.employee.manager;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
index ba18ccb..19d70a8 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.flow.domain.vo.WarmFlowInteractiveTypeVO;
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
index 5cd9017..16c067e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
@@ -1,12 +1,12 @@
package net.lab1024.sa.admin.module.system.login.controller;
import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.login.domain.LoginForm;
import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
@@ -40,8 +40,8 @@ public class LoginController {
@PostMapping("/login")
@Operation(summary = "登录 @author 卓大")
public ResponseDTO login(@Valid @RequestBody LoginForm loginForm, HttpServletRequest request) {
- String ip = JakartaServletUtil.getClientIP(request);
- String userAgent = JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
+ String ip = ServletUtil.getClientIP(request);
+ String userAgent = ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
return loginService.login(loginForm, ip, userAgent);
}
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
index d452638..960ca4d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.login.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
index 171fdcf..2527818 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
@@ -5,10 +5,10 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.RandomUtil;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.business.alarm.constant.AlarmPermissionCompat;
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
@@ -349,8 +349,8 @@ public class LoginService implements StpInterface {
}
// 更新请求ip和user agent
- requestEmployee.setUserAgent(JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT));
- requestEmployee.setIp(JakartaServletUtil.getClientIP(request));
+ requestEmployee.setUserAgent(ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT));
+ requestEmployee.setIp(ServletUtil.getClientIP(request));
return requestEmployee;
}
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
index 99f7ac1..7e9c975 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.menu.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuAddForm;
import net.lab1024.sa.admin.module.system.menu.domain.form.MenuUpdateForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
index 33a84b4..0cdaf57 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.menu.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.admin.module.system.menu.constant.MenuPermsTypeEnum;
import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
index e8c1ae6..2fc306a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.menu.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
index c384406..f5854db 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.menu.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
index 5dd3e02..4382d0d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.menu.service;
import cn.hutool.core.collection.CollectionUtil;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum;
import net.lab1024.sa.admin.module.system.menu.dao.MenuDao;
import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java
index 40922e2..c80c920 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/message/AdminMessageController.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.system.message;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
index de8f25d..b650c48 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.system.position.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.position.domain.form.PositionAddForm;
import net.lab1024.sa.admin.module.system.position.domain.form.PositionQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
index a56702d..de8e611 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.position.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
index e338f76..4216c11 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.position.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
index 7c5b53e..6ab8396 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.position.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.position.dao.PositionDao;
import net.lab1024.sa.admin.module.system.position.domain.entity.PositionEntity;
import net.lab1024.sa.admin.module.system.position.domain.form.PositionAddForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
index 70011ae..8782ee6 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.role.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleAddForm;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleUpdateForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
index 28bca46..293d8e4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.role.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleDataScopeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
index 41fae56..2e259dc 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.role.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeQueryForm;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
index 3f08708..16fcdf9 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.role.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleMenuUpdateForm;
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleMenuTreeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
index 2bfdc1a..96273ba 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
index 157ead1..0db8646 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.role.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
index b835953..89bbb2b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.admin.module.system.role.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
index 08a7b56..171596d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
index 7e7646f..0d41b6f 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
index ad0dd6c..b782428 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.manager;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.role.dao.RoleMenuDao;
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleMenuEntity;
import org.springframework.stereotype.Service;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
index 9b747cc..cadf71a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.service;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleDataScopeEntity;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleDataScopeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
index 0435b6c..a3a7cb4 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.role.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
index 547de6d..233c026 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.service;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.menu.dao.MenuDao;
import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity;
import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuSimpleTreeVO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
index cf65b99..8d72d0b 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.admin.module.system.role.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.admin.module.system.department.domain.form.DepartmentQueryForm;
import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
import net.lab1024.sa.admin.module.system.role.dao.RoleDao;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
index 9eb0d5a..c56727a 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
@@ -2,10 +2,10 @@ package net.lab1024.sa.admin.module.system.support;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
index 1d6397e..6fa9abf 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
index 559383e..59bafa9 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.ValidateList;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
index 62aa6af..bac4859 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
index 51c67a6..cf77f15 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
index f0380cd..14a06b3 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
index 99d052b..8a40f40 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.system.support;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
index 5e6b776..82391c9 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
index af32703..f6af59e 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
index f306212..e462d29 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
index 3d41dc2..8ecca22 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.admin.module.system.support;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
index c3ffbc6..8c85bfe 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
index d5c4915..a0a652d 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
index 02e5cea..cad3808 100644
--- a/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
+++ b/economic-crime-api/economic-crime-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.admin.module.system.support;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-base/pom.xml b/economic-crime-api/economic-crime-base/pom.xml
index 08d399f..772d449 100644
--- a/economic-crime-api/economic-crime-base/pom.xml
+++ b/economic-crime-api/economic-crime-base/pom.xml
@@ -56,7 +56,7 @@
cn.dev33
- sa-token-spring-boot3-starter
+ sa-token-spring-boot-starter
@@ -114,7 +114,7 @@
com.baomidou
- mybatis-plus-spring-boot3-starter
+ mybatis-plus-boot-starter
@@ -124,7 +124,7 @@
com.github.xiaoymin
- knife4j-openapi3-jakarta-spring-boot-starter
+ knife4j-openapi3-spring-boot-starter
@@ -139,7 +139,7 @@
com.alibaba
- druid-spring-boot-3-starter
+ druid-spring-boot-starter
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
index fa185e2..5af3f4c 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
@@ -1,11 +1,11 @@
package net.lab1024.sa.base.common.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
index 17628d0..a211aa2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.common.domain;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
index bdf413a..31cea10 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.common.domain;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
import java.util.*;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
index d48cf69..2fac0c0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.common.json.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.file.service.FileService;
import org.apache.commons.lang3.StringUtils;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
index 328e974..d34cde1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.module.support.file.domain.vo.FileVO;
import net.lab1024.sa.base.module.support.file.service.FileService;
import org.apache.commons.lang3.StringUtils;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
index c3e8d9f..2d1de54 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.common.util;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
import org.springframework.beans.BeanUtils;
import java.util.Collections;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
index f31fa98..edd8a1d 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
@@ -4,7 +4,7 @@ import cn.idev.excel.FastExcel;
import cn.idev.excel.write.handler.SheetWriteHandler;
import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
import cn.idev.excel.write.metadata.holder.WriteWorkbookHolder;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.openxml4j.opc.PackagePartName;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
index 7d8ee45..597891f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.common.util;
import com.alibaba.fastjson.JSON;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import org.springframework.http.HttpHeaders;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartTableMetadataUtil.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartTableMetadataUtil.java
index 3fe6904..c736c95 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartTableMetadataUtil.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/util/SmartTableMetadataUtil.java
@@ -5,8 +5,8 @@ import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
index 85d8dc9..c095ce7 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.common.validator.enumeration;
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import javax.validation.Constraint;
+import javax.validation.Payload;
import net.lab1024.sa.base.common.enumeration.BaseEnum;
import java.lang.annotation.ElementType;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
index af84df4..abc152b 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.common.validator.enumeration;
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
import net.lab1024.sa.base.common.enumeration.BaseEnum;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
index 1af7ede..7574590 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.base.config;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.stat.StatFilter;
import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.jakarta.StatViewServlet;
-import com.alibaba.druid.support.jakarta.WebStatFilter;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
@@ -89,10 +89,10 @@ public class DataSourceConfig {
@Value("${spring.datasource.druid.method.pointcut}")
String methodPointcut;
- @jakarta.annotation.Resource
+ @javax.annotation.Resource
private MybatisPlusInterceptor paginationInterceptor;
- @jakarta.annotation.Resource
+ @javax.annotation.Resource
private DataScopePlugin dataScopePlugin;
@Bean
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
index 1b500a9..7406e43 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.config;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.module.support.heartbeat.core.HeartBeatManager;
import net.lab1024.sa.base.module.support.heartbeat.core.IHeartBeatRecordHandler;
import org.springframework.beans.factory.annotation.Value;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
index 68b3e83..10b6e0d 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
index 4148dcb..ee54ef4 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.config;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.constant.StringConst;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.module.support.repeatsubmit.RepeatSubmitAspect;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
index 6163c20..e2ac8e9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
@@ -12,14 +12,14 @@ import net.lab1024.sa.base.common.constant.RequestHeaderConst;
import net.lab1024.sa.base.common.swagger.SmartOperationCustomizer;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import org.apache.commons.lang3.StringUtils;
+import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.OpenAPIService;
+import org.springdoc.core.PropertyResolverUtils;
+import org.springdoc.core.SecurityService;
+import org.springdoc.core.SpringDocConfigProperties;
import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
-import org.springdoc.core.models.GroupedOpenApi;
-import org.springdoc.core.properties.SpringDocConfigProperties;
import org.springdoc.core.providers.JavadocProvider;
-import org.springdoc.core.service.OpenAPIService;
-import org.springdoc.core.service.SecurityService;
-import org.springdoc.core.utils.PropertyResolverUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java
index b8878e6..d23ddbf 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.config;
import cn.dev33.satoken.config.SaTokenConfig;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
import org.springframework.context.annotation.Configuration;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
index 7c69e4b..1d38a9a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.swagger.v3.oas.annotations.Operation;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.annoation.NoNeedLogin;
import net.lab1024.sa.base.common.domain.RequestUrlVO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
index fcb44bd..8260a6f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
@@ -51,6 +51,7 @@ public class YamlProcessor implements EnvironmentPostProcessor {
for (Resource resource : resources) {
log.info("初始化系统配置:{}", resource.getFilename());
List> load = loader.load(resource.getFilename(), resource);
+ // 使用 addLast 添加到最后,确保外部化配置文件 (application-prod.yaml) 或环境变量具有更高优先级,能正常覆盖包内配置
load.forEach(propertySources::addLast);
}
} catch (IOException e) {
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
index 6302c25..c391975 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.handler;
import cn.dev33.satoken.exception.NotPermissionException;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.SystemErrorCode;
import net.lab1024.sa.base.common.code.UserErrorCode;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.resource.NoResourceFoundException;
+import org.springframework.web.servlet.NoHandlerFoundException;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -101,11 +101,11 @@ public class GlobalExceptionHandler {
}
/**
- * 静态资源不存在(如 /upload/ 下图片缺失)
+ * 静态资源或路径不存在
*/
@ResponseBody
- @ExceptionHandler(NoResourceFoundException.class)
- public ResponseDTO> noResourceFoundHandler(NoResourceFoundException e) {
+ @ExceptionHandler(NoHandlerFoundException.class)
+ public ResponseDTO> noResourceFoundHandler(NoHandlerFoundException e) {
String url = getCurrentRequestUrl();
if (url != null && url.startsWith("/upload/")) {
log.warn("静态资源不存在, URL: {}", url);
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
index 5ee528e..7380ee4 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.apiencrypt.advice;
import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.module.support.apiencrypt.annotation.ApiDecrypt;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
index f4f6c03..b850ed9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.apiencrypt.advice;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.enumeration.DataTypeEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
index 3d49f9d..1ae17ee 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.cache;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.constant.ReloadConst;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import org.springframework.cache.caffeine.CaffeineCache;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CaffeineCacheServiceImpl.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CaffeineCacheServiceImpl.java
index 087b537..7df9fa6 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CaffeineCacheServiceImpl.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/CaffeineCacheServiceImpl.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.cache;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.constant.ReloadConst;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import org.springframework.cache.caffeine.CaffeineCache;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java
index 5e04fcc..c5bfe49 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.cache;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.constant.ReloadConst;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import org.springframework.data.redis.cache.RedisCache;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
index b5ee9b2..d4fd297 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.captcha;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
index 500704e..c9c9818 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
@@ -4,7 +4,7 @@ import cn.hutool.captcha.CaptchaUtil;
import cn.hutool.captcha.LineCaptcha;
import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.util.RandomUtil;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.constant.StringConst;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
index e87dff3..34a4f54 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.captcha.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
index 8aac145..b1c9a04 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.changelog.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
index 0d8093b..62f272a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.changelog.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
index e442b5f..309d83a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.changelog.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
index b385217..6a605a5 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.changelog.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
index 515d71a..b3080b6 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
@@ -2,9 +2,9 @@ package net.lab1024.sa.base.module.support.codegenerator.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
index f434b53..cba25c9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
@@ -1,9 +1,9 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
index ad8838e..38890d3 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
index f5ac9dd..9c6f2c2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
index c51defd..e3d995e 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
index 0b08a98..9675980 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
index 0121c67..ccdebb0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
index a081f88..fb59a2a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
index f83f710..c0c4107 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
index 2a730c4..a43d9e0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.codegenerator.domain.model;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
index e495bb7..b92a91f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index 74998c9..4555f2f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -8,7 +8,7 @@ import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.google.common.base.CaseFormat;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.module.support.codegenerator.domain.entity.CodeGeneratorConfigEntity;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
index d47c9f9..bf16ce0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
@@ -93,8 +93,8 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
if (Boolean.TRUE.equals(field.getRequiredFlag())) {
String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull";
finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")");
- packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;"
- : "import jakarta.validation.constraints.NotNull;");
+ packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;"
+ : "import javax.validation.constraints.NotNull;");
}
}
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
index a5089da..7e31c6e 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
@@ -108,7 +108,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
if (Boolean.TRUE.equals(field.getRequiredFlag())) {
String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull";
finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")");
- packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;" : "import jakarta.validation.constraints.NotNull;");
+ packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;" : "import javax.validation.constraints.NotNull;");
}
}
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
index f0636ea..24a5ec1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.config;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
index e8f9c35..0db9ba7 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.base.module.support.config;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.PageResult;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
index 375ff4d..6e4772a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.config.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
index 28bef4d..c7ecfce 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.config.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
index 4690793..2ea8957 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.datatracer.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
index 9243cdc..190f1d6 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.datatracer.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
index 432096f..cfc1930 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.google.common.base.CaseFormat;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartBigDecimalUtil;
import net.lab1024.sa.base.common.util.SmartEnumUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
index aa20805..3699fa1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.datatracer.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictAddForm.java
index 95726a7..34de3f9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.dict.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataAddForm.java
index cfc1f66..63b33b8 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.dict.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataUpdateForm.java
index 77c43c7..9957488 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictDataUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.dict.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictUpdateForm.java
index 1edd622..adf53d2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictUpdateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.dict.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/manager/DictManager.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/manager/DictManager.java
index 7b87861..2b12fe6 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/manager/DictManager.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/manager/DictManager.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.dict.manager;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.constant.CacheKeyConst;
import net.lab1024.sa.base.module.support.dict.dao.DictDao;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
index 8762b0b..099c656 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.dict.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
index f83ff7e..621114a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.feedback.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
index e6cd76a..41c870f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.feedback.domain;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
index 88fafcb..352edc2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.feedback.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
index 0b31457..672a091 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
@@ -1,11 +1,11 @@
package net.lab1024.sa.base.module.support.file.controller;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import net.lab1024.sa.base.common.constant.RequestHeaderConst;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.RequestUser;
@@ -54,7 +54,7 @@ public class FileController extends SupportBaseController {
@Operation(summary = "下载文件流(根据fileKey) ")
@GetMapping("/file/downLoad")
public void downLoad(@RequestParam String fileKey, HttpServletRequest request, HttpServletResponse response) throws IOException {
- String userAgent = JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
+ String userAgent = ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
ResponseDTO downloadFileResult = fileService.getDownloadFile(fileKey, userAgent);
if (!downloadFileResult.getOk()) {
SmartResponseUtil.write(response, downloadFileResult);
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
index 47ac4d0..c48b3a1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.file.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
index 544367e..e614728 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.file.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.constant.StringConst;
import net.lab1024.sa.base.common.domain.PageResult;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
index bcdfe21..dc956fe 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
@@ -6,7 +6,7 @@ import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.CannedAccessControlList;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.S3Object;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.SystemErrorCode;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
index 227ed4a..bcc29b8 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
@@ -3,7 +3,7 @@ package net.lab1024.sa.base.module.support.file.service;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.net.NetUtil;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.SystemErrorCode;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
index 0e968b1..fa29822 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.heartbeat;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.module.support.heartbeat.core.HeartBeatRecord;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
index 7f8a0b3..8ac6c09 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.heartbeat;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
index bd112f9..f3d3d65 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
@@ -2,9 +2,9 @@ package net.lab1024.sa.base.module.support.helpdoc.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
index 6789cfd..8fbba76 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
index c171a01..c720089 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
index a54da48..ee20278 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
index d3bde32..0c8fb9f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
index 51ca19c..4972a6e 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
index 29fc7a0..9eb56d9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
index 55756ea..3ae8964 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.helpdoc.domain.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
index 12bc5d8..04494f1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.helpdoc.manager;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.module.support.helpdoc.dao.HelpDocDao;
import net.lab1024.sa.base.module.support.helpdoc.domain.entity.HelpDocEntity;
import net.lab1024.sa.base.module.support.helpdoc.domain.form.HelpDocRelationForm;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
index c88630f..1676039 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.helpdoc.service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.module.support.helpdoc.dao.HelpDocCatalogDao;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
index 4dd241d..2a92156 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
index d7043f9..4117426 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.helpdoc.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
index 6c61dd2..d8a6a2f 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.job.api;
import cn.hutool.core.util.IdUtil;
import com.google.common.collect.Lists;
-import jakarta.annotation.PreDestroy;
+import javax.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.module.support.job.api.domain.SmartJobMsg;
import net.lab1024.sa.base.module.support.job.config.SmartJobAutoConfiguration;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
index 836f42f..8301010 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.job.api;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobAddForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobAddForm.java
index 0ca70f1..a3ff9c7 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobAddForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobAddForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.job.api.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
index 11de070..a706ed1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.job.api.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
index 81f4cb2..9d9eae0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.job.api.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
index 860b4a9..98f0087 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.job.api.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
index 88162f8..d2b63e2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.job.core;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import jakarta.annotation.PreDestroy;
+import javax.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.module.support.job.config.SmartJobConfig;
import net.lab1024.sa.base.module.support.job.constant.SmartJobConst;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
index 62505b2..521e239 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.loginlog;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
index 24f6284..53e3785 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
@@ -5,9 +5,9 @@ import cn.hutool.core.lang.UUID;
import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
-import jakarta.annotation.Resource;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
+import javax.annotation.Resource;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.SystemEnvironment;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
index 449a124..7e0d702 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.message.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
index d62d216..286b2cd 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.message.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
index 9f70ac6..6b788db 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.message.domain;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
import net.lab1024.sa.base.module.support.message.constant.MessageTemplateEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
index d380c19..ddb89b1 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.message.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
index 5ad1684..c707909 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.operatelog;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
index 5d3415f..4e9eeb2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
@@ -1,14 +1,14 @@
package net.lab1024.sa.base.module.support.operatelog.core;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.constant.RequestHeaderConst;
import net.lab1024.sa.base.common.constant.StringConst;
@@ -164,8 +164,8 @@ public abstract class OperateLogAspect {
String operateUserName = "匿名";
String operateUserAccount = StringConst.EMPTY;
String operateUserRole = StringConst.EMPTY;
- String ip = JakartaServletUtil.getClientIP(request);
- String ua = JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
+ String ip = ServletUtil.getClientIP(request);
+ String ua = ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
if (user != null) {
operateUserId = user.getUserId() == null ? 0L : user.getUserId();
operateUserType = user.getUserType() == null ? 0 : user.getUserType().getValue();
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
index a45f812..1e74ccd 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.redis;
import com.alibaba.fastjson.JSON;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.SystemEnvironment;
import net.lab1024.sa.base.common.enumeration.SystemEnvironmentEnum;
import net.lab1024.sa.base.common.util.SmartStringUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java
deleted file mode 100644
index 3781ca8..0000000
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.lab1024.sa.base.module.support.redis;
-
-import net.lab1024.sa.base.common.util.SmartStringUtil;
-import org.redisson.config.Config;
-import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
-import org.springframework.stereotype.Component;
-
-/**
- *
- * redission对于password 为空处理有问题,重新设置下
- *
- * @Author 1024创新实验室-主任:卓大
- * @Date 2024/7/16 01:04:18
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 ,Since 2012
- */
-
-@Component
-public class RedissonPasswordConfigurationCustomizer implements RedissonAutoConfigurationCustomizer {
- @Override
- public void customize(Config configuration) {
- if (configuration.isSingleConfig() && SmartStringUtil.isEmpty(configuration.useSingleServer().getPassword())) {
- configuration.useSingleServer().setPassword(null);
- }
-
- if (configuration.isClusterConfig() && SmartStringUtil.isEmpty(configuration.useClusterServers().getPassword())) {
- configuration.useClusterServers().setPassword(null);
- }
- if (configuration.isSentinelConfig() && SmartStringUtil.isEmpty(configuration.useSentinelServers().getPassword())) {
- configuration.useSentinelServers().setPassword(null);
- }
- }
-}
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
index aaab74a..204f9ee 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
@@ -120,7 +120,7 @@ public class RedissonService {
* @param
*/
public void putObj(String key, T v, Duration duration) {
- redissonClient.getBucket(key).set(v, duration);
+ redissonClient.getBucket(key).set(v, duration.toMillis(), TimeUnit.MILLISECONDS);
}
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
index e848b05..137bffd 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.reload;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.module.support.reload.core.AbstractSmartReloadCommand;
import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadItem;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
index 98b8ae3..e6c5b6d 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.reload;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.reload.dao.ReloadItemDao;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
index 98773e1..9f022b0 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
@@ -1,9 +1,9 @@
package net.lab1024.sa.base.module.support.reload.core;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadObject;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
index c704fc2..e7abea2 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.reload.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
index 8333493..73c8bd6 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.securityprotect.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
index 00cb51e..0e50c41 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
@@ -3,8 +3,8 @@ package net.lab1024.sa.base.module.support.securityprotect.service;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
index 9ecfd75..0c98b50 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.securityprotect.service;
import lombok.extern.slf4j.Slf4j;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.exception.TikaException;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
index c51eb0c..c8a7f69 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
@@ -2,7 +2,7 @@ package net.lab1024.sa.base.module.support.securityprotect.service;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
index 3cd8305..8f20532 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.securityprotect.service;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartStringUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
index 0308cfd..1e5a2f9 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.serialnumber.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
index 95041bb..08f1366 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.serialnumber.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import net.lab1024.sa.base.common.domain.PageParam;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
index baa912b..ec54dd4 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.serialnumber.service;
import com.google.common.collect.Lists;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.exception.BusinessException;
import net.lab1024.sa.base.common.util.SmartEnumUtil;
import net.lab1024.sa.base.module.support.serialnumber.constant.SerialNumberIdEnum;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
index d102ea5..63cd9fd 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.serialnumber.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.util.SmartPageUtil;
import net.lab1024.sa.base.module.support.serialnumber.dao.SerialNumberRecordDao;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
index 571e0d9..4da1996 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
@@ -1,6 +1,6 @@
package net.lab1024.sa.base.module.support.serialnumber.service.impl;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.exception.BusinessException;
import net.lab1024.sa.base.constant.RedisKeyConst;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
index 66b3dc5..197506b 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
@@ -2,8 +2,8 @@ package net.lab1024.sa.base.module.support.table;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.annotation.Resource;
+import javax.validation.Valid;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
index 871e1aa..b28246a 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.table;
import com.alibaba.fastjson.JSONArray;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.table.domain.TableColumnEntity;
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
index 4cc96f0..413fd35 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
@@ -1,8 +1,8 @@
package net.lab1024.sa.base.module.support.table.domain;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
index dce303f..2b67600 100644
--- a/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
+++ b/economic-crime-api/economic-crime-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
@@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.table.domain;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
diff --git a/economic-crime-api/economic-crime-base/src/main/resources/dev/sa-base.yaml b/economic-crime-api/economic-crime-base/src/main/resources/dev/sa-base.yaml
index bffea0c..8644036 100644
--- a/economic-crime-api/economic-crime-base/src/main/resources/dev/sa-base.yaml
+++ b/economic-crime-api/economic-crime-base/src/main/resources/dev/sa-base.yaml
@@ -20,13 +20,25 @@ spring:
method:
pointcut: net.lab1024.sa..*Service.*
- # redis 连接池配置信息
+ # redis 连接池配置信息 (兼容 Spring Boot 2.7 和 Redisson 自动配置)
+ redis:
+ database: 10
+ host: 8.162.3.203
+ port: 6379
+ password: sdy@2025#dc
+ timeout: 10000ms
+ lettuce:
+ pool:
+ max-active: 5
+ min-idle: 1
+ max-idle: 3
+ max-wait: 30000ms
data:
redis:
database: 10
- host: 127.0.0.1
+ host: 8.162.3.203
port: 6379
- password:
+ password: sdy@2025#dc
timeout: 10000ms
lettuce:
pool:
diff --git a/economic-crime-api/economic-crime-base/src/main/resources/prod/sa-base.yaml b/economic-crime-api/economic-crime-base/src/main/resources/prod/sa-base.yaml
index 7309c20..48fac5a 100644
--- a/economic-crime-api/economic-crime-base/src/main/resources/prod/sa-base.yaml
+++ b/economic-crime-api/economic-crime-base/src/main/resources/prod/sa-base.yaml
@@ -3,7 +3,7 @@ spring:
datasource:
url: jdbc:kingbase8://8.162.3.203:54321/economic_crime_dev?currentSchema=public&clientEncoding=utf8&socketTimeout=30000&loginTimeout=30
username: dcms_dev
- password: dy@2025#dc$ks
+ password: sdy@2025#dc$ks
driver-class-name: com.kingbase8.Driver
initial-size: 10
min-idle: 10
@@ -20,13 +20,25 @@ spring:
method:
pointcut: net.lab1024.sa..*Service.*
- # redis 连接池配置信息
+ # redis 连接池配置信息 (兼容 Spring Boot 2.7 和 Redisson 自动配置)
+ redis:
+ database: 10
+ host: 8.162.3.203
+ port: 6379
+ password: sdy@2025#dc
+ timeout: 10000ms
+ lettuce:
+ pool:
+ max-active: 100
+ min-idle: 10
+ max-idle: 50
+ max-wait: 30000ms
data:
redis:
- database: 1
- host: 127.0.0.1
+ database: 10
+ host: 8.162.3.203
port: 6379
- password:
+ password: sdy@2025#dc
timeout: 10000ms
lettuce:
pool:
@@ -164,4 +176,21 @@ smart:
# 数据库配置检测-开关 默认开启 可选(作用是固定间隔读取数据库配置更新任务,关闭后只能重启服务或通过接口修改定时任务,建议开启)
db-refresh-enabled: true
# 数据库配置检测-执行间隔 默认120秒 可选
- db-refresh-interval: 60
\ No newline at end of file
+ db-refresh-interval: 60
+
+# warm-flow工作流配置
+warm-flow:
+ # 是否开启工作流,默认true
+ enabled: true
+ # 是否开启设计器ui
+ ui: true
+ # 默认Authorization,如果有多个token,用逗号分隔
+ token-name: ${sa-token.token-name}
+ # 流程状态对应的三元色
+ chart-status-color:
+ ## 未办理
+ - 62,62,62
+ ## 待办理
+ - 255,205,23
+ ## 已办理
+ - 157,255,0
\ No newline at end of file
diff --git a/economic-crime-api/pom.xml b/economic-crime-api/pom.xml
index e6a7378..411dfe9 100644
--- a/economic-crime-api/pom.xml
+++ b/economic-crime-api/pom.xml
@@ -16,12 +16,12 @@
- 21
+ 17
UTF-8
UTF-8
- 3.3.1
+ 2.7.18
2.0.8
- 6.4.3
+ 5.8.11
8.3.0
8.6.0
3.5.7
@@ -57,7 +57,7 @@
2.13.4
2.16.1
1.2.0
- 3.25.0
+ 3.17.7
2.2
2.3.33
1.18.1
@@ -93,7 +93,7 @@
com.baomidou
- mybatis-plus-spring-boot3-starter
+ mybatis-plus-boot-starter
${mybatis-plus.version}
@@ -117,7 +117,7 @@
com.github.xiaoymin
- knife4j-openapi3-jakarta-spring-boot-starter
+ knife4j-openapi3-spring-boot-starter
${knife4j.version}
@@ -130,7 +130,7 @@
com.alibaba
- druid-spring-boot-3-starter
+ druid-spring-boot-starter
${druid.version}
@@ -246,7 +246,7 @@
cn.dev33
- sa-token-spring-boot3-starter
+ sa-token-spring-boot-starter
${sa-token.version}
@@ -258,10 +258,10 @@
-
+
org.dromara.warm
- warm-flow-mybatis-plus-sb3-starter
+ warm-flow-mybatis-plus-sb-starter
${warm-flow.version}
@@ -431,8 +431,8 @@
3.13.0
-parameters
- 21
- 21
+ 17
+ 17
UTF-8
diff --git a/economic-crime-web/.env.production b/economic-crime-web/.env.production
index b5f9f13..4ab58b0 100644
--- a/economic-crime-web/.env.production
+++ b/economic-crime-web/.env.production
@@ -1,3 +1,3 @@
NODE_ENV=production
VITE_APP_TITLE='铜陵市公安局经侦案件智慧管理平台'
-VITE_APP_API_URL='https://preview.smartadmin.vip/smart-admin-api'
\ No newline at end of file
+VITE_APP_API_URL='/economic-crime'
\ No newline at end of file
diff --git a/jingzhen-case-mgmt/backend/pom.xml b/jingzhen-case-mgmt/backend/pom.xml
deleted file mode 100644
index 9ae170e..0000000
--- a/jingzhen-case-mgmt/backend/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
- 4.0.0
-
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.7.18
-
-
-
- com.jingzhen
- jingzhen-case-mgmt-backend
- 1.0.0
- jar
-
- 经侦智慧案件管控系统后端
- 基于Spring Boot + MyBatis + 人大金仓的经侦案件管控系统
-
-
- 17
- 2.3.1
- 8.6.0
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- ${mybatis-spring-boot.version}
-
-
-
- com.alibaba
- druid-spring-boot-starter
- 1.2.20
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
-
- com.h2database
- h2
- runtime
-
-
-
- com.auth0
- java-jwt
- 4.4.0
-
-
-
- commons-fileupload
- commons-fileupload
- 1.5
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.12.1
-
- 21
- 21
- UTF-8
-
-
-
-
-
\ No newline at end of file
diff --git a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/Application.java b/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/Application.java
deleted file mode 100644
index e6ad89c..0000000
--- a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/Application.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jingzhen;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@SpringBootApplication
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
-
- @Configuration
- public static class WebConfig implements WebMvcConfigurer {
- @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry) {
- // 配置静态资源访问路径
- registry.addResourceHandler("/**")
- .addResourceLocations("classpath:/static/")
- .addResourceLocations("file:../frontend/dist/");
- }
- }
-}
diff --git a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/CorsConfig.java b/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/CorsConfig.java
deleted file mode 100644
index a6a9e6f..0000000
--- a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/CorsConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jingzhen.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-@Configuration
-public class CorsConfig {
-
- @Bean
- public CorsFilter corsFilter() {
- CorsConfiguration config = new CorsConfiguration();
- config.addAllowedOriginPattern("*");
- config.addAllowedHeader("*");
- config.addAllowedMethod("*");
- config.setAllowCredentials(true);
- config.setMaxAge(3600L);
-
- UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
- source.registerCorsConfiguration("/**", config);
- return new CorsFilter(source);
- }
-}
diff --git a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/DataInitializer.java b/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/DataInitializer.java
deleted file mode 100644
index 6fbacc5..0000000
--- a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/config/DataInitializer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.jingzhen.config;
-
-import com.jingzhen.entity.Role;
-import com.jingzhen.entity.User;
-import com.jingzhen.service.RoleService;
-import com.jingzhen.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DataInitializer implements CommandLineRunner {
-
- @Autowired
- private UserService userService;
-
- @Autowired
- private RoleService roleService;
-
- @Override
- public void run(String... args) throws Exception {
- if (roleService.findByCode("admin") == null) {
- Role adminRole = new Role();
- adminRole.setRoleName("管理员");
- adminRole.setRoleCode("admin");
- adminRole.setDescription("系统管理员");
- adminRole.setStatus(1);
- roleService.create(adminRole);
- }
-
- if (roleService.findByCode("police") == null) {
- Role policeRole = new Role();
- policeRole.setRoleName("民警");
- policeRole.setRoleCode("police");
- policeRole.setDescription("办案民警");
- policeRole.setStatus(1);
- roleService.create(policeRole);
- }
-
- if (userService.findByUsername("admin") == null) {
- User admin = new User();
- admin.setUsername("admin");
- admin.setPassword("123456");
- admin.setRealName("系统管理员");
- admin.setPhone("13800138000");
- admin.setEmail("admin@jingzhen.com");
- admin.setDepartmentId(1L);
- admin.setDepartmentName("经侦支队");
- admin.setRoleId(1L);
- admin.setRoleName("管理员");
- admin.setStatus(1);
- userService.create(admin);
- }
- }
-}
diff --git a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/controller/CaseFileController.java b/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/controller/CaseFileController.java
deleted file mode 100644
index 6985f11..0000000
--- a/jingzhen-case-mgmt/backend/src/main/java/com/jingzhen/controller/CaseFileController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.jingzhen.controller;
-
-import com.jingzhen.entity.CaseFile;
-import com.jingzhen.service.CaseFileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api/case-files")
-public class CaseFileController {
-
- @Autowired
- private CaseFileService caseFileService;
-
- @GetMapping
- public ResponseEntity> getAllFiles() {
- List files = caseFileService.findAll();
- return ResponseEntity.ok(files);
- }
-
- @GetMapping("/{id}")
- public ResponseEntity getFileById(@PathVariable Long id) {
- CaseFile file = caseFileService.findById(id);
- return ResponseEntity.ok(file);
- }
-
- @GetMapping("/case/{caseId}")
- public ResponseEntity> getFilesByCaseId(@PathVariable Long caseId) {
- List files = caseFileService.findByCaseId(caseId);
- return ResponseEntity.ok(files);
- }
-
- @GetMapping("/status/{status}")
- public ResponseEntity> getFilesByStatus(@PathVariable String status) {
- List files = caseFileService.findByStatus(status);
- return ResponseEntity.ok(files);
- }
-
- @PostMapping
- public ResponseEntity createFile(@RequestBody CaseFile file) {
- CaseFile createdFile = caseFileService.create(file);
- return ResponseEntity.ok(createdFile);
- }
-
- @PutMapping("/{id}")
- public ResponseEntity updateFile(@PathVariable Long id, @RequestBody CaseFile file) {
- file.setId(id);
- CaseFile updatedFile = caseFileService.update(file);
- return ResponseEntity.ok(updatedFile);
- }
-
- @DeleteMapping("/{id}")
- public ResponseEntity