Merge pull request #296 from rememberber/develop

Develop
rememberber · Nov 19, 2024 · 2f5105f · 2f5105f
2 parents 3aaf381 + 25f7fd4
commit 2f5105f
Show file tree

Hide file tree

Showing 96 changed files with 649 additions and 165 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /target/
 /.idea/
 /logs/
+.DS_Store
diff --git a/assets/mac/WePush.icns b/assets/mac/WePush.icns
diff --git a/icons/.DS_Store b/icons/.DS_Store
diff --git a/icons/android/play_store_512.png b/icons/android/play_store_512.png
diff --git a/icons/android/res/mipmap-anydpi-v26/ic_launcher.xml b/icons/android/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>
diff --git a/icons/android/res/mipmap-hdpi/ic_launcher.png b/icons/android/res/mipmap-hdpi/ic_launcher.png
diff --git a/icons/android/res/mipmap-hdpi/ic_launcher_background.png b/icons/android/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/icons/android/res/mipmap-hdpi/ic_launcher_foreground.png b/icons/android/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/icons/android/res/mipmap-hdpi/ic_launcher_monochrome.png b/icons/android/res/mipmap-hdpi/ic_launcher_monochrome.png
diff --git a/icons/android/res/mipmap-mdpi/ic_launcher.png b/icons/android/res/mipmap-mdpi/ic_launcher.png
diff --git a/icons/android/res/mipmap-mdpi/ic_launcher_background.png b/icons/android/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/icons/android/res/mipmap-mdpi/ic_launcher_foreground.png b/icons/android/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/icons/android/res/mipmap-mdpi/ic_launcher_monochrome.png b/icons/android/res/mipmap-mdpi/ic_launcher_monochrome.png
diff --git a/icons/android/res/mipmap-xhdpi/ic_launcher.png b/icons/android/res/mipmap-xhdpi/ic_launcher.png
diff --git a/icons/android/res/mipmap-xhdpi/ic_launcher_background.png b/icons/android/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/icons/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/icons/android/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/icons/android/res/mipmap-xhdpi/ic_launcher_monochrome.png b/icons/android/res/mipmap-xhdpi/ic_launcher_monochrome.png
diff --git a/icons/android/res/mipmap-xxhdpi/ic_launcher.png b/icons/android/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/icons/android/res/mipmap-xxhdpi/ic_launcher_background.png b/icons/android/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/icons/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/icons/android/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/icons/android/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/icons/android/res/mipmap-xxhdpi/ic_launcher_monochrome.png
diff --git a/icons/android/res/mipmap-xxxhdpi/ic_launcher.png b/icons/android/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/icons/android/res/mipmap-xxxhdpi/ic_launcher_background.png b/icons/android/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/icons/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/icons/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/icons/android/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/icons/android/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-20@2x~ipad.png b/icons/ios/AppIcon-20@2x~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-20~ipad.png b/icons/ios/AppIcon-20~ipad.png
diff --git a/icons/ios/AppIcon-29.png b/icons/ios/AppIcon-29.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-29@2x~ipad.png b/icons/ios/AppIcon-29@2x~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-29~ipad.png b/icons/ios/AppIcon-29~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-40@2x~ipad.png b/icons/ios/AppIcon-40@2x~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon-40~ipad.png b/icons/ios/AppIcon-40~ipad.png
diff --git a/icons/ios/AppIcon-60@2x~car.png b/icons/ios/AppIcon-60@2x~car.png
diff --git a/icons/ios/AppIcon-60@3x~car.png b/icons/ios/AppIcon-60@3x~car.png
diff --git a/icons/ios/AppIcon-83.5@2x~ipad.png b/icons/ios/AppIcon-83.5@2x~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon@2x~ipad.png b/icons/ios/AppIcon@2x~ipad.png
diff --git a/icons/ios/[email protected] b/icons/ios/[email protected]
diff --git a/icons/ios/AppIcon~ios-marketing.png b/icons/ios/AppIcon~ios-marketing.png
diff --git a/icons/ios/AppIcon~ipad.png b/icons/ios/AppIcon~ipad.png
diff --git a/icons/ios/Contents.json b/icons/ios/Contents.json
@@ -0,0 +1,134 @@
+{
+  "images": [
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
+    },
+    {
+      "filename": "AppIcon@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
+    },
+    {
+      "filename": "AppIcon-83.5@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-40~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
+    },
+    {
+      "filename": "AppIcon-40@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-20~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-20@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "filename": "AppIcon-29.png",
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "[email protected]",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-29@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "AppIcon-60@2x~car.png",
+      "idiom": "car",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon-60@3x~car.png",
+      "idiom": "car",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon~ios-marketing.png",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    }
+  ],
+  "info": {
+    "author": "iconkitchen",
+    "version": 1
+  }
+}
diff --git a/icons/macos/AppIcon.icns b/icons/macos/AppIcon.icns
diff --git a/icons/web/README.txt b/icons/web/README.txt
@@ -0,0 +1,18 @@
+Add this to your HTML <head>:
+
+    <link rel="icon" href="/favicon.ico" sizes="any">
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
+
+Add this to your app's manifest.json:
+
+    ...
+    {
+      "icons": [
+        { "src": "/favicon.ico", "type": "image/x-icon", "sizes": "16x16 32x32" },
+        { "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
+        { "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" },
+        { "src": "/icon-192-maskable.png", "type": "image/png", "sizes": "192x192", "purpose": "maskable" },
+        { "src": "/icon-512-maskable.png", "type": "image/png", "sizes": "512x512", "purpose": "maskable" }
+      ]
+    }
+    ...
diff --git a/icons/web/apple-touch-icon.png b/icons/web/apple-touch-icon.png
diff --git a/icons/web/favicon.ico b/icons/web/favicon.ico
diff --git a/icons/web/icon-192-maskable.png b/icons/web/icon-192-maskable.png
diff --git a/icons/web/icon-192.png b/icons/web/icon-192.png
diff --git a/icons/web/icon-512-maskable.png b/icons/web/icon-512-maskable.png
diff --git a/icons/web/icon-512.png b/icons/web/icon-512.png
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,31 @@
 
     <groupId>com.fangxuele.tool</groupId>
     <artifactId>WePush</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
     <packaging>jar</packaging>
 
     <name>WePush</name>
     <url>https://github.com/rememberber/WePush</url>
 
+    <repositories>
+        <repository>
+            <id>alimaven</id>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>mvnrepository.com</id>
+            <url>https://mvnrepository.com</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>oss.sonatype.org</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -38,7 +57,7 @@
         <velocity-engine-core.version>2.3</velocity-engine-core.version>
         <lombok.version>1.18.30</lombok.version>
         <mybatis.version>3.5.13</mybatis.version>
-        <sqlite-jdbc.version>3.42.0.1</sqlite-jdbc.version>
+        <sqlite-jdbc.version>3.43.0.0</sqlite-jdbc.version>
         <junit.version>4.13.1</junit.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
         <HikariCP.version>3.4.5</HikariCP.version>
@@ -47,9 +66,9 @@
         <aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
         <bce-java-sdk.version>0.10.134</bce-java-sdk.version>
         <qiniu-java-sdk.version>7.3.0</qiniu-java-sdk.version>
-        <flatlaf.version>3.3</flatlaf.version>
-        <flatlaf-extras.version>3.3</flatlaf-extras.version>
-        <flatlaf-intellij-themes.version>3.3</flatlaf-intellij-themes.version>
+        <flatlaf.version>3.5.2</flatlaf.version>
+        <flatlaf-extras.version>3.5.2</flatlaf-extras.version>
+        <flatlaf-intellij-themes.version>3.5.2</flatlaf-intellij-themes.version>
         <json-path.version>2.6.0</json-path.version>
         <tencentcloud-sdk-java.version>3.1.847</tencentcloud-sdk-java.version>
     </properties>
@@ -440,7 +459,7 @@
             <plugin>
                 <groupId>io.github.fvarrui</groupId>
                 <artifactId>javapackager</artifactId>
-                <version>1.7.4</version>
+                <version>1.7.5</version>
                 <configuration>
                     <bundleJre>true</bundleJre>
                     <mainClass>com.fangxuele.tool.push.App</mainClass>
@@ -489,19 +508,23 @@
 <!--                    <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
 <!--                                            </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>
-                                                                                    </configuration>
-                                                                                </execution>
+                    <execution>
+                        <id>bundling-for-mac</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>package</goal>
+                        </goals>
+                        <configuration>
+                            <platform>mac</platform>
+                            <createTarball>true</createTarball>
+                            <macConfig>
+                                <developerId>[email protected]</developerId>
+                                <macStartup>UNIVERSAL</macStartup>
+                            </macConfig>
+                            <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
+                            <customizedJre>false</customizedJre>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 

diff --git a/src/main/java/com/fangxuele/tool/push/App.java b/src/main/java/com/fangxuele/tool/push/App.java
@@ -49,6 +49,7 @@ public static void main(String[] args) {
             System.setProperty("apple.awt.application.name", UiConsts.APP_NAME);
             System.setProperty("com.apple.mrj.application.apple.menu.about.name", UiConsts.APP_NAME);
             System.setProperty("apple.awt.application.appearance", "system");
+            System.setProperty("flatlaf.useRoundedPopupBorder", "true");
 
             FlatDesktop.setAboutHandler(() -> {
                 try {

diff --git a/src/main/java/com/fangxuele/tool/push/bean/TemplateData.java b/src/main/java/com/fangxuele/tool/push/bean/TemplateData.java
@@ -3,8 +3,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
-
 /**
  * <pre>
  * 模板数据
@@ -15,7 +13,7 @@
  */
 @Getter
 @Setter
-public class TemplateData implements Serializable {
+public class TemplateData {
 
     private String name;
 

diff --git a/src/main/java/com/fangxuele/tool/push/bean/UserCase.java b/src/main/java/com/fangxuele/tool/push/bean/UserCase.java
@@ -2,8 +2,6 @@
 
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * <pre>
  * 用户案例
@@ -13,9 +11,7 @@
  * @since 2019/4/20.
  */
 @Data
-public class UserCase implements Serializable {
-
-    private static final long serialVersionUID = 2829237163275443844L;
+public class UserCase {
 
     private String qrCodeUrl;
 

diff --git a/src/main/java/com/fangxuele/tool/push/bean/VersionSummary.java b/src/main/java/com/fangxuele/tool/push/bean/VersionSummary.java
@@ -2,7 +2,6 @@
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,9 +13,7 @@
  * @since 2019/4/20.
  */
 @Data
-public class VersionSummary implements Serializable {
-
-    private static final long serialVersionUID = 4637273116136790267L;
+public class VersionSummary {
 
     /**
      * 当前版本
@@ -42,9 +39,7 @@ public class VersionSummary implements Serializable {
      * @since 2019/4/20.
      */
     @Data
-    public static class Version implements Serializable {
-
-        private static final long serialVersionUID = 4637273116136790268L;
+    public static class Version {
 
         private String version;
 

diff --git a/src/main/java/com/fangxuele/tool/push/bean/msg/HttpMsg.java b/src/main/java/com/fangxuele/tool/push/bean/msg/HttpMsg.java
@@ -4,7 +4,6 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.net.HttpCookie;
 import java.util.List;
 import java.util.Map;
@@ -20,9 +19,7 @@
 @Getter
 @Setter
 @ToString
-public class HttpMsg implements Serializable {
-
-    private static final long serialVersionUID = 114436270588113296L;
+public class HttpMsg {
 
     private String url;
 

diff --git a/src/main/java/com/fangxuele/tool/push/bean/msg/MailMsg.java b/src/main/java/com/fangxuele/tool/push/bean/msg/MailMsg.java
@@ -5,7 +5,6 @@
 import lombok.ToString;
 
 import java.io.File;
-import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -19,9 +18,7 @@
 @Getter
 @Setter
 @ToString
-public class MailMsg implements Serializable {
-
-    private static final long serialVersionUID = 7269816872586216264L;
+public class MailMsg {
 
     /**
      * 标题
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     /target/
     /.idea/
     /logs/
+    .DS_Store