From 56d222642cfa7cef55330ed3e6af86968e94b46d Mon Sep 17 00:00:00 2001
From: KasumiNova <3044344887@qq.com>
Date: Thu, 13 Oct 2022 20:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=BB=E5=BA=95=E4=BF=AE=E5=A4=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                             | 2 +-
 exe4j_configuration.exe4j                                | 6 +++---
 .../github/kasuminova/balloonserver/BalloonServer.java   | 2 +-
 .../balloonserver/UpdateChecker/ApplicationVersion.java  | 4 ++++
 .../kasuminova/balloonserver/UpdateChecker/Checker.java  | 9 ++-------
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index c864693..e24fc32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'github.kasuminova'
-version '1.3.1-STABLE'
+version '1.3.2-STABLE'
 
 repositories {
     maven {
diff --git a/exe4j_configuration.exe4j b/exe4j_configuration.exe4j
index 7073c36..a10212d 100644
--- a/exe4j_configuration.exe4j
+++ b/exe4j_configuration.exe4j
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <exe4j version="8.0.1" transformSequenceNumber="3">
   <directoryPresets config="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer" />
-  <application name="BalloonServer-GUI-LIB-1.3.1-STABLE" distributionSourceDir="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/build/libs" />
-  <executable name="BalloonServer-1.3.1-STABLE" wrapperType="embed" iconSet="true" iconFile="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/src/main/resources/image/icon_16x16.ico" executableDir="." redirectStderr="false" stderrFile="balloonserver.log" stdoutFile="balloonserver.log" executableMode="gui" singleInstance="true" />
+  <application name="BalloonServer-GUI-LIB-1.3.2-STABLE" distributionSourceDir="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/build/libs" />
+  <executable name="BalloonServer-1.3.2-STABLE" wrapperType="embed" iconSet="true" iconFile="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/src/main/resources/image/icon_16x16.ico" executableDir="." redirectStderr="false" stderrFile="balloonserver.log" stdoutFile="balloonserver.log" executableMode="gui" singleInstance="true" />
   <java mainClass="github.kasuminova.balloonserver.BalloonServer" vmParameters="-Xms512m -XX:+UseStringDeduplication -XX:+UseFastAccessorMethods -XX:+UseG1GC" preferredVM="server" minVersion="17" allowBetaVM="true">
     <searchSequence>
       <directory location="./java17-jre" />
       <registry />
     </searchSequence>
     <classPath>
-      <archive location="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/build/libs/BalloonServer-GUI-1.3.1-STABLE.jar" />
+      <archive location="C:/Users/Kasumi_Nova/IdeaProjects/BalloonServer/build/libs/BalloonServer-GUI-1.3.2-STABLE.jar" />
     </classPath>
   </java>
 </exe4j>
diff --git a/src/main/java/github/kasuminova/balloonserver/BalloonServer.java b/src/main/java/github/kasuminova/balloonserver/BalloonServer.java
index f674c1f..988b849 100644
--- a/src/main/java/github/kasuminova/balloonserver/BalloonServer.java
+++ b/src/main/java/github/kasuminova/balloonserver/BalloonServer.java
@@ -43,7 +43,7 @@ public final class BalloonServer {
         //设置全局主题，字体等
         SetupSwing.init();
     }
-    public static final ApplicationVersion VERSION = new ApplicationVersion("1.3.1-STABLE");
+    public static final ApplicationVersion VERSION = new ApplicationVersion("1.3.2-STABLE");
     public static final String TITLE = "BalloonServer " + VERSION;
     /*
     可执行文件名称。
diff --git a/src/main/java/github/kasuminova/balloonserver/UpdateChecker/ApplicationVersion.java b/src/main/java/github/kasuminova/balloonserver/UpdateChecker/ApplicationVersion.java
index 1bc61cb..0e8687f 100644
--- a/src/main/java/github/kasuminova/balloonserver/UpdateChecker/ApplicationVersion.java
+++ b/src/main/java/github/kasuminova/balloonserver/UpdateChecker/ApplicationVersion.java
@@ -40,4 +40,8 @@ public int getBigVersion() {
     public String toString() {
         return String.format("%s.%s.%s-%s", bigVersion, subVersion, minorVersion, branch);
     }
+
+    public int toInt() {
+        return (bigVersion * 100000) + (subVersion * 1000) + minorVersion;
+    }
 }
diff --git a/src/main/java/github/kasuminova/balloonserver/UpdateChecker/Checker.java b/src/main/java/github/kasuminova/balloonserver/UpdateChecker/Checker.java
index b6cb805..6824947 100644
--- a/src/main/java/github/kasuminova/balloonserver/UpdateChecker/Checker.java
+++ b/src/main/java/github/kasuminova/balloonserver/UpdateChecker/Checker.java
@@ -37,13 +37,7 @@ public static void checkUpdates() {
             if (!applicationVersion.getBranch().equals(newVersion.getBranch())) continue;
 
             //版本更新检查
-            if (applicationVersion.getBigVersion() >= newVersion.getBigVersion()) {
-                if (applicationVersion.getSubVersion() >= newVersion.getSubVersion()) {
-                    if (applicationVersion.getMinorVersion() >= newVersion.getMinorVersion()) {
-                        continue;
-                    }
-                }
-            }
+            if (applicationVersion.toInt() >= newVersion.toInt()) continue;
 
             if (CONFIG.isAutoUpdate() && ARCHIVE_NAME.contains("e4j") && ARCHIVE_NAME.contains("Temp"))
             {
@@ -51,6 +45,7 @@ public static void checkUpdates() {
                 return;
             }
             showUpdateConfirmDialog(latestRelease);
+            return;
         }
     }