Merge pull request #44 from qq254963746/develop

Develop

Author: qq254963746

lts-admin/src/main/java/com/lts/web/cluster/AdminApplication.java

@@ -1,8 +1,8 @@
 package com.lts.web.cluster;
 
 import com.lts.biz.logger.JobLogger;
-import com.lts.core.cluster.Node;
 import com.lts.core.Application;
+import com.lts.core.cluster.Node;
 import com.lts.queue.*;
 
 /**

lts-admin/src/main/java/com/lts/web/controller/api/JobQueueApiController.java

@@ -1,13 +1,13 @@
 package com.lts.web.controller.api;
 
+import com.lts.biz.logger.domain.JobLogPo;
 import com.lts.biz.logger.domain.JobLoggerRequest;
 import com.lts.core.commons.utils.Assert;
 import com.lts.core.commons.utils.StringUtils;
-import com.lts.core.domain.PageResponse;
-import com.lts.biz.logger.domain.JobLogPo;
-import com.lts.core.commons.utils.DateUtils;
 import com.lts.core.domain.JobQueueRequest;
+import com.lts.core.domain.PageResponse;
 import com.lts.core.support.CronExpression;
+import com.lts.core.support.SystemClock;
 import com.lts.queue.domain.JobPo;
 import com.lts.web.cluster.AdminApplication;
 import com.lts.web.controller.AbstractController;
@@ -163,7 +163,7 @@ private void addJob(JobQueueRequest request, Long triggerTime) {
         jobPo.setJobId(StringUtils.generateUUID());
         jobPo.setCronExpression(request.getCronExpression());
         jobPo.setExtParams(request.getExtParams());
-        jobPo.setGmtCreated(DateUtils.currentTimeMillis());
+        jobPo.setGmtCreated(SystemClock.now());
         jobPo.setGmtModified(jobPo.getGmtCreated());
         jobPo.setNeedFeedback(request.getNeedFeedback());
         jobPo.setPriority(request.getPriority());
@@ -181,7 +181,7 @@ private void addJob(JobQueueRequest request, Long triggerTime) {
             }
         }
         if (jobPo.getTriggerTime() == null) {
-            jobPo.setTriggerTime(DateUtils.currentTimeMillis());
+            jobPo.setTriggerTime(SystemClock.now());
         }
 
         application.getExecutableJobQueue().add(jobPo);

lts-admin/src/main/java/com/lts/web/controller/api/NodeApiController.java

@@ -1,7 +1,7 @@
 package com.lts.web.controller.api;
 
-import com.lts.core.commons.utils.CollectionUtils;
 import com.lts.core.cluster.Node;
+import com.lts.core.commons.utils.CollectionUtils;
 import com.lts.core.commons.utils.StringUtils;
 import com.lts.web.cluster.RegistryService;
 import com.lts.web.controller.AbstractController;

lts-admin/src/main/java/com/lts/web/support/AdminAppFactoryBean.java

@@ -1,16 +1,16 @@
 package com.lts.web.support;
 
-import com.lts.core.cluster.Node;
-import com.lts.core.cluster.NodeType;
 import com.lts.biz.logger.JobLoggerFactory;
 import com.lts.core.cluster.Config;
-import com.lts.core.extension.ExtensionLoader;
+import com.lts.core.cluster.Node;
+import com.lts.core.cluster.NodeType;
 import com.lts.core.commons.utils.StringUtils;
+import com.lts.core.extension.ExtensionLoader;
 import com.lts.queue.CronJobQueueFactory;
+import com.lts.queue.ExecutableJobQueueFactory;
 import com.lts.queue.ExecutingJobQueueFactory;
 import com.lts.queue.NodeGroupStoreFactory;
 import com.lts.web.cluster.AdminApplication;
-import com.lts.queue.ExecutableJobQueueFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 

lts-admin/src/main/webapp/main/job-logger.jsp

@@ -69,7 +69,12 @@
 
         var columns = [
             {
-                title: '日志时间', dataIndex: 'timestamp', width: 125, renderer: function (v) {
+                title: '日志记录时间', dataIndex: 'logTime', width: 125, renderer: function (v) {
+                return DateUtil.formatYMDHMD(v);
+            }
+            },
+            {
+                title: '日志创建时间', dataIndex: 'gmtCreated', width: 125, renderer: function (v) {
                 return DateUtil.formatYMDHMD(v);
             }
             },

lts-admin/src/test/java/com/lts/biz/logger/mysql/MysqlJobLoggerTest.java

@@ -3,16 +3,13 @@
 import com.lts.biz.logger.domain.JobLogPo;
 import com.lts.biz.logger.domain.LogType;
 import com.lts.core.cluster.Config;
-import com.lts.core.commons.utils.DateUtils;
 import com.lts.core.constant.Level;
-import com.lts.core.domain.Job;
+import com.lts.core.support.SystemClock;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Robert HG (254963746@qq.com) on 6/12/15.
  */
