1.对应 cn.reghao.jutil 依赖的变更

2.使用 jakarta 替换 javax

agent/src/main/java/cn/reghao/bnt/agent/ws/event/handler/EvtAppDeployHandler.java

@@ -9,8 +9,8 @@ import cn.reghao.jutil.jdk.event.handler.Handler;
 import cn.reghao.jutil.jdk.event.message.Event;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 
 import java.io.IOException;
 

agent/src/main/java/cn/reghao/bnt/agent/ws/event/handler/EvtAppStatHandler.java

@@ -10,8 +10,8 @@ import cn.reghao.jutil.jdk.event.handler.Handler;
 import cn.reghao.jutil.jdk.event.message.Event;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 
 import java.io.IOException;
 

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/DockerApp.java

@@ -9,7 +9,7 @@ import cn.reghao.bnt.common.machine.Machine;
 import cn.reghao.bnt.common.msg.constant.NodeStatus;
 import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
 import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import com.github.dockerjava.api.command.InspectContainerResponse;

common/src/main/java/cn/reghao/bnt/common/docker/DockerImpl.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.common.docker;
 
 import cn.reghao.bnt.common.docker.model.DockerAuth;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.text.TextFile;
+import cn.reghao.jutil.jdk.io.TextFile;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.*;

common/src/main/java/cn/reghao/bnt/common/machine/Machine.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.machine.data.detail.*;
 import cn.reghao.jutil.jdk.machine.id.MachineId;
 import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;
-import cn.reghao.jutil.jdk.result.AppVersion;
+import cn.reghao.jutil.jdk.web.result.AppVersion;
 import oshi.SystemInfo;
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OperatingSystem;

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentStart.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.common.msg.event;
 
-import cn.reghao.jutil.jdk.result.AppVersion;
+import cn.reghao.jutil.jdk.web.result.AppVersion;
 import cn.reghao.jutil.jdk.event.message.Event;
 import cn.reghao.jutil.jdk.machine.data.detail.*;
 import lombok.Getter;

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStatResult.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.common.msg.event;
 
 import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import lombok.Getter;
 import lombok.Setter;
 

deployer/src/main/java/cn/reghao/bnt/deployer/util/Sftp.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.deployer.util;
 import cn.reghao.bnt.deployer.model.RemoteHost;
 import cn.reghao.bnt.deployer.model.UserInfoImpl;
 import cn.reghao.jutil.jdk.shell.ShellResult;
-import cn.reghao.jutil.jdk.text.TextFile;
+import cn.reghao.jutil.jdk.io.TextFile;
 import com.jcraft.jsch.*;
 import lombok.extern.slf4j.Slf4j;
 

web/pom.xml

@@ -36,17 +36,17 @@
             <artifactId>jdk</artifactId>
             <version>jdk17-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.reghao.jutil</groupId>
-            <artifactId>web</artifactId>
-            <version>jdk17-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>cn.reghao.bnt</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.reghao.jutil</groupId>
+            <artifactId>web</artifactId>
+            <version>jdk17-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -92,9 +92,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>8.0.1.Final</version>
         </dependency>
 
         <dependency>

web/src/main/java/cn/reghao/bnt/web/admin/controller/AccountPageController.java

@@ -6,8 +6,8 @@ import cn.reghao.bnt.web.admin.model.po.User;
 import cn.reghao.bnt.web.admin.model.po.UserMessage;
 import cn.reghao.bnt.web.admin.model.vo.LoginRecordInfo;
 import cn.reghao.bnt.web.admin.service.*;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/admin/controller/LoginController.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.admin.controller;
 import cn.reghao.bnt.web.admin.model.dto.RsaPubkey;
 import cn.reghao.bnt.web.admin.service.CodeService;
 import cn.reghao.bnt.web.admin.service.PubkeyService;
-import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.web.result.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

web/src/main/java/cn/reghao/bnt/web/admin/controller/MenuPageController.java

@@ -8,7 +8,7 @@ import cn.reghao.bnt.web.admin.model.vo.MenuTree;
 import cn.reghao.bnt.web.admin.service.MenuService;
 import cn.reghao.bnt.web.admin.service.RoleService;
 import cn.reghao.bnt.web.admin.service.UserContext;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/admin/controller/SysFileController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;

web/src/main/java/cn/reghao/bnt/web/admin/controller/UserPageController.java

