Merge pull request #159 from rememberber/develop

 release:v_3.4.1_190624

src/main/java/com/fangxuele/tool/push/logic/PushControl.java

@@ -266,8 +266,8 @@ static void savePushData() throws IOException {
             ArrayList<String> mailToList = new ArrayList<>(Arrays.asList(mailTos));
 
             MailMsgSender mailMsgSender = new MailMsgSender();
-            String title = "WePush推送结果：" + MessageEditForm.messageEditForm.getMsgNameField().getText()
-                    + "-" + PushData.sendSuccessList.size() + "成功；" + PushData.sendFailList.size() + "失败；"
+            String title = "WePush推送结果：【" + MessageEditForm.messageEditForm.getMsgNameField().getText()
+                    + "】" + PushData.sendSuccessList.size() + "成功；" + PushData.sendFailList.size() + "失败；"
                     + PushData.toSendList.size() + "未发送";
             StringBuilder contentBuilder = new StringBuilder();
             contentBuilder.append("<h2>WePush推送结果</h2>");

src/main/java/com/fangxuele/tool/push/ui/UiConsts.java

@@ -16,7 +16,7 @@ public class UiConsts {
      * 软件名称,版本
      */
     public final static String APP_NAME = "WePush";
-    public final static String APP_VERSION = "v_3.4.0_190619";
+    public final static String APP_VERSION = "v_3.4.1_190624";
 
     /**
      * 主窗口图标-大

src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.form

@@ -197,7 +197,7 @@
                   <text value="HTTP请求"/>
                 </properties>
               </component>
-              <component id="c9ddb" class="javax.swing.JRadioButton" binding="eMailBETARadioButton" default-binding="true">
+              <component id="c9ddb" class="javax.swing.JRadioButton" binding="eMailRadioButton">
                 <constraints>
                   <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>

src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java

@@ -31,7 +31,7 @@ public class MessageTypeForm {
     private JRadioButton yunPianRadioButton;
     private JRadioButton upYunRadioButton;
     private JRadioButton hwYunRadioButton;
-    private JRadioButton eMailBETARadioButton;
+    private JRadioButton eMailRadioButton;
     private JPanel msgTypeListPanel;
     private JRadioButton 网易云信短信RadioButton;
     private JRadioButton 榛子云短信RadioButton;
@@ -85,7 +85,7 @@ public static void init() {
                 messageTypeForm.getHwYunRadioButton().setSelected(true);
                 break;
             case MessageTypeEnum.EMAIL_CODE:
-                messageTypeForm.getEMailBETARadioButton().setSelected(true);
+                messageTypeForm.getEMailRadioButton().setSelected(true);
                 break;
 
             default:
@@ -214,10 +214,10 @@ public static void clearAllSelected() {
         HTTP请求RadioButton.setEnabled(false);
         HTTP请求RadioButton.setText("HTTP请求");
         msgTypeListPanel.add(HTTP请求RadioButton, new GridConstraints(9, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        eMailBETARadioButton = new JRadioButton();
-        eMailBETARadioButton.setEnabled(true);
-        eMailBETARadioButton.setText("E-Mail（BETA）");
-        msgTypeListPanel.add(eMailBETARadioButton, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        eMailRadioButton = new JRadioButton();
+        eMailRadioButton.setEnabled(true);
+        eMailRadioButton.setText("E-Mail（BETA）");
+        msgTypeListPanel.add(eMailRadioButton, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JPanel panel1 = new JPanel();
         panel1.setLayout(new GridLayoutManager(2, 1, new Insets(8, 8, 8, 0), -1, -1));
         messageTypePanel.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));

src/main/java/com/fangxuele/tool/push/ui/listener/MessageTypeListener.java

@@ -65,7 +65,7 @@ public static void addListeners() {
             App.config.setMsgType(MessageTypeEnum.HW_YUN_CODE);
             saveType();
         });
-        messageTypeForm.getEMailBETARadioButton().addActionListener(e -> {
+        messageTypeForm.getEMailRadioButton().addActionListener(e -> {
             App.config.setMsgType(MessageTypeEnum.EMAIL_CODE);
             saveType();
         });

src/main/resources/version_summary.json

@@ -1,5 +1,5 @@
 {
-  "currentVersion": "v_3.4.0_190619",
+  "currentVersion": "v_3.4.1_190624",
   "versionIndex": {
     "v_1.1.0_170701": "0",
     "v_1.2.0_170831": "1",
@@ -26,7 +26,8 @@
     "v_3.2.0_190601": "22",
     "v_3.2.1_190603": "23",
     "v_3.3.0_190608": "24",
-    "v_3.4.0_190619": "25"
+    "v_3.4.0_190619": "25",
+    "v_3.4.1_190624": "26"
   },
   "versionDetailList": [
     {
@@ -158,6 +159,11 @@
       "version": "v_3.4.0_190619",
       "title": "自动获取微信公众号可选模板+模板参数自动填充",
       "log": "● 自动获取微信公众号可选模板\n● 模板参数自动填充\n● 客服消息文本类型输入区域优化\n● UI调整，消息编辑可见范围不受屏幕分辨率限制\n● 增加空跑帮助提示\n● 消息发送器解耦，新增消息加工器策略，大幅提高消息加工性能\n● push相关流程深度梳理和大规模重构\n● UI细节调整，增加累计推送量展示\n"
+    },
+    {
+      "version": "v_3.4.1_190624",
+      "title": "新增支持E-Mail类型消息",
+      "log": "● 新增支持发送E-Mail类型消息（beta）\n● 计划任务增加推送结果邮件通知\n● 优化SQL连接测试\n● 计划任务支持执行时重新导入目标用户\n● 统一全局强调色为黄色\n● SQL导入支持导入变量信息\n● 使用Hikari连接池\n"
     }
   ]
 }