ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新RM

This commit is contained in:
xuxueli 2018-08-16 22:06:02 +08:00
parent 15af500d40
commit 3957ef2ff7
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/XXL-JOB官方文档.md
View File

@ -347,7 +347,7 @@ XXL-JOB是一个轻量级分布式任务调度平台，其核心设计目标是
<property name="appName" value="${xxl.job.executor.appname}" /> <property name="appName" value="${xxl.job.executor.appname}" />
<!-- 执行器IP[选填]，为空则自动获取 --> <!-- 执行器IP[选填]，为空则自动获取 -->
<property name="ip" value="${xxl.job.executor.ip}" /> <property name="ip" value="${xxl.job.executor.ip}" />
<!-- 执行器端口号[选填]，为空则自动获取 --> <!-- 执行器端口号[选填]，小于等于0则自动获取 -->
<property name="port" value="${xxl.job.executor.port}" /> <property name="port" value="${xxl.job.executor.port}" />
<!-- 访问令牌[选填]，非空则进行匹配校验 --> <!-- 访问令牌[选填]，非空则进行匹配校验 -->
<property name="accessToken" value="${xxl.job.accessToken}" /> <property name="accessToken" value="${xxl.job.accessToken}" />

2
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
View File

@ -129,7 +129,7 @@ public class XxlJobExecutor implements ApplicationContextAware {
private NetComServerFactory serverFactory = new NetComServerFactory(); private NetComServerFactory serverFactory = new NetComServerFactory();
private void initExecutorServer(int port, String ip, String appName, String accessToken) throws Exception { private void initExecutorServer(int port, String ip, String appName, String accessToken) throws Exception {
// valid param // valid param
port = port>0?port: NetUtil.findAvailablePort(9999,ip); port = port>0?port: NetUtil.findAvailablePort(9999);
// start server // start server
NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl()); // rpc-service, base on jetty NetComServerFactory.putService(ExecutorBiz.class, new ExecutorBizImpl()); // rpc-service, base on jetty

35
xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java
View File

@ -2,10 +2,8 @@ package com.xxl.job.core.util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
/** /**
@ -17,24 +15,23 @@ public class NetUtil {
private static Logger logger = LoggerFactory.getLogger(NetUtil.class); private static Logger logger = LoggerFactory.getLogger(NetUtil.class);
/** /**
* find avaliable port by ip * find avaliable port
* *
* @param defaultPort * @param defaultPort
* @param ip
* @return * @return
*/ */
public static int findAvailablePort(int defaultPort,String ip) { public static int findAvailablePort(int defaultPort) {
int portTmp = defaultPort; int portTmp = defaultPort;
while (portTmp < 65535) { while (portTmp < 65535) {
if (!isPortUsed(portTmp,ip)) { if (!isPortUsed(portTmp)) {
return portTmp; return portTmp;
} else { } else {
portTmp++; portTmp++;
} }
} }
portTmp = --defaultPort; portTmp = defaultPort--;
while (portTmp > 0) { while (portTmp > 0) {
if (!isPortUsed(portTmp,ip)) { if (!isPortUsed(portTmp)) {
return portTmp; return portTmp;
} else { } else {
portTmp--; portTmp--;
@ -43,34 +40,18 @@ public class NetUtil {
throw new IllegalStateException("no available port."); throw new IllegalStateException("no available port.");
} }
/**
* find avaliable port
*
* @param defaultPort
* @return
*/
public static int findAvailablePort(int defaultPort) {
return findAvailablePort(defaultPort,null);
}
/** /**
* check port used * check port used
* *
* @param port * @param port
* @param ip 为空则为 InetAddress.anyLocalAddress()
* @return * @return
*/ */
public static boolean isPortUsed(int port,String ip) { public static boolean isPortUsed(int port) {
boolean used = false; boolean used = false;
ServerSocket serverSocket = null; ServerSocket serverSocket = null;
try { try {
if(StringUtils.isEmpty(ip)){ serverSocket = new ServerSocket(port);
serverSocket = new ServerSocket(port); used = false;
}else {
serverSocket = new ServerSocket();
serverSocket.bind(new InetSocketAddress(ip,port));
}
} catch (IOException e) { } catch (IOException e) {
logger.debug(">>>>>>>>>>> xxl-job, port[{}] is in use.", port); logger.debug(">>>>>>>>>>> xxl-job, port[{}] is in use.", port);
used = true; used = true;

2
xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
View File

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