From 1f419276fd6e99ac7b3d757000fe3abf2fc683d4 Mon Sep 17 00:00:00 2001 From: hugui <254963746@qq.com> Date: Fri, 13 May 2016 22:11:40 +0800 Subject: [PATCH] 1.6.8 --- .../ltsopensource/core/support/JobDomainConverter.java | 4 +++- .../github/ltsopensource/remoting/AbstractRemoting.java | 2 +- .../ltsopensource/remoting/AbstractRemotingClient.java | 7 +++++-- .../ltsopensource/remoting/AbstractRemotingServer.java | 3 +-- .../ltsopensource/remoting/common/RemotingHelper.java | 4 +--- .../github/ltsopensource/remoting/lts/LtsCodecFactory.java | 2 +- .../github/ltsopensource/remoting/lts/LtsEventHandler.java | 2 +- .../ltsopensource/remoting/mina/MinaCodecFactory.java | 2 +- .../github/ltsopensource/remoting/mina/MinaHandler.java | 2 +- .../ltsopensource/remoting/netty/NettyCodecFactory.java | 2 +- .../ltsopensource/remoting/netty/NettyRemotingClient.java | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java b/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java index 20c7b4432..bd7d94a4d 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java +++ b/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java @@ -57,7 +57,6 @@ public static JobPo convert(Job job) { } else if (job.isRepeatable()) { jobPo.setCronExpression(null); jobPo.setRepeatInterval(job.getRepeatInterval()); - jobPo.setInternalExtParam(Constants.FIRST_FIRE_TIME, String.valueOf(jobPo.getTriggerTime())); jobPo.setJobType(JobType.REPEAT); } else if (job.getTriggerTime() == null) { jobPo.setJobType(JobType.REAL_TIME); @@ -77,6 +76,9 @@ public static JobPo convert(Job job) { jobPo.setTriggerTime(job.getTriggerTime()); } } + if (job.isRepeatable()) { + jobPo.setInternalExtParam(Constants.FIRST_FIRE_TIME, String.valueOf(jobPo.getTriggerTime())); + } return jobPo; } diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemoting.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemoting.java index 5415f84ca..5e6da4265 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemoting.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemoting.java @@ -27,7 +27,7 @@ * Server与Client公用抽象类 */ public abstract class AbstractRemoting { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRemoting.class); // 信号量，Oneway情况会使用，防止本地缓存请求过多 protected final Semaphore semaphoreOneway; diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingClient.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingClient.java index b26d4b536..8c8e05c5e 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingClient.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingClient.java @@ -11,7 +11,10 @@ import java.net.SocketAddress; import java.util.Timer; import java.util.TimerTask; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -20,7 +23,7 @@ * Remoting客户端实现 */ public abstract class AbstractRemotingClient extends AbstractRemoting implements RemotingClient { - protected static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractRemotingClient.class); private static final long LockTimeoutMillis = 3000; diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingServer.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingServer.java index bc6bb12f8..29016b14d 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingServer.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/AbstractRemotingServer.java @@ -4,7 +4,6 @@ import com.github.ltsopensource.core.factory.NamedThreadFactory; import com.github.ltsopensource.core.logger.Logger; import com.github.ltsopensource.core.logger.LoggerFactory; -import com.github.ltsopensource.remoting.common.RemotingHelper; import com.github.ltsopensource.remoting.exception.RemotingException; import com.github.ltsopensource.remoting.exception.RemotingSendRequestException; import com.github.ltsopensource.remoting.exception.RemotingTimeoutException; @@ -21,7 +20,7 @@ * Remoting服务端实现 */ public abstract class AbstractRemotingServer extends AbstractRemoting implements RemotingServer { - protected static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractRemotingServer.class); protected final RemotingServerConfig remotingServerConfig; // 处理Callback应答器 diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/common/RemotingHelper.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/common/RemotingHelper.java index d0f02e028..b640e5eaf 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/common/RemotingHelper.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/common/RemotingHelper.java @@ -15,9 +15,7 @@ */ public class RemotingHelper { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); - - public static final String RemotingLogName = "LtsRemoting"; + private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.class); /** * IP:PORT diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsCodecFactory.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsCodecFactory.java index 63b21876e..891555b7d 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsCodecFactory.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsCodecFactory.java @@ -18,7 +18,7 @@ */ public class LtsCodecFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(LtsCodecFactory.class); private Codec codec; diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsEventHandler.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsEventHandler.java index ee6bf8620..8cec5c5eb 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsEventHandler.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/lts/LtsEventHandler.java @@ -18,7 +18,7 @@ */ public class LtsEventHandler implements com.github.ltsopensource.nio.handler.NioHandler { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(LtsEventHandler.class); private AbstractRemoting remoting; private String sideType; // SERVER , CLIENT diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaCodecFactory.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaCodecFactory.java index 8d9d1f598..b1a374d24 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaCodecFactory.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaCodecFactory.java @@ -19,7 +19,7 @@ */ public class MinaCodecFactory implements ProtocolCodecFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(MinaCodecFactory.class); private Codec codec; diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaHandler.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaHandler.java index 6d43b204c..804c7ffab 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaHandler.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/mina/MinaHandler.java @@ -17,7 +17,7 @@ */ public class MinaHandler extends IoHandlerAdapter { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(MinaHandler.class); private AbstractRemoting remoting; private String sideType; // SERVER , CLIENT diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyCodecFactory.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyCodecFactory.java index 8ef1b4244..13f6d2bcb 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyCodecFactory.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyCodecFactory.java @@ -22,7 +22,7 @@ */ public class NettyCodecFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(NettyCodecFactory.class); private Codec codec; private AppContext appContext; diff --git a/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyRemotingClient.java b/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyRemotingClient.java index 8d4602a5b..3c7a35368 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyRemotingClient.java +++ b/lts-core/src/main/java/com/github/ltsopensource/remoting/netty/NettyRemotingClient.java @@ -25,7 +25,7 @@ * @author Robert HG (254963746@qq.com) on 11/3/15. */ public class NettyRemotingClient extends AbstractRemotingClient { - private static final Logger LOGGER = LoggerFactory.getLogger(RemotingHelper.RemotingLogName); + private static final Logger LOGGER = LoggerFactory.getLogger(NettyRemotingClient.class); private final Bootstrap bootstrap = new Bootstrap(); private final EventLoopGroup eventLoopGroup;