diff --git a/powerjob-worker-starter/pom.xml b/powerjob-worker-starter/pom.xml index 8f281119..43264e62 100644 --- a/powerjob-worker-starter/pom.xml +++ b/powerjob-worker-starter/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-starter - 3.2.0 + 3.2.1 jar - 3.2.0 + 3.2.1 2.2.6.RELEASE diff --git a/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java b/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java index 14391bcb..6f6000c4 100644 --- a/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java +++ b/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java @@ -1,22 +1,21 @@ package com.github.kfcfans.powerjob.worker.autoconfigure; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.worker.OhMyWorker; import com.github.kfcfans.powerjob.worker.common.OhMyConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.StringUtils; import java.util.Arrays; -import java.util.Collections; import java.util.List; /** * PowerJob 自动装配 * * @author songyinyin - * @date 2020/7/26 16:37 + * @since 2020/7/26 16:37 */ @Configuration @EnableConfigurationProperties(PowerJobProperties.class) @@ -27,19 +26,18 @@ public class PowerJobAutoConfiguration { public OhMyWorker initPowerJob(PowerJobProperties properties) { // 服务器HTTP地址(端口号为 server.port,而不是 ActorSystem port),请勿添加任何前缀(http://) - List serverAddress = StringUtils.hasText(properties.getServerAddress()) - ? Arrays.asList(properties.getServerAddress().split(",")) - : Collections.singletonList("127.0.0.1:7700"); + CommonUtils.requireNonNull(properties.getServerAddress(), "serverAddress can't be empty!"); + List serverAddress = Arrays.asList(properties.getServerAddress().split(",")); // 1. 创建配置文件 OhMyConfig config = new OhMyConfig(); - // 可以不显示设置,默认值 27777 + // 可以不显式设置,默认值 27777 config.setPort(properties.getAkkaPort()); // appName,需要提前在控制台注册,否则启动报错 config.setAppName(properties.getAppName()); config.setServerAddress(serverAddress); // 如果没有大型 Map/MapReduce 的需求,建议使用内存来加速计算 - // 有大型 Map/MapReduce 需求,可能产生大量子任务(Task)的场景,请使用 DISK,否则妥妥的 OutOfMemeory + // 有大型 Map/MapReduce 需求,可能产生大量子任务(Task)的场景,请使用 DISK,否则妥妥的 OutOfMemory config.setStoreStrategy(properties.getStoreStrategy()); // 启动测试模式,true情况下,不再尝试连接 server 并验证appName config.setEnableTestMode(properties.isEnableTestMode()); diff --git a/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobProperties.java b/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobProperties.java index 220f260d..b8cf30b9 100644 --- a/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobProperties.java +++ b/powerjob-worker-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobProperties.java @@ -10,7 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * PowerJob 配置项 * * @author songyinyin - * @date 2020/7/26 16:37 + * @since 2020/7/26 16:37 */ @Data @ConfigurationProperties(prefix = "powerjob") @@ -26,7 +26,7 @@ public class PowerJobProperties { /** * 调度服务器地址,ip:port 或 域名,多个用英文逗号分隔 */ - private String serverAddress = "127.0.0.1:7700"; + private String serverAddress; /** * 本地持久化方式,默认使用磁盘 */ diff --git a/powerjob-worker-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/powerjob-worker-starter/src/main/resources/META-INF/spring-configuration-metadata.json index 6a012148..1fbedb0a 100644 --- a/powerjob-worker-starter/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/powerjob-worker-starter/src/main/resources/META-INF/spring-configuration-metadata.json @@ -29,9 +29,8 @@ { "name": "powerjob.server-address", "type": "java.lang.String", - "description": "调度服务器地址,ip:port 或 域名,多个用英文逗号分隔", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "defaultValue": "127.0.0.1:7700" + "description": "调度服务器地址,ip:port 或 域名,多值用英文逗号分隔", + "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties" }, { "name": "powerjob.store-strategy",