diff --git a/pom.xml b/pom.xml
index 5a8ec555..db1df523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
tech.powerjob
powerjob
- 4.3.1-bugfix
+ 4.3.2
pom
powerjob
http://www.powerjob.tech
diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml
index 830369e4..1259b8d9 100644
--- a/powerjob-client/pom.xml
+++ b/powerjob-client/pom.xml
@@ -5,18 +5,18 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-client
- 4.3.1-bugfix
+ 4.3.2
jar
5.9.1
1.2.83
- 4.3.1-bugfix
+ 4.3.2
3.2.4
diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml
index 9cd869ab..694e2bda 100644
--- a/powerjob-common/pom.xml
+++ b/powerjob-common/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-common
- 4.3.1-bugfix
+ 4.3.2
jar
diff --git a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java
index 34a7d6bd..16f23715 100644
--- a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java
+++ b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerDiscoveryRequest.java
@@ -30,7 +30,10 @@ public class ServerDiscoveryRequest implements Serializable {
public Map toMap() {
Map 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);
diff --git a/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java b/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java
index 985b8df9..085da18c 100644
--- a/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java
+++ b/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java
@@ -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) {
diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml
index 5757c561..5511b4d2 100644
--- a/powerjob-official-processors/pom.xml
+++ b/powerjob-official-processors/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-official-processors
- 4.3.1-bugfix
+ 4.3.2
jar
@@ -20,7 +20,7 @@
5.9.1
1.2.9
- 4.3.1-bugfix
+ 4.3.2
5.2.9.RELEASE
2.1.214
8.0.28
diff --git a/powerjob-remote/pom.xml b/powerjob-remote/pom.xml
index bc90e539..b9b330ee 100644
--- a/powerjob-remote/pom.xml
+++ b/powerjob-remote/pom.xml
@@ -5,7 +5,7 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
pom
diff --git a/powerjob-remote/powerjob-remote-benchmark/pom.xml b/powerjob-remote/powerjob-remote-benchmark/pom.xml
index 723a190d..0564f87c 100644
--- a/powerjob-remote/powerjob-remote-benchmark/pom.xml
+++ b/powerjob-remote/powerjob-remote-benchmark/pom.xml
@@ -5,7 +5,7 @@
powerjob-remote
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
@@ -21,8 +21,8 @@
1.2.9
2.7.4
- 4.3.1-bugfix
- 4.3.1-bugfix
+ 4.3.2
+ 4.3.2
3.9.0
4.2.9
diff --git a/powerjob-remote/powerjob-remote-framework/pom.xml b/powerjob-remote/powerjob-remote-framework/pom.xml
index 2b44608b..5f2441a4 100644
--- a/powerjob-remote/powerjob-remote-framework/pom.xml
+++ b/powerjob-remote/powerjob-remote-framework/pom.xml
@@ -5,11 +5,11 @@
powerjob-remote
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
- 4.3.1-bugfix
+ 4.3.2
powerjob-remote-framework
@@ -17,7 +17,7 @@
8
UTF-8
- 4.3.1-bugfix
+ 4.3.2
0.10.2
diff --git a/powerjob-remote/powerjob-remote-impl-akka/pom.xml b/powerjob-remote/powerjob-remote-impl-akka/pom.xml
index e949868c..15f58d31 100644
--- a/powerjob-remote/powerjob-remote-impl-akka/pom.xml
+++ b/powerjob-remote/powerjob-remote-impl-akka/pom.xml
@@ -5,19 +5,19 @@
powerjob-remote
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-remote-impl-akka
- 4.3.1-bugfix
+ 4.3.2
8
8
UTF-8
- 4.3.1-bugfix
+ 4.3.2
2.6.13
diff --git a/powerjob-remote/powerjob-remote-impl-http/pom.xml b/powerjob-remote/powerjob-remote-impl-http/pom.xml
index 384835a8..557b3b00 100644
--- a/powerjob-remote/powerjob-remote-impl-http/pom.xml
+++ b/powerjob-remote/powerjob-remote-impl-http/pom.xml
@@ -5,12 +5,12 @@
powerjob-remote
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-remote-impl-http
- 4.3.1-bugfix
+ 4.3.2
8
@@ -18,7 +18,7 @@
UTF-8
4.3.7
- 4.3.1-bugfix
+ 4.3.2
diff --git a/powerjob-remote/powerjob-remote-impl-http/src/main/java/tech/powerjob/remote/http/vertx/VertxInitializer.java b/powerjob-remote/powerjob-remote-impl-http/src/main/java/tech/powerjob/remote/http/vertx/VertxInitializer.java
index d74c0591..8d0eda3d 100644
--- a/powerjob-remote/powerjob-remote-impl-http/src/main/java/tech/powerjob/remote/http/vertx/VertxInitializer.java
+++ b/powerjob-remote/powerjob-remote-impl-http/src/main/java/tech/powerjob/remote/http/vertx/VertxInitializer.java
@@ -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);
}
}
diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
index 7b193857..6e4bc90b 100644
--- a/powerjob-server/pom.xml
+++ b/powerjob-server/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-server
- 4.3.1-bugfix
+ 4.3.2
pom
@@ -49,9 +49,9 @@
3.0.10
9.1.6
- 4.3.1-bugfix
- 4.3.1-bugfix
- 4.3.1-bugfix
+ 4.3.2
+ 4.3.2
+ 4.3.2
1.6.14
diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml
index d26da377..e38fcd53 100644
--- a/powerjob-server/powerjob-server-common/pom.xml
+++ b/powerjob-server/powerjob-server-common/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml
index 8fc6751c..60beb006 100644
--- a/powerjob-server/powerjob-server-core/pom.xml
+++ b/powerjob-server/powerjob-server-core/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml
index 9c6d91f4..0dc14617 100644
--- a/powerjob-server/powerjob-server-extension/pom.xml
+++ b/powerjob-server/powerjob-server-extension/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml
index 611d2624..2d7fd98d 100644
--- a/powerjob-server/powerjob-server-migrate/pom.xml
+++ b/powerjob-server/powerjob-server-migrate/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-monitor/pom.xml b/powerjob-server/powerjob-server-monitor/pom.xml
index d8197081..2a576025 100644
--- a/powerjob-server/powerjob-server-monitor/pom.xml
+++ b/powerjob-server/powerjob-server-monitor/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml
index 781e012e..3e157df6 100644
--- a/powerjob-server/powerjob-server-persistence/pom.xml
+++ b/powerjob-server/powerjob-server-persistence/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java
index d0488c01..4c32c266 100644
--- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java
+++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java
@@ -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);
}
diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml
index c0197428..a587fe6b 100644
--- a/powerjob-server/powerjob-server-remote/pom.xml
+++ b/powerjob-server/powerjob-server-remote/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml
index 4ab94492..b53f59a1 100644
--- a/powerjob-server/powerjob-server-starter/pom.xml
+++ b/powerjob-server/powerjob-server-starter/pom.xml
@@ -5,7 +5,7 @@
powerjob-server
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
../pom.xml
4.0.0
diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml
index 5a02cb20..451f7cb0 100644
--- a/powerjob-worker-agent/pom.xml
+++ b/powerjob-worker-agent/pom.xml
@@ -5,24 +5,24 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-worker-agent
- 4.3.1-bugfix
+ 4.3.2
jar
- 4.3.1-bugfix
+ 4.3.2
1.2.9
4.3.2
5.3.23
2.3.4.RELEASE
- 4.3.1-bugfix
+ 4.3.2
8.0.28
diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml
index 3676f13e..83348b52 100644
--- a/powerjob-worker-samples/pom.xml
+++ b/powerjob-worker-samples/pom.xml
@@ -5,18 +5,18 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-worker-samples
- 4.3.1-bugfix
+ 4.3.2
2.7.4
- 4.3.1-bugfix
+ 4.3.2
1.2.83
- 4.3.1-bugfix
+ 4.3.2
true
diff --git a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/SimpleProcessor.java b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/SimpleProcessor.java
index 96a8f382..b82b9cf8 100644
--- a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/SimpleProcessor.java
+++ b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/SimpleProcessor.java
@@ -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!");
}
diff --git a/powerjob-worker-samples/src/main/resources/application.properties b/powerjob-worker-samples/src/main/resources/application.properties
index f2f6e1b0..ceb6fda9 100644
--- a/powerjob-worker-samples/src/main/resources/application.properties
+++ b/powerjob-worker-samples/src/main/resources/application.properties
@@ -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.
diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml
index fc5eeb5e..14083922 100644
--- a/powerjob-worker-spring-boot-starter/pom.xml
+++ b/powerjob-worker-spring-boot-starter/pom.xml
@@ -5,16 +5,16 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-worker-spring-boot-starter
- 4.3.1-bugfix
+ 4.3.2
jar
- 4.3.1-bugfix
+ 4.3.2
2.7.4
diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml
index 2df7b142..4ba4736f 100644
--- a/powerjob-worker/pom.xml
+++ b/powerjob-worker/pom.xml
@@ -5,12 +5,12 @@
powerjob
tech.powerjob
- 4.3.1-bugfix
+ 4.3.2
4.0.0
powerjob-worker
- 4.3.1-bugfix
+ 4.3.2
jar
@@ -21,10 +21,10 @@
1.2.9
- 4.3.1-bugfix
- 4.3.1-bugfix
- 4.3.1-bugfix
- 4.3.1-bugfix
+ 4.3.2
+ 4.3.2
+ 4.3.2
+ 4.3.2