From 34f8cb73b2a3f626d2160f40885f1d9db2e8d2bb Mon Sep 17 00:00:00 2001
From: chuzhongzai <njy1822574439@outlook.com>
Date: Sat, 16 Dec 2023 01:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8AOT;=E5=8E=BB=E9=99=A4thymele?=
 =?UTF-8?q?af;=E7=A7=BB=E5=8A=A8=E5=89=8D=E7=AB=AF=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 43 ++++++++-----------
 .../lionwebsite/Configuration/CustomBean.java |  6 ++-
 .../Controller/NavigationController.java      | 28 ------------
 .../lionwebsite/Message/AbstractMessage.java  |  3 ++
 .../com/lion/lionwebsite/Util/CustomUtil.java |  1 +
 .../static/{ => asserts}/index/index.css      |  0
 .../static/{ => asserts}/index/index.js       |  0
 .../static/{ => asserts}/mobile/index.css     |  0
 .../static/{ => asserts}/mobile/index.js      |  0
 .../static/{ => asserts}/self/index.css       |  0
 .../static/{ => asserts}/self/index.js        |  0
 .../static/{ => asserts}/self/mobile.css      |  0
 .../static/{ => asserts}/self/mobile.js       |  0
 .../{templates => static}/index.html          |  4 +-
 .../{templates => static}/mobile.html         |  4 +-
 .../self.html => static/selfIndex.html}       |  4 +-
 16 files changed, 34 insertions(+), 59 deletions(-)
 delete mode 100644 src/main/java/com/lion/lionwebsite/Controller/NavigationController.java
 rename src/main/resources/static/{ => asserts}/index/index.css (100%)
 rename src/main/resources/static/{ => asserts}/index/index.js (100%)
 rename src/main/resources/static/{ => asserts}/mobile/index.css (100%)
 rename src/main/resources/static/{ => asserts}/mobile/index.js (100%)
 rename src/main/resources/static/{ => asserts}/self/index.css (100%)
 rename src/main/resources/static/{ => asserts}/self/index.js (100%)
 rename src/main/resources/static/{ => asserts}/self/mobile.css (100%)
 rename src/main/resources/static/{ => asserts}/self/mobile.js (100%)
 rename src/main/resources/{templates => static}/index.html (72%)
 rename src/main/resources/{templates => static}/mobile.html (73%)
 rename src/main/resources/{templates/self.html => static/selfIndex.html} (67%)

diff --git a/pom.xml b/pom.xml
index 27da7bb..00263d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,9 @@
     <name>LionWebsite</name>
     <description>LionWebsite</description>
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -28,7 +24,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
         </dependency>
 
         <dependency>
@@ -45,7 +41,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter-test</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -123,23 +119,22 @@
 
     <build>
         <plugins>
-<!--            <plugin>-->
-<!--                <groupId>org.graalvm.buildtools</groupId>-->
-<!--                <artifactId>native-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <imageName>lionwebsite</imageName>-->
-<!--                    <fallback>false</fallback>-->
-<!--                    <verbose>true</verbose>-->
-<!--                    <quickBuild>true</quickBuild>-->
-<!--                    <buildArgs>-->
-<!--                        <arg>-H:+ReportExceptionStackTraces</arg>-->
-<!--                        <arg>&#45;&#45;initialize-at-build-time=org.apache.commons.logging.LogFactory,org.apache.commons.logging.LogFactoryService</arg>-->
-<!--                    </buildArgs>-->
-<!--                    <metadataRepository>-->
-<!--                        <enabled>true</enabled>-->
-<!--                    </metadataRepository>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <configuration>
+                    <imageName>lionwebsite</imageName>
+                    <buildArgs>
+                        <arg>--gc=G1</arg>
+                        <arg>-Ob</arg>
+                        <arg>-H:+ReportExceptionStackTraces</arg>
+                        <arg>--initialize-at-build-time=org.apache.commons.logging.LogFactory,org.apache.commons.logging.LogFactoryService</arg>
+                    </buildArgs>
+                    <metadataRepository>
+                        <enabled>true</enabled>
+                    </metadataRepository>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java b/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java
index d18d1c0..3d53167 100644
--- a/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java
+++ b/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java
@@ -1,11 +1,13 @@
 package com.lion.lionwebsite.Configuration;
 
 import com.lion.lionwebsite.Domain.*;
+import com.lion.lionwebsite.Message.*;
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.model.Chat;
 import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.MessageEntity;
 import com.pengrad.telegrambot.response.SendResponse;
+import com.sun.tools.javac.Main;
 import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,7 +18,9 @@ import com.pengrad.telegrambot.model.User;
         GalleryForQuery.class, Gallery.class, GalleryTask.class, MaskDomain.class,
         PageNameCache.class, ShareFile.class, Tag.class, TagMark.class, User.class,
         SendResponse.class, Message.class, com.pengrad.telegrambot.model.User.class,
