diff --git a/powerjob-common/src/main/java/tech/powerjob/common/OmsConstant.java b/powerjob-common/src/main/java/tech/powerjob/common/OmsConstant.java index 129ac429..99a1b2ba 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/OmsConstant.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/OmsConstant.java @@ -17,6 +17,7 @@ public class OmsConstant { public static final String NONE = "N/A"; public static final String COMMA = ","; + public static final String MINUS = "-"; public static final String LINE_SEPARATOR = "\r\n"; public static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type"; diff --git a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/SJ.java b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/SJ.java index 443300b2..27787fd9 100644 --- a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/SJ.java +++ b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/SJ.java @@ -2,6 +2,7 @@ package tech.powerjob.server.common; import com.google.common.base.Joiner; import com.google.common.base.Splitter; +import tech.powerjob.common.OmsConstant; /** * Splitter & Joiner @@ -11,7 +12,7 @@ import com.google.common.base.Splitter; */ public class SJ { - public static final Splitter COMMA_SPLITTER = Splitter.on(","); - public static final Joiner COMMA_JOINER = Joiner.on(","); + public static final Splitter COMMA_SPLITTER = Splitter.on(OmsConstant.COMMA); + public static final Joiner COMMA_JOINER = Joiner.on(OmsConstant.COMMA); } diff --git a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java index 664a671c..810b5208 100644 --- a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java +++ b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java @@ -2,6 +2,7 @@ package tech.powerjob.server.common.utils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import tech.powerjob.common.OmsConstant; import tech.powerjob.common.RemoteConstant; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; @@ -48,9 +49,9 @@ public class TimeUtils { // 只保留结束时间在当前时间前的生命周期 lifeCycle.forEach(range -> { - String[] split = range.split("-"); + String[] split = range.split(OmsConstant.MINUS); long end = Long.parseLong(split[1]); - if (end < startTime) { + if (end <= startTime) { return; } remainingLifecycle.add(Pair.of(Long.valueOf(split[0]), end)); diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java index 6af93504..59f45ea9 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java @@ -1,11 +1,11 @@ package tech.powerjob.server.core.service; -import tech.powerjob.server.persistence.remote.model.UserInfoDO; -import tech.powerjob.server.persistence.remote.repository.UserInfoRepository; -import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.repository.UserInfoRepository; import javax.annotation.Resource; import java.util.Date; @@ -45,7 +45,7 @@ public class UserService { return Lists.newLinkedList(); } // 去重 - Set userIdList = Splitter.on(",").splitToList(userIds).stream().map(Long::valueOf).collect(Collectors.toSet()); + Set userIdList = SJ.COMMA_SPLITTER.splitToList(userIds).stream().map(Long::valueOf).collect(Collectors.toSet()); List res = userInfoRepository.findByIdIn(Lists.newLinkedList(userIdList)); res.forEach(x -> x.setPassword(null)); return res; diff --git a/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java b/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java index b89767f1..34b2805c 100644 --- a/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java +++ b/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java @@ -1,5 +1,6 @@ package tech.powerjob.agent; +import tech.powerjob.common.OmsConstant; import tech.powerjob.common.RemoteConstant; import tech.powerjob.worker.PowerJobWorker; import tech.powerjob.worker.common.PowerJobWorkerConfig; @@ -52,7 +53,7 @@ public class MainApplication implements Runnable { cfg.setAppName(appName); cfg.setPort(port); - cfg.setServerAddress(Splitter.on(",").splitToList(server)); + cfg.setServerAddress(Splitter.on(OmsConstant.COMMA).splitToList(server)); cfg.setStoreStrategy(StoreStrategy.MEMORY.name().equals(storeStrategy) ? StoreStrategy.MEMORY : StoreStrategy.DISK); cfg.setMaxResultLength(length); cfg.setTag(tag); diff --git a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java index 3f8b196d..5f48e437 100644 --- a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java +++ b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java @@ -1,5 +1,6 @@ package tech.powerjob.worker.autoconfigure; +import tech.powerjob.common.OmsConstant; import tech.powerjob.common.utils.CommonUtils; import tech.powerjob.common.utils.NetUtils; import tech.powerjob.worker.PowerJobWorker; @@ -37,7 +38,7 @@ public class PowerJobAutoConfiguration { * any prefix, i.e. http://. */ CommonUtils.requireNonNull(worker.getServerAddress(), "serverAddress can't be empty!"); - List serverAddress = Arrays.asList(worker.getServerAddress().split(",")); + List serverAddress = Arrays.asList(worker.getServerAddress().split(OmsConstant.COMMA)); /* * Create OhMyConfig object for setting properties.