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 '4.3.2-main'

Browse Source
This commit is contained in:
tjq 2023-03-19 23:33:16 +08:00
commit 1a40447b23
28 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>tech.powerjob</groupId>
<artifactId>powerjob</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>pom</packaging>
<name>powerjob</name>
<url>http://www.powerjob.tech</url>

6
powerjob-client/pom.xml
View File

@ -5,18 +5,18 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-client</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>
<junit.version>5.9.1</junit.version>
<fastjson.version>1.2.83</fastjson.version>
<powerjob.common.version>4.3.1-bugfix</powerjob.common.version>
<powerjob.common.version>4.3.2</powerjob.common.version>
<mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
</properties>

4
powerjob-common/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-common</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>

5
powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java
View File

@ -30,7 +30,10 @@ public class ServerDiscoveryRequest implements Serializable {
public Map<String, Object> toMap() {
Map<String, Object> ret = new HashMap<>();
ret.put("appId", appId);
// testMode 下 appId 可能为空，此处不判断会导致 testMode 无法启动 #580
if (appId != null) {
ret.put("appId", appId);
}
ret.put("protocol", protocol);
if (StringUtils.isNotEmpty(currentServer)) {
ret.put("currentServer", currentServer);

6
powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java
View File

@ -32,6 +32,9 @@ public class JsonUtils {
}
public static String toJSONString(Object obj) {
if (obj instanceof String) {
return (String) obj;
}
try {
return JSON_MAPPER.writeValueAsString(obj);
}catch (Exception e) {
@ -41,6 +44,9 @@ public class JsonUtils {
}
public static String toJSONStringUnsafe(Object obj) {
if (obj instanceof String) {
return (String) obj;
}
try {
return JSON_MAPPER.writeValueAsString(obj);
}catch (Exception e) {

6
powerjob-official-processors/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-official-processors</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>
@ -20,7 +20,7 @@
<!-- 不会被打包的部分，scope 只能是 test 或 provide -->
<junit.version>5.9.1</junit.version>
<logback.version>1.2.9</logback.version>
<powerjob.worker.version>4.3.1-bugfix</powerjob.worker.version>
<powerjob.worker.version>4.3.2</powerjob.worker.version>
<spring.jdbc.version>5.2.9.RELEASE</spring.jdbc.version>
<h2.db.version>2.1.214</h2.db.version>
<mysql.version>8.0.28</mysql.version>

2
powerjob-remote/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

6
powerjob-remote/powerjob-remote-benchmark/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,8 +21,8 @@
<logback.version>1.2.9</logback.version>
<springboot.version>2.7.4</springboot.version>
<powerjob-remote-impl-http.version>4.3.1-bugfix</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.1-bugfix</powerjob-remote-impl-akka.version>
<powerjob-remote-impl-http.version>4.3.2</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.2</powerjob-remote-impl-akka.version>
<gatling.version>3.9.0</gatling.version>
<gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>

6
powerjob-remote/powerjob-remote-framework/pom.xml
View File

@ -5,11 +5,11 @@
<parent>
<artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<artifactId>powerjob-remote-framework</artifactId>
<properties>
@ -17,7 +17,7 @@
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powerjob-common.version>4.3.1-bugfix</powerjob-common.version>
<powerjob-common.version>4.3.2</powerjob-common.version>
<reflections.version>0.10.2</reflections.version>

6
powerjob-remote/powerjob-remote-impl-akka/pom.xml
View File

@ -5,19 +5,19 @@
<parent>
<artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-remote-impl-akka</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powerjob-remote-framework.version>4.3.1-bugfix</powerjob-remote-framework.version>
<powerjob-remote-framework.version>4.3.2</powerjob-remote-framework.version>
<akka.version>2.6.13</akka.version>
</properties>

6
powerjob-remote/powerjob-remote-impl-http/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-remote-impl-http</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
@ -18,7 +18,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.3.7</vertx.version>
<powerjob-remote-framework.version>4.3.1-bugfix</powerjob-remote-framework.version>
<powerjob-remote-framework.version>4.3.2</powerjob-remote-framework.version>
</properties>
<dependencies>

4
powerjob-remote/powerjob-remote-impl-http/src/main/java/tech/powerjob/remote/http/vertx/VertxInitializer.java
View File

@ -53,8 +53,8 @@ public class VertxInitializer {
.addCompressor(io.netty.handler.codec.compression.StandardCompressionOptions.gzip())
.setCompressionSupported(true);
log.warn("[PowerJob-Vertx] enable server side compression successfully!");
} catch (Exception e) {
log.warn("[PowerJob-Vertx] enable server side compression failed!", e);
} catch (Throwable t) {
log.warn("[PowerJob-Vertx] enable server side compression failed. The error is not fatal, but performance may be degraded", t);
}
}

10
powerjob-server/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-server</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>pom</packaging>
<modules>
@ -49,9 +49,9 @@
<groovy.version>3.0.10</groovy.version>
<cron-utils.version>9.1.6</cron-utils.version>
<powerjob-common.version>4.3.1-bugfix</powerjob-common.version>
<powerjob-remote-impl-http.version>4.3.1-bugfix</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.1-bugfix</powerjob-remote-impl-akka.version>
<powerjob-common.version>4.3.2</powerjob-common.version>
<powerjob-remote-impl-http.version>4.3.2</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.2</powerjob-remote-impl-akka.version>
<springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
</properties>

2
powerjob-server/powerjob-server-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-extension/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-migrate/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-monitor/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-persistence/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java
View File

@ -39,7 +39,7 @@ public class PowerJobPhysicalNamingStrategy extends SpringPhysicalNamingStrategy
String text = name.getText();
String noDOText = StringUtils.endsWithIgnoreCase(text, "do") ? text.substring(0, text.length() - 2) : text;
String newText = StringUtils.isEmpty(tablePrefix) ? tablePrefix + noDOText : noDOText;
String newText = StringUtils.isNotEmpty(tablePrefix) ? tablePrefix + noDOText : noDOText;
return super.toPhysicalTableName(new Identifier(newText, name.isQuoted()), jdbcEnvironment);
}

2
powerjob-server/powerjob-server-remote/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,24 +5,24 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-agent</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>4.3.1-bugfix</powerjob.worker.version>
<powerjob.worker.version>4.3.2</powerjob.worker.version>
<logback.version>1.2.9</logback.version>
<picocli.version>4.3.2</picocli.version>
<spring.version>5.3.23</spring.version>
<spring.boot.version>2.3.4.RELEASE</spring.boot.version>
<powerjob.official.processors.version>4.3.1-bugfix</powerjob.official.processors.version>
<powerjob.official.processors.version>4.3.2</powerjob.official.processors.version>
<!-- dependency for dynamic sql processor -->
<mysql.version>8.0.28</mysql.version>

8
powerjob-worker-samples/pom.xml
View File

@ -5,18 +5,18 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-samples</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<properties>
<springboot.version>2.7.4</springboot.version>
<powerjob.worker.starter.version>4.3.1-bugfix</powerjob.worker.starter.version>
<powerjob.worker.starter.version>4.3.2</powerjob.worker.starter.version>
<fastjson.version>1.2.83</fastjson.version>
<powerjob.official.processors.version>4.3.1-bugfix</powerjob.official.processors.version>
<powerjob.official.processors.version>4.3.2</powerjob.official.processors.version>
<!-- 部署时跳过该module -->
<maven.deploy.skip>true</maven.deploy.skip>

6
powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/SimpleProcessor.java
View File

@ -13,7 +13,6 @@ import java.util.Optional;
*/
public class SimpleProcessor implements BasicProcessor {
@Override
public ProcessResult process(TaskContext context) throws Exception {
@ -23,6 +22,11 @@ public class SimpleProcessor implements BasicProcessor {
logger.info("Current context:{}", context.getWorkflowContext());
logger.info("Current job params:{}", jobParams);
// 测试中文问题 #581
if (jobParams.contains("CN")) {
return new ProcessResult(true, "任务成功啦！！！");
}
return jobParams.contains("F") ? new ProcessResult(false) : new ProcessResult(true, "yeah!");
}

4
powerjob-worker-samples/src/main/resources/application.properties
View File

@ -3,6 +3,8 @@ spring.jpa.open-in-view=false
########### PowerJob-worker properties. ###########
# Whether to enable PowerJob Worker, default is true
powerjob.worker.enabled=true
# Turn on test mode and do not force the server connection to be verified
powerjob.worker.enable-test-mode=false
# Transport port, default is 27777
powerjob.worker.port=27777
# Application name, used for grouping applications. Recommend to set the same value as project name.
@ -10,7 +12,7 @@ powerjob.worker.app-name=powerjob-worker-samples
# Address of PowerJob-server node(s). Ip:port or domain. Multiple addresses should be separated with comma.
powerjob.worker.server-address=127.0.0.1:7700,127.0.0.1:7701
# transport protocol between server and worker
powerjob.worker.protocol=akka
powerjob.worker.protocol=http
# Store strategy of H2 database. disk or memory. Default value is disk.
powerjob.worker.store-strategy=disk
# Max length of result. Results that are longer than the value will be truncated.

6
powerjob-worker-spring-boot-starter/pom.xml
View File

@ -5,16 +5,16 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-spring-boot-starter</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>4.3.1-bugfix</powerjob.worker.version>
<powerjob.worker.version>4.3.2</powerjob.worker.version>
<springboot.version>2.7.4</springboot.version>
</properties>

12
powerjob-worker/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker</artifactId>
<version>4.3.1-bugfix</version>
<version>4.3.2</version>
<packaging>jar</packaging>
<properties>
@ -21,10 +21,10 @@
<logback.version>1.2.9</logback.version>
<powerjob-common.version>4.3.1-bugfix</powerjob-common.version>
<powerjob-remote-framework.version>4.3.1-bugfix</powerjob-remote-framework.version>
<powerjob-remote-impl-akka.version>4.3.1-bugfix</powerjob-remote-impl-akka.version>
<powerjob-remote-impl-http.version>4.3.1-bugfix</powerjob-remote-impl-http.version>
<powerjob-common.version>4.3.2</powerjob-common.version>
<powerjob-remote-framework.version>4.3.2</powerjob-remote-framework.version>
<powerjob-remote-impl-akka.version>4.3.2</powerjob-remote-impl-akka.version>
<powerjob-remote-impl-http.version>4.3.2</powerjob-remote-impl-http.version>
</properties>
<dependencies>