xueli.xue преди 9 години
родител
ревизия
90f658464e

+ 9 - 3
xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java Целия файл

@@ -58,10 +58,16 @@ public class RemoteHttpJobBean extends QuartzJobBean {
58 58
 		params.put(HandlerRepository.TRIGGER_LOG_ID, String.valueOf(jobLog.getId()));
59 59
 		params.put(HandlerRepository.HANDLER_NAME, jobDataMap.get(HandlerRepository.HANDLER_NAME));
60 60
 		params.put(HandlerRepository.HANDLER_PARAMS, jobDataMap.get(HandlerRepository.HANDLER_PARAMS));
61
-		
62
-		String[] postResp = HttpUtil.post(jobDataMap.get(HandlerRepository.HANDLER_ADDRESS), params);
61
+
62
+		// handler address, netty or servlet
63
+		String handler_address = jobDataMap.get(HandlerRepository.HANDLER_ADDRESS);
64
+		if (!handler_address.startsWith("http")){
65
+			handler_address = "http://" + handler_address + "/";
66
+		}
67
+
68
+		String[] postResp = HttpUtil.post(handler_address, params);
63 69
 		logger.info(">>>>>>>>>>> xxl-job trigger http response, jobLog.id:{}, jobLog:{}", jobLog.getId(), jobLog);
64
-		
70
+
65 71
 		// parse trigger response
66 72
 		String responseMsg = postResp[0];
67 73
 		String exceptionMsg = postResp[1];

+ 1 - 1
xxl-job-admin/src/main/resources/config.properties Целия файл

@@ -1 +1 @@
1
-trigger_log_url=http://localhost:8080/xxl-job-admin/joblog/save
1
+trigger_log_url=http://localhost:8080/joblog/save

+ 4 - 0
xxl-job-client-demo/src/main/resources/applicationcontext-base.xml Целия файл

@@ -11,4 +11,8 @@
11 11
 
12 12
 	<context:component-scan base-package="com.xxl.job.service" />
13 13
 
14
+	<bean id="xxlJobJettyServer" class="com.xxl.job.client.netcom.jetty.XxlJobJettyServer" init-method="start">
15
+		<property name="port" value="9999" />
16
+	</bean>
17
+
14 18
 </beans>

+ 1 - 1
xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml Целия файл

@@ -23,7 +23,7 @@
23 23
 	<!-- Xxl Job Servlet -->
24 24
 	<servlet>
25 25
 		<servlet-name>XxlJobServlet</servlet-name>
26
-		<servlet-class>com.xxl.job.client.netcom.http.XxlJobServlet</servlet-class>
26
+		<servlet-class>com.xxl.job.client.netcom.servlet.XxlJobServlet</servlet-class>
27 27
 		<load-on-startup>1</load-on-startup>
28 28
 	</servlet>
29 29
 	<servlet-mapping>

+ 8 - 1
xxl-job-client/pom.xml Целия файл

@@ -24,6 +24,13 @@
24 24
 			<version>2.1</version>
25 25
 			<scope>provided</scope>
26 26
 		</dependency>
27
+
28
+		<!-- jetty -->
29
+		<dependency>
30
+			<groupId>org.eclipse.jetty</groupId>
31
+			<artifactId>jetty-server</artifactId>
32
+			<version>7.6.9.v20130131</version>
33
+		</dependency>
27 34
 				
28 35
 		<!-- slf4j -->
29 36
 		<dependency>
@@ -45,7 +52,7 @@
45 52
 			<artifactId>httpclient</artifactId>
46 53
 			<version>4.3.6</version>
47 54
 		</dependency>
48
-		
55
+
49 56
 	</dependencies>
50 57
 
51 58
 	<build>

xxl-job-client/src/main/java/com/xxl/job/client/netcom/http/XxlJobServlet.java → xxl-job-client/src/main/java/com/xxl/job/client/netcom/servlet/XxlJobServlet.java Целия файл

@@ -1,60 +1,60 @@
1
-package com.xxl.job.client.netcom.http;
2
-
3
-
4
-import java.io.IOException;
5
-import java.util.HashMap;
6
-import java.util.Map;
7
-
8
-import javax.servlet.ServletException;
9
-import javax.servlet.http.HttpServlet;
10
-import javax.servlet.http.HttpServletRequest;
11
-import javax.servlet.http.HttpServletResponse;
12
-
13
-import com.xxl.job.client.handler.HandlerRepository;
14
-
15
-
16
-/**
17
- * remote job client on http
18
- * @author xuxueli 2015-12-19 18:36:47
19
- */
20
-public class XxlJobServlet extends HttpServlet {
21
-	private static final long serialVersionUID = 1L;
22
-
23
-    /**
24
-     * Default constructor. 
25
-     */
26
-    public XxlJobServlet() {
27
-        // TODO Auto-generated constructor stub
28
-    }
29
-    
30
-	/**
31
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
32
-	 */
33
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
34
-		request.setCharacterEncoding("UTF-8");
35
-		response.setCharacterEncoding("UTF-8");
36
-		
37
-		Map<String, String> _param = new HashMap<String, String>();
38
-		if (request.getParameterMap()!=null && request.getParameterMap().size()>0) {
39
-			for (Object paramKey : request.getParameterMap().keySet()) {
40
-				if (paramKey!=null) {
41
-					String paramKeyStr = paramKey.toString();
42
-					_param.put(paramKeyStr, request.getParameter(paramKeyStr));
43
-				}
44
-			}
45
-		}
46
-		
47
-		String resp = HandlerRepository.pushHandleQueue(_param);
48
-		response.getWriter().append(resp);
49
-		return;
50
-	}
51
-
52
-	/**
53
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
54
-	 */
55
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
56
-		// TODO Auto-generated method stub
57
-		doGet(request, response);
58
-	}
59
-
60
-}
1
+package com.xxl.job.client.netcom.servlet;
2
+
3
+
4
+import java.io.IOException;
5
+import java.util.HashMap;
6
+import java.util.Map;
7
+
8
+import javax.servlet.ServletException;
9
+import javax.servlet.http.HttpServlet;
10
+import javax.servlet.http.HttpServletRequest;
11
+import javax.servlet.http.HttpServletResponse;
12
+
13
+import com.xxl.job.client.handler.HandlerRepository;
14
+
15
+
16
+/**
17
+ * remote job client on http
18
+ * @author xuxueli 2015-12-19 18:36:47
19
+ */
20
+public class XxlJobServlet extends HttpServlet {
21
+	private static final long serialVersionUID = 1L;
22
+
23
+    /**
24
+     * Default constructor. 
25
+     */
26
+    public XxlJobServlet() {
27
+        // TODO Auto-generated constructor stub
28
+    }
29
+    
30
+	/**
31
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
32
+	 */
33
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
34
+		request.setCharacterEncoding("UTF-8");
35
+		response.setCharacterEncoding("UTF-8");
36
+		
37
+		Map<String, String> _param = new HashMap<String, String>();
38
+		if (request.getParameterMap()!=null && request.getParameterMap().size()>0) {
39
+			for (Object paramKey : request.getParameterMap().keySet()) {
40
+				if (paramKey!=null) {
41
+					String paramKeyStr = paramKey.toString();
42
+					_param.put(paramKeyStr, request.getParameter(paramKeyStr));
43
+				}
44
+			}
45
+		}
46
+		
47
+		String resp = HandlerRepository.pushHandleQueue(_param);
48
+		response.getWriter().append(resp);
49
+		return;
50
+	}
51
+
52
+	/**
53
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
54
+	 */
55
+	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
56
+		// TODO Auto-generated method stub
57
+		doGet(request, response);
58
+	}
59
+
60
+}