From 0ebe1ee92c09b37f7a34ccf614156283350ba7ca Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Wed, 9 Dec 2020 11:30:06 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/ui/form/msg/MpTemplateMsgForm.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java index 08975bbb..26110439 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java @@ -140,7 +140,7 @@ public MpTemplateMsgForm() { }); templateListComboBox.addItemListener(e -> { if (needListenTemplateListComboBox && e.getStateChange() == ItemEvent.SELECTED) { - clearAllField(); + clearAllFieldExceptTemplateListAndContent(); fillWxTemplateContentToField(); } }); @@ -417,6 +417,15 @@ public static void initTemplateDataTable() { * 清空所有界面字段 */ public static void clearAllField() { + clearAllFieldExceptTemplateListAndContent(); + getInstance().getTemplateListComboBox().removeAllItems(); + getInstance().getTemplateContentTextArea().setText(""); + } + + /** + * 清空所有界面字段 + */ + public static void clearAllFieldExceptTemplateListAndContent() { getInstance().getMsgTemplateIdTextField().setText(""); getInstance().getMsgTemplateUrlTextField().setText(""); getInstance().getMsgTemplateMiniAppidTextField().setText(""); @@ -424,8 +433,6 @@ public static void clearAllField() { getInstance().getTemplateDataNameTextField().setText(""); getInstance().getTemplateDataValueTextField().setText(""); getInstance().getTemplateDataColorTextField().setText(""); - getInstance().getTemplateListComboBox().removeAllItems(); - getInstance().getTemplateContentTextArea().setText(""); selectedMsgTemplateId = null; initTemplateDataTable(); } From b6a9c3de50be737c90cf63ca4e05da32c743502b Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Wed, 9 Dec 2020 19:54:30 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=90=8E=E6=B6=88=E6=81=AF=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangxuele/tool/push/ui/form/MessageManageForm.java | 2 -- .../java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java index b269417b..748f49c1 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java @@ -90,8 +90,6 @@ public static MessageManageForm getInstance() { public static void init() { messageManageForm = getInstance(); - MessageEditForm.getInstance().getMsgNameField().setText(""); - initSwitchMultiAccount(); initMessageList(); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java index 8ecea2c1..10222bce 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java @@ -132,6 +132,7 @@ public static void init() { MessageEditForm.switchMsgType(msgType); MessageEditForm.getInstance().getMsgTypeName().setText(MessageTypeEnum.getName(msgType)); MessageManageForm.init(); + MessageEditForm.getInstance().getMsgNameField().setText(""); MemberForm.init(); PushHisForm.init(); ScheduleForm.init(); From c8246b2a92e27700e8fc812de612b0330def29e8 Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Thu, 10 Dec 2020 11:17:15 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=EF=BC=8C=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=90=8D=E7=A7=B0=E5=8F=98=E4=B8=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/ui/form/msg/MpTemplateMsgForm.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java index 26110439..16dcae56 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java @@ -162,12 +162,15 @@ public void init(String msgName) { } clearAllField(); - initTemplateList(); + Integer msgId = 0; List tMsgMpTemplateList = msgMpTemplateMapper.selectByMsgTypeAndMsgName(MessageTypeEnum.MP_TEMPLATE_CODE, msgName); if (tMsgMpTemplateList.size() > 0) { TMsgMpTemplate tMsgMpTemplate = tMsgMpTemplateList.get(0); msgId = tMsgMpTemplate.getId(); + selectedMsgTemplateId = tMsgMpTemplate.getTemplateId(); + initTemplateList(); + mpTemplateMsgForm.getMsgTemplateIdTextField().setText(tMsgMpTemplate.getTemplateId()); mpTemplateMsgForm.getMsgTemplateUrlTextField().setText(tMsgMpTemplate.getUrl()); mpTemplateMsgForm.getMsgTemplateMiniAppidTextField().setText(tMsgMpTemplate.getMaAppid()); @@ -176,8 +179,8 @@ public void init(String msgName) { MessageEditForm messageEditForm = MessageEditForm.getInstance(); messageEditForm.getMsgNameField().setText(tMsgMpTemplate.getMsgName()); messageEditForm.getPreviewUserField().setText(tMsgMpTemplate.getPreviewUser()); - - selectedMsgTemplateId = tMsgMpTemplate.getTemplateId(); + } else { + initTemplateList(); } initTemplateDataTable(); From 1c7b1e307e06e7b70eb3cedfa5bb619fa4aa2d54 Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Thu, 10 Dec 2020 11:19:39 +0800 Subject: [PATCH 04/12] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=AC=A1=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=B2=A1=E6=9C=89=E8=AE=B0=E4=BD=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangxuele/tool/push/ui/listener/MessageTypeListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/MessageTypeListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/MessageTypeListener.java index ed3160f4..58b2930a 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/listener/MessageTypeListener.java +++ b/src/main/java/com/fangxuele/tool/push/ui/listener/MessageTypeListener.java @@ -131,6 +131,7 @@ public void mouseExited(MouseEvent e) { * 保存消息类型 */ private static void saveType() { + App.config.save(); MessageTypeForm.init(); } } From 2093e5c50106b579c69b1c451ae2fb394113a8aa Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Thu, 10 Dec 2020 11:39:12 +0800 Subject: [PATCH 05/12] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=AC=A1=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=B2=A1=E6=9C=89=E8=AE=B0=E4=BD=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java index b6878171..1f1ff9db 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java @@ -117,6 +117,7 @@ public void windowClosing(WindowEvent e) { renderTable(); SettingForm.initSwitchMultiAccount(); MessageManageForm.initSwitchMultiAccount(); + MessageManageForm.init(); JOptionPane.showMessageDialog(this, "保存成功!", "成功", JOptionPane.INFORMATION_MESSAGE); }); From 6662ec3a20ac0efebc97f652d1bae7fa5bd5cce6 Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Thu, 10 Dec 2020 11:54:58 +0800 Subject: [PATCH 06/12] =?UTF-8?q?feature:=E5=A2=9E=E5=8A=A0=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=97=A5=E6=9C=9F=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form | 2 +- .../com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java | 2 +- .../com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form | 2 +- .../com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java | 2 +- .../com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form | 2 +- .../com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java | 2 +- .../fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form | 2 +- .../fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java | 2 +- .../fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form | 2 +- .../fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java | 2 +- .../fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form | 2 +- .../fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.java | 2 +- .../com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.form | 2 +- .../com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.java | 2 +- .../com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.form | 2 +- .../com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.java | 2 +- .../java/com/fangxuele/tool/push/util/TemplateUtil.java | 6 ++++++ src/main/resources/version_summary.json | 2 +- 18 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form index 920843be..7adcf227 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java index 4034e2e5..fdcc073f 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java @@ -262,7 +262,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form index 64e65dec..a9c75302 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java index eac62fae..885e35bc 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java @@ -265,7 +265,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form index 8f092d9d..431e9493 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java index 8bb79021..7f543259 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java @@ -266,7 +266,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form index add8fc07..751af976 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java index 06ab264c..9497e658 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java @@ -287,7 +287,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form index 7f1d8162..8e6681e9 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java index 16dcae56..77d7267a 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java @@ -464,7 +464,7 @@ public static void clearAllFieldExceptTemplateListAndContent() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form index 7983ffd3..7ece2f41 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.java index 3316ece3..b4dd45e4 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.java @@ -266,7 +266,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.form index 93b9653e..0ff45c75 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.java index 2bc9c9ab..9d7cca0d 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/TxYunMsgForm.java @@ -267,7 +267,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.form index be24d610..aedba9b9 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.form @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.java index 3da9af6f..339a1915 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/UpYunMsgForm.java @@ -267,7 +267,7 @@ public static void clearAllField() { templateMsgDataPanel = new JPanel(); templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1)); templateMsgPanel.add(templateMsgDataPanel, 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_WANT_GROW, null, null, null, 0, false)); - templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"$ENTER$\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); + templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量(可使用\"${ENTER}\"作为换行符)", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null)); templateDataNameTextField = new JTextField(); templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例:first或者keyword1或者remark之类的"); templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/util/TemplateUtil.java b/src/main/java/com/fangxuele/tool/push/util/TemplateUtil.java index f651e394..4e41fcf5 100644 --- a/src/main/java/com/fangxuele/tool/push/util/TemplateUtil.java +++ b/src/main/java/com/fangxuele/tool/push/util/TemplateUtil.java @@ -1,5 +1,6 @@ package com.fangxuele.tool.push.util; +import cn.hutool.core.date.DateUtil; import com.fangxuele.tool.push.logic.PushControl; import com.fangxuele.tool.push.logic.msgsender.WxMpTemplateMsgSender; import me.chanjar.weixin.common.error.WxErrorException; @@ -8,6 +9,7 @@ import org.apache.velocity.app.VelocityEngine; import java.io.StringWriter; +import java.util.Date; /** *
@@ -40,6 +42,10 @@ public static String evaluate(String content, VelocityContext velocityContext) {
         }
 
         velocityContext.put("ENTER", "\n");
+        Date now = new Date();
+        velocityContext.put("DATE", DateUtil.today());
+        velocityContext.put("TIME", DateUtil.formatTime(now));
+        velocityContext.put("DATE_TIME", DateUtil.formatDateTime(now));
 
         StringWriter writer = new StringWriter();
         velocityEngine.evaluate(velocityContext, writer, "", content);
diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
index 0df76645..8d06f71e 100644
--- a/src/main/resources/version_summary.json
+++ b/src/main/resources/version_summary.json
@@ -58,7 +58,7 @@
     {
       "version": "v_1.3.0_180207",
       "title": "新增变量消息,可实现每条消息内容不同",
-      "log": "1.新增支持变量消息,可实现每个用户/每条消息内容不同\n2.微信模板消息和客服消息支持昵称变量,可在消息内容中增加用户昵称\n3.换行符规则变更:由#ENTER#变更为$ENTER$\n4.导入数据进度条优化\n"
+      "log": "1.新增支持变量消息,可实现每个用户/每条消息内容不同\n2.微信模板消息和客服消息支持昵称变量,可在消息内容中增加用户昵称\n3.换行符规则变更:由#ENTER#变更为${ENTER}\n4.导入数据进度条优化\n"
     },
     {
       "version": "v_1.4.0_180209",

From 076c1773f41ba2318c39186281b065413647fdb3 Mon Sep 17 00:00:00 2001
From: zhoubo58 
Date: Thu, 10 Dec 2020 14:02:33 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E6=95=B4=E4=B8=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/fangxuele/tool/push/ui/Init.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/fangxuele/tool/push/ui/Init.java b/src/main/java/com/fangxuele/tool/push/ui/Init.java
index df0d6b7b..8a3a7dce 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/Init.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/Init.java
@@ -32,6 +32,8 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 
@@ -134,7 +136,8 @@ public static void initAllTab() {
 
         // 检查新版版
         if (App.config.isAutoCheckUpdate()) {
-            ThreadUtil.execute(() -> UpgradeUtil.checkUpdate(true));
+            ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(1);
+            threadPoolExecutor.scheduleAtFixedRate(() -> UpgradeUtil.checkUpdate(true), 0, 24 * 60 * 60 * 1000, TimeUnit.MILLISECONDS);
         }
         // 更新二维码
         ThreadUtil.execute(AboutListener::initQrCode);

From 908c01461c0c27e7786ce052d6929daaea42cb2f Mon Sep 17 00:00:00 2001
From: zhoubo58 
Date: Thu, 10 Dec 2020 14:04:52 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E6=95=B4=E4=B8=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/fangxuele/tool/push/ui/Init.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/fangxuele/tool/push/ui/Init.java b/src/main/java/com/fangxuele/tool/push/ui/Init.java
index 8a3a7dce..b8314f4f 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/Init.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/Init.java
@@ -137,7 +137,7 @@ public static void initAllTab() {
         // 检查新版版
         if (App.config.isAutoCheckUpdate()) {
             ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(1);
-            threadPoolExecutor.scheduleAtFixedRate(() -> UpgradeUtil.checkUpdate(true), 0, 24 * 60 * 60 * 1000, TimeUnit.MILLISECONDS);
+            threadPoolExecutor.scheduleAtFixedRate(() -> UpgradeUtil.checkUpdate(true), 0, 24, TimeUnit.HOURS);
         }
         // 更新二维码
         ThreadUtil.execute(AboutListener::initQrCode);

From 231ab6d05687e41e4e1831aa5838aab145d9c1bd Mon Sep 17 00:00:00 2001
From: zhoubo58 
Date: Thu, 10 Dec 2020 14:09:47 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E6=95=B4=E4=B8=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fangxuele/tool/push/ui/listener/PushListener.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/PushListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/PushListener.java
index 97d35447..a87ca179 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/listener/PushListener.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/listener/PushListener.java
@@ -212,7 +212,7 @@ public static void addListeners() {
                         serviceStartPerDay = Executors.newSingleThreadScheduledExecutor();
                         long millisBetween = startPerDayMills - System.currentTimeMillis();
                         long delay = millisBetween < 0 ? millisBetween + 24 * 60 * 60 * 1000 : millisBetween;
-                        serviceStartPerDay.scheduleAtFixedRate(new PushRunThread(), delay, 24 * 60 * 60 * 1000, TimeUnit.MILLISECONDS);
+                        serviceStartPerDay.scheduleAtFixedRate(new PushRunThread(), delay, 24, TimeUnit.HOURS);
                     }
                     existScheduleTask = true;
                 }
@@ -251,7 +251,7 @@ public static void addListeners() {
                         serviceStartPerWeek = Executors.newSingleThreadScheduledExecutor();
                         long millisBetween = startPerWeekMills + todaySetMills - System.currentTimeMillis();
                         long delay = millisBetween < 0 ? millisBetween + 7 * 24 * 60 * 60 * 1000 : millisBetween;
-                        serviceStartPerWeek.scheduleAtFixedRate(new PushRunThread(), delay, 7 * 24 * 60 * 60 * 1000, TimeUnit.MILLISECONDS);
+                        serviceStartPerWeek.scheduleAtFixedRate(new PushRunThread(), delay, 7 * 24, TimeUnit.HOURS);
                     }
                     existScheduleTask = true;
                 }

From 18a034ef73e3a039e585775f04c9daab1a9f5f47 Mon Sep 17 00:00:00 2001
From: zhoubo58 
Date: Thu, 10 Dec 2020 14:45:31 +0800
Subject: [PATCH 10/12] fix

---
 .../com/fangxuele/tool/push/ui/form/MessageManageForm.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java
index 748f49c1..f0e4af8a 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java
@@ -218,8 +218,8 @@ public static void initSwitchMultiAccount() {
                 for (TWxAccount tWxAccount : wxAccountList) {
                     messageManageForm.getAccountSwitchComboBox().addItem(tWxAccount.getAccountName());
                 }
-                accountSwitchComboBoxListenIgnore = false;
                 messageManageForm.getAccountSwitchComboBox().setSelectedItem(App.config.getWechatMpName());
+                accountSwitchComboBoxListenIgnore = false;
                 break;
 
             case MessageTypeEnum.MA_SUBSCRIBE_CODE:
@@ -227,10 +227,12 @@ public static void initSwitchMultiAccount() {
             case MessageTypeEnum.WX_UNIFORM_MESSAGE_CODE:
                 // 多账号切换-小程序
                 wxAccountList = wxAccountMapper.selectByAccountType(UiConsts.WX_ACCOUNT_TYPE_MA);
+                accountSwitchComboBoxListenIgnore = true;
                 for (TWxAccount tWxAccount : wxAccountList) {
                     messageManageForm.getAccountSwitchComboBox().addItem(tWxAccount.getAccountName());
                 }
                 messageManageForm.getAccountSwitchComboBox().setSelectedItem(App.config.getMiniAppName());
+                accountSwitchComboBoxListenIgnore = false;
                 break;
             default:
                 break;

From a37000aeca1327e0964ad4a11a72c67b5b1e9756 Mon Sep 17 00:00:00 2001
From: zhoubo58 
Date: Thu, 10 Dec 2020 21:13:24 +0800
Subject: [PATCH 11/12] release:v_4.2.3_201210

---
 src/main/java/com/fangxuele/tool/push/ui/UiConsts.java |  2 +-
 src/main/resources/version_summary.json                | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java b/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java
index b865d70e..73387f02 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java
+++ b/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_4.2.2_201208";
+    public final static String APP_VERSION = "v_4.2.3_201210";
 
     /**
      * Logo-1024*1024
diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
index 8d06f71e..d3400fb6 100644
--- a/src/main/resources/version_summary.json
+++ b/src/main/resources/version_summary.json
@@ -1,5 +1,5 @@
 {
-  "currentVersion": "v_4.2.2_201208",
+  "currentVersion": "v_4.2.3_201210",
   "versionIndex": {
     "v_1.1.0_170701": "0",
     "v_1.2.0_170831": "1",
@@ -42,7 +42,8 @@
     "v_4.1.1_191027": "38",
     "v_4.2.0_191129": "39",
     "v_4.2.1_200308": "40",
-    "v_4.2.2_201208": "41"
+    "v_4.2.2_201208": "41",
+    "v_4.2.3_201210": "42"
   },
   "versionDetailList": [
     {
@@ -254,6 +255,11 @@
       "version": "v_4.2.2_201208",
       "title": "微信公众号和小程序类消息管理体验优化",
       "log": "● feature:微信公号和小程序消息支持按多账号分组管理\n● feature:保存了编辑每条消息时的预览用户,下次预览不再烦恼\n● feature:设置tab新增调试模块和查看日志按钮\n● fix:修复公众号模板消息模板列表为空时的后台报错\n● optimization:部分sender客户端连接池调整\n● optimization:调整判断所有线程都执行完毕的逻辑\n● optimization:1.批量升级依赖版本 2.移除小程序模板消息相关消息构造器和发送器 3.调整小程序统一服务消息功能 4.代码细节和文案细节调整\n"
+    },
+    {
+      "version": "v_4.2.3_201210",
+      "title": "修复bug",
+      "log": "● fix:修复模板消息模板列表切换时报错的问题\n● fix:修复保存消息后消息名称被清空的问题\n● fix:修复选择模板保存后,再次打开,选择的模板名称变为默认的问题\n● fix:修复其他体验问题\n● feature:增加支持日期相关的变量\n"
     }
   ]
 }
\ No newline at end of file

From 011612559dbf832a445c8480127fa87372452e9f Mon Sep 17 00:00:00 2001
From: duoduo 
Date: Thu, 10 Dec 2020 23:21:59 +0800
Subject: [PATCH 12/12] release:v_4.2.3_201210

---
 download.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/download.md b/download.md
index 2d34e9b6..8532b6f4 100644
--- a/download.md
+++ b/download.md
@@ -3,6 +3,7 @@
 
Windows +[WePush-v4.2.3_201210-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.3_201210-x64-Setup.exe) [WePush-v4.2.2_201208-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.2_201208-x64-Setup.exe) [WePush-v4.2.1_200308-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.1_200308-x64-Setup.exe) [WePush-v4.2.0_191129-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.0_191129-x64-Setup.exe) @@ -76,6 +77,7 @@
Mac OS +[v_4.2.3_201210.app](http://download.zhoubochina.com/mac/4.2.3.zip) [v_4.2.2_201208.app](http://download.zhoubochina.com/mac/4.2.2.zip) [v_4.2.1_200308.app](http://download.zhoubochina.com/mac/4.2.1.zip) [v_4.1.1_191027.app](http://download.zhoubochina.com/mac/4.1.1.zip) @@ -129,6 +131,7 @@
Portable(各系统通用绿色便携版32/64位) +[v4.2.3_201210](http://download.zhoubochina.com/linux/WePush-4.2.3.zip) [v4.2.2_201208](http://download.zhoubochina.com/linux/WePush-4.2.2.zip) [v4.2.1_200308](http://download.zhoubochina.com/linux/WePush-4.2.1.zip) [v4.2.0_191129](http://download.zhoubochina.com/linux/WePush-4.2.0.zip)