v_5.0.2

rememberber · Sep 4, 2023 · 0d3cce3 · 0d3cce3
1 parent cf23229
commit 0d3cce3
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 81 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,10 @@ language: java
 
 before_install:
   - mvn install:install-file -Dfile=./lib/antlr-2.7.4.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=antlr -Dpackaging=jar -Dversion=2.7.4 -DgeneratePom=true -DcreateChecksum=true
-  - mvn install:install-file -Dfile=./lib/beautyeye_lnf.jar -DgroupId=com.beautyeye -DartifactId=beautyeye-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
   - mvn install:install-file -Dfile=./lib/chardet-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=chardet -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
   - mvn install:install-file -Dfile=./lib/cpdetector_1.0.10.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=cpdetector -Dpackaging=jar -Dversion=1.0.10 -DgeneratePom=true -DcreateChecksum=true
-  - mvn install:install-file -Dfile=./lib/darcula.jar -DgroupId=com.darcula -DartifactId=darcula-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
   - mvn install:install-file -Dfile=./lib/jargs-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=jargs -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
   - mvn install:install-file -Dfile=./lib/taobao-sdk-java-auto.jar -DgroupId=com.taobao -DartifactId=taobao-sdk-java-auto -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
-  - mvn install:install-file -Dfile=./lib/weblaf-1.29.jar -DgroupId=com.weblaf -DartifactId=weblaf-lnf -Dpackaging=jar -Dversion=1.2.9 -DgeneratePom=true -DcreateChecksum=true
 
 jdk:
   - openjdk8

diff --git a/lib/beautyeye_lnf.jar b/lib/beautyeye_lnf.jar
diff --git a/lib/darcula.jar b/lib/darcula.jar
diff --git a/lib/weblaf-1.29.jar b/lib/weblaf-1.29.jar
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.fangxuele.tool</groupId>
     <artifactId>WePush</artifactId>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <packaging>jar</packaging>
 
     <name>WePush</name>
@@ -447,36 +447,36 @@
                     <generateInstaller>true</generateInstaller>
                 </configuration>
                 <executions>
-<!--                    <execution>-->
-<!--                        <id>bundling-for-windows</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>package</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                            <platform>windows</platform>-->
-<!--                            <createZipball>true</createZipball>-->
-<!--                            <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
-<!--                            &lt;!&ndash;                            <administratorRequired>true</administratorRequired>&ndash;&gt;-->
-<!--                            <winConfig>-->
-
-<!--                                &lt;!&ndash; general properties &ndash;&gt;-->
-<!--                                <generateSetup>true</generateSetup>-->
-<!--                                <generateMsi>true</generateMsi>-->
-<!--                                <generateMsm>true</generateMsm>-->
-
-<!--                                &lt;!&ndash; setup generation properties &ndash;&gt;-->
-<!--                                <setupMode>installForAllUsers</setupMode>-->
-<!--                                <createDesktopIconTask>true</createDesktopIconTask>-->
-<!--                                <disableDirPage>false</disableDirPage>-->
-<!--                                <disableFinishedPage>false</disableFinishedPage>-->
-<!--                                <setupLanguages>-->
-<!--                                    <english>compiler:Default.isl</english>-->
-<!--                                    &lt;!&ndash;                                    <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
-<!--                                </setupLanguages>-->
-<!--                            </winConfig>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
+                    <execution>
+                        <id>bundling-for-windows</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>package</goal>
+                        </goals>
+                        <configuration>
+                            <platform>windows</platform>
+                            <createZipball>true</createZipball>
+                            <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
+                            <!--                            <administratorRequired>true</administratorRequired>-->
+                            <winConfig>
+
+                                <!-- general properties -->
+                                <generateSetup>true</generateSetup>
+                                <generateMsi>true</generateMsi>
+                                <generateMsm>true</generateMsm>
+
+                                <!-- setup generation properties -->
+                                <setupMode>installForAllUsers</setupMode>
+                                <createDesktopIconTask>true</createDesktopIconTask>
+                                <disableDirPage>false</disableDirPage>
+                                <disableFinishedPage>false</disableFinishedPage>
+                                <setupLanguages>
+                                    <english>compiler:Default.isl</english>
+                                    <!--                                    <spanish>compiler:Languages\Chinese.isl</spanish>-->
+                                </setupLanguages>
+                            </winConfig>
+                        </configuration>
+                    </execution>
                     <!--                    <execution>-->
                     <!--                        <id>bundling-for-linux</id>-->
                     <!--                        <phase>package</phase>-->
