Merge pull request #158 from rememberber/develop

Develop
rememberber · Jun 24, 2019 · 7456217 · 7456217
2 parents 0b86438 + 7a8dae6
commit 7456217
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 44 deletions.
diff --git a/src/main/java/com/fangxuele/tool/push/logic/PushControl.java b/src/main/java/com/fangxuele/tool/push/logic/PushControl.java
@@ -1,5 +1,6 @@
 package com.fangxuele.tool.push.logic;
 
+import cn.hutool.core.date.BetweenFormater;
 import cn.hutool.core.date.DateUtil;
 import com.fangxuele.tool.push.App;
 import com.fangxuele.tool.push.dao.TPushHistoryMapper;
@@ -29,13 +30,15 @@
 import com.fangxuele.tool.push.util.SystemUtil;
 import com.opencsv.CSVWriter;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 
 import javax.swing.*;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -277,10 +280,9 @@ static void savePushData() throws IOException {
             contentBuilder.append("<p>未推送数：" + PushData.toSendList.size() + "</p>");
             contentBuilder.append("<br/>");
 
-            // TODO
-            contentBuilder.append("<p>开始时间：</p>");
-            contentBuilder.append("<p>完毕时间：</p>");
-            contentBuilder.append("<p>总耗时：</p>");
+            contentBuilder.append("<p>开始时间：" + DateFormatUtils.format(new Date(PushData.startTime), "yyyy-MM-dd HH:mm:ss") + "</p>");
+            contentBuilder.append("<p>完毕时间：" + DateFormatUtils.format(new Date(PushData.endTime), "yyyy-MM-dd HH:mm:ss") + "</p>");
+            contentBuilder.append("<p>总耗时：" + DateUtil.formatBetween(PushData.endTime - PushData.startTime, BetweenFormater.Level.SECOND) + "</p>");
             contentBuilder.append("<br/>");
 
             contentBuilder.append("<p>详情请查看附件</p>");

diff --git a/src/main/java/com/fangxuele/tool/push/logic/PushData.java b/src/main/java/com/fangxuele/tool/push/logic/PushData.java
@@ -97,18 +97,30 @@ public static void increaseStopedThread() {
         stopedThreadCount.add(1);
     }
 
+    /**
+     * 开始时间
+     */
+    public static long startTime = 0;
+
+    /**
+     * 结束时间
+     */
+    public static long endTime = 0;
+
     /**
      * 重置推送数据
      */
     static void reset() {
-        PushData.running = true;
-        PushData.successRecords.reset();
-        PushData.failRecords.reset();
-        PushData.stopedThreadCount.reset();
-        PushData.threadCount = 0;
-        PushData.toSendList = Collections.synchronizedList(new LinkedList<>());
-        PushData.sendSuccessList = Collections.synchronizedList(new LinkedList<>());
-        PushData.sendFailList = Collections.synchronizedList(new LinkedList<>());
+        running = true;
+        successRecords.reset();
+        failRecords.reset();
+        stopedThreadCount.reset();
+        threadCount = 0;
+        toSendList = Collections.synchronizedList(new LinkedList<>());
+        sendSuccessList = Collections.synchronizedList(new LinkedList<>());
+        sendFailList = Collections.synchronizedList(new LinkedList<>());
+        startTime = 0;
+        endTime = 0;
     }
 
 }
diff --git a/src/main/java/com/fangxuele/tool/push/logic/PushRunThread.java b/src/main/java/com/fangxuele/tool/push/logic/PushRunThread.java
@@ -73,6 +73,7 @@ private void preparePushRun() {
 
         // 重置推送数据
         PushData.reset();
+        PushData.startTime = System.currentTimeMillis();
 
         // 拷贝准备的目标用户
         PushData.toSendList.addAll(PushData.allUser);
@@ -178,6 +179,8 @@ private void timeMonitor() {
                     PushForm.pushForm.getPushStopButton().setText("停止计划任务");
                 }
 
+                PushData.endTime = System.currentTimeMillis();
+
                 // 保存停止前的数据
                 try {
                     ConsoleUtil.consoleWithLog("正在保存结果数据……");

diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/SettingListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/SettingListener.java
@@ -291,6 +291,45 @@ public static void addListeners() {
             }
         });
 
