From 19da87a044db0dacc834eaef2cb26a5d5715889a Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Sun, 30 Jul 2023 17:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/NavigationController.java | 22 ++++++++----------- .../Controller/PersonalController.java | 2 +- .../lion/lionwebsite/Domain/GalleryTask.java | 10 --------- .../com/lion/lionwebsite/Domain/User.java | 6 +---- .../Interceptor/HumanInterceptor.java | 1 + .../Interceptor/TaskHandlerInterceptor.java | 1 + .../Service/GalleryManageService.java | 6 +---- .../lionwebsite/Service/LocalServiceImpl.java | 2 -- .../lionwebsite/Service/RemoteService.java | 2 ++ .../lion/lionwebsite/Util/FileDownload.java | 1 - 10 files changed, 16 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java b/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java index 48ed50d..954984e 100644 --- a/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java +++ b/src/main/java/com/lion/lionwebsite/Controller/NavigationController.java @@ -5,15 +5,15 @@ 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("/personal/") +// public String personal_index(){ +// return "self"; +// } +// +// @GetMapping("/personal/mobile") +// public String personal_mobile(){ +// return "selfMobile"; +// } @GetMapping("/") public String index(){ @@ -25,8 +25,4 @@ public class NavigationController { return "mobile"; } - @GetMapping("/publish/") - public String publish_index(){ - return "publish"; - } } diff --git a/src/main/java/com/lion/lionwebsite/Controller/PersonalController.java b/src/main/java/com/lion/lionwebsite/Controller/PersonalController.java index 2332776..7a7f316 100644 --- a/src/main/java/com/lion/lionwebsite/Controller/PersonalController.java +++ b/src/main/java/com/lion/lionwebsite/Controller/PersonalController.java @@ -65,7 +65,7 @@ public class PersonalController { } @PostMapping("/extendShareTime") - public String extendShareTime(String path, Integer extendHour) throws JsonProcessingException { + public String extendShareTime(String path, Integer extendHour) { return personalService.extendShareTime(path, extendHour); } diff --git a/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java b/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java index 3b9c0d8..2d74ce9 100644 --- a/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java +++ b/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java @@ -35,14 +35,4 @@ public class GalleryTask { @JsonIgnore private String path; - - @JsonIgnore - public boolean is_download_complete(){ - return status == DOWNLOAD_COMPLETE; - } - - @JsonIgnore - public boolean is_compress_complete(){ - return status == COMPRESS_COMPLETE; - } } diff --git a/src/main/java/com/lion/lionwebsite/Domain/User.java b/src/main/java/com/lion/lionwebsite/Domain/User.java index 57bfc87..8d34f9d 100644 --- a/src/main/java/com/lion/lionwebsite/Domain/User.java +++ b/src/main/java/com/lion/lionwebsite/Domain/User.java @@ -21,8 +21,4 @@ public class User { @JsonProperty("isEnable") boolean isEnable; - - public String getUniqueId(){ - return id < 10 ? "0" + id: "" + id; - } -} +} \ No newline at end of file diff --git a/src/main/java/com/lion/lionwebsite/Interceptor/HumanInterceptor.java b/src/main/java/com/lion/lionwebsite/Interceptor/HumanInterceptor.java index d918389..d1a2585 100644 --- a/src/main/java/com/lion/lionwebsite/Interceptor/HumanInterceptor.java +++ b/src/main/java/com/lion/lionwebsite/Interceptor/HumanInterceptor.java @@ -3,6 +3,7 @@ package com.lion.lionwebsite.Interceptor; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; public class HumanInterceptor implements HandlerInterceptor { diff --git a/src/main/java/com/lion/lionwebsite/Interceptor/TaskHandlerInterceptor.java b/src/main/java/com/lion/lionwebsite/Interceptor/TaskHandlerInterceptor.java index e2592a3..86f2f43 100644 --- a/src/main/java/com/lion/lionwebsite/Interceptor/TaskHandlerInterceptor.java +++ b/src/main/java/com/lion/lionwebsite/Interceptor/TaskHandlerInterceptor.java @@ -4,6 +4,7 @@ import com.lion.lionwebsite.Dao.UserMapper; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.lang.NonNullApi; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java index e64c133..77f7de0 100644 --- a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java +++ b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java @@ -12,7 +12,6 @@ import com.lion.lionwebsite.Util.GalleryUtil; import com.lion.lionwebsite.Util.Response; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.annotation.Resource; -import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; @@ -21,10 +20,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Service; import java.io.*; -import java.net.URI; -import java.net.URL; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -387,6 +382,7 @@ public class GalleryManageService { tagMapper.disMarkTagByGid(gallery.getGid()); //删除本子标记 gid2name_cache.remove(gallery.getGid()); //删除本子缓存 page2pageNameCache.remove(gallery.getName()); //移除页数缓存 + pageNameCacheMapper.deletePageNameByGid(gid); if(new File(TargetPath + "/" + gallery.getName()).isDirectory()) //删除本地缓存 FileUtil.del(TargetPath + "/" + gallery.getName()); diff --git a/src/main/java/com/lion/lionwebsite/Service/LocalServiceImpl.java b/src/main/java/com/lion/lionwebsite/Service/LocalServiceImpl.java index f75c299..3c5c235 100644 --- a/src/main/java/com/lion/lionwebsite/Service/LocalServiceImpl.java +++ b/src/main/java/com/lion/lionwebsite/Service/LocalServiceImpl.java @@ -6,7 +6,6 @@ import com.lion.lionwebsite.Dao.ShareFileMapper; import com.lion.lionwebsite.Domain.CustomConfiguration; import com.lion.lionwebsite.Domain.ShareFile; import com.lion.lionwebsite.Util.CustomUtil; -import com.lion.lionwebsite.Util.GalleryUtil; import jakarta.annotation.Resource; import lombok.Data; import org.apache.http.HttpEntity; @@ -26,7 +25,6 @@ import java.nio.file.attribute.BasicFileAttributes; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.TimeUnit; import static java.nio.file.FileVisitResult.CONTINUE; diff --git a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java index 49cc5a1..cde6bce 100644 --- a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java +++ b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java @@ -245,6 +245,8 @@ public class RemoteService { boolean result = promise.await(10, TimeUnit.SECONDS); if(result){ ResponseMessage rsm = (ResponseMessage)promise.getNow(); + if(rsm.getResult() != 0) + log.error("更新本子" + gallery.getName() + "出错" + rsm.getResult()); } }catch (InterruptedException e){ e.printStackTrace(); diff --git a/src/main/java/com/lion/lionwebsite/Util/FileDownload.java b/src/main/java/com/lion/lionwebsite/Util/FileDownload.java index 10e844c..0a67ae2 100644 --- a/src/main/java/com/lion/lionwebsite/Util/FileDownload.java +++ b/src/main/java/com/lion/lionwebsite/Util/FileDownload.java @@ -99,7 +99,6 @@ public class FileDownload { if (transmitted < contentLength) { len = randomAccessFile.read(buff, 0, (int) (contentLength - transmitted)); outputStream.write(buff, 0, len); - transmitted += len; } outputStream.flush();