@@ -490,20 +490,20 @@
                     <!--                            <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
                     <!--                        </configuration>-->
                     <!--                    </execution>-->
-                                                                                <execution>
-                                                                                    <id>bundling-for-mac</id>
-                                                                                    <phase>package</phase>
-                                                                                    <goals>
-                                                                                        <goal>package</goal>
-                                                                                    </goals>
-                                                                                    <configuration>
-                                                                                        <platform>mac</platform>
-                                                                                        <createTarball>true</createTarball>
-                                                                                        <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
-                                                                                        <customizedJre>false</customizedJre>
-                                        <!--                                                <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
-                                                                                    </configuration>
-                                                                                </execution>
+<!--                                                                                <execution>-->
+<!--                                                                                    <id>bundling-for-mac</id>-->
+<!--                                                                                    <phase>package</phase>-->
+<!--                                                                                    <goals>-->
+<!--                                                                                        <goal>package</goal>-->
+<!--                                                                                    </goals>-->
+<!--                                                                                    <configuration>-->
+<!--                                                                                        <platform>mac</platform>-->
+<!--                                                                                        <createTarball>true</createTarball>-->
+<!--                                                                                        <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
+<!--                                                                                        <customizedJre>false</customizedJre>-->
+<!--                                        &lt;!&ndash;                                                <jdkPath>X:\\path\to\mac\jdk</jdkPath>&ndash;&gt;-->
+<!--                                                                                    </configuration>-->
+<!--                                                                                </execution>-->
                 </executions>
             </plugin>
 
@@ -512,36 +512,6 @@
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
                 <executions>
-                    <execution>
-                        <id>install-beautyeye</id>
-                        <phase>clean</phase>
-                        <configuration>
-                            <file>lib/beautyeye_lnf.jar</file>
-                            <groupId>com.beautyeye</groupId>
-                            <artifactId>beautyeye-lnf</artifactId>
-                            <version>1.0</version>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                        </configuration>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>install-darcula</id>
-                        <phase>clean</phase>
-                        <configuration>
-                            <file>lib/darcula.jar</file>
-                            <groupId>com.darcula</groupId>
-                            <artifactId>darcula-lnf</artifactId>
-                            <version>1.0</version>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                        </configuration>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>install-taobao-sdk-auto</id>
                         <phase>clean</phase>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java b/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java
@@ -19,7 +19,7 @@ public class UiConsts {
      * 软件名称,版本
      */
     public final static String APP_NAME = "WePush";
-    public final static String APP_VERSION = "v_5.0.1";
+    public final static String APP_VERSION = "v_5.0.2";
 
     public static final int TABLE_ROW_HEIGHT = 30;
 

diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
@@ -1,9 +1,10 @@
 {
-  "currentVersion": "v_5.0.1",
+  "currentVersion": "v_5.0.2",
   "versionIndex": {
     "v_0.0.0": "0",
     "v_5.0.0": "1",
-    "v_5.0.1": "2"
+    "v_5.0.1": "2",
+    "v_5.0.2": "3"
   },
   "versionDetailList": [
     {
@@ -20,6 +21,11 @@
       "version": "v_5.0.1",
       "title": "针对5.0新版多处修复和优化",
       "log": "● 任务：修复任务执行状态更新不及时的问题\n● 窗口：优化esc键最小化后窗口再次恢复的表现\n● 修复excel导入提示缺少依赖的问题\n● 任务：修复任务详情成功失败文件路径不实时显示的问题\n● 增加执行前重新导入目标用户功能\n● 任务详情增加模式和线程数等更多细节展示\n"
+    },
+    {
+      "version": "v_5.0.2",
+      "title": "增加支持腾讯云短信3.0",
+      "log": "● 增加支持腾讯云短信3.0，由于没有条件，无法充分验证\n● 企业微信消息：支持私有化部署时BaseApiUrl配置\n● 全局：优化窗口关闭时的行为，避免再次点击任务栏图标无法唤出窗口\n"
     }
   ]
 }