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

Merge branch 'v3.4.5' into jenkins_auto_build

Browse Source
This commit is contained in:
tjq 2021-01-31 22:57:04 +08:00
commit 416dd1a4d8
10 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
### English | [简体中文](./README_zhCN.md) # English | [简体中文](./README_zhCN.md)
<p align="center"> <p align="center">
<img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/> <img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/>

2
README_zhCN.md
View File

@ -1,4 +1,4 @@
### [English](./README.md) | 简体中文 # [English](./README.md) | 简体中文
<p align="center"> <p align="center">
<img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/> <img src="https://raw.githubusercontent.com/KFCFans/PowerJob/master/others/images/logo.png" alt="PowerJob" title="PowerJob" width="557"/>

BIN
others/images/user.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 365 KiB

2
pom.xml
View File

@ -43,7 +43,7 @@
<module>powerjob-worker-agent</module> <module>powerjob-worker-agent</module>
<module>powerjob-worker-spring-boot-starter</module> <module>powerjob-worker-spring-boot-starter</module>
<module>powerjob-worker-samples</module> <module>powerjob-worker-samples</module>
<module>powerjob-offical-processors</module> <module>powerjob-official-processors</module>
</modules> </modules>
<properties> <properties>

14
powerjob-offical-processors/pom.xml → powerjob-official-processors/pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-offical-processors</artifactId> <artifactId>powerjob-official-processors</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -91,10 +91,6 @@
<pattern>okio</pattern> <pattern>okio</pattern>
<shadedPattern>shade.powerjob.okio</shadedPattern> <shadedPattern>shade.powerjob.okio</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com</pattern>
<shadedPattern>shade.powerjob.com</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>org</pattern> <pattern>org</pattern>
<shadedPattern>shade.powerjob.org</shadedPattern> <shadedPattern>shade.powerjob.org</shadedPattern>
@ -103,6 +99,14 @@
<pattern>javax</pattern> <pattern>javax</pattern>
<shadedPattern>shade.powerjob.javax</shadedPattern> <shadedPattern>shade.powerjob.javax</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>shade.powerjob.com.google</shadedPattern>
</relocation>
<relocation>
<pattern>com.alibaba</pattern>
<shadedPattern>shade.powerjob.com.alibaba</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
<executions> <executions>

2
powerjob-offical-processors/src/main/java/tech/powerjob/offical/processors/CommonBasicProcessor.java → powerjob-official-processors/src/main/java/tech/powerjob/official/processors/CommonBasicProcessor.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.offical.processors; package tech.powerjob.official.processors;
import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult;
import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; import com.github.kfcfans.powerjob.worker.core.processor.TaskContext;

4
powerjob-offical-processors/src/main/java/tech/powerjob/offical/processors/impl/HttpProcessor.java → powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/HttpProcessor.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.offical.processors.impl; package tech.powerjob.official.processors.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONValidator; import com.alibaba.fastjson.JSONValidator;
@ -8,7 +8,7 @@ import com.github.kfcfans.powerjob.worker.log.OmsLogger;
import lombok.Data; import lombok.Data;
import okhttp3.*; import okhttp3.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import tech.powerjob.offical.processors.CommonBasicProcessor; import tech.powerjob.official.processors.CommonBasicProcessor;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

2
powerjob-offical-processors/src/test/java/tech/powerjob/offical/processors/TestUtils.java → powerjob-official-processors/src/test/java/tech/powerjob/official/processors/TestUtils.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.offical.processors; package tech.powerjob.official.processors;
import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; import com.github.kfcfans.powerjob.worker.core.processor.TaskContext;
import com.github.kfcfans.powerjob.worker.log.impl.OmsServerLogger; import com.github.kfcfans.powerjob.worker.log.impl.OmsServerLogger;

6
powerjob-offical-processors/src/test/java/tech/powerjob/offical/processors/impl/HttpProcessorTest.java → powerjob-official-processors/src/test/java/tech/powerjob/official/processors/impl/HttpProcessorTest.java
View File

@ -1,10 +1,8 @@
package tech.powerjob.offical.processors.impl; package tech.powerjob.official.processors.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import tech.powerjob.offical.processors.TestUtils; import tech.powerjob.official.processors.TestUtils;
import static org.junit.jupiter.api.Assertions.*;
/** /**
* HttpProcessorTest * HttpProcessorTest

6
powerjob-worker-agent/pom.xml
View File

@ -21,7 +21,7 @@
<spring.boot.version>2.2.6.RELEASE</spring.boot.version> <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
<powerjob.offical.processors.version>1.0.0</powerjob.offical.processors.version> <powerjob.official.processors.version>1.0.0</powerjob.official.processors.version>
</properties> </properties>
<dependencies> <dependencies>
@ -34,8 +34,8 @@
<dependency> <dependency>
<groupId>com.github.kfcfans</groupId> <groupId>com.github.kfcfans</groupId>
<artifactId>powerjob-offical-processors</artifactId> <artifactId>powerjob-official-processors</artifactId>
<version>${powerjob.offical.processors.version}</version> <version>${powerjob.official.processors.version}</version>
</dependency> </dependency>
<!-- java cli 工具 --> <!-- java cli 工具 -->