Merge pull request #215 from rememberber/develop

Develop
rememberber · Sep 4, 2019 · ec6ee93 · ec6ee93
2 parents 79578de + 04ca0e8
commit ec6ee93
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/download.md b/download.md
@@ -3,6 +3,7 @@
 <details>
 <summary>Windows</summary>
 
+[WePush-v3.7.0_190904-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.7.0_190904-x64-Setup.exe)  
 [WePush-v3.6.3_190825-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.6.3_190825-x64-Setup.exe)  
 [WePush-v3.6.2_190811-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.6.2_190811-x64-Setup.exe)  
 [WePush-v3.6.1_190728-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.6.1_190728-x64-Setup.exe)  
@@ -107,6 +108,7 @@
 <details>
 <summary>Linux</summary>
 
+[v3.7.0_190904](http://download.zhoubochina.com/linux/WePush-3.7.0.zip)  
 [v3.6.3_190825](http://download.zhoubochina.com/linux/WePush-3.6.3.zip)  
 [v3.6.2_190811](http://download.zhoubochina.com/linux/WePush-3.6.2.zip)  
 [v3.6.1_190728](http://download.zhoubochina.com/linux/WePush-3.6.1.zip)  

diff --git a/src/main/java/com/fangxuele/tool/push/App.java b/src/main/java/com/fangxuele/tool/push/App.java
@@ -44,16 +44,14 @@ public static void main(String[] args) {
         mainFrame.setVisible(true);
         UpgradeUtil.smoothUpgrade();
 
-        SwingUtilities.invokeLater(() -> {
-            mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-            Init.initGlobalFont();
-            mainFrame.setContentPane(MainWindow.getInstance().getMainPanel());
-            MainWindow.getInstance().init();
-            Init.initAllTab();
-            Init.initOthers();
-            mainFrame.addListeners();
-            mainFrame.remove(loadingPanel);
-            Init.initFontSize();
-        });
+        mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        Init.initGlobalFont();
+        mainFrame.setContentPane(MainWindow.getInstance().getMainPanel());
+        MainWindow.getInstance().init();
+        Init.initAllTab();
+        Init.initOthers();
+        mainFrame.addListeners();
+        mainFrame.remove(loadingPanel);
+        Init.initFontSize();
     }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/logic/msgmaker/WxCpMsgMaker.java b/src/main/java/com/fangxuele/tool/push/logic/msgmaker/WxCpMsgMaker.java
@@ -40,9 +40,12 @@ public class WxCpMsgMaker extends BaseMsgMaker implements IMsgMaker {
     public void prepare() {
         String agentIdBefore = agentId;
         String agentIdNow = WxCpMsgForm.appNameToAgentIdMap.get(WxCpMsgForm.getInstance().getAppNameComboBox().getSelectedItem());
-        if (agentIdBefore == null || !agentIdBefore.equals(agentIdNow)) {
-            WxCpMsgSender.wxCpConfigStorage = null;
-            WxCpMsgSender.wxCpService = null;
+        synchronized (this) {
+            if (agentIdBefore == null || !agentIdBefore.equals(agentIdNow)) {
+                agentId = agentIdNow;
+                WxCpMsgSender.wxCpConfigStorage = null;
+                WxCpMsgSender.wxCpService = null;
+            }
         }
         msgType = (String) WxCpMsgForm.getInstance().getMsgTypeComboBox().getSelectedItem();
         msgTitle = WxCpMsgForm.getInstance().getTitleTextField().getText();

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_3.6.3_190825";
+    public final static String APP_VERSION = "v_3.7.0_190904";
 
     /**
      * Logo-1024*1024

diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
@@ -1,5 +1,5 @@
 {
-  "currentVersion": "v_3.6.3_190825",
+  "currentVersion": "v_3.7.0_190904",
   "versionIndex": {
     "v_1.1.0_170701": "0",
     "v_1.2.0_170831": "1",
@@ -33,7 +33,8 @@
     "v_3.6.0_190721": "29",
     "v_3.6.1_190728": "30",
     "v_3.6.2_190811": "31",
-    "v_3.6.3_190825": "32"
+    "v_3.6.3_190825": "32",
+    "v_3.7.0_190904": "33"
   },
   "versionDetailList": [
     {
@@ -200,6 +201,11 @@
       "version": "v_3.6.3_190825",
       "title": "小的优化和修复",
       "log": "● feature:微信相关消息类型url支持变量\n● 代码大规模重构，优化加载速度\n● optimization:一些界面相关的bug修复和细节调整\n● optimization:更新高清logo\n"
+    },
+    {
+      "version": "v_3.7.0_190904",
+      "title": "严重bug修复",
+      "log": "● bug fix:修复客服消息文本类型发送失败的问题\n● bug fix:修复微信公众号相关消息accessToken缓存机制问题\n● optimization:导入用户tab相关按钮防止重复点击\n● optimization:移除对阿里大于短信的支持\n"
     }
   ]
 }