diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3199f5e..ed4e37d 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1183,6 +1183,7 @@ - 19、提供多版本执行器:不依赖容器版本、不内嵌Jetty版本(通过配置executoraddress替换jetty通讯)等; - 20、注册中心支持扩展,除默认基于DB之外,支持扩展接入第三方注册中心如zk、eureka等; - 21、依赖Core内部国际化处理; +- 22、大数据量下任务日志分页优化,时间选择组件支持清空功能可提升速度; ## 七、其他 diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3199f5e..ed4e37d 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1183,6 +1183,7 @@ - 19、提供多版本执行器:不依赖容器版本、不内嵌Jetty版本(通过配置executoraddress替换jetty通讯)等; - 20、注册中心支持扩展,除默认基于DB之外,支持扩展接入第三方注册中心如zk、eureka等; - 21、依赖Core内部国际化处理; +- 22、大数据量下任务日志分页优化,时间选择组件支持清空功能可提升速度; ## 七、其他 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java index b0343fc..3d2f9bb 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java @@ -58,8 +58,7 @@ // valid response if (response == null) { - logger.error(">>>>>>>>>>> xxl-rpc netty response not found."); - throw new Exception(">>>>>>>>>>> xxl-rpc netty response not found."); + throw new Exception("Network request fail, response not found."); } if (response.isError()) { throw new RuntimeException(response.getError()); diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3199f5e..ed4e37d 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1183,6 +1183,7 @@ - 19、提供多版本执行器:不依赖容器版本、不内嵌Jetty版本(通过配置executoraddress替换jetty通讯)等; - 20、注册中心支持扩展,除默认基于DB之外,支持扩展接入第三方注册中心如zk、eureka等; - 21、依赖Core内部国际化处理; +- 22、大数据量下任务日志分页优化,时间选择组件支持清空功能可提升速度; ## 七、其他 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java index b0343fc..3d2f9bb 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java @@ -58,8 +58,7 @@ // valid response if (response == null) { - logger.error(">>>>>>>>>>> xxl-rpc netty response not found."); - throw new Exception(">>>>>>>>>>> xxl-rpc netty response not found."); + throw new Exception("Network request fail, response not found."); } if (response.isError()) { throw new RuntimeException(response.getError()); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java index d03a28c..fed1e0f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java @@ -29,7 +29,7 @@ byte[] responseBytes = HttpClientUtil.postRequest(reqURL, requestBytes); if (responseBytes == null || responseBytes.length==0) { RpcResponse rpcResponse = new RpcResponse(); - rpcResponse.setError("RpcResponse byte[] is null"); + rpcResponse.setError("Network request fail, RpcResponse byte[] is null"); return rpcResponse; } @@ -40,7 +40,7 @@ logger.error(e.getMessage(), e); RpcResponse rpcResponse = new RpcResponse(); - rpcResponse.setError("Client-error:" + e.getMessage()); + rpcResponse.setError("Network request error: " + e.getMessage()); return rpcResponse; } } diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3199f5e..ed4e37d 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1183,6 +1183,7 @@ - 19、提供多版本执行器:不依赖容器版本、不内嵌Jetty版本(通过配置executoraddress替换jetty通讯)等; - 20、注册中心支持扩展,除默认基于DB之外,支持扩展接入第三方注册中心如zk、eureka等; - 21、依赖Core内部国际化处理; +- 22、大数据量下任务日志分页优化,时间选择组件支持清空功能可提升速度; ## 七、其他 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java index b0343fc..3d2f9bb 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java @@ -58,8 +58,7 @@ // valid response if (response == null) { - logger.error(">>>>>>>>>>> xxl-rpc netty response not found."); - throw new Exception(">>>>>>>>>>> xxl-rpc netty response not found."); + throw new Exception("Network request fail, response not found."); } if (response.isError()) { throw new RuntimeException(response.getError()); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java index d03a28c..fed1e0f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java @@ -29,7 +29,7 @@ byte[] responseBytes = HttpClientUtil.postRequest(reqURL, requestBytes); if (responseBytes == null || responseBytes.length==0) { RpcResponse rpcResponse = new RpcResponse(); - rpcResponse.setError("RpcResponse byte[] is null"); + rpcResponse.setError("Network request fail, RpcResponse byte[] is null"); return rpcResponse; } @@ -40,7 +40,7 @@ logger.error(e.getMessage(), e); RpcResponse rpcResponse = new RpcResponse(); - rpcResponse.setError("Client-error:" + e.getMessage()); + rpcResponse.setError("Network request error: " + e.getMessage()); return rpcResponse; } } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java index cbb846a..7642475 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java @@ -64,7 +64,6 @@ EntityUtils.consume(entity); } } catch (Exception e) { - logger.error(e.getMessage(), e); throw e; } finally { httpPost.releaseConnection();