diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java index 8a36c6cf..d86fa4c3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java @@ -1,8 +1,6 @@ package com.xxl.job.admin.controller; import com.xxl.job.admin.controller.annotation.PermessionLimit; -import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler; -import com.xxl.job.core.biz.AdminBiz; import com.xxl.job.core.rpc.codec.RpcRequest; import com.xxl.job.core.rpc.codec.RpcResponse; import com.xxl.job.core.rpc.netcom.NetComServerFactory; @@ -25,10 +23,6 @@ import java.io.OutputStream; public class JobApiController { private static Logger logger = LoggerFactory.getLogger(JobApiController.class); - static { - NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz); - } - private RpcResponse doInvoke(HttpServletRequest request) { try { // deserialize request 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 3fc57fd0..cac05002 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 @@ -38,13 +38,15 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware, In } // init - private NetComServerFactory serverFactory = new NetComServerFactory(); public void init() throws Exception { // admin registry monitor run JobRegistryMonitorHelper.getInstance().start(); // admin monitor run JobFailMonitorHelper.getInstance().start(); + + // rpc-service, base on spring-mvc + NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz); } // destroy @@ -54,8 +56,6 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware, In // admin monitor stop JobFailMonitorHelper.getInstance().toStop(); - - serverFactory.destroy(); } // xxlJobLogDao、xxlJobInfoDao 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 e7a1de37..89c63de2 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 @@ -52,7 +52,7 @@ public class XxlJobExecutor implements ApplicationContextAware, ApplicationListe private NetComServerFactory serverFactory = new NetComServerFactory(); public void start() throws Exception { // executor start - NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl()); + NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl()); // rpc-service, base on jetty serverFactory.start(port, ip, appName); // trigger callback thread start 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 27e25fb0..2402949a 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 @@ -21,7 +21,7 @@ public class JettyClient { // reqURL String reqURL = request.getServerAddress(); - if (reqURL!=null && reqURL.indexOf("http://")==-1) { + if (reqURL!=null && reqURL.toLowerCase().indexOf("http://")==-1) { reqURL = "http://" + request.getServerAddress() + "/"; }