release:v_4.2.2_201208

rememberber · Dec 8, 2020 · ec990a8 · ec990a8
1 parent 12df48a
commit ec990a8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 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
@@ -16,7 +16,7 @@ public class UiConsts {
      * 软件名称,版本
      */
     public final static String APP_NAME = "WePush";
-    public final static String APP_VERSION = "v_4.2.1_200308";
+    public final static String APP_VERSION = "v_4.2.2_201208";
 
     /**
      * Logo-1024*1024

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
@@ -7,6 +7,7 @@
 import com.fangxuele.tool.push.dao.TWxAccountMapper;
 import com.fangxuele.tool.push.domain.TWxAccount;
 import com.fangxuele.tool.push.ui.UiConsts;
+import com.fangxuele.tool.push.ui.form.MessageManageForm;
 import com.fangxuele.tool.push.ui.form.SettingForm;
 import com.fangxuele.tool.push.ui.listener.SettingListener;
 import com.fangxuele.tool.push.util.ComponentUtil;
@@ -115,6 +116,7 @@ public void windowClosing(WindowEvent e) {
             }
             renderTable();
             SettingForm.initSwitchMultiAccount();
+            MessageManageForm.initSwitchMultiAccount();
             JOptionPane.showMessageDialog(this, "保存成功！", "成功",
                     JOptionPane.INFORMATION_MESSAGE);
         });

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MemberForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MemberForm.java
@@ -116,6 +116,7 @@ public static void init() {
             Color foreColor = new Color(187, 187, 187);
             memberForm.getImportFromSqlTextArea().setForeground(foreColor);
         }
+        clearMember();
     }
 
     /**

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/PushHisForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/PushHisForm.java
@@ -71,7 +71,7 @@ public static void init() {
 
         pushHisForm.getSplitPane().setDividerLocation((int) (App.mainFrame.getWidth() * 0.38));
         initHisLeftTable();
-
+        pushHisForm.getPushHisTextArea().setText("");
     }
 
     private static void initHisLeftTable() {

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
@@ -133,6 +133,7 @@ public static void addListeners() {
                 }
 
                 SettingForm.initSwitchMultiAccount();
+                MessageManageForm.initSwitchMultiAccount();
                 WxMpTemplateMsgSender.wxMpConfigStorage = null;
                 WxMpTemplateMsgSender.wxMpService = null;
                 JOptionPane.showMessageDialog(settingPanel, "保存成功！", "成功",

diff --git a/src/main/java/com/fangxuele/tool/push/util/UpgradeUtil.java b/src/main/java/com/fangxuele/tool/push/util/UpgradeUtil.java
@@ -128,6 +128,7 @@ public static void smoothUpgrade() {
                     String sql = FileUtil.readString(sqlFileUrl, CharsetUtil.UTF_8);
                     try {
                         MybatisUtil.executeSql(sql);
+                        log.info("执行索引为{}的版本对应的sql完毕", i);
                     } catch (SQLException e) {
                         log.error("执行索引为{}的版本对应的sql时异常", i, e);
                         if (!e.getMessage().contains("duplicate column")) {

diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
@@ -1,5 +1,5 @@
 {
-  "currentVersion": "v_4.2.1_200308",
+  "currentVersion": "v_4.2.2_201208",
   "versionIndex": {
     "v_1.1.0_170701": "0",
     "v_1.2.0_170831": "1",
@@ -41,7 +41,8 @@
     "v_4.1.0_190930": "37",
     "v_4.1.1_191027": "38",
     "v_4.2.0_191129": "39",
-    "v_4.2.1_200308": "40"
+    "v_4.2.1_200308": "40",
+    "v_4.2.2_201208": "41"
   },
   "versionDetailList": [
     {
@@ -248,6 +249,11 @@
       "version": "v_4.2.1_200308",
       "title": "修复bug",
       "log": "● fix：修复小程序订阅消息无法发送问题\n● optimization：由于小程序模板消息接口将于2020年1月10日下线，禁用小程序模板消息入口\n● fix：公众号模板消息支持小程序路径修复\n● fix：代码优化，界面细节优化\n"
+    },
+    {
+      "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"
     }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ public static void init() { @@
                 Color foreColor = new Color(187, 187, 187);
                 memberForm.getImportFromSqlTextArea().setForeground(foreColor);
             }
+            clearMember();
         }
         /**
@@ Expand Down @@