diff --git a/pom.xml b/pom.xml index 333e828..d28d59f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ waynboot-message-core waynboot-data waynboot-monitor + waynboot-job com.wayn waynboot @@ -54,6 +55,7 @@ 7.9.1 1.4.7 2.6.2 + 2.3.0 @@ -224,6 +226,12 @@ mail ${mail.version} + + + com.xuxueli + xxl-job-core + ${xxl-job.version} + diff --git a/waynboot-job/pom.xml b/waynboot-job/pom.xml new file mode 100644 index 0000000..0cf5a75 --- /dev/null +++ b/waynboot-job/pom.xml @@ -0,0 +1,19 @@ + + + + waynboot + com.wayn + 1.1.0 + + 4.0.0 + + waynboot-job + pom + + waynboot-job-xxl-job + + + + diff --git a/waynboot-job/waynboot-job-xxl-job/pom.xml b/waynboot-job/waynboot-job-xxl-job/pom.xml new file mode 100644 index 0000000..f51fde0 --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/pom.xml @@ -0,0 +1,67 @@ + + + + waynboot-job + com.wayn + 1.1.0 + + 4.0.0 + + waynboot-job-xxl-job + + + com.wayn.job.XxlJobExecutorApplication + + + + com.xuxueli + xxl-job-core + + + + com.wayn + waynboot-common + 1.1.0 + + + org.elasticsearch + elasticsearch + + + org.elasticsearch.client + elasticsearch-rest-client + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + ${main-class} + ZIP + + + + + + + + repackage + + + + + + + diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/XxlJobExecutorApplication.java b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/XxlJobExecutorApplication.java new file mode 100644 index 0000000..8dfd064 --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/XxlJobExecutorApplication.java @@ -0,0 +1,17 @@ +package com.wayn.job; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * @author xuxueli 2018-10-28 00:38:13 + */ +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +public class XxlJobExecutorApplication { + + public static void main(String[] args) { + SpringApplication.run(XxlJobExecutorApplication.class, args); + } + +} diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/config/XxlJobConfig.java b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/config/XxlJobConfig.java new file mode 100644 index 0000000..397d164 --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/config/XxlJobConfig.java @@ -0,0 +1,78 @@ +package com.wayn.job.config; + +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * xxl-job config + * + * @author xuxueli 2017-04-28 + */ +@Configuration +public class XxlJobConfig { + private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); + + @Value("${xxl.job.admin.addresses}") + private String adminAddresses; + + @Value("${xxl.job.accessToken}") + private String accessToken; + + @Value("${xxl.job.executor.appname}") + private String appname; + + @Value("${xxl.job.executor.address}") + private String address; + + @Value("${xxl.job.executor.ip}") + private String ip; + + @Value("${xxl.job.executor.port}") + private int port; + + @Value("${xxl.job.executor.logpath}") + private String logPath; + + @Value("${xxl.job.executor.logretentiondays}") + private int logRetentionDays; + + + @Bean + public XxlJobSpringExecutor xxlJobExecutor() { + logger.info(">>>>>>>>>>> xxl-job config init."); + XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); + xxlJobSpringExecutor.setAdminAddresses(adminAddresses); + xxlJobSpringExecutor.setAppname(appname); + xxlJobSpringExecutor.setAddress(address); + xxlJobSpringExecutor.setIp(ip); + xxlJobSpringExecutor.setPort(port); + xxlJobSpringExecutor.setAccessToken(accessToken); + xxlJobSpringExecutor.setLogPath(logPath); + xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); + + return xxlJobSpringExecutor; + } + + /** + * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP; + * + * 1、引入依赖: + * + * org.springframework.cloud + * spring-cloud-commons + * ${version} + * + * + * 2、配置文件,或者容器启动变量 + * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' + * + * 3、获取IP + * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + */ + + +} diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/MyXxlJob.java b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/MyXxlJob.java new file mode 100644 index 0000000..898709d --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/MyXxlJob.java @@ -0,0 +1,40 @@ +package com.wayn.job.jobhandler; + +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.concurrent.TimeUnit; + +/** + * XxlJob开发示例(Bean模式) + *

+ * 开发步骤: + * 1、任务开发:在Spring Bean实例中,开发Job方法; + * 2、注解配置:为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")",注解value值对应的是调度中心新建任务的JobHandler属性的值。 + * 3、执行日志:需要通过 "XxlJobHelper.log" 打印执行日志; + * 4、任务结果:默认任务结果为 "成功" 状态,不需要主动设置;如有诉求,比如设置任务结果为失败,可以通过 "XxlJobHelper.handleFail/handleSuccess" 自主设置任务结果; + * + * @author xuxueli 2019-12-11 21:52:51 + */ +@Slf4j +@Component +public class MyXxlJob { + + + /** + * 1、简单任务示例(Bean模式) + */ + @XxlJob("helloJobHandler") + public void helloJobHandler() throws Exception { + XxlJobHelper.log("XXL-JOB, Hello World."); + + TimeUnit.SECONDS.sleep(2); + XxlJobHelper.log("beat at:" + new Date()); + // default success + } + + +} diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/SampleXxlJob.java b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/SampleXxlJob.java new file mode 100644 index 0000000..59c7a48 --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/java/com/wayn/job/jobhandler/SampleXxlJob.java @@ -0,0 +1,253 @@ +package com.wayn.job.jobhandler; + +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +/** + * XxlJob开发示例(Bean模式) + * + * 开发步骤: + * 1、任务开发:在Spring Bean实例中,开发Job方法; + * 2、注解配置:为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")",注解value值对应的是调度中心新建任务的JobHandler属性的值。 + * 3、执行日志:需要通过 "XxlJobHelper.log" 打印执行日志; + * 4、任务结果:默认任务结果为 "成功" 状态,不需要主动设置;如有诉求,比如设置任务结果为失败,可以通过 "XxlJobHelper.handleFail/handleSuccess" 自主设置任务结果; + * + * @author xuxueli 2019-12-11 21:52:51 + */ +@Component +public class SampleXxlJob { + private static Logger logger = LoggerFactory.getLogger(SampleXxlJob.class); + + + /** + * 1、简单任务示例(Bean模式) + */ + @XxlJob("demoJobHandler") + public void demoJobHandler() throws Exception { + XxlJobHelper.log("XXL-JOB, Hello World."); + + for (int i = 0; i < 5; i++) { + XxlJobHelper.log("beat at:" + i); + TimeUnit.SECONDS.sleep(2); + } + // default success + } + + + /** + * 2、分片广播任务 + */ + @XxlJob("shardingJobHandler") + public void shardingJobHandler() throws Exception { + + // 分片参数 + int shardIndex = XxlJobHelper.getShardIndex(); + int shardTotal = XxlJobHelper.getShardTotal(); + + XxlJobHelper.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardIndex, shardTotal); + + // 业务逻辑 + for (int i = 0; i < shardTotal; i++) { + if (i == shardIndex) { + XxlJobHelper.log("第 {} 片, 命中分片开始处理", i); + } else { + XxlJobHelper.log("第 {} 片, 忽略", i); + } + } + + } + + + /** + * 3、命令行任务 + */ + @XxlJob("commandJobHandler") + public void commandJobHandler() throws Exception { + String command = XxlJobHelper.getJobParam(); + int exitValue = -1; + + BufferedReader bufferedReader = null; + try { + // command process + ProcessBuilder processBuilder = new ProcessBuilder(); + processBuilder.command(command); + processBuilder.redirectErrorStream(true); + + Process process = processBuilder.start(); + //Process process = Runtime.getRuntime().exec(command); + + BufferedInputStream bufferedInputStream = new BufferedInputStream(process.getInputStream()); + bufferedReader = new BufferedReader(new InputStreamReader(bufferedInputStream)); + + // command log + String line; + while ((line = bufferedReader.readLine()) != null) { + XxlJobHelper.log(line); + } + + // command exit + process.waitFor(); + exitValue = process.exitValue(); + } catch (Exception e) { + XxlJobHelper.log(e); + } finally { + if (bufferedReader != null) { + bufferedReader.close(); + } + } + + if (exitValue == 0) { + // default success + } else { + XxlJobHelper.handleFail("command exit value("+exitValue+") is failed"); + } + + } + + + /** + * 4、跨平台Http任务 + * 参数示例: + * "url: http://www.baidu.com\n" + + * "method: get\n" + + * "data: content\n"; + */ + @XxlJob("httpJobHandler") + public void httpJobHandler() throws Exception { + + // param parse + String param = XxlJobHelper.getJobParam(); + if (param==null || param.trim().length()==0) { + XxlJobHelper.log("param["+ param +"] invalid."); + + XxlJobHelper.handleFail(); + return; + } + + String[] httpParams = param.split("\n"); + String url = null; + String method = null; + String data = null; + for (String httpParam: httpParams) { + if (httpParam.startsWith("url:")) { + url = httpParam.substring(httpParam.indexOf("url:") + 4).trim(); + } + if (httpParam.startsWith("method:")) { + method = httpParam.substring(httpParam.indexOf("method:") + 7).trim().toUpperCase(); + } + if (httpParam.startsWith("data:")) { + data = httpParam.substring(httpParam.indexOf("data:") + 5).trim(); + } + } + + // param valid + if (url==null || url.trim().length()==0) { + XxlJobHelper.log("url["+ url +"] invalid."); + + XxlJobHelper.handleFail(); + return; + } + if (method==null || !Arrays.asList("GET", "POST").contains(method)) { + XxlJobHelper.log("method["+ method +"] invalid."); + + XxlJobHelper.handleFail(); + return; + } + boolean isPostMethod = method.equals("POST"); + + // request + HttpURLConnection connection = null; + BufferedReader bufferedReader = null; + try { + // connection + URL realUrl = new URL(url); + connection = (HttpURLConnection) realUrl.openConnection(); + + // connection setting + connection.setRequestMethod(method); + connection.setDoOutput(isPostMethod); + connection.setDoInput(true); + connection.setUseCaches(false); + connection.setReadTimeout(5 * 1000); + connection.setConnectTimeout(3 * 1000); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); + connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); + + // do connection + connection.connect(); + + // data + if (isPostMethod && data!=null && data.trim().length()>0) { + DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); + dataOutputStream.write(data.getBytes("UTF-8")); + dataOutputStream.flush(); + dataOutputStream.close(); + } + + // valid StatusCode + int statusCode = connection.getResponseCode(); + if (statusCode != 200) { + throw new RuntimeException("Http Request StatusCode(" + statusCode + ") Invalid."); + } + + // result + bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + StringBuilder result = new StringBuilder(); + String line; + while ((line = bufferedReader.readLine()) != null) { + result.append(line); + } + String responseMsg = result.toString(); + + XxlJobHelper.log(responseMsg); + + return; + } catch (Exception e) { + XxlJobHelper.log(e); + + XxlJobHelper.handleFail(); + return; + } finally { + try { + if (bufferedReader != null) { + bufferedReader.close(); + } + if (connection != null) { + connection.disconnect(); + } + } catch (Exception e2) { + XxlJobHelper.log(e2); + } + } + + } + + /** + * 5、生命周期任务示例:任务初始化与销毁时,支持自定义相关逻辑; + */ + @XxlJob(value = "demoJobHandler2", init = "init", destroy = "destroy") + public void demoJobHandler2() throws Exception { + XxlJobHelper.log("XXL-JOB, Hello World."); + } + public void init(){ + logger.info("init"); + } + public void destroy(){ + logger.info("destory"); + } + + +} diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/resources/application.yml b/waynboot-job/waynboot-job-xxl-job/src/main/resources/application.yml new file mode 100644 index 0000000..48141cb --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 8081 + +spring: + application: + name: waynboot-job-xxl-job + profiles: + active: dev + +logging: + config: classpath:logback.xml +xxl: + job: + admin: + addresses: http://127.0.0.1:8080/xxl-job-admin + accessToken: + executor: + appname: xxl-job-executor-sample + address: + ip: + port: 9999 + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 30 diff --git a/waynboot-job/waynboot-job-xxl-job/src/main/resources/logback.xml b/waynboot-job/waynboot-job-xxl-job/src/main/resources/logback.xml new file mode 100644 index 0000000..d5a0d2c --- /dev/null +++ b/waynboot-job/waynboot-job-xxl-job/src/main/resources/logback.xml @@ -0,0 +1,29 @@ + + + + logback + + + + + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + ${log.path} + + ${log.path}.%d{yyyy-MM-dd}.zip + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/waynboot-monitor/pom.xml b/waynboot-monitor/pom.xml index 32ecfe3..bf98ce2 100644 --- a/waynboot-monitor/pom.xml +++ b/waynboot-monitor/pom.xml @@ -12,7 +12,7 @@ waynboot-monitor - com.wayn.MonitorApplication + com.wayn.monitor.MonitorApplication diff --git a/waynboot-monitor/src/main/java/com/wayn/MonitorApplication.java b/waynboot-monitor/src/main/java/com/wayn/monitor/MonitorApplication.java similarity index 93% rename from waynboot-monitor/src/main/java/com/wayn/MonitorApplication.java rename to waynboot-monitor/src/main/java/com/wayn/monitor/MonitorApplication.java index 807a181..e855847 100644 --- a/waynboot-monitor/src/main/java/com/wayn/MonitorApplication.java +++ b/waynboot-monitor/src/main/java/com/wayn/monitor/MonitorApplication.java @@ -1,4 +1,4 @@ -package com.wayn; +package com.wayn.monitor; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication;