Merge pull request #217 from rememberber/develop

Develop
rememberber · Sep 5, 2019 · 7a030f2 · 7a030f2
2 parents ec6ee93 + 701b32d
commit 7a030f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java
@@ -41,6 +41,7 @@ public static AboutForm getInstance() {
 
     public static void init() {
         getInstance().getPushTotalLabel().setText("<html>已累计为您推送 <b>" + App.config.getPushTotal() + "</b> 条消息</html>");
+        aboutForm.getAboutPanel().updateUI();
     }
 
     {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java
@@ -54,6 +54,7 @@ public static IMsgForm getMsgForm() {
                 iMsgForm = HttpMsgForm.getInstance();
                 break;
             default:
+                iMsgForm = HttpMsgForm.getInstance();
         }
         if (iMsgForm != null) {
             UndoUtil.register(iMsgForm);

diff --git a/src/main/java/com/fangxuele/tool/push/util/WeWxMpServiceImpl.java b/src/main/java/com/fangxuele/tool/push/util/WeWxMpServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
+import cn.hutool.json.JSONUtil;
 import com.fangxuele.tool.push.App;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.bean.WxAccessToken;
@@ -82,7 +83,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
                                 throw new WxErrorException(error);
                             }
                         }
-                        accessToken = WxAccessToken.fromJson(resultContent);
+                        accessToken = JSONUtil.toBean(resultContent, WxAccessToken.class);
                     } finally {
                         httpGet.releaseConnection();
                     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ public static AboutForm getInstance() { @@
         public static void init() {
             getInstance().getPushTotalLabel().setText("<html>已累计为您推送 <b>" + App.config.getPushTotal() + "</b> 条消息</html>");
+            aboutForm.getAboutPanel().updateUI();
         }
         {
@@ Expand Down @@