From 4be5b01ba15769d33e7be49abc43453b9ac06045 Mon Sep 17 00:00:00 2001 From: KFCFans Date: Sun, 15 Nov 2020 15:11:50 +0800 Subject: [PATCH 1/4] refactor: rename some class and optimize log --- .../com/github/kfcfans/powerjob/client/OhMyClient.java | 4 ++-- .../powerjob/server/common/config/SwaggerConfig.java | 2 +- .../com/github/kfcfans/powerjob/worker/OhMyWorker.java | 4 ++-- .../worker/background/WorkerHealthReporter.java | 4 ++-- .../{OmsBannerPrinter.java => PowerBannerPrinter.java} | 4 ++-- ...msWorkerVersion.java => PowerJobWorkerVersion.java} | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) rename powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/{OmsBannerPrinter.java => PowerBannerPrinter.java} (95%) rename powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/{OmsWorkerVersion.java => PowerJobWorkerVersion.java} (83%) diff --git a/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java index 29609430..d7c3bfb4 100644 --- a/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java +++ b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java @@ -56,7 +56,7 @@ public class OhMyClient { */ public OhMyClient(List addressList, String appName, String password) { - CommonUtils.requireNonNull(addressList, "domain can't be null!"); + CommonUtils.requireNonNull(addressList, "addressList can't be null!"); CommonUtils.requireNonNull(appName, "appName can't be null"); allAddress = addressList; @@ -81,7 +81,7 @@ public class OhMyClient { if (StringUtils.isEmpty(currentAddress)) { throw new PowerJobException("no server available"); } - log.info("[OhMyClient] {}'s oms-client bootstrap successfully, using server: {}", appName, currentAddress); + log.info("[OhMyClient] {}'s OhMyClient bootstrap successfully, using server: {}", appName, currentAddress); } private static String assertApp(String appName, String password, String url) throws IOException { diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java index c574ca59..804e45ce 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java @@ -28,7 +28,7 @@ public class SwaggerConfig { .description("Distributed scheduling and computing framework.") .license("Apache Licence 2") .termsOfServiceUrl("https://github.com/KFCFans/PowerJob") - .version("3.1.3") + .version("3.3.3") .build(); return new Docket(DocumentationType.SWAGGER_2) diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java index 1cde2378..7fe1fe1f 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java @@ -20,7 +20,7 @@ import com.github.kfcfans.powerjob.worker.background.OmsLogHandler; import com.github.kfcfans.powerjob.worker.background.ServerDiscoveryService; import com.github.kfcfans.powerjob.worker.background.WorkerHealthReporter; import com.github.kfcfans.powerjob.worker.common.OhMyConfig; -import com.github.kfcfans.powerjob.worker.common.OmsBannerPrinter; +import com.github.kfcfans.powerjob.worker.common.PowerBannerPrinter; import com.github.kfcfans.powerjob.worker.common.utils.SpringUtils; import com.github.kfcfans.powerjob.worker.persistence.TaskPersistenceService; import com.google.common.base.Stopwatch; @@ -80,7 +80,7 @@ public class OhMyWorker implements ApplicationContextAware, InitializingBean, Di Stopwatch stopwatch = Stopwatch.createStarted(); log.info("[OhMyWorker] start to initialize OhMyWorker..."); try { - OmsBannerPrinter.print(); + PowerBannerPrinter.print(); // 校验 appName if (!config.isEnableTestMode()) { appId = assertAppName(); diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java index 9caafca1..5b69d34e 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java @@ -5,7 +5,7 @@ import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.model.SystemMetrics; import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; import com.github.kfcfans.powerjob.worker.OhMyWorker; -import com.github.kfcfans.powerjob.worker.common.OmsWorkerVersion; +import com.github.kfcfans.powerjob.worker.common.PowerJobWorkerVersion; import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; import com.github.kfcfans.powerjob.worker.common.utils.SystemInfoUtils; import com.github.kfcfans.powerjob.worker.container.OmsContainerFactory; @@ -40,7 +40,7 @@ public class WorkerHealthReporter implements Runnable { heartbeat.setAppName(OhMyWorker.getConfig().getAppName()); heartbeat.setAppId(OhMyWorker.getAppId()); heartbeat.setHeartbeatTime(System.currentTimeMillis()); - heartbeat.setVersion(OmsWorkerVersion.getVersion()); + heartbeat.setVersion(PowerJobWorkerVersion.getVersion()); // 获取当前加载的容器列表 heartbeat.setContainerInfos(OmsContainerFactory.getDeployedContainerInfos()); diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerBannerPrinter.java similarity index 95% rename from powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerBannerPrinter.java index 227d5bec..eea991d7 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerBannerPrinter.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; * @since 2020/5/11 */ @Slf4j -public final class OmsBannerPrinter { +public final class PowerBannerPrinter { private static final String BANNER = "" + "\n" + @@ -30,7 +30,7 @@ public final class OmsBannerPrinter { public static void print() { log.info(BANNER); - String version = OmsWorkerVersion.getVersion(); + String version = PowerJobWorkerVersion.getVersion(); version = (version != null) ? " (v" + version + ")" : ""; log.info(":: PowerJob Worker :: {}", version); } diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerJobWorkerVersion.java similarity index 83% rename from powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerJobWorkerVersion.java index c1fc0eb4..1436114a 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/PowerJobWorkerVersion.java @@ -17,7 +17,7 @@ import java.util.jar.JarFile; * @author tjq * @since 2020/5/11 */ -public final class OmsWorkerVersion { +public final class PowerJobWorkerVersion { private static String CACHE = null; @@ -29,17 +29,17 @@ public final class OmsWorkerVersion { */ public static String getVersion() { if (StringUtils.isEmpty(CACHE)) { - CACHE = determineSpringBootVersion(); + CACHE = determinePowerJobVersion(); } return CACHE; } - private static String determineSpringBootVersion() { - String implementationVersion = OmsWorkerVersion.class.getPackage().getImplementationVersion(); + private static String determinePowerJobVersion() { + String implementationVersion = PowerJobWorkerVersion.class.getPackage().getImplementationVersion(); if (implementationVersion != null) { return implementationVersion; } - CodeSource codeSource = OmsWorkerVersion.class.getProtectionDomain().getCodeSource(); + CodeSource codeSource = PowerJobWorkerVersion.class.getProtectionDomain().getCodeSource(); if (codeSource == null) { return null; } From 5a50d933a8ee846d4687e1d0b68bbd3ff5f0630c Mon Sep 17 00:00:00 2001 From: KFCFans Date: Sat, 21 Nov 2020 13:32:43 +0800 Subject: [PATCH 2/4] fix: split brain #102 --- .../service/ha/ServerSelectService.java | 34 ++++++++++++++----- .../web/controller/ServerController.java | 13 +------ .../resources/application-daily.properties | 5 ++- .../main/resources/application-pre.properties | 5 ++- .../resources/application-product.properties | 5 ++- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java index e82760b8..50401c72 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java @@ -12,6 +12,7 @@ import com.github.kfcfans.powerjob.server.service.lock.LockService; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -20,6 +21,7 @@ import java.util.Date; import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletionStage; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; /** @@ -37,17 +39,25 @@ public class ServerSelectService { @Resource private AppInfoRepository appInfoRepository; + @Value("${oms.accurate.select.server.percentage}") + private int accurateSelectServerPercentage; + private static final int RETRY_TIMES = 10; private static final long PING_TIMEOUT_MS = 1000; private static final String SERVER_ELECT_LOCK = "server_elect_%d"; - /** - * 获取某个应用对应的Server - * - * @param appId 应用ID - * @return 当前可用的Server - */ - public String getServer(Long appId) { + + public String getServer(Long appId, String currentServer) { + if (!accurate()) { + // 如果是本机，就不需要查数据库那么复杂的操作了，直接返回成功 + if (OhMyServer.getActorSystemAddress().equals(currentServer)) { + return currentServer; + } + } + return getServer0(appId); + } + + private String getServer0(Long appId) { Set downServerCache = Sets.newHashSet(); @@ -95,7 +105,7 @@ public class ServerSelectService { lockService.unlock(lockName); } } - throw new RuntimeException("server elect failed for app " + appId); + throw new PowerJobException("server elect failed for app " + appId); } /** @@ -113,6 +123,10 @@ public class ServerSelectService { return false; } + if (OhMyServer.getActorSystemAddress().equals(serverAddress)) { + return true; + } + Ping ping = new Ping(); ping.setCurrentTime(System.currentTimeMillis()); @@ -128,4 +142,8 @@ public class ServerSelectService { downServerCache.add(serverAddress); return false; } + + private boolean accurate() { + return ThreadLocalRandom.current().nextInt(100) < accurateSelectServerPercentage; + } } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java index 1de5f06e..ce19b8ce 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java @@ -2,26 +2,21 @@ package com.github.kfcfans.powerjob.server.web.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.server.akka.OhMyServer; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.service.ha.ClusterStatusHolder; import com.github.kfcfans.powerjob.server.service.ha.ServerSelectService; import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; -import com.taobao.api.internal.cluster.ClusterManager; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; import java.util.Optional; import java.util.TimeZone; @@ -52,13 +47,7 @@ public class ServerController { @GetMapping("/acquire") public ResultDTO acquireServer(Long appId, String currentServer) { - - // 如果是本机，就不需要查数据库那么复杂的操作了，直接返回成功 - if (OhMyServer.getActorSystemAddress().equals(currentServer)) { - return ResultDTO.success(currentServer); - } - String server = serverSelectService.getServer(appId); - return ResultDTO.success(server); + return ResultDTO.success(serverSelectService.getServer(appId, currentServer)); } @GetMapping("/hello") diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index 9b1e2b7a..18bb67ef 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -32,4 +32,7 @@ oms.container.retention.local=1 oms.container.retention.remote=-1 ####### 缓存配置 ####### -oms.instance.metadata.cache.size=1024 \ No newline at end of file +oms.instance.metadata.cache.size=1024 + +####### 精确获取 server 的百分比，0～100，100代表每次 worker 获取 server 都会进行完整的探活流程，不存在脑裂问题，但有性能开销 ####### +oms.accurate.select.server.percentage = 50 \ No newline at end of file diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties index 04060a2b..496d84ab 100644 --- a/powerjob-server/src/main/resources/application-pre.properties +++ b/powerjob-server/src/main/resources/application-pre.properties @@ -32,4 +32,7 @@ oms.container.retention.local=3 oms.container.retention.remote=-1 ####### 缓存配置 ####### -oms.instance.metadata.cache.size=1024 \ No newline at end of file +oms.instance.metadata.cache.size=1024 + +####### 精确获取 server 的百分比，0～100，100代表每次 worker 获取 server 都会进行完整的探活流程，不存在脑裂问题，但有性能开销 ####### +oms.accurate.select.server.percentage = 50 \ No newline at end of file diff --git a/powerjob-server/src/main/resources/application-product.properties b/powerjob-server/src/main/resources/application-product.properties index 768aad92..15ee98e4 100644 --- a/powerjob-server/src/main/resources/application-product.properties +++ b/powerjob-server/src/main/resources/application-product.properties @@ -32,4 +32,7 @@ oms.container.retention.local=7 oms.container.retention.remote=-1 ####### 缓存配置 ####### -oms.instance.metadata.cache.size=2048 \ No newline at end of file +oms.instance.metadata.cache.size=2048 + +####### 精确获取 server 的百分比，0～100，100代表每次 worker 获取 server 都会进行完整的探活流程，不存在脑裂问题，但有性能开销 ####### +oms.accurate.select.server.percentage = 50 \ No newline at end of file From 1868d9289fd9d8f3394922c778ee15de4c28d236 Mon Sep 17 00:00:00 2001 From: KFCFans Date: Sat, 21 Nov 2020 17:01:42 +0800 Subject: [PATCH 3/4] feat: mail send failed use WARN log level --- .../service/alarm/impl/MailAlarmService.java | 2 +- .../web/controller/ServerController.java | 3 -- .../PowerJobAutoConfiguration.java | 11 ++++-- .../powerjob/worker/common/OhMyConfig.java | 34 ++----------------- 4 files changed, 12 insertions(+), 38 deletions(-) diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java index 2c0ca41f..516d1814 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java @@ -50,7 +50,7 @@ public class MailAlarmService implements Alarmable { javaMailSender.send(sm); }catch (Exception e) { - log.error("[MailAlarmService] send mail failed, reason is {}", e.getMessage()); + log.warn("[MailAlarmService] send mail failed, reason is {}", e.getMessage()); } } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java index ce19b8ce..8cb2e457 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java @@ -8,7 +8,6 @@ import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.server.akka.OhMyServer; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; import com.github.kfcfans.powerjob.server.service.ha.ServerSelectService; import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; import org.springframework.web.bind.annotation.GetMapping; @@ -35,8 +34,6 @@ public class ServerController { private ServerSelectService serverSelectService; @Resource private AppInfoRepository appInfoRepository; - @Resource - private JobInfoRepository jobInfoRepository; @GetMapping("/assert") public ResultDTO assertAppName(String appName) { diff --git a/powerjob-worker-spring-boot-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java b/powerjob-worker-spring-boot-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java index 31615b54..f562d391 100644 --- a/powerjob-worker-spring-boot-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java +++ b/powerjob-worker-spring-boot-starter/src/main/java/com/github/kfcfans/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java @@ -1,6 +1,7 @@ package com.github.kfcfans.powerjob.worker.autoconfigure; import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.worker.OhMyWorker; import com.github.kfcfans.powerjob.worker.common.OhMyConfig; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; @@ -37,8 +38,14 @@ public class PowerJobAutoConfiguration { // 1. 创建配置文件 OhMyConfig config = new OhMyConfig(); - // 可以不显式设置，默认值 27777 - config.setPort(worker.getAkkaPort()); + + // 端口配置，支持随机端口 + int port = worker.getAkkaPort(); + if (port <= 0) { + port = NetUtils.getRandomPort(); + } + config.setPort(port); + // appName，需要提前在控制台注册，否则启动报错 config.setAppName(worker.getAppName()); config.setServerAddress(serverAddress); diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java index 12ef9ac3..16c83f25 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java @@ -1,10 +1,10 @@ package com.github.kfcfans.powerjob.worker.common; import com.github.kfcfans.powerjob.common.RemoteConstant; -import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy; import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; import com.google.common.collect.Lists; +import lombok.Getter; import lombok.Setter; import java.util.List; @@ -15,6 +15,7 @@ import java.util.List; * @author tjq * @since 2020/3/16 */ +@Getter @Setter public class OhMyConfig { /** @@ -48,35 +49,4 @@ public class OhMyConfig { * true -> 用于本地写单元测试调试； false -> 默认值，标准模式 */ private boolean enableTestMode = false; - - public String getAppName() { - return appName; - } - - public int getPort() { - if (port > 0) { - return port; - } - return NetUtils.getRandomPort(); - } - - public List getServerAddress() { - return serverAddress; - } - - public StoreStrategy getStoreStrategy() { - return storeStrategy; - } - - public int getMaxResultLength() { - return maxResultLength; - } - - public Object getUserContext() { - return userContext; - } - - public boolean isEnableTestMode() { - return enableTestMode; - } } From b463261bd3f8caf9b64a45c5df53717260dc4acb Mon Sep 17 00:00:00 2001 From: KFCFans Date: Sat, 21 Nov 2020 17:08:20 +0800 Subject: [PATCH 4/4] refactor: remove powerjob.xxx config --- .../spring-configuration-metadata.json | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/powerjob-worker-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/powerjob-worker-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json index 5fe74cec..a67473e2 100644 --- a/powerjob-worker-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/powerjob-worker-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json @@ -50,60 +50,6 @@ "type": "com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy", "description": "本地持久化方式，默认使用磁盘", "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties$Worker" - }, - { - "name": "powerjob.akka-port", - "type": "java.lang.Integer", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.akka-port" - } - }, - { - "name": "powerjob.app-name", - "type": "java.lang.String", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.app-name" - } - }, - { - "name": "powerjob.enable-test-mode", - "type": "java.lang.Boolean", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.enable-test-mode" - } - }, - { - "name": "powerjob.max-result-length", - "type": "java.lang.Integer", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.max-result-length" - } - }, - { - "name": "powerjob.server-address", - "type": "java.lang.String", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.server-address" - } - }, - { - "name": "powerjob.store-strategy", - "type": "com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy", - "sourceType": "com.github.kfcfans.powerjob.worker.autoconfigure.PowerJobProperties", - "deprecated": true, - "deprecation": { - "replacement": "powerjob.worker.store-strategy" - } } ], "hints": []