msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

chore(deps): 升级项目依赖版本并调整包路径

Browse Source 
- 升级 Spring Boot 从 4.0.0 到 4.0.1
- 升级 Spring 框架从 7.0.1 到 7.0.2
- 升级 Netty 从 4.2.7.Final 到 4.2.9.Final
- 升级 xxl-sso 从 2.2.0 到 2.3.1
- 升级 xxl-tool 从 2.3.2 到 2.4.2
- 将 SHA256Tool 包路径从 xxl.tool.encrypt 调整为 xxl.tool.crypto
- 将 GsonTool 包路径从 xxl.tool.gson 调整为 xxl.tool.json
- 将 ThrowableTool 包路径从 xxl.tool.exception 调整为 xxl.tool.error
- 移除未使用的 Header 枚举导入
3.3.2-release
xuxueli 9 months ago
parent 80a99cfb9d
commit b260a005b6
15 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File

3
doc/XXL-JOB官方文档.md
Unescape View File

@ -2757,7 +2757,8 @@ public void execute() {
- 6、【优化】调度中心OpenAPI通讯token调整为非必填；合并PR-3892； - 6、【优化】调度中心OpenAPI通讯token调整为非必填；合并PR-3892；
- 7、【优化】执行器详情接口权限调整，支持普通用户查看注册节点；合并PR-3882； - 7、【优化】执行器详情接口权限调整，支持普通用户查看注册节点；合并PR-3882；
- 8、【优化】任务参数LogDateTime生成逻辑调整，分片广播场景下保障时间一致； - 8、【优化】任务参数LogDateTime生成逻辑调整，分片广播场景下保障时间一致；
- 9、【TODO】任务调度触发后分批批量更新，提升调度性能； - 9、【升级】升级多项maven依赖至较新版本，如 spring、netty、xxl-sso、xxl-tool 等；
- 10、【TODO】任务调度触发后分批批量更新，提升调度性能；

10
pom.xml
Unescape View File

@ -38,23 +38,23 @@
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version> <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
<!-- spring --> <!-- spring -->
<spring-boot.version>4.0.0</spring-boot.version> <spring-boot.version>4.0.1</spring-boot.version>
<spring.version>7.0.1</spring.version> <spring.version>7.0.2</spring.version>
<!-- mybatis & db --> <!-- mybatis & db -->
<mybatis-spring-boot-starter.version>4.0.0</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>4.0.0</mybatis-spring-boot-starter.version>
<mysql-connector-j.version>9.5.0</mysql-connector-j.version> <mysql-connector-j.version>9.5.0</mysql-connector-j.version>
<!-- net --> <!-- net -->
<netty.version>4.2.7.Final</netty.version> <netty.version>4.2.9.Final</netty.version>
<gson.version>2.13.2</gson.version> <gson.version>2.13.2</gson.version>
<!-- groovy --> <!-- groovy -->
<groovy.version>5.0.3</groovy.version> <groovy.version>5.0.3</groovy.version>
<!-- xxl-sso (+xxl-tool、gson) --> <!-- xxl-sso (+xxl-tool、gson) -->
<xxl-sso.version>2.2.0</xxl-sso.version> <xxl-sso.version>2.3.1</xxl-sso.version>
<!-- xxl-tool --> <!-- xxl-tool -->
<xxl-tool.version>2.3.2</xxl-tool.version> <xxl-tool.version>2.4.2</xxl-tool.version>
</properties> </properties>
<licenses> <licenses>

8
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java
Unescape View File

@ -7,7 +7,7 @@ import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.encrypt.SHA256Tool; import com.xxl.tool.crypto.Sha256Tool;
import com.xxl.tool.id.UUIDTool; import com.xxl.tool.id.UUIDTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -63,7 +63,7 @@ public class LoginController {
} }
// valid passowrd // valid passowrd
String passwordHash = SHA256Tool.sha256(password); String passwordHash = Sha256Tool.sha256(password);
if (!passwordHash.equals(xxlJobUser.getPassword())) { if (!passwordHash.equals(xxlJobUser.getPassword())) {
return Response.ofFail( I18nUtil.getString("login_param_unvalid") ); return Response.ofFail( I18nUtil.getString("login_param_unvalid") );
} }
@ -104,8 +104,8 @@ public class LoginController {
} }
// md5 password // md5 password
String oldPasswordHash = SHA256Tool.sha256(oldPassword); String oldPasswordHash = Sha256Tool.sha256(oldPassword);
String passwordHash = SHA256Tool.sha256(password); String passwordHash = Sha256Tool.sha256(password);
// valid old pwd // valid old pwd
Response<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); Response<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request);

2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java
Unescape View File

@ -9,7 +9,7 @@ import com.xxl.job.admin.util.JobGroupPermissionUtil;
import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

10
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
Unescape View File