@@ -12,8 +12,8 @@ import cn.reghao.bnt.web.admin.service.AccountSessionService;
 import cn.reghao.bnt.web.admin.model.po.User;
 import cn.reghao.bnt.web.admin.service.RoleService;
 import cn.reghao.bnt.web.admin.service.UserContext;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/AccountLoginDto.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/AccountPassword.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/AccountRole.java

@@ -2,8 +2,8 @@ package cn.reghao.bnt.web.admin.model.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.Set;
 
 /**

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/CreateAccountDto.java

@@ -4,8 +4,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/MenuDto.java

@@ -4,8 +4,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/UpdatePasswordDto.java

@@ -4,8 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/dto/UpdateUsernameDto.java

@@ -4,8 +4,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/po/AccessLog.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.admin.model.po;
 
 import cn.reghao.bnt.web.util.BaseEntity;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.jdk.result.GatewayLog;
+import cn.reghao.jutil.jdk.web.log.GatewayLog;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

web/src/main/java/cn/reghao/bnt/web/admin/model/po/Menu.java

@@ -7,9 +7,9 @@ import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.Map;
 import java.util.Set;
 

web/src/main/java/cn/reghao/bnt/web/admin/model/po/Role.java

@@ -7,7 +7,7 @@ import lombok.*;
 import org.hibernate.validator.constraints.Length;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
 import java.util.Set;
 
 /**

web/src/main/java/cn/reghao/bnt/web/admin/model/po/RuntimeLog.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.admin.model.po;
 
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.jdk.result.AppLog;
+import cn.reghao.jutil.jdk.web.log.AppLog;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

web/src/main/java/cn/reghao/bnt/web/admin/model/po/SiteOption.java

@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.Length;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 站点配置项

web/src/main/java/cn/reghao/bnt/web/admin/model/po/User.java

@@ -7,7 +7,7 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Set;

web/src/main/java/cn/reghao/bnt/web/admin/model/po/Webhook.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/vo/RuntimeLogInfo.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.admin.model.vo;
 
 import cn.reghao.bnt.web.admin.model.po.RuntimeLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.result.AppLog;
+import cn.reghao.jutil.jdk.web.log.AppLog;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

web/src/main/java/cn/reghao/bnt/web/admin/model/vo/UploadFile.java

@@ -4,8 +4,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/admin/model/vo/UserSession.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.admin.model.vo;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

web/src/main/java/cn/reghao/bnt/web/admin/model/vo/UserVO.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.admin.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.admin.model.po.User;
 import lombok.Data;
 

web/src/main/java/cn/reghao/bnt/web/admin/security/handler/AuthFailureHandlerImpl.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.admin.security.handler;
 
 import cn.reghao.bnt.web.admin.security.exception.AccountLoginException;
 import cn.reghao.bnt.web.admin.service.LoginAttemptService;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;

web/src/main/java/cn/reghao/bnt/web/admin/security/handler/AuthSuccessHandlerImpl.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.admin.security.handler;
 
 import cn.reghao.bnt.web.admin.security.form.AccountAuthToken;
 import cn.reghao.bnt.web.admin.service.LoginAttemptService;
-import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.web.result.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.security.core.Authentication;

web/src/main/java/cn/reghao/bnt/web/admin/service/AccountService.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.admin.service;
 import cn.reghao.bnt.web.admin.model.dto.*;
 import cn.reghao.bnt.web.admin.model.po.User;
 import cn.reghao.bnt.web.admin.model.vo.UserVO;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 

web/src/main/java/cn/reghao/bnt/web/admin/service/CodeService.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.admin.service;
 
-import cn.reghao.jutil.jdk.image.CaptchaUtil;
+import cn.reghao.jutil.jdk.media.CaptchaUtil;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.bnt.web.util.CacheKeys;
 import com.github.benmanes.caffeine.cache.Cache;

web/src/main/java/cn/reghao/bnt/web/admin/service/HomeViewService.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.admin.service;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.devops.machine.model.vo.MachineStat;
 import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
 import cn.reghao.jutil.jdk.jvm.JVM;

web/src/main/java/cn/reghao/bnt/web/admin/service/LogService.java

@@ -7,9 +7,9 @@ import cn.reghao.bnt.web.admin.model.po.RuntimeLog;
 import cn.reghao.bnt.web.admin.model.vo.AccessLogInfo;
 import cn.reghao.bnt.web.admin.model.vo.RuntimeLogInfo;
 import cn.reghao.bnt.web.ws.handler.LogHandler;
-import cn.reghao.jutil.jdk.result.AppLog;
+import cn.reghao.jutil.jdk.web.log.AppLog;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.jdk.result.GatewayLog;
+import cn.reghao.jutil.jdk.web.log.GatewayLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;

web/src/main/java/cn/reghao/bnt/web/admin/service/LoginAttemptService.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.admin.service;
 
 import cn.reghao.bnt.web.admin.model.vo.LoginRecordInfo;
 import cn.reghao.bnt.web.admin.security.form.AccountAuthToken;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 import java.util.List;
 

web/src/main/java/cn/reghao/bnt/web/admin/service/MenuService.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.admin.model.dto.MenuDto;
 import cn.reghao.bnt.web.admin.model.po.Menu;
 import cn.reghao.bnt.web.admin.model.po.Role;
 import cn.reghao.bnt.web.admin.model.vo.MenuTree;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 import java.util.List;
 

web/src/main/java/cn/reghao/bnt/web/admin/service/RoleService.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.admin.model.po.Menu;
 import cn.reghao.bnt.web.admin.model.po.Role;
 import cn.reghao.bnt.web.admin.model.po.User;
 import cn.reghao.bnt.web.admin.model.vo.RoleVO;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 

web/src/main/java/cn/reghao/bnt/web/admin/service/impl/AccountServiceImpl.java

@@ -9,8 +9,8 @@ import cn.reghao.bnt.web.admin.service.AccountService;
 import cn.reghao.bnt.web.admin.service.UserContext;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppDeployConfig;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.bnt.web.admin.db.repository.UserRepository;
 import cn.reghao.bnt.web.admin.model.po.User;

web/src/main/java/cn/reghao/bnt/web/admin/service/impl/LoginAttemptServiceImpl.java

@@ -9,7 +9,7 @@ import cn.reghao.bnt.web.admin.service.LoginAttemptService;
 import cn.reghao.bnt.web.admin.service.UserContext;
 import cn.reghao.bnt.web.util.CacheKeys;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.jutil.web.ServletUtil;
 import com.github.benmanes.caffeine.cache.Cache;

web/src/main/java/cn/reghao/bnt/web/admin/service/impl/MenuServiceImpl.java

@@ -10,8 +10,8 @@ import cn.reghao.bnt.web.admin.db.repository.RoleRepository;
 import cn.reghao.bnt.web.admin.model.vo.MenuTree;
 import cn.reghao.bnt.web.admin.service.MenuService;
 import cn.reghao.bnt.web.admin.service.UserContext;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

web/src/main/java/cn/reghao/bnt/web/blog/controller/AdminArticleController.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.blog.controller;
 
 import cn.reghao.bnt.web.blog.hibernate.HibernateLucene;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.bnt.web.blog.service.ArticleQuery;

web/src/main/java/cn/reghao/bnt/web/blog/controller/AdminCategoryController.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.blog.controller;
 
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.bnt.web.blog.model.CategoryType;
 import cn.reghao.bnt.web.blog.model.vo.CategoryCount;

web/src/main/java/cn/reghao/bnt/web/blog/controller/AdminQuestionController.java

@@ -1,8 +1,8 @@
 package cn.reghao.bnt.web.blog.controller;
 
 import cn.reghao.bnt.web.blog.model.dto.QuestionUpdateDto;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.bnt.web.blog.model.dto.QuestionDto;
 import cn.reghao.bnt.web.blog.model.po.Category;

web/src/main/java/cn/reghao/bnt/web/blog/model/dto/ArticleDto.java

@@ -4,9 +4,9 @@ import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;

web/src/main/java/cn/reghao/bnt/web/blog/model/dto/ChannelDto.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

web/src/main/java/cn/reghao/bnt/web/blog/model/dto/QuestionDto.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

web/src/main/java/cn/reghao/bnt/web/blog/model/dto/QuestionUpdateDto.java

@@ -3,8 +3,8 @@ package cn.reghao.bnt.web.blog.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/blog/service/ArticleService.java

@@ -3,8 +3,8 @@ package cn.reghao.bnt.web.blog.service;
 import cn.reghao.bnt.web.blog.model.CategoryType;
 import cn.reghao.bnt.web.blog.model.dto.ArticleDto;
 import cn.reghao.bnt.web.util.MarkdownUtil;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.id.IdGenerator;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.string.IdGenerator;
 import cn.reghao.bnt.web.blog.db.repository.ArticleRepository;
 import cn.reghao.bnt.web.blog.db.repository.ArticleTagRepository;
 import cn.reghao.bnt.web.blog.db.repository.CategoryRepository;

web/src/main/java/cn/reghao/bnt/web/blog/service/ArticleViewService.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.blog.service;
 
-import cn.reghao.jutil.web.HeaderNames;
+import cn.reghao.jutil.jdk.http.HeaderNames;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.bnt.web.blog.db.repository.ArticleViewRepository;
 import cn.reghao.bnt.web.blog.model.po.ArticleView;

web/src/main/java/cn/reghao/bnt/web/blog/service/CategoryService.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.blog.service;
 import cn.reghao.bnt.web.blog.db.repository.ArticleRepository;
 import cn.reghao.bnt.web.blog.db.repository.QuestionRepository;
 import cn.reghao.bnt.web.blog.model.vo.GroupCount;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.bnt.web.blog.db.repository.ArticleTagRepository;
 import cn.reghao.bnt.web.blog.db.repository.CategoryRepository;
 import cn.reghao.bnt.web.blog.model.CategoryType;

web/src/main/java/cn/reghao/bnt/web/blog/service/QuestionService.java

@@ -4,8 +4,8 @@ import cn.reghao.bnt.web.blog.model.dto.QuestionUpdateDto;
 import cn.reghao.bnt.web.blog.model.po.Category;
 import cn.reghao.bnt.web.blog.model.po.Question;
 import cn.reghao.bnt.web.util.MarkdownUtil;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.id.IdGenerator;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.string.IdGenerator;
 import cn.reghao.bnt.web.blog.db.repository.CategoryRepository;
 import cn.reghao.bnt.web.blog.db.repository.QuestionRepository;
 import cn.reghao.bnt.web.blog.model.dto.QuestionDto;

web/src/main/java/cn/reghao/bnt/web/config/AccessInterceptor.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.config;
 import cn.reghao.bnt.web.admin.model.dto.AccountInfo;
 import cn.reghao.bnt.web.admin.service.*;
 import cn.reghao.bnt.web.config.spring.SpringLifecycle;
-import cn.reghao.jutil.web.HeaderNames;
+import cn.reghao.jutil.jdk.http.HeaderNames;
 import cn.reghao.jutil.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;

web/src/main/java/cn/reghao/bnt/web/config/log/MyLogbackAppender.java

@@ -4,9 +4,9 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import cn.reghao.bnt.web.admin.service.LogService;
-import cn.reghao.jutil.web.HeaderNames;
+import cn.reghao.jutil.jdk.http.HeaderNames;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.jdk.result.AppLog;
+import cn.reghao.jutil.jdk.web.log.AppLog;
 import lombok.Getter;
 import lombok.Setter;
 

web/src/main/java/cn/reghao/bnt/web/config/web/exception/ControllerExceptionHandler.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.config.web.exception;
 import cn.reghao.bnt.web.admin.model.po.Menu;
 import cn.reghao.bnt.web.admin.service.MenuService;
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;

web/src/main/java/cn/reghao/bnt/web/devops/aliyun/model/dto/GetSignedUrl.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.devops.aliyun.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppConfigPageController.java

@@ -14,7 +14,7 @@ import cn.reghao.bnt.web.devops.app.model.vo.AppConfigVO;
 import cn.reghao.bnt.web.devops.build.db.repository.CompilerConfigRepository;
 import cn.reghao.bnt.web.devops.build.db.repository.PackerConfigRepository;
 import cn.reghao.bnt.web.devops.build.db.repository.RepoAuthConfigRepository;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppDeployConfigPageController.java

@@ -10,7 +10,7 @@ import cn.reghao.bnt.web.devops.app.model.po.config.AppDeployConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.AppDeployConfigVO;
 import cn.reghao.bnt.web.devops.app.service.AppDeployService;
 import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppDomainPageController.java

@@ -10,7 +10,7 @@ import cn.reghao.bnt.web.devops.app.model.vo.AppDeployConfigVO;
 import cn.reghao.bnt.web.devops.app.service.AppDeployService;
 import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
 import cn.reghao.bnt.web.util.SelectOption;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppStatPageController.java

@@ -8,8 +8,8 @@ import cn.reghao.bnt.web.devops.app.db.query.AppDeployQuery;
 import cn.reghao.bnt.web.devops.app.model.vo.AppRunning;
 import cn.reghao.bnt.web.devops.app.model.vo.AppRunningNode;
 import cn.reghao.bnt.web.devops.app.service.AppRunService;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/BuildDeployPageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.devops.app.controller;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.devops.app.service.AppBuildService;
 import cn.reghao.bnt.web.devops.app.service.bd.DeployApp;
 import cn.reghao.bnt.web.devops.app.service.bd.GetApp;
@@ -17,7 +17,7 @@ import cn.reghao.bnt.web.devops.app.model.vo.BuildLogVO;
 import cn.reghao.bnt.web.devops.app.model.vo.BuildTask;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildApp;
 import cn.reghao.bnt.web.util.StringUtil;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import io.swagger.v3.oas.annotations.tags.Tag;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/dto/AppConfigDto.java

@@ -1,15 +1,15 @@
 package cn.reghao.bnt.web.devops.app.model.dto;
 
 import cn.reghao.bnt.web.devops.app.model.constant.AppType;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/dto/AppConfigUpdateDto.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/dto/CopyAppDto.java

@@ -4,9 +4,9 @@ import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/model/dto/DeployConfigDto.java

@@ -1,11 +1,11 @@
 package cn.reghao.bnt.web.devops.app.model.dto;
 
 import cn.reghao.bnt.common.msg.constant.PackType;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/model/dto/DeployConfigUpdateDto.java

@@ -3,8 +3,8 @@ package cn.reghao.bnt.web.devops.app.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/AppBuilding.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.devops.app.model.constant.BuildStatus;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/AppDeploying.java

@@ -11,7 +11,7 @@ import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/AppDeployingNode.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.devops.app.model.po;
 
 import cn.reghao.bnt.web.devops.app.model.constant.DeployStatus;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppDeployConfig;
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/AppConfig.java

@@ -10,15 +10,15 @@ import cn.reghao.bnt.web.devops.build.model.vo.BuildConfig;
 import cn.reghao.bnt.web.devops.builder.model.AppDto;
 import cn.reghao.bnt.web.devops.builder.model.BuildConfigDto;
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/AppDeployConfig.java

@@ -10,8 +10,8 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 应用部署配置

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/AppBuildingVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.devops.app.model.vo;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/AppDeployingNodeVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.devops.app.model.vo;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.devops.app.model.po.AppDeployingNode;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.devops.machine.model.po.MachineHost;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/AppRunningNode.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.devops.app.model.vo;
 
-import cn.reghao.jutil.jdk.result.NotAvailable;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.bnt.web.devops.app.model.constant.RunStatus;
 import cn.reghao.bnt.web.devops.app.model.po.AppDeployingNode;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/msg/DeployNotifyMsg.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.admin.service.notifier.ding.DingMsg;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.devops.app.model.po.log.DeployLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.Data;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/AppBuildService.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.web.devops.app.model.dto.AppConfigUpdateDto;
 import cn.reghao.bnt.web.devops.app.model.dto.CopyAppDto;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.builder.chain.impl.BuildChainResult;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/service/AppDeployService.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.web.devops.app.model.dto.DeployConfigDto;
 import cn.reghao.bnt.web.devops.app.model.dto.DeployConfigUpdateDto;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.machine.model.po.MachineHost;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/BuildApp.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.app.service.bd;
 
 import cn.reghao.bnt.web.devops.app.model.vo.BuildTask;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 import java.util.List;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/impl/BuildAppImpl.java

@@ -15,10 +15,10 @@ import cn.reghao.bnt.web.devops.builder.chain.*;
 import cn.reghao.bnt.web.devops.builder.chain.impl.BuildChainParam;
 import cn.reghao.bnt.web.devops.builder.chain.impl.BuildChainResult;
 import cn.reghao.bnt.web.devops.builder.model.AppDto;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.jutil.jdk.id.IdGenerator;
+import cn.reghao.jutil.jdk.string.IdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/impl/DeployAppImpl.java

@@ -18,8 +18,8 @@ import cn.reghao.bnt.web.devops.build.model.po.DockerRegistry;
 import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
 import cn.reghao.bnt.web.ws.WsSender;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/task/OssDeployTask.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.web.devops.aliyun.service.AliyunOss;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.app.service.AppDeployService;
 import cn.reghao.bnt.web.devops.builder.model.LocalBuildDir;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/impl/AppBuildServiceImpl.java

@@ -19,8 +19,8 @@ import cn.reghao.bnt.web.devops.builder.chain.impl.BuildChainResult;
 import cn.reghao.bnt.web.devops.builder.model.AppDto;
 import cn.reghao.bnt.web.devops.builder.model.LocalBuildDir;
 import cn.reghao.bnt.web.devops.builder.model.constant.RepoType;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.data.domain.Page;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/impl/AppDeployServiceImpl.java

@@ -26,8 +26,8 @@ import cn.reghao.bnt.web.devops.app.task.RereshCheckTask;
 import cn.reghao.bnt.web.devops.machine.model.po.MachineHost;
 import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;

web/src/main/java/cn/reghao/bnt/web/devops/build/controller/BuildDirPageController.java

@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.devops.build.controller;
 import cn.reghao.bnt.web.devops.build.model.po.BuildDir;
 import cn.reghao.bnt.web.devops.build.service.BuildDirService;
 import cn.reghao.bnt.web.util.PageSort;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/build/controller/CompilerPageController.java

@@ -6,7 +6,7 @@ import cn.reghao.bnt.web.devops.build.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.build.service.CompilerConfigService;
 import cn.reghao.bnt.web.devops.builder.model.constant.CompileType;
 import cn.reghao.bnt.web.util.PageSort;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/build/controller/PackerPageController.java

@@ -8,7 +8,7 @@ import cn.reghao.bnt.web.devops.build.db.repository.PackerConfigRepository;
 import cn.reghao.bnt.web.devops.build.model.po.PackerConfig;
 import cn.reghao.bnt.web.devops.build.service.PackerConfigService;
 import cn.reghao.bnt.web.util.PageSort;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/build/controller/RepoAuthPageController.java

@@ -6,7 +6,7 @@ import cn.reghao.bnt.web.devops.build.service.RepoAuthConfigService;
 import cn.reghao.bnt.web.devops.builder.model.constant.RepoAuthType;
 import cn.reghao.bnt.web.devops.builder.model.constant.RepoType;
 import cn.reghao.bnt.web.util.PageSort;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

web/src/main/java/cn/reghao/bnt/web/devops/build/model/po/CompilerConfig.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.devops.build.model.provider.CompilerConfigGroupSequence
 import cn.reghao.bnt.web.devops.builder.model.CompilerDto;
 import cn.reghao.bnt.web.devops.builder.model.constant.CompileType;
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -14,8 +14,8 @@ import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.group.GroupSequenceProvider;
 
 import jakarta.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import java.util.List;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/build/model/po/DockerRegistry.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/model/po/PackerConfig.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.common.msg.constant.PackType;
 import cn.reghao.bnt.web.devops.build.model.provider.PackerConfigGroupSequenceProvider;
 import cn.reghao.bnt.web.devops.builder.model.PackerDto;
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -16,9 +16,9 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * 打包方式配置

web/src/main/java/cn/reghao/bnt/web/devops/build/model/po/RepoAuthConfig.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.web.devops.builder.model.RepoAuth;
 import cn.reghao.bnt.web.devops.builder.model.constant.RepoAuthType;
 import cn.reghao.bnt.web.devops.builder.model.constant.RepoType;
 import cn.reghao.bnt.web.util.BaseEntity;
-import cn.reghao.jutil.web.validator.ValidEnum;
+import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
@@ -14,8 +14,8 @@ import org.hibernate.validator.group.GroupSequenceProvider;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * 仓库认证配置

web/src/main/java/cn/reghao/bnt/web/devops/build/service/BuildDirService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.build.service;
 
 import cn.reghao.bnt.web.devops.build.model.po.BuildDir;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/service/CompilerConfigService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.build.service;
 
 import cn.reghao.bnt.web.devops.build.model.po.CompilerConfig;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/service/DockerRegistryService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.build.service;
 
 import cn.reghao.bnt.common.docker.model.DockerAuth;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/service/PackerConfigService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.build.service;
 
 import cn.reghao.bnt.web.devops.build.model.po.PackerConfig;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/service/RepoAuthConfigService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.build.service;
 
 import cn.reghao.bnt.web.devops.build.model.po.RepoAuthConfig;
-import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.web.result.Result;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/build/service/impl/BuildDirServiceImpl.java

@@ -7,8 +7,8 @@ import cn.reghao.bnt.web.devops.build.service.BuildDirService;
 import cn.reghao.bnt.web.devops.builder.model.LocalBuildDir;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.machine.data.detail.DiskDetail;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;