Compare commits

..

No commits in common. "7ca12d799977a909961efccdf8e501adce484874" and "29f1532dea159c7c3d9bbb5dceb8fa86e0f5986d" have entirely different histories.

30 changed files with 312 additions and 445 deletions

View File

@ -1,166 +0,0 @@
================================================================================
LionWebsite 项目总结
================================================================================
一、项目概况
──────────────────────────────────────────────────────────────────────────────
名称: LionWebsite
技术栈: Spring Boot 3.3.2, Java 21, Maven, SQLite, MyBatis, Netty
定位: 个人/私有 Web 应用,兼具 E-Hentai 画廊下载管理、个人文件服务、
代理订阅管理等功能。
运行端口: 8888
数据库: 双 SQLite 数据库 — LionWebsite.db (主库) + cache.db (缓存库)
构建目标: 支持 GraalVM Native Image (AOT 编译)
二、项目结构
──────────────────────────────────────────────────────────────────────────────
src/main/java/com/lion/lionwebsite/
├── LionWebsiteApplication.java 主启动类 (@EnableScheduling, 双数据源 MapperScan)
├── Configuration/
│ ├── SqlConfiguration.java 双数据源 (main + cache) SQLite 配置
│ ├── MyBatisNativeConfiguration.java GraalVM Native 适配 (AOT hints)
│ ├── WebsocketConfiguration.java WebSocket 注册 (/ws/)
│ ├── InterceptorConfiguration.java 拦截器链注册
│ ├── CorsConfig.java CORS 全开放
│ └── CustomBean.java Telegram Bot Bean + Native 反射注册
├── Controller/
│ ├── GalleryManageController.java 画廊任务 CRUD、收藏、图片在线缓存 /GalleryManage
│ ├── QueryController.java E-Hentai 搜索代理 /query
│ ├── PublicController.java 根路由、IP、订阅、文件分享、验证 /、/ip、/sub/、/GetFile/、/validate
│ ├── PersonalController.java 个人文件管理 /personal/
│ ├── SubController.java 订阅绑定管理 /personal/subBind/
│ └── UserController.java 用户管理 /personal/user
├── Service/
│ ├── GalleryManageService.java 核心画廊管理 (任务创建/查询/删除/图片缓存/在线图片)
│ ├── RemoteService.java Netty TCP 客户端连接远程存储节点 (5.255.110.45:26321+)
│ ├── WebSocketService.java WebSocket 推送下载进度给前端
│ ├── PushService.java Telegram Bot 通知 (admin 告警)
│ ├── QueryService.java E-Hentai 搜索 + 缩略图代理缓存 (转 AVIF)
│ ├── LocalServiceImpl.java 定时任务 (连接检测/额度重置/Cookie验证/订阅更新/缩略图清理)
│ ├── PublicServiceImpl.java IP 记录、分享码文件获取、授权码修改
│ ├── PersonalServiceImpl.java 文件管理 (浏览/上传/下载/分享/压缩/删除/TAR打包)
│ ├── SubService.java 代理订阅绑定/重置/查询/更新记录
│ ├── CollectService.java 画廊收藏/取消收藏
│ └── UserServiceImpl.java 用户 CRUD + 授权码管理
├── Dao/
│ ├── normal/ 主库 Mapper
│ │ ├── GalleryMapper.java gallery 表 CRUD
│ │ ├── UserMapper.java user 表 CRUD
│ │ ├── CollectMapper.java collect 表 CRUD
│ │ ├── ShareFileMapper.java ShareFile 表 CRUD
│ │ ├── CustomConfigurationMapper.java 配置键值对读写
│ │ └── SubMapper.java 订阅绑定 & 更新记录
│ └── cache/ 缓存库 Mapper
│ └── ImageCacheMapper.java 图片 key 缓存 (gidToKey + ImageKeyCache)
├── Domain/ 实体类 (Lombok @Data)
│ ├── Gallery.java 画廊 (gid, name, link, pages, status, resolution, ...)
│ ├── GalleryForQuery.java 搜索结果的画廊精简信息
│ ├── GalleryTask.java 下载任务状态 (下载中/下载完成/压缩中/压缩完成)
│ ├── User.java 用户 (id, AuthCode, username, isEnable)
│ ├── GidToKey.java 画廊 GID → MPV Key 映射
│ ├── ImageKeyCache.java 图片 key 缓存 (gid, page, imgkey)
│ ├── CustomConfiguration.java 配置键常量定义
│ ├── ShareFile.java 文件分享 (ShareCode, FilePath, ExpireTime)
│ ├── SubBind.java 订阅绑定 (key, user)
│ ├── SubUpdateRecord.java 订阅更新记录 (ip, UA, time, location)
│ └── PageNameCache.java 页面名缓存 (gid, page, pageName)
├── Message/ 自定义 TCP 消息协议 (Netty)
│ ├── AbstractMessage.java 消息基类 (定义了 7 种消息类型常量)
│ ├── MessageCodec.java Netty ByteToMessageCodec 编解码器
│ ├── DownloadPostMessage.java 下发下载任务
│ ├── DownloadStatusMessage.java 下载进度状态上报
│ ├── ResponseMessage.java 通用响应
│ ├── DeleteGalleryMessage.java 删除画廊指令
│ ├── IdentityMessage.java 身份认证
│ ├── MaintainMessage.java 维护/心跳消息
│ └── AvailableCheckMessage.java 可用性检测
├── Interceptor/
│ ├── TaskHandlerInterceptor.java 验证 AuthCode 是否有效 (用于 /GalleryManage, /validate)
│ ├── PersonalInterceptor.java 限制 /personal/**, /remote/** 仅 AuthCode="alone"
│ └── HumanInterceptor.java 拦截无 User-Agent 的请求 (机器人防护)
├── Filter/
│ ├── AdaptorFilter.java UA 检测: 移动端重定向到 /mobile, 桌面端放行; 日志记录
│ └── AccessFilter.java 更新用户最后访问时间 (/validate 接口)
├── Util/
│ ├── Response.java 通用 JSON 响应封装 ({result, data})
│ ├── CustomUtil.java 工具类 (文件大小格式化/时间/空闲端口/404)
│ ├── GalleryUtil.java E-Hentai 网页解析/图片下载/MPV key 管理/图片格式转换
│ └── FileDownload.java 支持断点续传的文件下载工具 (Range)
├── Error/
│ └── ErrorCode.java 错误码常量 (IO_ERROR=1, FILE_NOT_FOUND=2, COMPRESS_ERROR=3)
└── Exception/
└── ResolutionNotMatchException.java 分辨率不匹配异常
三、核心功能模块
──────────────────────────────────────────────────────────────────────────────
1. E-Hentai 画廊下载管理
- 用户通过 AuthCode 提交 E-Hentai 画廊链接,指定目标分辨率
- GalleryUtil 解析页面 (Jsoup) 获取: 名称/语言/页数/文件大小/可选分辨率
- 通过 Netty TCP 将下载任务发往远程存储节点 (RemoteService)
- RemoteService 维护与存储节点的长连接 (自动重连+端口探测)
- 存储节点实时回传下载进度 (DownloadStatusMessage),通过 WebSocket 推送给前端
- 支持图片在线预览: 缓存 MPV key → 按需下载单页 → 转为 AVIF 格式
- 画廊收藏/取消收藏
2. 个人文件服务
- 文件浏览器: 按路径浏览文件/文件夹,显示大小、分享状态
- 上传: MultipartFile 上传到指定路径
- 下载: 支持 HTTP Range 断点续传
- 分享: 生成 8 位随机分享码,设置过期时间,可延长/取消
- 压缩: 异步 TAR 打包目录
- 删除文件/文件夹
3. E-Hentai 搜索代理
- 代理搜索 exhentai.org返回格式化结果 (含缩略图 URL)
- 缩略图代理: 下载 → ImageMagick 转 AVIF → 本地缓存 → 返回
4. 代理订阅管理
- 定时从外部链接拉取 V2Ray/Clash 订阅配置
- 过滤高倍率节点 (流量倍率 > 2)
- 为每个用户生成唯一订阅 Key记录更新 IP/UA/时间/位置
5. Telegram 通知
- 通过 Telegram Bot 向 admin 推送: 任务提交/完成/失败、存储节点上下线、
Cookie 过期、订阅异常等
四、定时任务 (@Scheduled)
──────────────────────────────────────────────────────────────────────────────
- 每 30 分钟: 检测存储节点连接,断开则自动重连
- 每周一 4:00: 重置每周下载额度
- 每天 0:00: 验证 E-Hentai Cookie 有效性
- 每天 4:00: 清理过期分享码
- 每 24 小时: 更新代理订阅配置文件
- 每周一 4:00: 清理缩略图缓存 (保留最近 10000 个)
五、安全机制
──────────────────────────────────────────────────────────────────────────────
- 所有管理接口需 AuthCode 参数 (TaskHandlerInterceptor 校验)
- /personal 和 /remote 路径限 AuthCode="alone" 用户
- HumanInterceptor 拒绝无 User-Agent 请求
- AdaptorFilter 记录所有请求日志 (IP/路径/UA/时间)
- 分享码失败黑名单 (连续失败则屏蔽)
六、依赖
──────────────────────────────────────────────────────────────────────────────
spring-boot-starter-web, spring-boot-starter-websocket, mybatis-spring-boot-starter
jsoup (HTML 解析), hutool-all (工具集), sqlite-jdbc (数据库)
httpclient + httpmime (HTTP 请求), commons-compress (TAR 打包)
commons-io, commons-lang3, netty-all (TCP 通信)
java-telegram-bot-api (Telegram Bot), graalvm native-maven-plugin (AOT)
================================================================================
End of Summary
================================================================================

15
pom.xml
View File

@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.40</version> <version>1.18.30</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -110,19 +110,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.40</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.graalvm.buildtools</groupId> <groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId> <artifactId>native-maven-plugin</artifactId>

View File

@ -2,15 +2,12 @@ package com.lion.lionwebsite.Configuration;
import com.lion.lionwebsite.Domain.*; import com.lion.lionwebsite.Domain.*;
import com.lion.lionwebsite.Message.*; import com.lion.lionwebsite.Message.*;
import com.lion.lionwebsite.Util.GalleryUtil;
import com.pengrad.telegrambot.TelegramBot; import com.pengrad.telegrambot.TelegramBot;
import com.pengrad.telegrambot.model.*; import com.pengrad.telegrambot.model.*;
import com.pengrad.telegrambot.model.User; import com.pengrad.telegrambot.model.User;
import com.pengrad.telegrambot.response.SendResponse; import com.pengrad.telegrambot.response.SendResponse;
import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariConfig;
import jakarta.annotation.PostConstruct;
import org.springframework.aot.hint.annotation.RegisterReflectionForBinding; import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -24,19 +21,8 @@ import org.springframework.context.annotation.Configuration;
IdentityMessage.class, MaintainMessage.class, ResponseMessage.class, AvailableCheckMessage.class, LinkPreviewOptions.class}) IdentityMessage.class, MaintainMessage.class, ResponseMessage.class, AvailableCheckMessage.class, LinkPreviewOptions.class})
public class CustomBean { public class CustomBean {
@Value("${bot.token:5222939329:AAHa6l9ZuVVdNSDLPI_H-c8O_VgeOEw5plA}")
private String botToken;
@Value("${gallery.cookie:ipb_session_id=af2b2b1a795b39550711134d7bdcbf7f; ipb_member_id=5774855; ipb_pass_hash=4b061c3abe25289568b5a8e0123fb3b9; sk=oye107wk02gtomb56x65dmv4qzbn; nw=1}")
private String ehentaiCookie;
@PostConstruct
void initGalleryCookie() {
GalleryUtil.setEhentaiCookie(ehentaiCookie);
}
@Bean @Bean
public TelegramBot getTelegramBot(){ public TelegramBot getTelegramBot(){
return new TelegramBot(botToken); return new TelegramBot("5222939329:AAHa6l9ZuVVdNSDLPI_H-c8O_VgeOEw5plA");
} }
} }

View File

@ -3,7 +3,6 @@ package com.lion.lionwebsite.Configuration;
import com.lion.lionwebsite.Interceptor.HumanInterceptor; import com.lion.lionwebsite.Interceptor.HumanInterceptor;
import com.lion.lionwebsite.Interceptor.PersonalInterceptor; import com.lion.lionwebsite.Interceptor.PersonalInterceptor;
import com.lion.lionwebsite.Interceptor.TaskHandlerInterceptor; import com.lion.lionwebsite.Interceptor.TaskHandlerInterceptor;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
@ -11,9 +10,12 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration @Configuration
@RequiredArgsConstructor
public class InterceptorConfiguration implements WebMvcConfigurer { public class InterceptorConfiguration implements WebMvcConfigurer {
final TaskHandlerInterceptor taskHandlerInterceptor; TaskHandlerInterceptor taskHandlerInterceptor;
public InterceptorConfiguration(TaskHandlerInterceptor taskHandlerInterceptor) {
this.taskHandlerInterceptor = taskHandlerInterceptor;
}
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {

View File

@ -1,7 +1,6 @@
package com.lion.lionwebsite.Configuration; package com.lion.lionwebsite.Configuration;
import com.lion.lionwebsite.Service.WebSocketService; import com.lion.lionwebsite.Service.WebSocketService;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@ -9,10 +8,12 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry
@Configuration @Configuration
@EnableWebSocket @EnableWebSocket
@RequiredArgsConstructor
public class WebsocketConfiguration implements WebSocketConfigurer { public class WebsocketConfiguration implements WebSocketConfigurer {
final WebSocketService webSocketService; WebSocketService webSocketService;
public WebsocketConfiguration(WebSocketService webSocketService) {
this.webSocketService = webSocketService;
}
@Override @Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {

View File

@ -3,11 +3,10 @@ package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Service.CollectService; import com.lion.lionwebsite.Service.CollectService;
import com.lion.lionwebsite.Service.GalleryManageService; import com.lion.lionwebsite.Service.GalleryManageService;
import com.lion.lionwebsite.Service.RemoteService; import com.lion.lionwebsite.Service.RemoteService;
import com.lion.lionwebsite.Service.UserService; import com.lion.lionwebsite.Service.UserServiceImpl;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -16,15 +15,21 @@ import java.util.concurrent.Callable;
@RestController @RestController
@RequestMapping("/GalleryManage") @RequestMapping("/GalleryManage")
@Slf4j @Slf4j
@RequiredArgsConstructor
public class GalleryManageController { public class GalleryManageController {
final GalleryManageService galleryManageService; GalleryManageService galleryManageService;
final CollectService collectService; CollectService collectService;
final UserService userService; UserServiceImpl userService;
final RemoteService remoteService; RemoteService remoteService;
public GalleryManageController(GalleryManageService galleryManageService, CollectService collectService, UserServiceImpl userService, RemoteService remoteService) {
this.galleryManageService = galleryManageService;
this.collectService = collectService;
this.userService = userService;
this.remoteService = remoteService;
}
@PostMapping("") @PostMapping("")
public String create_task(String link, String targetResolution, String AuthCode){ public String create_task(String link, String targetResolution, String AuthCode){

View File

@ -1,12 +1,11 @@
package com.lion.lionwebsite.Controller; package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Service.LocalService; import com.lion.lionwebsite.Service.LocalServiceImpl;
import com.lion.lionwebsite.Service.PersonalService; import com.lion.lionwebsite.Service.PersonalServiceImpl;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -19,13 +18,17 @@ import java.io.IOException;
@RestController @RestController
@Slf4j @Slf4j
@RequiredArgsConstructor
@RequestMapping("/personal") @RequestMapping("/personal")
public class PersonalController { public class PersonalController {
final PersonalService personalService; PersonalServiceImpl personalService;
final LocalService localService; LocalServiceImpl localService;
public PersonalController(PersonalServiceImpl personalService, LocalServiceImpl localService) {
this.personalService = personalService;
this.localService = localService;
}
@GetMapping("/") @GetMapping("/")
public void index(HttpServletResponse resp) throws IOException { public void index(HttpServletResponse resp) throws IOException {

View File

@ -2,14 +2,13 @@ package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Domain.User; import com.lion.lionwebsite.Domain.User;
import com.lion.lionwebsite.Service.PublicService; import com.lion.lionwebsite.Service.PublicServiceImpl;
import com.lion.lionwebsite.Service.QueryService; import com.lion.lionwebsite.Service.QueryService;
import com.lion.lionwebsite.Service.RemoteService; import com.lion.lionwebsite.Service.RemoteService;
import com.lion.lionwebsite.Service.SubService; import com.lion.lionwebsite.Service.SubService;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -20,18 +19,24 @@ import java.util.List;
@RestController @RestController
@Slf4j @Slf4j
@RequiredArgsConstructor
public class PublicController { public class PublicController {
final List<String> black_share_codes = new LinkedList<>(); final List<String> black_share_codes = new LinkedList<>();
final PublicService publicService; PublicServiceImpl publicService;
final RemoteService remoteService; RemoteService remoteService;
final SubService subService; SubService subService;
final QueryService queryService; QueryService queryService;
public PublicController(PublicServiceImpl publicService, RemoteService remoteService, SubService subService, QueryService queryService) {
this.publicService = publicService;
this.remoteService = remoteService;
this.subService = subService;
this.queryService = queryService;
}
@GetMapping("/") @GetMapping("/")
public void index(HttpServletResponse resp) throws IOException { public void index(HttpServletResponse resp) throws IOException {

View File

@ -1,7 +1,6 @@
package com.lion.lionwebsite.Controller; package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Service.QueryService; import com.lion.lionwebsite.Service.QueryService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -9,10 +8,13 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/query") @RequestMapping("/query")
@RequiredArgsConstructor
public class QueryController { public class QueryController {
final QueryService queryService; QueryService queryService;
public QueryController(QueryService queryService) {
this.queryService = queryService;
}
@GetMapping("") @GetMapping("")
public String query(String keyword, String prev, String next){ public String query(String keyword, String prev, String next){

View File

@ -1,14 +1,16 @@
package com.lion.lionwebsite.Controller; package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Service.SubService; import com.lion.lionwebsite.Service.SubService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/personal/subBind/") @RequestMapping("/personal/subBind/")
@RequiredArgsConstructor
public class SubController { public class SubController {
final SubService subService; SubService subService;
public SubController(SubService subService) {
this.subService = subService;
}
@PostMapping("") @PostMapping("")
public String addSubBind(String user){ public String addSubBind(String user){

View File

@ -1,15 +1,18 @@
package com.lion.lionwebsite.Controller; package com.lion.lionwebsite.Controller;
import com.lion.lionwebsite.Service.UserService; import com.lion.lionwebsite.Service.UserServiceImpl;
import lombok.RequiredArgsConstructor; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/personal/user") @RequestMapping("/personal/user")
@RequiredArgsConstructor
public class UserController { public class UserController {
final UserService userService; UserServiceImpl userService;
public UserController(UserServiceImpl userService) {
this.userService = userService;
}
@GetMapping("") @GetMapping("")
public String getAllUser(){ public String getAllUser(){

View File

@ -4,15 +4,17 @@ import com.lion.lionwebsite.Dao.normal.UserMapper;
import com.lion.lionwebsite.Util.CustomUtil; import com.lion.lionwebsite.Util.CustomUtil;
import jakarta.servlet.*; import jakarta.servlet.*;
import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import lombok.RequiredArgsConstructor;
import java.io.IOException; import java.io.IOException;
@WebFilter(filterName = "AccessFilter", urlPatterns = {"/validate"}) @WebFilter(filterName = "AccessFilter", urlPatterns = {"/validate"})
@RequiredArgsConstructor
public class AccessFilter implements Filter { public class AccessFilter implements Filter {
final UserMapper userMapper; UserMapper userMapper;
public AccessFilter(UserMapper userMapper) {
this.userMapper = userMapper;
}
@Override @Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

View File

@ -4,13 +4,11 @@ import jakarta.servlet.*;
import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException; import java.io.IOException;
import java.util.Calendar; import java.util.Calendar;
@WebFilter(filterName = "AdaptorFilter", urlPatterns = {"/", "/personal/"}) @WebFilter(filterName = "AdaptorFilter", urlPatterns = {"/", "/personal/"})
@Slf4j
public class AdaptorFilter implements Filter { public class AdaptorFilter implements Filter {
@Override @Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
@ -29,7 +27,7 @@ public class AdaptorFilter implements Filter {
String now = String.format("%s:%s:%s", calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND)); String now = String.format("%s:%s:%s", calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND));
//日志 //日志
log.info("{} ip:{} \tpath:{} \tAuthCode:{} ua:{}", now, ip, ServletPath, AuthCode, UserAgent.length() > 61 ? UserAgent.substring(0, 60): UserAgent); System.out.printf("%s ip:%s \tpath:%s \tAuthCode:%s ua:%s\n", now, ip, ServletPath, AuthCode, UserAgent.length() > 61 ? UserAgent.substring(0, 60): UserAgent);
//如果是验证则直接跳转 //如果是验证则直接跳转
if(ServletPath.equals("/validate")) if(ServletPath.equals("/validate"))

View File

@ -1,25 +1,24 @@
package com.lion.lionwebsite.Interceptor; package com.lion.lionwebsite.Interceptor;
import com.lion.lionwebsite.Dao.normal.UserMapper; import com.lion.lionwebsite.Dao.normal.UserMapper;
import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
@Component @Component
@RequiredArgsConstructor
public class TaskHandlerInterceptor implements HandlerInterceptor { public class TaskHandlerInterceptor implements HandlerInterceptor {
final UserMapper userMapper; @Resource
UserMapper userMapper;
String[] AuthCodes; String[] AuthCodes;
@PostConstruct public TaskHandlerInterceptor(UserMapper userMapper) {
void init() { this.userMapper = userMapper;
AuthCodes = userMapper.selectAllAuthCode(); AuthCodes = userMapper.selectAllAuthCode();
} }

View File

@ -8,7 +8,11 @@ import org.springframework.stereotype.Service;
@Service @Service
@Data @Data
public class CollectService { public class CollectService {
final CollectMapper collectMapper; CollectMapper collectMapper;
public CollectService(CollectMapper collectMapper){
this.collectMapper = collectMapper;
}
public String collectGallery(int gid, int collector){ public String collectGallery(int gid, int collector){
Response response = Response.generateResponse(); Response response = Response.generateResponse();

View File

@ -30,21 +30,33 @@ import static com.lion.lionwebsite.Util.GalleryUtil.*;
public class GalleryManageService { public class GalleryManageService {
String cachePath = "/storage/galleryCache/onlineImages/"; String cachePath = "/storage/galleryCache/onlineImages/";
final GalleryMapper galleryMapper; GalleryMapper galleryMapper;
final CollectMapper collectMapper; CollectMapper collectMapper;
final CustomConfigurationMapper configurationMapper; CustomConfigurationMapper configurationMapper;
final UserMapper userMapper; UserMapper userMapper;
final ShareFileMapper shareFileMapper; ShareFileMapper shareFileMapper;
final ImageCacheMapper imageCacheMapper; ImageCacheMapper imageCacheMapper;
final RemoteService remoteService; RemoteService remoteService;
final PushService pushService; PushService pushService;
public GalleryManageService(GalleryMapper galleryMapper, CollectMapper collectMapper, CustomConfigurationMapper configurationMapper, UserMapper userMapper, ShareFileMapper shareFileMapper,
RemoteService remoteService, PushService pushService, ImageCacheMapper imageCacheMapper) {
this.galleryMapper = galleryMapper;
this.collectMapper = collectMapper;
this.configurationMapper = configurationMapper;
this.userMapper = userMapper;
this.shareFileMapper = shareFileMapper;
this.remoteService = remoteService;
this.pushService = pushService;
this.imageCacheMapper = imageCacheMapper;
}
/** /**
* 创建任务 * 创建任务
@ -300,7 +312,7 @@ public class GalleryManageService {
case 0 -> response.success(); case 0 -> response.success();
} }
if (response.get("result").equals("failure")) if (response.get("result").equals("failure"))
log.info(response.getData()); log.info(response.getResult());
return response.toJSONString(); return response.toJSONString();
} }
@ -368,17 +380,16 @@ public class GalleryManageService {
GidToKey gidToKey = imageCacheMapper.selectKeyByGid(gid); GidToKey gidToKey = imageCacheMapper.selectKeyByGid(gid);
if(gidToKey == null) if(gidToKey == null)
try { try {
log.error("未缓存gid:{}", gid); log.error("未缓存gid:" + gid);
response.sendError(404); response.sendError(404);
return null; return null;
}catch (IOException e){ }catch (IOException ignored){
log.warn("sendError 404 failed", e);
return null; return null;
} }
return () -> { return () -> {
if(response.isCommitted()) { if(response.isCommitted()) {
log.info("连接已关闭: gid={} page={}", gid, page); log.info("连接已关闭: gid=" + gid + " page=" + page);
return null; return null;
} }
@ -400,7 +411,7 @@ public class GalleryManageService {
if (imageUrl == null) { if (imageUrl == null) {
CustomUtil.fourZeroFour(response); CustomUtil.fourZeroFour(response);
log.error("获取图片url失败:gid={} page={} imageKey={}", gid, page, imageKeyCache.getImgkey()); log.error("获取图片url失败:gid=" + gid + " page=" + page + " imageKey=" + imageKeyCache.getImgkey());
return null; return null;
} }
@ -410,7 +421,8 @@ public class GalleryManageService {
try { try {
new URI(imageUrl).toURL().openConnection().getInputStream().transferTo(new FileOutputStream(imagePath)); new URI(imageUrl).toURL().openConnection().getInputStream().transferTo(new FileOutputStream(imagePath));
}catch (Exception e){ }catch (Exception e){
log.error("下载图片失败:url{}", imageUrl, e); log.error("下载图片失败:url" + imageUrl);
e.printStackTrace();
CustomUtil.fourZeroFour(response); CustomUtil.fourZeroFour(response);
return null; return null;
} }

View File

@ -8,13 +8,11 @@ import com.lion.lionwebsite.Domain.ShareFile;
import com.lion.lionwebsite.Util.CustomUtil; import com.lion.lionwebsite.Util.CustomUtil;
import com.lion.lionwebsite.Util.GalleryUtil; import com.lion.lionwebsite.Util.GalleryUtil;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -33,25 +31,28 @@ import static java.nio.file.FileVisitResult.CONTINUE;
@Service @Service
@Data @Data
@Slf4j public class LocalServiceImpl{
public class LocalService{ String DouNaiClash = "https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=clashmeta";
@Value("${local.dou-nai-clash:https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=clashmeta}")
String DouNaiClash;
@Value("${local.dou-nai-v2ray:https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=v2}") String DouNaiV2ray = "https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=v2";
String DouNaiV2ray;
private static final CloseableHttpClient httpClient = HttpClients.createDefault(); CustomConfigurationMapper configurationMapper;
final CustomConfigurationMapper configurationMapper; ShareFileMapper shareFileMapper;
final ShareFileMapper shareFileMapper; GalleryMapper galleryMapper;
final GalleryMapper galleryMapper; PushService pushService;
final PushService pushService; RemoteService remoteService;
final RemoteService remoteService; public LocalServiceImpl(CustomConfigurationMapper configurationMapper, ShareFileMapper shareFileMapper, GalleryMapper galleryMapper, PushService pushService, RemoteService remoteService) {
this.shareFileMapper = shareFileMapper;
this.configurationMapper = configurationMapper;
this.galleryMapper = galleryMapper;
this.pushService = pushService;
this.remoteService = remoteService;
}
/** /**
* 检查连接是否有效如果无效自动重连 * 检查连接是否有效如果无效自动重连
@ -61,7 +62,7 @@ public class LocalService{
if (remoteService.isDead()){ if (remoteService.isDead()){
remoteService.initChannel(); remoteService.initChannel();
pushService.sendToMe("主动检测连接已断开,自动进行重连"); pushService.sendToMe("主动检测连接已断开,自动进行重连");
log.warn("主动检测连接已断开,自动进行重连"); System.out.println("主动检测连接已断开,自动进行重连");
return; return;
} }
@ -74,7 +75,7 @@ public class LocalService{
default -> "未知错误"; default -> "未知错误";
}; };
pushService.sendToMe("主动检测连接无数据返回,自动进行重连:" + result); pushService.sendToMe("主动检测连接无数据返回,自动进行重连:" + result);
log.warn("主动检测连接无数据返回,自动进行重连:{}", result); System.out.println("主动检测连接无数据返回,自动进行重连:" + result);
} }
} }
@ -164,9 +165,10 @@ public class LocalService{
} }
writer.write(new String(Base64.getEncoder().encode(stringBuilder.toString().getBytes(StandardCharsets.UTF_8)))); writer.write(new String(Base64.getEncoder().encode(stringBuilder.toString().getBytes(StandardCharsets.UTF_8))));
log.info("load DouNai v2ray complete"); System.out.println("load DouNai v2ray complete");
}catch (IOException e){ }catch (IOException e){
log.error("load DouNai v2ray failure", e); e.printStackTrace();
System.out.println("load DouNai v2ray failure");
} }
//下载豆奶clash订阅 //下载豆奶clash订阅
@ -195,9 +197,10 @@ public class LocalService{
for(String line: clashProcessed) for(String line: clashProcessed)
writer.write(line + "\n"); writer.write(line + "\n");
log.info("load DouNai clash complete"); System.out.println("load DouNai clash complete");
}catch (IOException e){ }catch (IOException e){
log.error("load DouNai clash failure", e); e.printStackTrace();
System.out.println("load DouNai clash failure");
} }
configurationMapper.updateConfiguration(CustomConfiguration.LAST_UPDATE_SUB_TIME, dateTimeFormatter.format(LocalDateTime.now())); configurationMapper.updateConfiguration(CustomConfiguration.LAST_UPDATE_SUB_TIME, dateTimeFormatter.format(LocalDateTime.now()));
@ -211,6 +214,7 @@ public class LocalService{
* @throws IOException 网络异常 * @throws IOException 网络异常
*/ */
public static ArrayList<String> Get(String url) throws IOException { public static ArrayList<String> Get(String url) throws IOException {
CloseableHttpClient httpClient = HttpClients.createDefault();
CloseableHttpResponse httpResponse; CloseableHttpResponse httpResponse;
HttpGet httpGet = new HttpGet(url); HttpGet httpGet = new HttpGet(url);
@ -227,6 +231,7 @@ public class LocalService{
temp.add(str); temp.add(str);
} }
httpClient.close();
httpResponse.close(); httpResponse.close();
return temp; return temp;
} }
@ -285,12 +290,12 @@ public class LocalService{
try { try {
Files.delete(file); Files.delete(file);
}catch (IOException e){ }catch (IOException e){
log.warn("删除缩略图缓存文件失败: {}", file, e); e.printStackTrace();
} }
} }
log.info("Deleted {} files", toDelete.size()); System.out.println("Deleted " + toDelete.size() + " files");
} else { } else {
log.info("No files to delete"); System.out.println("No files to delete");
} }
} }
} }

