更新RM
This commit is contained in:
parent
dd94810416
commit
5e0ac51a89
|
@ -29,26 +29,26 @@ public class XxlJobExecutor implements ApplicationContextAware {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(XxlJobExecutor.class);
|
private static final Logger logger = LoggerFactory.getLogger(XxlJobExecutor.class);
|
||||||
|
|
||||||
// ---------------------- param ----------------------
|
// ---------------------- param ----------------------
|
||||||
|
private String adminAddresses;
|
||||||
|
private String appName;
|
||||||
private String ip;
|
private String ip;
|
||||||
private int port;
|
private int port;
|
||||||
private String appName;
|
|
||||||
private String adminAddresses;
|
|
||||||
private String accessToken;
|
private String accessToken;
|
||||||
private String logPath;
|
private String logPath;
|
||||||
private int logRetentionDays;
|
private int logRetentionDays;
|
||||||
|
|
||||||
|
public void setAdminAddresses(String adminAddresses) {
|
||||||
|
this.adminAddresses = adminAddresses;
|
||||||
|
}
|
||||||
|
public void setAppName(String appName) {
|
||||||
|
this.appName = appName;
|
||||||
|
}
|
||||||
public void setIp(String ip) {
|
public void setIp(String ip) {
|
||||||
this.ip = ip;
|
this.ip = ip;
|
||||||
}
|
}
|
||||||
public void setPort(int port) {
|
public void setPort(int port) {
|
||||||
this.port = port;
|
this.port = port;
|
||||||
}
|
}
|
||||||
public void setAppName(String appName) {
|
|
||||||
this.appName = appName;
|
|
||||||
}
|
|
||||||
public void setAdminAddresses(String adminAddresses) {
|
|
||||||
this.adminAddresses = adminAddresses;
|
|
||||||
}
|
|
||||||
public void setAccessToken(String accessToken) {
|
public void setAccessToken(String accessToken) {
|
||||||
this.accessToken = accessToken;
|
this.accessToken = accessToken;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,12 +29,13 @@ public class JFinalCoreConfig extends JFinalConfig {
|
||||||
|
|
||||||
// init executor
|
// init executor
|
||||||
xxlJobExecutor = new XxlJobExecutor();
|
xxlJobExecutor = new XxlJobExecutor();
|
||||||
|
xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
|
||||||
|
xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
|
||||||
xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
|
xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
|
||||||
xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
|
xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
|
||||||
xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
|
|
||||||
xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
|
|
||||||
xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
|
|
||||||
xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
|
xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
|
||||||
|
xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
|
||||||
|
xxlJobExecutor.setLogRetentionDays(xxlJobProp.getInt("xxl.job.executor.logretentiondays"));
|
||||||
|
|
||||||
// start executor
|
// start executor
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -6,8 +6,10 @@ xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
xxl.job.executor.ip=
|
xxl.job.executor.ip=
|
||||||
xxl.job.executor.port=9996
|
xxl.job.executor.port=9996
|
||||||
|
|
||||||
|
### xxl-job, access token
|
||||||
|
xxl.job.accessToken=
|
||||||
|
|
||||||
### xxl-job log path
|
### xxl-job log path
|
||||||
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
||||||
|
### xxl-job log retention days
|
||||||
### xxl-job, access token
|
xxl.job.executor.logretentiondays=-1
|
||||||
xxl.job.accessToken=
|
|
||||||
|
|
|
@ -39,12 +39,13 @@ public class NutzSetup implements Setup {
|
||||||
|
|
||||||
// init executor
|
// init executor
|
||||||
xxlJobExecutor = new XxlJobExecutor();
|
xxlJobExecutor = new XxlJobExecutor();
|
||||||
|
xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
|
||||||
|
xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
|
||||||
xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
|
xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
|
||||||
xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
|
xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
|
||||||
xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
|
|
||||||
xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
|
|
||||||
xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
|
|
||||||
xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
|
xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
|
||||||
|
xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
|
||||||
|
xxlJobExecutor.setLogRetentionDays(xxlJobProp.getInt("xxl.job.executor.logretentiondays"));
|
||||||
|
|
||||||
// start executor
|
// start executor
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -6,8 +6,10 @@ xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
xxl.job.executor.ip=
|
xxl.job.executor.ip=
|
||||||
xxl.job.executor.port=9997
|
xxl.job.executor.port=9997
|
||||||
|
|
||||||
|
### xxl-job, access token
|
||||||
|
xxl.job.accessToken=
|
||||||
|
|
||||||
### xxl-job log path
|
### xxl-job log path
|
||||||
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
||||||
|
### xxl-job log retention days
|
||||||
### xxl-job, access token
|
xxl.job.executor.logretentiondays=-1
|
||||||
xxl.job.accessToken=
|
|
||||||
|
|
|
@ -23,14 +23,14 @@
|
||||||
|
|
||||||
<!-- 配置02、执行器 -->
|
<!-- 配置02、执行器 -->
|
||||||
<bean id="xxlJobExecutor" class="com.xxl.job.core.executor.XxlJobExecutor" init-method="start" destroy-method="destroy" >
|
<bean id="xxlJobExecutor" class="com.xxl.job.core.executor.XxlJobExecutor" init-method="start" destroy-method="destroy" >
|
||||||
|
<!-- 执行器注册中心地址[选填],为空则关闭自动注册 -->
|
||||||
|
<property name="adminAddresses" value="${xxl.job.admin.addresses}" />
|
||||||
|
<!-- 执行器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}" />
|
||||||
<!-- 执行器端口号[选填],为空则自动获取 -->
|
<!-- 执行器端口号[选填],为空则自动获取 -->
|
||||||
<property name="port" value="${xxl.job.executor.port}" />
|
<property name="port" value="${xxl.job.executor.port}" />
|
||||||
<!-- 执行器AppName[选填],为空则关闭自动注册 -->
|
|
||||||
<property name="appName" value="${xxl.job.executor.appname}" />
|
|
||||||
<!-- 执行器注册中心地址[选填],为空则关闭自动注册 -->
|
|
||||||
<property name="adminAddresses" value="${xxl.job.admin.addresses}" />
|
|
||||||
<!-- 访问令牌[选填],非空则进行匹配校验 -->
|
<!-- 访问令牌[选填],非空则进行匹配校验 -->
|
||||||
<property name="accessToken" value="${xxl.job.accessToken}" />
|
<property name="accessToken" value="${xxl.job.accessToken}" />
|
||||||
<!-- 执行器日志路径[选填],为空则使用默认路径 -->
|
<!-- 执行器日志路径[选填],为空则使用默认路径 -->
|
||||||
|
|
|
@ -4,7 +4,7 @@ xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
||||||
### xxl-job executor address
|
### xxl-job executor address
|
||||||
xxl.job.executor.appname=xxl-job-executor-sample
|
xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
xxl.job.executor.ip=
|
xxl.job.executor.ip=
|
||||||
xxl.job.executor.port=9999
|
xxl.job.executor.port=9998
|
||||||
|
|
||||||
### xxl-job, access token
|
### xxl-job, access token
|
||||||
xxl.job.accessToken=
|
xxl.job.accessToken=
|
||||||
|
@ -13,4 +13,3 @@ xxl.job.accessToken=
|
||||||
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
||||||
### xxl-job log retention days
|
### xxl-job log retention days
|
||||||
xxl.job.executor.logretentiondays=-1
|
xxl.job.executor.logretentiondays=-1
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,11 @@ import org.springframework.context.annotation.Configuration;
|
||||||
public class XxlJobConfig {
|
public class XxlJobConfig {
|
||||||
private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
|
private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
|
||||||
|
|
||||||
|
|
||||||
@Value("${xxl.job.admin.addresses}")
|
@Value("${xxl.job.admin.addresses}")
|
||||||
private String addresses;
|
private String adminAddresses;
|
||||||
|
|
||||||
@Value("${xxl.job.executor.appname}")
|
@Value("${xxl.job.executor.appname}")
|
||||||
private String appname;
|
private String appName;
|
||||||
|
|
||||||
@Value("${xxl.job.executor.ip}")
|
@Value("${xxl.job.executor.ip}")
|
||||||
private String ip;
|
private String ip;
|
||||||
|
@ -31,22 +30,28 @@ public class XxlJobConfig {
|
||||||
@Value("${xxl.job.executor.port}")
|
@Value("${xxl.job.executor.port}")
|
||||||
private int port;
|
private int port;
|
||||||
|
|
||||||
@Value("${xxl.job.executor.logpath}")
|
|
||||||
private String logpath;
|
|
||||||
|
|
||||||
@Value("${xxl.job.accessToken}")
|
@Value("${xxl.job.accessToken}")
|
||||||
private String accessToken;
|
private String accessToken;
|
||||||
|
|
||||||
|
@Value("${xxl.job.executor.logpath}")
|
||||||
|
private String logPath;
|
||||||
|
|
||||||
|
@Value("xxl.job.executor.logretentiondays")
|
||||||
|
private int logRetentionDays;
|
||||||
|
|
||||||
|
|
||||||
@Bean(initMethod = "start", destroyMethod = "destroy")
|
@Bean(initMethod = "start", destroyMethod = "destroy")
|
||||||
public XxlJobExecutor xxlJobExecutor() {
|
public XxlJobExecutor xxlJobExecutor() {
|
||||||
logger.info(">>>>>>>>>>> xxl-job config init.");
|
logger.info(">>>>>>>>>>> xxl-job config init.");
|
||||||
XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
|
XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
|
||||||
|
xxlJobExecutor.setAdminAddresses(adminAddresses);
|
||||||
|
xxlJobExecutor.setAppName(appName);
|
||||||
xxlJobExecutor.setIp(ip);
|
xxlJobExecutor.setIp(ip);
|
||||||
xxlJobExecutor.setPort(port);
|
xxlJobExecutor.setPort(port);
|
||||||
xxlJobExecutor.setAppName(appname);
|
|
||||||
xxlJobExecutor.setAdminAddresses(addresses);
|
|
||||||
xxlJobExecutor.setLogPath(logpath);
|
|
||||||
xxlJobExecutor.setAccessToken(accessToken);
|
xxlJobExecutor.setAccessToken(accessToken);
|
||||||
|
xxlJobExecutor.setLogPath(logPath);
|
||||||
|
xxlJobExecutor.setLogRetentionDays(logRetentionDays);
|
||||||
|
|
||||||
return xxlJobExecutor;
|
return xxlJobExecutor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,17 +4,19 @@ server.port=8081
|
||||||
# log config
|
# log config
|
||||||
logging.config=classpath:logback.xml
|
logging.config=classpath:logback.xml
|
||||||
|
|
||||||
# xxl-job
|
|
||||||
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
|
||||||
xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
||||||
|
|
||||||
### xxl-job executor address
|
### xxl-job executor address
|
||||||
xxl.job.executor.appname=xxl-job-executor-sample
|
xxl.job.executor.appname=xxl-job-executor-sample
|
||||||
xxl.job.executor.ip=
|
xxl.job.executor.ip=
|
||||||
xxl.job.executor.port=9998
|
xxl.job.executor.port=9999
|
||||||
|
|
||||||
### xxl-job log path
|
|
||||||
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
|
||||||
|
|
||||||
### xxl-job, access token
|
### xxl-job, access token
|
||||||
xxl.job.accessToken=
|
xxl.job.accessToken=
|
||||||
|
|
||||||
|
### xxl-job log path
|
||||||
|
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
||||||
|
### xxl-job log retention days
|
||||||
|
xxl.job.executor.logretentiondays=-1
|
||||||
|
|
Loading…
Reference in New Issue