@@ -33,8 +30,8 @@ public void testLog() throws Exception {
         List<JobLogPo> jobLogPoList = new ArrayList<JobLogPo>();
 
         JobLogPo jobLogPo = new JobLogPo();
-        jobLogPo.setGmtCreated(DateUtils.currentTimeMillis());
-        jobLogPo.setLogTime(DateUtils.currentTimeMillis());
+        jobLogPo.setGmtCreated(SystemClock.now());
+        jobLogPo.setLogTime(SystemClock.now());
         jobLogPo.setLevel(Level.INFO);
         jobLogPo.setLogType(LogType.BIZ);
         jobLogPoList.add(jobLogPo);

lts-core/src/main/java/com/lts/core/Application.java

@@ -3,8 +3,8 @@
 import com.lts.core.cluster.Config;
 import com.lts.core.cluster.MasterElector;
 import com.lts.core.cluster.SubscribedNodeManager;
-import com.lts.ec.EventCenter;
 import com.lts.core.protocol.command.CommandBodyWrapper;
+import com.lts.ec.EventCenter;
 
 /**
  * @author Robert HG (254963746@qq.com) on 8/17/14.

lts-core/src/main/java/com/lts/core/cluster/AbstractClientNode.java

@@ -1,11 +1,11 @@
 package com.lts.core.cluster;
 
 import com.lts.core.Application;
+import com.lts.core.commons.utils.StringUtils;
 import com.lts.core.constant.Constants;
 import com.lts.core.factory.NamedThreadFactory;
 import com.lts.core.remoting.HeartBeatMonitor;
 import com.lts.core.remoting.RemotingClientDelegate;
-import com.lts.core.commons.utils.StringUtils;
 import com.lts.remoting.netty.NettyClientConfig;
 import com.lts.remoting.netty.NettyRemotingClient;
 import com.lts.remoting.netty.NettyRequestProcessor;

lts-core/src/main/java/com/lts/core/cluster/AbstractJobNode.java

@@ -9,12 +9,12 @@
 import com.lts.core.listener.MasterChangeListener;
 import com.lts.core.listener.MasterElectionListener;
 import com.lts.core.listener.NodeChangeListener;
+import com.lts.core.listener.SelfChangeListener;
 import com.lts.core.logger.Logger;
 import com.lts.core.logger.LoggerFactory;
+import com.lts.core.protocol.command.CommandBodyWrapper;
 import com.lts.core.registry.*;
 import com.lts.ec.EventCenterFactory;
-import com.lts.core.listener.SelfChangeListener;
-import com.lts.core.protocol.command.CommandBodyWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +46,6 @@ public AbstractJobNode() {
 
     final public void start() {
         try {
-
             // 初始化配置
             initConfig();
 

lts-core/src/main/java/com/lts/core/cluster/AbstractServerNode.java

@@ -1,7 +1,7 @@
 package com.lts.core.cluster;
 
-import com.lts.core.constant.Constants;
 import com.lts.core.Application;
+import com.lts.core.constant.Constants;
 import com.lts.core.factory.NamedThreadFactory;
 import com.lts.core.remoting.RemotingServerDelegate;
 import com.lts.remoting.netty.NettyRemotingServer;