View File

@ -13,7 +13,7 @@ import com.lion.lionwebsite.Util.CustomUtil;
import com.lion.lionwebsite.Util.FileDownload; import com.lion.lionwebsite.Util.FileDownload;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.Data; import lombok.Data;
@ -42,22 +42,35 @@ import java.util.concurrent.Executors;
@Service @Service
@Data @Data
@Slf4j @Slf4j
public class PersonalService{ public class PersonalServiceImpl{
final CustomConfigurationMapper configurationMapper; @Resource
CustomConfigurationMapper configurationMapper;
final UserMapper userMapper; @Resource
UserMapper userMapper;
final ShareFileMapper shareFileMapper; @Resource
ShareFileMapper shareFileMapper;
final TaskHandlerInterceptor taskHandlerInterceptor; @Resource
TaskHandlerInterceptor taskHandlerInterceptor;
String StoragePath = "/storage/"; String StoragePath = "/storage/";
DateTimeFormatter dateTimeFormatter = CustomUtil.dateTimeFormatter(); DateTimeFormatter dateTimeFormatter = CustomUtil.dateTimeFormatter();
ExecutorService compressThreadPool = Executors.newFixedThreadPool(1); ExecutorService compressThreadPool;
final PushService pushService; PushService pushService;
public PersonalServiceImpl(CustomConfigurationMapper configurationMapper, UserMapper userMapper, ShareFileMapper shareFileMapper, TaskHandlerInterceptor taskHandlerInterceptor, PushService pushService){
this.configurationMapper = configurationMapper;
this.userMapper = userMapper;
this.shareFileMapper = shareFileMapper;
this.taskHandlerInterceptor = taskHandlerInterceptor;
this.pushService = pushService;
compressThreadPool = Executors.newFixedThreadPool(1);
}
/** /**
* 获取文件列表同时带上分享码以及过期时间 * 获取文件列表同时带上分享码以及过期时间
@ -137,7 +150,7 @@ public class PersonalService{
try{ try{
response.getWriter().print("404 NOT FOUND"); response.getWriter().print("404 NOT FOUND");
}catch (IOException e){ }catch (IOException e){
log.warn("输出404失败", e); e.printStackTrace();
} }
} }
@ -169,7 +182,7 @@ public class PersonalService{
response.success("上传成功"); response.success("上传成功");
} catch (IOException e) { } catch (IOException e) {
response.failure("上传失败"); response.failure("上传失败");
log.error("上传失败: {}", fileName, e); e.printStackTrace();
} }
} }
else else
@ -328,7 +341,7 @@ public class PersonalService{
File targetFile = new File(finalPath + ".tar***undone"); File targetFile = new File(finalPath + ".tar***undone");
log.info("打包成功,重命名:" + targetFile.renameTo(new File(finalPath + ".tar"))); log.info("打包成功,重命名:" + targetFile.renameTo(new File(finalPath + ".tar")));
}catch (IOException e){ }catch (IOException e){
log.error("打包失败", e); e.printStackTrace();
log.info("打包失败,删除文件结果:" + new File(finalPath + ".tar***undone").delete()); log.info("打包失败,删除文件结果:" + new File(finalPath + ".tar***undone").delete());
} }
}); });

View File

@ -12,9 +12,9 @@ import com.lion.lionwebsite.Util.CustomUtil;
import com.lion.lionwebsite.Util.FileDownload; import com.lion.lionwebsite.Util.FileDownload;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -24,16 +24,26 @@ import java.nio.charset.StandardCharsets;
import java.util.Calendar; import java.util.Calendar;
@Service @Service
@RequiredArgsConstructor public class PublicServiceImpl {
public class PublicService {
final CustomConfigurationMapper configurationMapper; @Resource
CustomConfigurationMapper configurationMapper;
final ShareFileMapper shareFileMapper; @Resource
ShareFileMapper shareFileMapper;
final UserMapper userMapper; @Resource
UserMapper userMapper;
final TaskHandlerInterceptor taskHandlerInterceptor; @Resource
TaskHandlerInterceptor taskHandlerInterceptor;
public PublicServiceImpl(CustomConfigurationMapper configurationMapper, ShareFileMapper shareFileMapper, UserMapper userMapper, TaskHandlerInterceptor taskHandlerInterceptor) {
this.configurationMapper = configurationMapper;
this.shareFileMapper = shareFileMapper;
this.userMapper = userMapper;
this.taskHandlerInterceptor = taskHandlerInterceptor;
}
/** /**
* 记录家里ip地址 * 记录家里ip地址

View File

@ -3,19 +3,26 @@ package com.lion.lionwebsite.Service;
import com.lion.lionwebsite.Domain.Gallery; import com.lion.lionwebsite.Domain.Gallery;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import com.pengrad.telegrambot.TelegramBot; import com.pengrad.telegrambot.TelegramBot;
import com.pengrad.telegrambot.UpdatesListener;
import com.pengrad.telegrambot.model.Update;
import com.pengrad.telegrambot.request.SendMessage; import com.pengrad.telegrambot.request.SendMessage;
import lombok.RequiredArgsConstructor; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
@Slf4j
@RequiredArgsConstructor
public class PushService { public class PushService {
long self = 686839482; long self = 686839482;
final TelegramBot bot; @Resource
TelegramBot bot;
public PushService(TelegramBot bot) {
this.bot = bot;
}
public void taskCreateReport(String username, String link, Response response){ public void taskCreateReport(String username, String link, Response response){
if(response.isSuccess()) if(response.isSuccess())
@ -37,7 +44,7 @@ public class PushService {
} }
public void sendToMe(String text){ public void sendToMe(String text){
log.info(text); System.out.println(text);
SendMessage sendMessage = new SendMessage(self, text); SendMessage sendMessage = new SendMessage(self, text);
bot.execute(sendMessage); bot.execute(sendMessage);
} }

View File

@ -41,7 +41,7 @@ public class QueryService {
try{ try{
result = GalleryUtil.requests("https://exhentai.org/" + param, "get", null, null); result = GalleryUtil.requests("https://exhentai.org/" + param, "get", null, null);
}catch (IOException e){ }catch (IOException e){
log.error("query failure", e); e.printStackTrace();
response.failure("query failure"); response.failure("query failure");
return response.toJSONString(); return response.toJSONString();
} }
@ -118,7 +118,7 @@ public class QueryService {
outputStream.write(inputStream.readAllBytes()); outputStream.write(inputStream.readAllBytes());
inputStream.close(); inputStream.close();
}catch (IOException | URISyntaxException e){ }catch (IOException | URISyntaxException e){
log.error("获取缩略图失败", e); System.out.println(e.getMessage());
} }
} }
} }

View File

@ -16,11 +16,8 @@ import io.netty.util.concurrent.DefaultPromise;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.PostConstruct;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.*; import java.net.*;
@ -40,29 +37,35 @@ public class RemoteService {
Channel channel; Channel channel;
@Value("${remote.ip:5.255.110.45}") String ip = "5.255.110.45";
String ip;
short port = 26321; short port = 26321;
final GalleryMapper galleryMapper; GalleryMapper galleryMapper;
final PushService pushService; PushService pushService;
HashMap<Integer, Promise<AbstractMessage>> promiseHashMap = new HashMap<>(); HashMap<Integer, Promise<AbstractMessage>> promiseHashMap;
EventLoop eventLoopGroup = new DefaultEventLoop(); EventLoop eventLoopGroup;
ExecutorService downloadThread = Executors.newCachedThreadPool(); ExecutorService downloadThread;
Thread monitor; Thread monitor;
AtomicInteger atomicInteger = new AtomicInteger(0); AtomicInteger atomicInteger;
final WebSocketService webSocketService; WebSocketService webSocketService;
public RemoteService(GalleryMapper galleryMapper, PushService pushService, WebSocketService webSocketService){
this.galleryMapper = galleryMapper;
this.pushService = pushService;
atomicInteger = new AtomicInteger(0);
eventLoopGroup = new DefaultEventLoop();
downloadThread = Executors.newCachedThreadPool();
promiseHashMap = new HashMap<>();
this.webSocketService = webSocketService;
@PostConstruct
void init() {
if(!initChannel()){ //如果远程服务器连接失败则开启本地监听 if(!initChannel()){ //如果远程服务器连接失败则开启本地监听
monitor = new Thread(this::monitorFunc); monitor = new Thread(this::monitorFunc);
monitor.start(); monitor.start();
@ -108,7 +111,8 @@ public class RemoteService {
resetUndone(); resetUndone();
return true; return true;
}catch (Exception e){ }catch (Exception e){
log.error("connect node failed, wait for node back online", e); e.printStackTrace();
log.info("connect node failed, wait for node back online");
return false; return false;
} }
} }
@ -143,8 +147,7 @@ public class RemoteService {
} }
else return -1; else return -1;
}catch (InterruptedException e){ }catch (InterruptedException e){
log.warn("checkAvailability interrupted", e); e.printStackTrace();
Thread.currentThread().interrupt();
return -1; return -1;
} }
} }
@ -186,8 +189,7 @@ public class RemoteService {
} }
else return -1; else return -1;
}catch (InterruptedException e){ }catch (InterruptedException e){
log.warn("addGalleryToQueue interrupted", e); e.printStackTrace();
Thread.currentThread().interrupt();
return -1; return -1;
} }
} }
@ -207,8 +209,6 @@ public class RemoteService {
return rsm.getResult(); return rsm.getResult();
}else return -1; }else return -1;
}catch (InterruptedException e){ }catch (InterruptedException e){
log.warn("deleteGallery interrupted", e);
Thread.currentThread().interrupt();
return -1; return -1;
} }
} }
@ -221,7 +221,7 @@ public class RemoteService {
while(true){ while(true){
client = socket.accept(); client = socket.accept();
if(client.getInetAddress().getHostAddress().equals(ip)){ if(client.getInetAddress().getHostAddress().equals("5.255.110.45")){
//连接之后发送lionwebsite否则存储节点不能确认这个端口是否有效 //连接之后发送lionwebsite否则存储节点不能确认这个端口是否有效
OutputStream outputStream = client.getOutputStream(); OutputStream outputStream = client.getOutputStream();
outputStream.write("lionwebsite".getBytes()); outputStream.write("lionwebsite".getBytes());
@ -245,7 +245,7 @@ public class RemoteService {
//如果不是响应信息或者响应信息为失败则打印 //如果不是响应信息或者响应信息为失败则打印
if(!(msg instanceof ResponseMessage rm) || rm.getResult() != 0) if(!(msg instanceof ResponseMessage rm) || rm.getResult() != 0)
if(! (msg instanceof MaintainMessage)) if(! (msg instanceof MaintainMessage))
log.debug("{}", msg); System.out.println(msg);
//下载状态 //下载状态
if(msg instanceof DownloadStatusMessage dsm){ if(msg instanceof DownloadStatusMessage dsm){
@ -277,10 +277,10 @@ public class RemoteService {
@Override @Override
public void channelUnregistered(ChannelHandlerContext ctx) { public void channelUnregistered(ChannelHandlerContext ctx) {
log.info("{}", ctx.channel()); System.out.println(ctx.channel());
log.info("{}", channel); System.out.println(channel);
if(ctx.channel() != null && ctx.channel().remoteAddress().toString().equals(channel.remoteAddress().toString())){ if(ctx.channel() != null && ctx.channel().remoteAddress().toString().equals(channel.remoteAddress().toString())){
log.info("activate monitor thread, waiting for node back online"); System.out.println("activate monitor thread, waiting for node back online");
pushService.storageNodeOffline(); pushService.storageNodeOffline();
monitor = new Thread(RemoteService.this::monitorFunc); monitor = new Thread(RemoteService.this::monitorFunc);
monitor.start(); monitor.start();

View File

@ -10,7 +10,6 @@ import com.lion.lionwebsite.Util.GalleryUtil;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
@ -23,9 +22,12 @@ import java.util.Date;
@Service @Service
@Slf4j @Slf4j
@RequiredArgsConstructor
public class SubService { public class SubService {
final SubMapper subMapper; SubMapper subMapper;
public SubService(SubMapper subMapper) {
this.subMapper = subMapper;
}
public String insertSubBind(String user){ public String insertSubBind(String user){
Response response = Response.generateResponse(); Response response = Response.generateResponse();

View File

@ -8,24 +8,32 @@ import com.lion.lionwebsite.Interceptor.TaskHandlerInterceptor;
import com.lion.lionwebsite.Util.CustomUtil; import com.lion.lionwebsite.Util.CustomUtil;
import com.lion.lionwebsite.Util.Response; import com.lion.lionwebsite.Util.Response;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@Service @Service
@Slf4j public class UserServiceImpl{
@RequiredArgsConstructor
public class UserService{
final UserMapper userMapper; @Resource
UserMapper userMapper;
final GalleryMapper galleryMapper; @Resource
GalleryMapper galleryMapper;
final CollectMapper collectMapper; @Resource
CollectMapper collectMapper;
final TaskHandlerInterceptor taskHandlerInterceptor; @Resource
TaskHandlerInterceptor taskHandlerInterceptor;
public UserServiceImpl(UserMapper userMapper, GalleryMapper galleryMapper, CollectMapper collectMapper, TaskHandlerInterceptor taskHandlerInterceptor) {
this.userMapper = userMapper;
this.galleryMapper = galleryMapper;
this.collectMapper = collectMapper;
this.taskHandlerInterceptor = taskHandlerInterceptor;
}
public String addAuthCode(String targetAuthCode, String people) { public String addAuthCode(String targetAuthCode, String people) {
Response response = Response.generateResponse(); Response response = Response.generateResponse();
@ -35,7 +43,7 @@ public class UserService{
taskHandlerInterceptor.updateAuthCodes(); taskHandlerInterceptor.updateAuthCodes();
response.success("插入成功"); response.success("插入成功");
}catch (Exception e){ }catch (Exception e){
log.error("插入授权码失败", e); e.printStackTrace();
response.failure("插入失败"); response.failure("插入失败");
} }
@ -54,7 +62,7 @@ public class UserService{
response.failure("授权码不存在"); response.failure("授权码不存在");
} }
}catch (Exception e){ }catch (Exception e){
log.error("修改授权码失败", e); e.printStackTrace();
response.failure("修改失败"); response.failure("修改失败");
} }
@ -72,7 +80,7 @@ public class UserService{
response.failure("授权码不存在"); response.failure("授权码不存在");
} }
}catch (Exception e){ }catch (Exception e){
log.error("修改用户名失败", e); e.printStackTrace();
response.failure("修改失败"); response.failure("修改失败");
} }
@ -96,7 +104,7 @@ public class UserService{
response.success("删除成功"); response.success("删除成功");
taskHandlerInterceptor.updateAuthCodes(); taskHandlerInterceptor.updateAuthCodes();
}catch (Exception e){ }catch (Exception e){
log.error("删除授权码失败", e); e.printStackTrace();
response.failure("删除失败"); response.failure("删除失败");
} }

View File

@ -4,23 +4,21 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.lion.lionwebsite.Domain.GalleryTask; import com.lion.lionwebsite.Domain.GalleryTask;
import com.lion.lionwebsite.Util.CustomUtil; import com.lion.lionwebsite.Util.CustomUtil;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.socket.*; import org.springframework.web.socket.*;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.ArrayList;
@Service @Service
@Slf4j
public class WebSocketService implements WebSocketHandler { public class WebSocketService implements WebSocketHandler {
CopyOnWriteArrayList<WebSocketSession> sessions; ArrayList<WebSocketSession> sessions;
ObjectMapper objectMapper; ObjectMapper objectMapper;
public WebSocketService() { public WebSocketService() {
sessions = new CopyOnWriteArrayList<>(); sessions = new ArrayList<>();
objectMapper = CustomUtil.objectMapper; objectMapper = CustomUtil.objectMapper;
} }
@ -32,8 +30,7 @@ public class WebSocketService implements WebSocketHandler {
sessions.forEach(s -> { sessions.forEach(s -> {
try { try {
s.sendMessage(new TextMessage("{\"type\": \"fullUpdate\"}")); s.sendMessage(new TextMessage("{\"type\": \"fullUpdate\"}"));
} catch (Exception e) { } catch (Exception ignore) {
log.warn("WebSocket send fullUpdate failed", e);
} }
}); });
return; return;
@ -42,13 +39,11 @@ public class WebSocketService implements WebSocketHandler {
ObjectNode objectNode = objectMapper.createObjectNode(); ObjectNode objectNode = objectMapper.createObjectNode();
objectNode.put("type", "updateTasks"); objectNode.put("type", "updateTasks");
objectNode.set("data", objectMapper.valueToTree(galleryTasks)); objectNode.set("data", objectMapper.valueToTree(galleryTasks));
log.debug("{}", objectNode); System.out.println(objectNode);
sessions.forEach(s -> { sessions.forEach(s -> {
try { try {
s.sendMessage(new TextMessage(objectNode.toString())); s.sendMessage(new TextMessage(objectNode.toString()));
}catch (Exception e){ }catch (Exception ignore){}
log.warn("WebSocket send updateTasks failed", e);
}
}); });
} }

View File

@ -3,7 +3,6 @@ package com.lion.lionwebsite.Util;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException; import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
@ -14,7 +13,6 @@ import java.util.regex.Pattern;
@Data @Data
@Slf4j
public class CustomUtil { public class CustomUtil {
public static final double ONE_KB = 1024; public static final double ONE_KB = 1024;
@ -88,7 +86,6 @@ public class CustomUtil {
ignored.close(); ignored.close();
return i; return i;
}catch (IOException ignored) { }catch (IOException ignored) {
log.trace("port {} unavailable", i);
} }
} }
return -1; return -1;
@ -98,7 +95,7 @@ public class CustomUtil {
try{ try{
response.sendError(404); response.sendError(404);
}catch (IOException e){ }catch (IOException e){
log.warn("sendError 404 failed", e); e.printStackTrace();
} }
} }
} }

View File

@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.URLUtil;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.ClientAbortException;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -14,7 +13,6 @@ import java.io.IOException;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
@Slf4j
public class FileDownload { public class FileDownload {
public static void export(HttpServletRequest request, HttpServletResponse response, String path) { public static void export(HttpServletRequest request, HttpServletResponse response, String path) {
File file = new File(path); File file = new File(path);
@ -82,10 +80,11 @@ public class FileDownload {
response.setHeader(HttpHeaders.CONTENT_RANGE, "bytes " + startByte + rangeSeparator + endByte + "/" + file.length()); response.setHeader(HttpHeaders.CONTENT_RANGE, "bytes " + startByte + rangeSeparator + endByte + "/" + file.length());
BufferedOutputStream outputStream; BufferedOutputStream outputStream;
RandomAccessFile randomAccessFile = null;
//已传送数据大小 //已传送数据大小
long transmitted = 0; long transmitted = 0;
try (RandomAccessFile randomAccessFile = new RandomAccessFile(file, "r")) {
try { try {
randomAccessFile = new RandomAccessFile(file, "r");
outputStream = new BufferedOutputStream(response.getOutputStream()); outputStream = new BufferedOutputStream(response.getOutputStream());
byte[] buff = new byte[4096]; byte[] buff = new byte[4096];
int len = 0; int len = 0;
@ -110,10 +109,15 @@ public class FileDownload {
// ignore 用户停止下载 // ignore 用户停止下载
// log.trace("用户停止下载: {}-{}, 已传输 {}", startByte, endByte, transmitted); // log.trace("用户停止下载: {}-{}, 已传输 {}", startByte, endByte, transmitted);
} catch (IOException e) { } catch (IOException e) {
log.error("文件下载IO错误: {}", path, e); e.printStackTrace();
} finally {
try {
if (randomAccessFile != null) {
randomAccessFile.close();
} }
} catch (IOException e) { } catch (IOException e) {
log.warn("关闭RandomAccessFile失败: {}", path, e); e.printStackTrace();
}
} }
} }
} }

View File

@ -17,23 +17,18 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static com.lion.lionwebsite.Util.CustomUtil.objectMapper; import static com.lion.lionwebsite.Util.CustomUtil.objectMapper;
public class GalleryUtil { public class GalleryUtil {
private static final Logger log = LoggerFactory.getLogger(GalleryUtil.class);
static String POST = "post"; static String POST = "post";
static String GET = "get"; static String GET = "get";
@ -41,17 +36,7 @@ public class GalleryUtil {
static String JSON = "json"; static String JSON = "json";
static ConcurrentHashMap<String, String> gid2MpvKey = new ConcurrentHashMap<>(); static HashMap<String, String> gid2MpvKey = new HashMap<>();
/** Reusable HTTP client —不要每次请求新建 */
private static final CloseableHttpClient httpClient = HttpClients.createDefault();
/** E-Hentai Cookie, injected from application.yaml via CustomBean */
private static String ehentaiCookie = "";
public static void setEhentaiCookie(String cookie) {
ehentaiCookie = cookie;
}
/** /**
@ -133,7 +118,7 @@ public class GalleryUtil {
//如果目标分辨率不存在抛出错误 //如果目标分辨率不存在抛出错误
if(!gallery.getAvailableResolution().containsKey(targetResolution)){ if(!gallery.getAvailableResolution().containsKey(targetResolution)){
log.warn("目标分辨率不存在,可用分辨率: {}", gallery.getAvailableResolution()); System.out.println(gallery.getAvailableResolution());
throw new ResolutionNotMatchException(targetResolution); throw new ResolutionNotMatchException(targetResolution);
} }
@ -152,7 +137,7 @@ public class GalleryUtil {
if(downloadDoc.select("#db > p:nth-child(2) > strong").text().startsWith("#")) if(downloadDoc.select("#db > p:nth-child(2) > strong").text().startsWith("#"))
gallery.setStatus("已提交"); gallery.setStatus("已提交");
else { else {
log.warn("下载提交失败: {}", downloadDoc.select("#db")); System.out.println(downloadDoc.select("#db"));
gallery.setStatus("提交失败"); gallery.setStatus("提交失败");
} }
@ -187,12 +172,11 @@ public class GalleryUtil {
return imageKeyCaches; return imageKeyCaches;
} }
public static String getMpvKey(String url){ public static synchronized String getMpvKey(String url){
String gid = String.valueOf(parseGid(url)); String gid = String.valueOf(parseGid(url));
return gid2MpvKey.computeIfAbsent(gid, k -> { if(!gid2MpvKey.containsKey(gid))
refreshMpvKey(url); refreshMpvKey(url);
return gid2MpvKey.get(k); return gid2MpvKey.get(gid);
});
} }
public static void refreshMpvKey(String url) { public static void refreshMpvKey(String url) {
@ -204,7 +188,7 @@ public class GalleryUtil {
try { try {
content = requests(mpvUrl, "get", header, null); content = requests(mpvUrl, "get", header, null);
}catch (Exception e){ }catch (Exception e){
log.error("刷新mpvKey失败, url: {}", url, e); e.printStackTrace();
gid2MpvKey.put(parseGid(url) + "", null); gid2MpvKey.put(parseGid(url) + "", null);
return; return;
} }
@ -213,7 +197,7 @@ public class GalleryUtil {
String[] scripts = script.html().split("\n"); String[] scripts = script.html().split("\n");
String mpvKey = scripts[1].split("=")[1].replace(";", "").replace("\"", "").replace(" ", ""); String mpvKey = scripts[1].split("=")[1].replace(";", "").replace("\"", "").replace(" ", "");
gid2MpvKey.put(parseGid(url) + "", mpvKey); gid2MpvKey.put(parseGid(url) + "", mpvKey);
log.info("刷新key:{}", mpvKey); System.out.println("刷新key:" + mpvKey);
} }
public static String getImageUrl(String mpvKey, ImageKeyCache imageKeyCache) { public static String getImageUrl(String mpvKey, ImageKeyCache imageKeyCache) {
@ -234,7 +218,8 @@ public class GalleryUtil {
return null; return null;
return jsonNode.get("i").asText(); return jsonNode.get("i").asText();
}catch (Exception e){ }catch (Exception e){
log.error("获取imgurl失败:{}:{}", imageKeyCache.getGid(), imageKeyCache.getPage(), e); System.out.println("获取imgurl失败:" + imageKeyCache.getGid() + ":" + imageKeyCache.getPage());
e.printStackTrace();
return null; return null;
} }
} }
@ -247,7 +232,7 @@ public class GalleryUtil {
boolean ignored = new File(imagePath).delete(); boolean ignored = new File(imagePath).delete();
return imagePath.replace(suffix, ".avif"); return imagePath.replace(suffix, ".avif");
} catch (IOException| InterruptedException e) { } catch (IOException| InterruptedException e) {
log.error("文件{}转换失败", imagePath, e); System.out.println("文件" + imagePath + "转换失败");
return null; return null;
} }
} }
@ -278,6 +263,7 @@ public class GalleryUtil {
* @throws IOException 可能会抛出IO错误 * @throws IOException 可能会抛出IO错误
*/ */
public static String requests(String url, String method, HashMap<String, String> headers, HashMap<String, String> body) throws IOException { public static String requests(String url, String method, HashMap<String, String> headers, HashMap<String, String> body) throws IOException {
CloseableHttpClient httpClient = HttpClients.createDefault();
CloseableHttpResponse httpResponse; CloseableHttpResponse httpResponse;
if(headers == null) if(headers == null)
headers = new HashMap<>(); headers = new HashMap<>();
@ -285,7 +271,7 @@ public class GalleryUtil {
headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0"); headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0");
headers.put("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"); headers.put("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
if(url.contains("hentai")) { if(url.contains("hentai")) {
headers.put("Cookie", ehentaiCookie); headers.put("Cookie", "ipb_session_id=af2b2b1a795b39550711134d7bdcbf7f; ipb_member_id=5774855; ipb_pass_hash=4b061c3abe25289568b5a8e0123fb3b9; sk=oye107wk02gtomb56x65dmv4qzbn; nw=1");
headers.put("Upgrade-Insecure-Requests", "1"); headers.put("Upgrade-Insecure-Requests", "1");
} }
@ -325,9 +311,10 @@ public class GalleryUtil {
while((str = reader.readLine()) != null) while((str = reader.readLine()) != null)
stringBuilder.append(str).append("\n"); stringBuilder.append(str).append("\n");
} else{ } else{
log.warn("{}:{}", url, statusCode); System.out.println(url + ":" + statusCode);
} }
httpClient.close();
httpResponse.close(); httpResponse.close();
return stringBuilder.toString(); return stringBuilder.toString();

View File

@ -56,17 +56,8 @@ public class Response {
return this; return this;
} }
public String getData(){
return result.get("data").asText();
}
/**
* @deprecated Use {@link #getData()} instead. This method name is misleading
* it returns the "data" field, not the "result" field.
*/
@Deprecated
public String getResult(){ public String getResult(){
return getData(); return result.get("data").asText();
} }
public boolean isSuccess(){ public boolean isSuccess(){

View File

@ -25,16 +25,19 @@ spring:
enabled: true enabled: true
# Application secrets — override via environment variables or external config in production #personal-service:
gallery: # StoragePath: /storage/
cookie: "ipb_session_id=af2b2b1a795b39550711134d7bdcbf7f; ipb_member_id=5774855; ipb_pass_hash=4b061c3abe25289568b5a8e0123fb3b9; sk=oye107wk02gtomb56x65dmv4qzbn; nw=1" #
#gallery-manage-service:
remote: # target-path: /root/gallery/
ip: "5.255.110.45" # cache-size: 100
#
local: #remote-service:
dou-nai-clash: "https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=clashmeta" # ip: 5.255.110.45
dou-nai-v2ray: "https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=v2" #
#local-service:
bot: # DouNaiClash: https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=clashmeta
token: "5222939329:AAHa6l9ZuVVdNSDLPI_H-c8O_VgeOEw5plA" # DouNaiV2ray: https://aaaa.gay/link/X7zEqkIx5gtIGugO?client=v2
#
#bot:
# token: 5222939329:AAHa6l9ZuVVdNSDLPI_H-c8O_VgeOEw5plA