+        // E-Mail测试
+        SettingForm.settingForm.getTestMailButton().addActionListener(e -> {
+            App.config.setMailHost(SettingForm.settingForm.getMailHostTextField().getText());
+            App.config.setMailPort(SettingForm.settingForm.getMailPortTextField().getText());
+            App.config.setMailFrom(SettingForm.settingForm.getMailFromTextField().getText());
+            App.config.setMailUser(SettingForm.settingForm.getMailUserTextField().getText());
+            App.config.setMailPassword(new String(SettingForm.settingForm.getMailPasswordField().getPassword()));
+            App.config.setMailUseStartTLS(SettingForm.settingForm.getMailStartTLSCheckBox().isSelected());
+            App.config.setMailUseSSL(SettingForm.settingForm.getMailSSLCheckBox().isSelected());
+            MailMsgSender.mailAccount = null;
+
+            MailTestDialog mailTestDialog = new MailTestDialog();
+            mailTestDialog.pack();
+            mailTestDialog.setVisible(true);
+        });
+
+        // E-Mail保存
+        SettingForm.settingForm.getSaveMailButton().addActionListener(e -> {
+            try {
+                App.config.setMailHost(SettingForm.settingForm.getMailHostTextField().getText());
+                App.config.setMailPort(SettingForm.settingForm.getMailPortTextField().getText());
+                App.config.setMailFrom(SettingForm.settingForm.getMailFromTextField().getText());
+                App.config.setMailUser(SettingForm.settingForm.getMailUserTextField().getText());
+                App.config.setMailPassword(new String(SettingForm.settingForm.getMailPasswordField().getPassword()));
+                App.config.setMailUseStartTLS(SettingForm.settingForm.getMailStartTLSCheckBox().isSelected());
+                App.config.setMailUseSSL(SettingForm.settingForm.getMailSSLCheckBox().isSelected());
+                App.config.save();
+
+                MailMsgSender.mailAccount = null;
+
+                JOptionPane.showMessageDialog(settingPanel, "保存成功！", "成功",
+                        JOptionPane.INFORMATION_MESSAGE);
+            } catch (Exception e1) {
+                JOptionPane.showMessageDialog(settingPanel, "保存失败！\n\n" + e1.getMessage(), "失败",
+                        JOptionPane.ERROR_MESSAGE);
+                logger.error(e1);
+            }
+        });
+
         // mysql数据库-测试链接
         SettingForm.settingForm.getSettingTestDbLinkButton().addActionListener(e -> {
             HikariDataSource hikariDataSource = null;
@@ -336,36 +375,6 @@ public static void addListeners() {
             }
         });
 
-        // E-Mail测试
-        SettingForm.settingForm.getTestMailButton().addActionListener(e -> {
-            MailTestDialog mailTestDialog = new MailTestDialog();
-            mailTestDialog.pack();
-            mailTestDialog.setVisible(true);
-        });
-
-        // E-Mail保存
-        SettingForm.settingForm.getSaveMailButton().addActionListener(e -> {
-            try {
-                App.config.setMailHost(SettingForm.settingForm.getMailHostTextField().getText());
-                App.config.setMailPort(SettingForm.settingForm.getMailPortTextField().getText());
-                App.config.setMailFrom(SettingForm.settingForm.getMailFromTextField().getText());
-                App.config.setMailUser(SettingForm.settingForm.getMailUserTextField().getText());
-                App.config.setMailPassword(new String(SettingForm.settingForm.getMailPasswordField().getPassword()));
-                App.config.setMailUseStartTLS(SettingForm.settingForm.getMailStartTLSCheckBox().isSelected());
-                App.config.setMailUseSSL(SettingForm.settingForm.getMailSSLCheckBox().isSelected());
-                App.config.save();
-
-                MailMsgSender.mailAccount = null;
-
-                JOptionPane.showMessageDialog(settingPanel, "保存成功！", "成功",
-                        JOptionPane.INFORMATION_MESSAGE);
-            } catch (Exception e1) {
-                JOptionPane.showMessageDialog(settingPanel, "保存失败！\n\n" + e1.getMessage(), "失败",
-                        JOptionPane.ERROR_MESSAGE);
-                logger.error(e1);
-            }
-        });
-
         // mysql数据库-保存
         SettingForm.settingForm.getSettingDbInfoSaveButton().addActionListener(e -> {
             try {

diff --git a/src/main/java/com/fangxuele/tool/push/util/ConfigUtil.java b/src/main/java/com/fangxuele/tool/push/util/ConfigUtil.java
@@ -467,15 +467,15 @@ public void setAliSign(String aliSign) {
     }
 
     public String getMailHost() {
-        return setting.getStr("mailHost", "setting.mail", "");
+        return setting.getStr("mailHost", "setting.mail", "smtp.163.com");
     }
 
     public void setMailHost(String mailHost) {
         setting.put("setting.mail", "mailHost", mailHost);
     }
 
     public String getMailPort() {
-        return setting.getStr("mailPort", "setting.mail", "");
+        return setting.getStr("mailPort", "setting.mail", "25");
     }
 
     public void setMailPort(String mailPort) {