瀏覽代碼

调度中心API服务改为自研RPC形式,统一底层通讯模型;

xuxueli 8 年之前
父節點
當前提交
ff8e43af54

+ 0 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java 查看文件

@@ -1,8 +1,6 @@
1 1
 package com.xxl.job.admin.controller;
2 2
 
3 3
 import com.xxl.job.admin.controller.annotation.PermessionLimit;
4
-import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
5
-import com.xxl.job.core.biz.AdminBiz;
6 4
 import com.xxl.job.core.rpc.codec.RpcRequest;
7 5
 import com.xxl.job.core.rpc.codec.RpcResponse;
8 6
 import com.xxl.job.core.rpc.netcom.NetComServerFactory;
@@ -25,10 +23,6 @@ import java.io.OutputStream;
25 23
 public class JobApiController {
26 24
     private static Logger logger = LoggerFactory.getLogger(JobApiController.class);
27 25
 
28
-    static {
29
-        NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz);
30
-    }
31
-
32 26
     private RpcResponse doInvoke(HttpServletRequest request) {
33 27
         try {
34 28
             // deserialize request

+ 3 - 3
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
38 38
 	}
39 39
     
40 40
     // init
41
-    private NetComServerFactory serverFactory = new NetComServerFactory();
42 41
     public void init() throws Exception {
43 42
 		// admin registry monitor run
44 43
         JobRegistryMonitorHelper.getInstance().start();
45 44
 
46 45
         // admin monitor run
47 46
         JobFailMonitorHelper.getInstance().start();
47
+
48
+        // rpc-service, base on spring-mvc
49
+        NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz);
48 50
     }
49 51
     
50 52
     // destroy
@@ -54,8 +56,6 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware, In
54 56
 
55 57
         // admin monitor stop
56 58
         JobFailMonitorHelper.getInstance().toStop();
57
-
58
-        serverFactory.destroy();
59 59
     }
60 60
     
61 61
     // xxlJobLogDao、xxlJobInfoDao

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java 查看文件

@@ -52,7 +52,7 @@ public class XxlJobExecutor implements ApplicationContextAware, ApplicationListe
52 52
     private NetComServerFactory serverFactory = new NetComServerFactory();
53 53
     public void start() throws Exception {
54 54
         // executor start
55
-        NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl());
55
+        NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl());   // rpc-service, base on jetty
56 56
         serverFactory.start(port, ip, appName);
57 57
 
58 58
         // trigger callback thread start

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java 查看文件

@@ -21,7 +21,7 @@ public class JettyClient {
21 21
 
22 22
 			// reqURL
23 23
 			String reqURL = request.getServerAddress();
24
-			if (reqURL!=null && reqURL.indexOf("http://")==-1) {
24
+			if (reqURL!=null && reqURL.toLowerCase().indexOf("http://")==-1) {
25 25
 				reqURL = "http://" + request.getServerAddress() + "/";
26 26
 			}
27 27