@ -11,7 +11,7 @@ import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.encrypt.SHA256Tool; import com.xxl.tool.crypto.Sha256Tool;
import com.xxl.tool.response.PageModel; import com.xxl.tool.response.PageModel;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -98,7 +98,7 @@ public class JobUserController {
return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" );
} }
// md5 password // md5 password
String passwordHash = SHA256Tool.sha256(xxlJobUser.getPassword()); String passwordHash = Sha256Tool.sha256(xxlJobUser.getPassword());
xxlJobUser.setPassword(passwordHash); xxlJobUser.setPassword(passwordHash);
// check repeat // check repeat
@ -130,7 +130,7 @@ public class JobUserController {
return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" );
} }
// md5 password // md5 password
String passwordHash = SHA256Tool.sha256(xxlJobUser.getPassword()); String passwordHash = Sha256Tool.sha256(xxlJobUser.getPassword());
xxlJobUser.setPassword(passwordHash); xxlJobUser.setPassword(passwordHash);
} else { } else {
xxlJobUser.setPassword(null); xxlJobUser.setPassword(null);
@ -180,8 +180,8 @@ public class JobUserController {
} }
// md5 password // md5 password
String oldPasswordHash = SHA256Tool.sha256(oldPassword); String oldPasswordHash = Sha256Tool.sha256(oldPassword);
String passwordHash = SHA256Tool.sha256(password); String passwordHash = Sha256Tool.sha256(password);
// valid old pwd // valid old pwd
Response<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); Response<LoginInfo> loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request);

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java
Unescape View File

@ -7,7 +7,7 @@ import com.xxl.job.core.openapi.model.CallbackRequest;
import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java
Unescape View File

@ -14,7 +14,7 @@ import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.exception.ThrowableTool; import com.xxl.tool.error.ThrowableTool;
import com.xxl.tool.http.IPTool; import com.xxl.tool.http.IPTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
Unescape View File

@ -20,7 +20,7 @@ import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo; import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.DateTool; import com.xxl.tool.core.DateTool;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.PageModel; import com.xxl.tool.response.PageModel;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/util/I18nUtil.java
Unescape View File

@ -3,7 +3,7 @@ package com.xxl.job.admin.util;
import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum;
import com.xxl.tool.core.PropTool; import com.xxl.tool.core.PropTool;
import com.xxl.tool.freemarker.FtlTool; import com.xxl.tool.freemarker.FtlTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebHandlerExceptionResolver.java
Unescape View File

@ -1,7 +1,7 @@
package com.xxl.job.admin.web.error; package com.xxl.job.admin.web.error;
import com.xxl.job.admin.scheduler.exception.XxlJobException; import com.xxl.job.admin.scheduler.exception.XxlJobException;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

4
xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java
Unescape View File

@ -5,8 +5,8 @@ import com.xxl.job.core.openapi.ExecutorBiz;
import com.xxl.job.core.openapi.impl.ExecutorBizImpl; import com.xxl.job.core.openapi.impl.ExecutorBizImpl;
import com.xxl.job.core.openapi.model.*; import com.xxl.job.core.openapi.model.*;
import com.xxl.job.core.thread.ExecutorRegistryThread; import com.xxl.job.core.thread.ExecutorRegistryThread;
import com.xxl.tool.exception.ThrowableTool; import com.xxl.tool.error.ThrowableTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;

4
xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
Unescape View File

@ -10,8 +10,8 @@ import com.xxl.job.core.log.XxlJobFileAppender;
import com.xxl.tool.core.ArrayTool; import com.xxl.tool.core.ArrayTool;
import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.encrypt.Md5Tool; import com.xxl.tool.crypto.Md5Tool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.io.FileTool; import com.xxl.tool.io.FileTool;
import com.xxl.tool.response.Response; import com.xxl.tool.response.Response;
import org.slf4j.Logger; import org.slf4j.Logger;

3
xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/jobhandler/SampleXxlJob.java
Unescape View File

@ -3,11 +3,10 @@ package com.xxl.job.executor.sample.frameless.jobhandler;
import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.http.HttpTool; import com.xxl.tool.http.HttpTool;
import com.xxl.tool.http.http.HttpResponse; import com.xxl.tool.http.http.HttpResponse;
import com.xxl.tool.http.http.enums.ContentType; import com.xxl.tool.http.http.enums.ContentType;
import com.xxl.tool.http.http.enums.Header;
import com.xxl.tool.http.http.enums.Method; import com.xxl.tool.http.http.enums.Method;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java
Unescape View File

@ -2,7 +2,7 @@ package com.xxl.job.executor.jobhandler;
import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import io.github.imfangs.dify.client.DifyClientFactory; import io.github.imfangs.dify.client.DifyClientFactory;
import io.github.imfangs.dify.client.DifyWorkflowClient; import io.github.imfangs.dify.client.DifyWorkflowClient;
import io.github.imfangs.dify.client.enums.ResponseMode; import io.github.imfangs.dify.client.enums.ResponseMode;

3
xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/jobhandler/SampleXxlJob.java
Unescape View File

@ -3,11 +3,10 @@ package com.xxl.job.executor.jobhandler;
import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.tool.core.StringTool; import com.xxl.tool.core.StringTool;
import com.xxl.tool.gson.GsonTool; import com.xxl.tool.json.GsonTool;
import com.xxl.tool.http.HttpTool; import com.xxl.tool.http.HttpTool;
import com.xxl.tool.http.http.HttpResponse; import com.xxl.tool.http.http.HttpResponse;
import com.xxl.tool.http.http.enums.ContentType; import com.xxl.tool.http.http.enums.ContentType;
import com.xxl.tool.http.http.enums.Header;
import com.xxl.tool.http.http.enums.Method; import com.xxl.tool.http.http.enums.Method;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

Write Preview
Loading…
Cancel
Save