-        Chat.class, MessageEntity.class})
+        Chat.class, MessageEntity.class,
+        AbstractMethodError.class, DeleteGalleryMessage.class, DownloadPostMessage.class, DownloadStatusMessage.class,
+        GalleryPageQueryMessage.class, GalleryRequestMessage.class, IdentityMessage.class, MaintainMessage.class, ResponseMessage.class, UpdateGalleryMessage.class})
 public class CustomBean {
 
     @Bean
diff --git a/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java b/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java
deleted file mode 100644
index 9761f73..0000000
--- a/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.lion.lionwebsite.Controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class NavigationController {
-    @GetMapping("/personal/")
-    public String personal_index(){
-        return "self";
-    }
-
-    @GetMapping("/personal/mobile")
-    public String personal_mobile(){
-        return "selfMobile";
-    }
-
-    @GetMapping("/")
-    public String index(){
-        return "index";
-    }
-
-    @GetMapping("/mobile")
-    public String mobile(){
-        return "mobile";
-    }
-
-}
diff --git a/src/main/java/com/lion/lionwebsite/Message/AbstractMessage.java b/src/main/java/com/lion/lionwebsite/Message/AbstractMessage.java
index c7fc6b8..8435dcb 100644
--- a/src/main/java/com/lion/lionwebsite/Message/AbstractMessage.java
+++ b/src/main/java/com/lion/lionwebsite/Message/AbstractMessage.java
@@ -1,5 +1,8 @@
 package com.lion.lionwebsite.Message;
 
+import lombok.Data;
+
+@Data
 public class AbstractMessage {
 
     public static final byte DOWNLOAD_POST_MESSAGE = 1;
diff --git a/src/main/java/com/lion/lionwebsite/Util/CustomUtil.java b/src/main/java/com/lion/lionwebsite/Util/CustomUtil.java
index 35a7c7e..a12a2d5 100644
--- a/src/main/java/com/lion/lionwebsite/Util/CustomUtil.java
+++ b/src/main/java/com/lion/lionwebsite/Util/CustomUtil.java
@@ -107,6 +107,7 @@ public class CustomUtil {
     public static short _findIdlePort(){
         for(int i=20000; i<65535; i++){
             try(ServerSocket ignored = new ServerSocket(i)){
+                ignored.close();
                 return (short) i;
             }catch (IOException ignored) {
             }
diff --git a/src/main/resources/static/index/index.css b/src/main/resources/static/asserts/index/index.css
similarity index 100%
rename from src/main/resources/static/index/index.css
rename to src/main/resources/static/asserts/index/index.css
diff --git a/src/main/resources/static/index/index.js b/src/main/resources/static/asserts/index/index.js
similarity index 100%
rename from src/main/resources/static/index/index.js
rename to src/main/resources/static/asserts/index/index.js
diff --git a/src/main/resources/static/mobile/index.css b/src/main/resources/static/asserts/mobile/index.css
similarity index 100%
rename from src/main/resources/static/mobile/index.css
rename to src/main/resources/static/asserts/mobile/index.css
diff --git a/src/main/resources/static/mobile/index.js b/src/main/resources/static/asserts/mobile/index.js
similarity index 100%
rename from src/main/resources/static/mobile/index.js
rename to src/main/resources/static/asserts/mobile/index.js
diff --git a/src/main/resources/static/self/index.css b/src/main/resources/static/asserts/self/index.css
similarity index 100%
rename from src/main/resources/static/self/index.css
rename to src/main/resources/static/asserts/self/index.css
diff --git a/src/main/resources/static/self/index.js b/src/main/resources/static/asserts/self/index.js
similarity index 100%
rename from src/main/resources/static/self/index.js
rename to src/main/resources/static/asserts/self/index.js
diff --git a/src/main/resources/static/self/mobile.css b/src/main/resources/static/asserts/self/mobile.css
similarity index 100%
rename from src/main/resources/static/self/mobile.css
rename to src/main/resources/static/asserts/self/mobile.css
diff --git a/src/main/resources/static/self/mobile.js b/src/main/resources/static/asserts/self/mobile.js
similarity index 100%
rename from src/main/resources/static/self/mobile.js
rename to src/main/resources/static/asserts/self/mobile.js
diff --git a/src/main/resources/templates/index.html b/src/main/resources/static/index.html
similarity index 72%
rename from src/main/resources/templates/index.html
rename to src/main/resources/static/index.html
index 8ff159d..1f582a1 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/static/index.html
@@ -6,8 +6,8 @@
     <link href="/reset.css" type="text/css">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Lion</title>
-<script type="module" src="/index/index.js"></script>
-<link rel="stylesheet" href="/index/index.css">
+<script type="module" src="/asserts/index/index.js"></script>
+<link rel="stylesheet" href="/asserts/index/index.css">
 </head>
 <body>
   <div id="app"></div>
diff --git a/src/main/resources/templates/mobile.html b/src/main/resources/static/mobile.html
similarity index 73%
rename from src/main/resources/templates/mobile.html
rename to src/main/resources/static/mobile.html
index b66ee74..96b4c88 100644
--- a/src/main/resources/templates/mobile.html
+++ b/src/main/resources/static/mobile.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
     <title>Lion</title>
   <meta name="apple-mobile-web-app-capable" content="yes">
-    <script type="module" crossorigin src="/mobile/index.js"></script>
-    <link rel="stylesheet" href="/mobile/index.css">
+    <script type="module" crossorigin src="/asserts/mobile/index.js"></script>
+    <link rel="stylesheet" href="/asserts/mobile/index.css">
   </head>
   <body>
     <div id="app"></div>
diff --git a/src/main/resources/templates/self.html b/src/main/resources/static/selfIndex.html
similarity index 67%
rename from src/main/resources/templates/self.html
rename to src/main/resources/static/selfIndex.html
index ef27851..4902ee4 100644
--- a/src/main/resources/templates/self.html
+++ b/src/main/resources/static/selfIndex.html
@@ -5,8 +5,8 @@
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Lion</title>
-    <script type="module" crossorigin src="/self/index.js"></script>
-    <link rel="stylesheet" href="/self/index.css">
+    <script type="module" crossorigin src="/asserts/self/index.js"></script>
+    <link rel="stylesheet" href="/asserts/self/index.css">
   </head>
   <body>
     <div id="app"></div>