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 614b10d07efa4a68aecca4dd9f8be55803498206..56b38abdcafc36eed2a9265e55e1098317d0697a 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" @@ -1419,6 +1419,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 5、精简项目，取消第三方依赖，如 commons-collections4 ; - 6、底层Log调优，应用正常终止取消异常栈信息打印； - 7、交互优化，尽量避免新开页面窗口；仅WebIDE支持新开页，并提供窗口快速关闭按钮； +- 8、[测试中]底层通讯方案优化：升级较新版本xxl-rpc，由"JETTY"方案调整为"NETTY_HTTP"方案，执行器内嵌netty-http-server提供服务，调度中心复用容器端口提供服务； - [迭代中]注册中心优化，实时性注册发现：心跳注册间隔10s，refresh失败则首次注册并立即更新注册信息，心跳类似；30s过期销毁； - [迭代中]脚本任务，支持数据参数，新版本仅支持单参数不支持需要兼容； - [迭代中]提供执行器Docker镜像； @@ -1457,9 +1458,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 31、调度中心-执行器通讯模型统一，双向RPC切换为Netty； - 32、任务暂停、删除优化，避免quartz delete不完整导致任务脏数据； - 32、quartz misfire 配置优化，计划改为0； -- 33、job通讯调优： - - 调度tcp； - - 回调http（netty），handler复用mvc（考虑是否双向tcp）； + ## 七、其他 diff --git a/pom.xml b/pom.xml index ab3aff5e936a1559e24f799a2a721b9d26010394..d6e0525c5908376b5f2dbf45d5486398f2669a69 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,7 @@ 1.7 true - 1.3.1 - 9.2.26.v20180806 + 1.3.2-SNAPSHOT 1.5.18.RELEASE 1.3.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index f1f065b56870766f2d7c97dcd1b5bc5fbe2023c0..fe64c1d3aba62b0287eadd4648cdc842fada3987 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -18,34 +18,6 @@ pom import - - - - org.eclipse.jetty - jetty-server - ${jetty-server.version} - - - org.eclipse.jetty - jetty-util - ${jetty-server.version} - - - org.eclipse.jetty - jetty-http - ${jetty-server.version} - - - org.eclipse.jetty - jetty-io - ${jetty-server.version} - - - org.eclipse.jetty - jetty-client - ${jetty-server.version} - - diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java index e9fba26093ac59cf808dbc09bfa6fd17c6b8459a..5dd891a8e32337a765d54da17ecb7b98a26d2dc8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java @@ -15,10 +15,9 @@ import com.xxl.rpc.remoting.invoker.call.CallType; import com.xxl.rpc.remoting.invoker.reference.XxlRpcReferenceBean; import com.xxl.rpc.remoting.invoker.route.LoadBalance; import com.xxl.rpc.remoting.net.NetEnum; -import com.xxl.rpc.remoting.net.impl.jetty.server.JettyServerHandler; +import com.xxl.rpc.remoting.net.impl.servlet.server.ServletServerHandler; import com.xxl.rpc.remoting.provider.XxlRpcProviderFactory; import com.xxl.rpc.serialize.Serializer; -import org.eclipse.jetty.server.Request; import org.quartz.*; import org.quartz.Trigger.TriggerState; import org.quartz.impl.triggers.CronTriggerImpl; @@ -95,12 +94,12 @@ public final class XxlJobDynamicScheduler { // ---------------------- admin rpc provider (no server version) ---------------------- - private static JettyServerHandler jettyServerHandler; + private static ServletServerHandler servletServerHandler; private void initRpcProvider(){ // init XxlRpcProviderFactory xxlRpcProviderFactory = new XxlRpcProviderFactory(); xxlRpcProviderFactory.initConfig( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), null, 0, @@ -112,13 +111,13 @@ public final class XxlJobDynamicScheduler { xxlRpcProviderFactory.addService(AdminBiz.class.getName(), null, XxlJobAdminConfig.getAdminConfig().getAdminBiz()); // jetty handler - jettyServerHandler = new JettyServerHandler(xxlRpcProviderFactory); + servletServerHandler = new ServletServerHandler(xxlRpcProviderFactory); } private void stopRpcProvider() throws Exception { XxlRpcInvokerFactory.getInstance().stop(); } public static void invokeAdminService(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - jettyServerHandler.handle(null, new Request(null, null), request, response); + servletServerHandler.handle(null, request, response); } @@ -139,7 +138,7 @@ public final class XxlJobDynamicScheduler { // set-cache executorBiz = (ExecutorBiz) new XxlRpcReferenceBean( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), CallType.SYNC, LoadBalance.ROUND, diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java index 249113b86d4d08feb5b01f950959ab21ad75cca4..d588cb6b3e0e25350ea6ff943c281b08c88f37de 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java @@ -33,7 +33,7 @@ public class AdminBizTest { public void registryTest() throws Exception { addressUrl = addressUrl.replace("http://", ""); AdminBiz adminBiz = (AdminBiz) new XxlRpcReferenceBean( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), CallType.SYNC, LoadBalance.ROUND, @@ -63,7 +63,7 @@ public class AdminBizTest { public void registryRemove() throws Exception { addressUrl = addressUrl.replace("http://", ""); AdminBiz adminBiz = (AdminBiz) new XxlRpcReferenceBean( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), CallType.SYNC, LoadBalance.ROUND, diff --git a/xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java index 3892c1f9b59bc3275dadd90095540047f7179101..53080ddabad4614d3dd121e0c3d7590baf04b41b 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java @@ -50,7 +50,7 @@ public class ExecutorBizTest { // do remote trigger String accessToken = null; ExecutorBiz executorBiz = (ExecutorBiz) new XxlRpcReferenceBean( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), CallType.SYNC, LoadBalance.ROUND, diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index f0600552898b4cc481498e60346b04282a750910..f5b889754939d361b089b408c3b2b295b4989ec5 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -20,26 +20,6 @@ com.xuxueli xxl-rpc-core ${xxl-rpc.version} - - - io.netty - netty-all - - - org.apache.commons - commons-pool2 - - - - - org.eclipse.jetty - jetty-server - ${jetty-server.version} - - - org.eclipse.jetty - jetty-client - ${jetty-server.version} diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java index 027aa7e4333e41af68c60d969f8ff44e14a19266..b38eff726f47e26cf216c4c43090695997b21a55 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java @@ -115,7 +115,7 @@ public class XxlJobExecutor { String addressUrl = address.concat(AdminBiz.MAPPING); AdminBiz adminBiz = (AdminBiz) new XxlRpcReferenceBean( - NetEnum.JETTY, + NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), CallType.SYNC, LoadBalance.ROUND, @@ -153,7 +153,7 @@ public class XxlJobExecutor { serviceRegistryParam.put("address", address); xxlRpcProviderFactory = new XxlRpcProviderFactory(); - xxlRpcProviderFactory.initConfig(NetEnum.JETTY, Serializer.SerializeEnum.HESSIAN.getSerializer(), ip, port, accessToken, ExecutorServiceRegistry.class, serviceRegistryParam); + xxlRpcProviderFactory.initConfig(NetEnum.NETTY_HTTP, Serializer.SerializeEnum.HESSIAN.getSerializer(), ip, port, accessToken, ExecutorServiceRegistry.class, serviceRegistryParam); // add services xxlRpcProviderFactory.addService(ExecutorBiz.class.getName(), null, new ExecutorBizImpl()); diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml index 1e196553941b19b0b0ac28b1858bc6c5b3a0102e..25a1c2b257ad8bfb50fe15a2e14d95ffd265b10f 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml @@ -28,34 +28,6 @@ pom import - - - - org.eclipse.jetty - jetty-server - ${jetty-server.version} - - - org.eclipse.jetty - jetty-util - ${jetty-server.version} - - - org.eclipse.jetty - jetty-http - ${jetty-server.version} - - - org.eclipse.jetty - jetty-io - ${jetty-server.version} - - - org.eclipse.jetty - jetty-client - ${jetty-server.version} - -