Merge pull request #228 from rememberber/develop

Develop
rememberber · Oct 27, 2019 · ca2a9c9 · ca2a9c9
2 parents 2aa9ed9 + 7d04cfe
commit ca2a9c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
         <velocity-engine-core.version>2.1</velocity-engine-core.version>
         <lombok.version>1.18.8</lombok.version>
-        <mybatis.version>3.5.1</mybatis.version>
+        <mybatis.version>3.5.3</mybatis.version>
         <sqlite-jdbc.version>3.28.0</sqlite-jdbc.version>
         <junit.version>4.12</junit.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>

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.1.0_190930";
+    public final static String APP_VERSION = "v_4.1.1_191027";
 
     /**
      * 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_4.1.0_190930",
+  "currentVersion": "v_4.1.1_191027",
   "versionIndex": {
     "v_1.1.0_170701": "0",
     "v_1.2.0_170831": "1",
@@ -38,7 +38,8 @@
     "v_3.8.0_190909": "34",
     "v_3.9.0_190915": "35",
     "v_4.0.0_190928": "36",
-    "v_4.1.0_190930": "37"
+    "v_4.1.0_190930": "37",
+    "v_4.1.1_191027": "38"
   },
   "versionDetailList": [
     {
@@ -230,6 +231,11 @@
       "version": "v_4.1.0_190930",
       "title": "新增支持小程序统一服务消息",
       "log": "● feature:新增支持小程序统一服务消息类型\n● bug fix:修复阿里云短信发送失败的问题（感谢@LEE.MW反馈）\n"
+    },
+    {
+      "version": "v_4.1.1_191027",
+      "title": "一波细节优化",
+      "log": "● optimization：优化推送历史复制按钮功能\n● optimization：窗口关闭更优雅一些\n● optimization：窗口增加esc按钮事件\n● optimization：UI细节优化\n"
     }
   ]
 }