third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[dev] update common,worker,client's version

Browse Source
This commit is contained in:
tjq 2020-05-14 19:12:31 +08:00
parent cb7a9042de
commit 5f2065f5ef
8 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oh-my-scheduler-client/pom.xml
View File

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>oh-my-scheduler-client</artifactId> <artifactId>oh-my-scheduler-client</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<oms.common.version>1.1.0</oms.common.version> <oms.common.version>1.1.1</oms.common.version>
<junit.version>5.6.1</junit.version> <junit.version>5.6.1</junit.version>
</properties> </properties>

2
oh-my-scheduler-common/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>oh-my-scheduler-common</artifactId> <artifactId>oh-my-scheduler-common</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

4
oh-my-scheduler-server/pom.xml
View File

@ -10,13 +10,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>oh-my-scheduler-server</artifactId> <artifactId>oh-my-scheduler-server</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
<springboot.version>2.2.6.RELEASE</springboot.version> <springboot.version>2.2.6.RELEASE</springboot.version>
<oms.common.version>1.1.0</oms.common.version> <oms.common.version>1.1.1</oms.common.version>
<mysql.version>8.0.19</mysql.version> <mysql.version>8.0.19</mysql.version>
<h2.db.version>1.4.200</h2.db.version> <h2.db.version>1.4.200</h2.db.version>
</properties> </properties>

2
oh-my-scheduler-worker-samples/pom.xml
View File

@ -14,7 +14,7 @@
<properties> <properties>
<springboot.version>2.2.6.RELEASE</springboot.version> <springboot.version>2.2.6.RELEASE</springboot.version>
<oms.worker.version>1.1.0</oms.worker.version> <oms.worker.version>1.1.1</oms.worker.version>
<fastjson.version>1.2.68</fastjson.version> <fastjson.version>1.2.68</fastjson.version>
</properties> </properties>

4
oh-my-scheduler-worker/pom.xml
View File

@ -10,12 +10,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>oh-my-scheduler-worker</artifactId> <artifactId>oh-my-scheduler-worker</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<spring.version>5.2.4.RELEASE</spring.version> <spring.version>5.2.4.RELEASE</spring.version>
<oms.common.version>1.1.0</oms.common.version> <oms.common.version>1.1.1</oms.common.version>
<h2.db.version>1.4.200</h2.db.version> <h2.db.version>1.4.200</h2.db.version>
<hikaricp.version>3.4.2</hikaricp.version> <hikaricp.version>3.4.2</hikaricp.version>
<junit.version>5.6.1</junit.version> <junit.version>5.6.1</junit.version>

1
oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java
View File

@ -53,6 +53,7 @@ public class ProcessorRunnable implements Runnable {
// 0. 完成执行上下文准备 & 上报执行信息 // 0. 完成执行上下文准备 & 上报执行信息
TaskContext taskContext = new TaskContext(); TaskContext taskContext = new TaskContext();
BeanUtils.copyProperties(task, taskContext); BeanUtils.copyProperties(task, taskContext);
taskContext.setJobId(instanceInfo.getJobId());
taskContext.setMaxRetryTimes(instanceInfo.getTaskRetryNum()); taskContext.setMaxRetryTimes(instanceInfo.getTaskRetryNum());
taskContext.setCurrentRetryTimes(task.getFailedCnt()); taskContext.setCurrentRetryTimes(task.getFailedCnt());
taskContext.setJobParams(instanceInfo.getJobParams()); taskContext.setJobParams(instanceInfo.getJobParams());

1
oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java
View File

@ -18,6 +18,7 @@ import lombok.Setter;
@Setter @Setter
public class TaskContext { public class TaskContext {
private Long jobId;
private Long instanceId; private Long instanceId;
private Long subInstanceId; private Long subInstanceId;
private String taskId; private String taskId;

20
pom.xml
View File

@ -196,6 +196,26 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Java Doc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<!-- JavaDoc 编译错误不影响正常构建 -->
<failOnError>false</failOnError>
<!-- 非严格模式...以后要好好按格式写注释啊... -->
<additionalJOption>-Xdoclint:none</additionalJOption>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- 编辑 MANIFEST.MF --> <!-- 编辑 MANIFEST.MF -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>