Skip to content

M
matrix
Commit b3076fc3 by qiuweili123
Options

v1.3.1 

增加job-starter
parent 3be9dbb0
Showing with 503 additions and 0 deletions
matrix-job/matrix-job-core/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.2.12.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-job-core</artifactId>
<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
matrix-job/matrix-job-core/src/main/java/com/secoo/mall/job/bean/JobInfo.java 0 → 100644
package com.secoo.mall.job.bean;
public interface JobInfo {
}
matrix-job/matrix-job-core/src/main/java/com/secoo/mall/job/client/JobClient.java 0 → 100644
package com.secoo.mall.job.client;
import com.secoo.mall.job.bean.JobInfo;
public interface JobClient<T,E extends JobInfo> {
/**
* 添加一个任务
*
* @param jobInfo {@link JobInfo}
* @return 任务ID
*/
T add( E jobInfo);
/**
* 修改任务
*
* @param id 任务ID
* @param jobInfo {@link JobInfo}
* @return if update success
*/
T update(int id, E jobInfo);
/**
* 删除任务
*
* @param id 任务ID
* @return if remove success
*/
T remove(int id);
/**
* 暂停任务
*
* @param id 任务ID
* @return if pause success
*/
T stop(int id);
/**
* 启动任务
*
* @param id 任务ID
* @return if start success
*/
T start(int id);
}
\ No newline at end of file
matrix-job/matrix-job-xxl-core/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.2.12.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-job-xxl-core</artifactId>
<dependencies>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-core</artifactId>
</dependency>
<dependency>
<groupId>com.secoo</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/bean/MatrixXxlJobInfo.java 0 → 100644
package com.secoo.mall.xxl.bean;
import com.secoo.mall.job.bean.JobInfo;
import lombok.Data;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.lang.reflect.Field;
import java.util.Date;
/**
* TODO
*
* @author gaochen
* Created on 2019/7/18.
*/
@Data
public class MatrixXxlJobInfo implements JobInfo {
/**
* 执行器主键ID
*/
private int jobGroup;
/**
* 任务执行CRON表达式
*/
private String jobCron;
private String jobDesc;
private Date addTime;
private Date updateTime;
/**
* 负责人
*/
private String author;
/**
* 报警邮件
*/
private String alarmEmail;
/**
* 执行器路由策略
*/
private String executorRouteStrategy;
/**
* 执行器，任务Handler名称
*/
private String executorHandler;
/**
* 执行器，任务参数
*/
private String executorParam;
/**
* 阻塞处理策略
*/
private String executorBlockStrategy;
/**
* 任务执行超时时间，单位秒
*/
private int executorTimeout;
/**
* 失败重试次数
*/
private int executorFailRetryCount;
/**
* GLUE类型 #com.xxl.job.core.glue.GlueTypeEnum
*/
private String glueType;
public MultiValueMap<String, Object> toMultiValueMap() {
MultiValueMap<String, Object> map = new LinkedMultiValueMap<>(20);
Field[] fields = MatrixXxlJobInfo.class.getDeclaredFields();
try {
for (Field field : fields) {
String fieldName = field.getName();
Object value = field.get(this);
if (value != null) {
map.set(fieldName, value);
}
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}
return map;
}
}
\ No newline at end of file
matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/client/MatrixXxlJobClient.java 0 → 100644
package com.secoo.mall.xxl.client;
import com.secoo.mall.job.client.JobClient;
import com.secoo.mall.xxl.bean.MatrixXxlJobInfo;
import com.secoo.mall.xxl.properties.MatrixXxlJobProperties;
import com.xxl.job.core.biz.model.ReturnT;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
public class MatrixXxlJobClient implements JobClient<ReturnT, MatrixXxlJobInfo> {
private final RestTemplate restTemplate;
private final String baseUrl;
private static final String XXL_JOB_URL_PREFIX = "/jobinfo";
private static final String ADD_URL = "/add";
private static final String UPDATE_URL = "/update";
private static final String REMOVE_URL = "/remove";
private static final String STOP_URL = "/stop";
private static final String START_URL = "/start";
public MatrixXxlJobClient(RestTemplate restTemplate, MatrixXxlJobProperties xxlJobProperties) {
this.restTemplate = restTemplate;
this.baseUrl = xxlJobProperties.getAdminAddresses();
}
@Override
public ReturnT add(MatrixXxlJobInfo jobInfo) {
String url = baseUrl + XXL_JOB_URL_PREFIX + ADD_URL;
MultiValueMap<String, Object> valueMap = jobInfo.toMultiValueMap();
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
return restTemplate.postForObject(url, requestEntity, ReturnT.class);
}
@Override
public ReturnT update(int id, MatrixXxlJobInfo jobInfo) {
String url = baseUrl + XXL_JOB_URL_PREFIX + UPDATE_URL;
MultiValueMap<String, Object> valueMap = jobInfo.toMultiValueMap();
valueMap.set("id", id);
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
return restTemplate.postForObject(url, requestEntity, ReturnT.class);
}
@Override
public ReturnT<String> remove(int id) {
String url = baseUrl + XXL_JOB_URL_PREFIX + REMOVE_URL;
MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
valueMap.set("id", id);
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
return restTemplate.postForObject(url, requestEntity, ReturnT.class);
}
@Override
public ReturnT<String> stop(int id) {
String url = baseUrl + XXL_JOB_URL_PREFIX + STOP_URL;
MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
valueMap.set("id", id);
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
return restTemplate.postForObject(url, requestEntity, ReturnT.class);
}
@Override
public ReturnT<String> start(int id) {
String url = baseUrl + XXL_JOB_URL_PREFIX + START_URL;
MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
valueMap.set("id", id);
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
return restTemplate.postForObject(url, requestEntity, ReturnT.class);
}
}
\ No newline at end of file
matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/properties/MatrixXxlJobProperties.java 0 → 100644
package com.secoo.mall.xxl.properties;
import com.secoo.mall.common.util.sys.SystemUtil;
import lombok.Data;
import org.apache.commons.lang3.SystemUtils;
import org.springframework.beans.factory.annotation.Value;
@Data
public class MatrixXxlJobProperties {
private static final int DEFAULT_EXECUTOR_PORT = 9999;
private String adminAddresses;
private String accessToken;
private String appName=SystemUtil.APP_ID;
private String logPath = (SystemUtil.IS_OS_WINDOWS?"c:/opt/":"/data/logs/")+this.appName;
@Value("${log.max_history:7}")
private int logRetentionDays;
private Executor executor = new Executor();
@Data
public static class Executor {
private String ip;
private int port = DEFAULT_EXECUTOR_PORT;
}
}
matrix-job/matrix-job-xxl-starter/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.2.12.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-job-xxl-starter</artifactId>
<dependencies>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobAutoConfiguration.java 0 → 100644
package com.secoo.mall.xxl.spring.boot.autoconfigure;
import com.secoo.mall.job.client.JobClient;
import com.secoo.mall.xxl.client.MatrixXxlJobClient;
import com.xxl.job.core.executor.XxlJobExecutor;
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;
@Slf4j
@ConditionalOnClass(XxlJobExecutor.class)
@EnableConfigurationProperties(MatrixXxlJobBootProperties.class)
@ConditionalOnProperty(name = "xxl.job.enabled", havingValue = "true", matchIfMissing = true)
public class MatrixXxlJobAutoConfiguration {
@Bean(initMethod = "start", destroyMethod = "destroy")
@ConditionalOnMissingBean
public XxlJobSpringExecutor xxlJobExecutor(MatrixXxlJobBootProperties xxlJobProperties) {
log.info("xxl-job config {} init.", xxlJobProperties);
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
xxlJobSpringExecutor.setAdminAddresses(xxlJobProperties.getAdminAddresses());
xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getAccessToken());
xxlJobSpringExecutor.setAppName(xxlJobProperties.getAppName());
xxlJobSpringExecutor.setIp(xxlJobProperties.getExecutor().getIp());
xxlJobSpringExecutor.setPort(xxlJobProperties.getExecutor().getPort());
xxlJobSpringExecutor.setLogPath(xxlJobProperties.getLogPath());
xxlJobSpringExecutor.setLogRetentionDays(xxlJobProperties.getLogRetentionDays());
return xxlJobSpringExecutor;
}
@Bean
@ConditionalOnMissingBean
public JobClient jobClient(RestTemplate restTemplate, MatrixXxlJobBootProperties xxlJobProperties) {
return new MatrixXxlJobClient(restTemplate, xxlJobProperties);
}
@Bean
@ConditionalOnMissingBean
public RestTemplate restTemplate() {
return new RestTemplate();
}
}
\ No newline at end of file
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobBootProperties.java 0 → 100644
package com.secoo.mall.xxl.spring.boot.autoconfigure;
import com.secoo.mall.xxl.properties.MatrixXxlJobProperties;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
@ConfigurationProperties(prefix =MatrixXxlJobBootProperties.PREFIX)
public class MatrixXxlJobBootProperties extends MatrixXxlJobProperties {
public static final String PREFIX = "xxl.job";
@NestedConfigurationProperty
private MatrixXxlJobProperties.Executor executor;
@Override
@Value("${spring.application.name}")
public void setAppName(String appName) {
super.setAppName(appName);
}
}
matrix-job/matrix-job-xxl-starter/src/main/resources/META-INF/spring.factories 0 → 100644
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.secoo.mall.xxl.spring.boot.autoconfigure.MatrixXxlJobAutoConfiguration
\ No newline at end of file
matrix-job/matrix-job-xxl-starter/src/test/resources/application.yml 0 → 100644
xxl:
job:
executor:
ip: 190.189.90.1
\ No newline at end of file
matrix-job/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.2.12.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-job</artifactId>
<packaging>pom</packaging>
<modules>
<module>matrix-job-core</module>
<module>matrix-job-xxl-core</module>
<module>matrix-job-xxl-starter</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-core</artifactId>
<version>1.2.12.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId>
<version>1.2.12.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo</groupId>
<artifactId>xxl-job-core</artifactId>
<version>2.1.0-secoo1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-util</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
matrix-mybatis/matrix-mybatis-starter/src/test/resources/application.yml
......@@ -2,3 +2,4 @@ spring:
datasource:
matrix:
type: druid
matir
\ No newline at end of file
pom.xml
......@@ -25,6 +25,7 @@
<module>matrix-protocol</module>
<module>matrix-datasource</module>
<module>rocketmq-starter</module>
<module>matrix-job</module>
</modules>
......@@ -147,6 +148,17 @@
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId>
<version>1.2.12.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-starter</artifactId>
<version>1.2.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment