瀏覽代碼

修正xxl-job.xml端口自动获取的描述和执行器在指定ip自动获取端口时的错误

raoq@vip.qq.com 7 年之前
父節點
當前提交
76b629ac5f

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

129
     private NetComServerFactory serverFactory = new NetComServerFactory();
129
     private NetComServerFactory serverFactory = new NetComServerFactory();
130
     private void initExecutorServer(int port, String ip, String appName, String accessToken) throws Exception {
130
     private void initExecutorServer(int port, String ip, String appName, String accessToken) throws Exception {
131
         // valid param
131
         // valid param
132
-        port = port>0?port: NetUtil.findAvailablePort(9999);
132
+        port = port>0?port: NetUtil.findAvailablePort(9999,ip);
133
 
133
 
134
         // start server
134
         // start server
135
         NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl());   // rpc-service, base on jetty
135
         NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl());   // rpc-service, base on jetty

+ 27 - 8
xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java 查看文件

2
 
2
 
3
 import org.slf4j.Logger;
3
 import org.slf4j.Logger;
4
 import org.slf4j.LoggerFactory;
4
 import org.slf4j.LoggerFactory;
5
+import org.springframework.util.StringUtils;
5
 
6
 
6
 import java.io.IOException;
7
 import java.io.IOException;
8
+import java.net.InetSocketAddress;
7
 import java.net.ServerSocket;
9
 import java.net.ServerSocket;
8
 
10
 
9
 /**
11
 /**
15
     private static Logger logger = LoggerFactory.getLogger(NetUtil.class);
17
     private static Logger logger = LoggerFactory.getLogger(NetUtil.class);
16
 
18
 
17
     /**
19
     /**
18
-     * find avaliable port
20
+     * find avaliable port by ip
19
      *
21
      *
20
      * @param defaultPort
22
      * @param defaultPort
23
+     * @param ip
21
      * @return
24
      * @return
22
      */
25
      */
23
-    public static int findAvailablePort(int defaultPort) {
26
+    public static int findAvailablePort(int defaultPort,String ip) {
24
         int portTmp = defaultPort;
27
         int portTmp = defaultPort;
25
         while (portTmp < 65535) {
28
         while (portTmp < 65535) {
26
-            if (!isPortUsed(portTmp)) {
29
+            if (!isPortUsed(portTmp,ip)) {
27
                 return portTmp;
30
                 return portTmp;
28
             } else {
31
             } else {
29
                 portTmp++;
32
                 portTmp++;
30
             }
33
             }
31
         }
34
         }
32
-        portTmp = defaultPort--;
35
+        portTmp = --defaultPort;
33
         while (portTmp > 0) {
36
         while (portTmp > 0) {
34
-            if (!isPortUsed(portTmp)) {
37
+            if (!isPortUsed(portTmp,ip)) {
35
                 return portTmp;
38
                 return portTmp;
36
             } else {
39
             } else {
37
                 portTmp--;
40
                 portTmp--;
41
     }
44
     }
42
 
45
 
43
     /**
46
     /**
47
+     * find avaliable port
48
+     *
49
+     * @param defaultPort
50
+     * @return
51
+     */
52
+    public static int findAvailablePort(int defaultPort) {
53
+        return findAvailablePort(defaultPort,null);
54
+    }
55
+
56
+
57
+    /**
44
      * check port used
58
      * check port used
45
      *
59
      *
46
      * @param port
60
      * @param port
61
+     * @param ip 为空则为 InetAddress.anyLocalAddress()
47
      * @return
62
      * @return
48
      */
63
      */
49
-    public static boolean isPortUsed(int port) {
64
+    public static boolean isPortUsed(int port,String ip) {
50
         boolean used = false;
65
         boolean used = false;
51
         ServerSocket serverSocket = null;
66
         ServerSocket serverSocket = null;
52
         try {
67
         try {
53
-            serverSocket = new ServerSocket(port);
54
-            used = false;
68
+            if(StringUtils.isEmpty(ip)){
69
+                serverSocket = new ServerSocket(port);
70
+            }else {
71
+                serverSocket = new ServerSocket();
72
+                serverSocket.bind(new InetSocketAddress(ip,port));
73
+            }
55
         } catch (IOException e) {
74
         } catch (IOException e) {
56
             logger.debug(">>>>>>>>>>> xxl-job, port[{}] is in use.", port);
75
             logger.debug(">>>>>>>>>>> xxl-job, port[{}] is in use.", port);
57
             used = true;
76
             used = true;

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml 查看文件

29
 		<property name="appName" value="${xxl.job.executor.appname}" />
29
 		<property name="appName" value="${xxl.job.executor.appname}" />
30
 		<!-- 执行器IP[选填],为空则自动获取 -->
30
 		<!-- 执行器IP[选填],为空则自动获取 -->
31
 		<property name="ip" value="${xxl.job.executor.ip}" />
31
 		<property name="ip" value="${xxl.job.executor.ip}" />
32
-		<!-- 执行器端口号[选填],为则自动获取 -->
32
+		<!-- 执行器端口号[选填],为<0则自动获取 -->
33
 		<property name="port" value="${xxl.job.executor.port}" />
33
 		<property name="port" value="${xxl.job.executor.port}" />
34
 		<!-- 访问令牌[选填],非空则进行匹配校验 -->
34
 		<!-- 访问令牌[选填],非空则进行匹配校验 -->
35
 		<property name="accessToken" value="${xxl.job.accessToken}" />
35
 		<property name="accessToken" value="${xxl.job.accessToken}" />