diff --git a/pom.xml b/pom.xml index 27da7bb..00263d2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,9 @@ LionWebsite LionWebsite - 17 + 21 - - org.springframework.boot - spring-boot-starter-thymeleaf - org.springframework.boot spring-boot-starter-web @@ -28,7 +24,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 3.0.2 + 3.0.3 @@ -45,7 +41,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter-test - 3.0.2 + 3.0.3 test @@ -123,23 +119,22 @@ - - - - - - - - - - - - - - - - - + + org.graalvm.buildtools + native-maven-plugin + + lionwebsite + + --gc=G1 + -Ob + -H:+ReportExceptionStackTraces + --initialize-at-build-time=org.apache.commons.logging.LogFactory,org.apache.commons.logging.LogFactoryService + + + true + + + org.springframework.boot spring-boot-maven-plugin 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 @@ Lion - - + +
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 @@ Lion - - + +
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 @@ Lion - - + +