Compare commits

..

153 Commits

Author SHA1 Message Date
q
1a5fc8d1ef feat: truncate long error msg, fix lanzou folder regex, bump version to 0.3.4 2026-05-30 01:16:17 +08:00
qaiu
a44f30f7e5 Merge pull request #189 from qaiu/copilot/update-readme-badge
Update README maven badge to track tag-triggered workflow status
2026-05-30 00:17:51 +08:00
copilot-swe-agent[bot]
f9ebd34de3 docs: remove branch filter from maven workflow badge 2026-05-29 16:16:43 +00:00
copilot-swe-agent[bot]
b47db300a6 Initial plan 2026-05-29 16:10:44 +00:00
qaiu
d19d8573f9 Merge pull request #188 from yukaidi1220/fix/qqwtool-json-api
fix(QQwTool): 改用 POST JSON API 解析 QQ 邮箱云盘链接
2026-05-29 23:54:20 +08:00
qaiu
799e120069 Merge pull request #187 from yukaidi1220/feat/contributions
安全加固、新功能、Bug 修复与代码质量改进
2026-05-29 23:53:09 +08:00
yukaidi
13f83e8795 fix(QQwTool): 改用 POST JSON API 解析 QQ 邮箱云盘链接
旧实现通过 GET 请求获取 HTML 并正则提取 JS 变量,但接口已改为返回 JSON,
导致 NumberFormatException。改为 POST 请求 `https://wx.mail.qq.com/s`,
body 为 `f=json&k={shareKey}`,解析 JSON 响应中的 body.url/name/size。

- 使用 postAbs() 替代 request() 以正确处理 HTTPS
- 使用 asJson() 兼容 gzip 响应
- 使用 complete() 正确存储 downloadUrl
- 添加 User-Agent、URL 编码 shareKey
2026-05-29 22:26:44 +08:00
yukaidi
7b5900aae4 refactor: 代码质量清理与日志规范化
- 替换 System.out.println/printStackTrace 为 Logger: MkgsTool, PodTool, WsTool, IpExtractor, ReqIpUtil, LogStatistics
- JsPlaygroundLogger 日志列表限制最大 1000 条防止内存泄漏
- JsScriptLoader JarFile 改用 try-with-resources 防止文件句柄泄漏
- DbServiceImpl Thread.sleep 改为 vertx.setTimer 避免阻塞 event loop
- 删除未使用的 api.js,删除空的 ParserApiClientLinkTest
- 移除前端未使用的导入和死代码 (downloaderService, monacoTypes)
- 提取 previewBaseUrl 到 constants.js 常量文件
2026-05-29 14:23:26 +08:00
yukaidi
e36c0bbe45 fix: Docker 部署优化
- run.sh 改用 exec 直接运行 Java,修复 Docker 中 ShutdownHook 失效
- Dockerfile 预创建 db 和 logs 目录,添加非 root 用户运行
- Docker entrypoint 以 root 运行再降权,解决 volume 权限问题
- EXPOSE 改为仅 6401,entrypoint 添加 -Duser.timezone
2026-05-29 14:23:01 +08:00
yukaidi
af723aed3a fix: NPE 修复、资源泄漏修复及其他 Bug 修复
- 修复 12 处 NPE 风险: FjTool/FsTool/IzTool/LzTool/MkwTool/P115Tool/PdbTool/QQTool/ParserCreate/CommonUtils/ShareLinkInfo/URLParamUtil
- 修复 4 处 Vert.x 资源泄漏: 测试类中 Vertx 实例未关闭
- 修复 CacheManager 防重入和 registerPeriodicCleanup 就绪检查
- 修复 ParserApi 中 redirectUrl()/viewUrl() Promise 未 complete
- 修复 CacheManager.updateTotalByField Promise 永不完成
- 修复 AppMain ShutdownHook 注册,确保 Vert.x 先于 JDBCPoolInit 关闭
- 修复 RouterHandlerFactory failureHandler 恢复返回 failure message
- 修复 ParserCreate/LzTool 收窄 catch 异常类型
- 修复 IzTool/FjTool/IzToolWithAuth 并发安全 (volatile + header 副本)
- 修复 P115Tool UA 为 null 时的 NPE,添加默认 User-Agent
- Font Awesome CDN 换源为 s4.zstatic.net,避免 bootcdn 投毒风险
- DirectoryTree selectAll 补 parserUrl 检查,Home 组件名 App→Home
2026-05-29 14:22:40 +08:00
yukaidi
0978186679 feat: 新功能与配置优化
- QQscTool: 支持多文件和目录解析,通过 GetFileList API 实现递归目录导航
- Home: 从粘贴文本中自动提取分享链接
- DirectoryTree: 目录浏览添加复制直链按钮
- domainName 改为可选,未配置时自动从请求地址推断
- 统一版本号管理,GitHub URL 构建时自动从 git remote origin 识别
- vue.config.js 添加前端构建配置,sync-version.js 构建时同步版本号
2026-05-29 14:21:32 +08:00
yukaidi
17460ff271 fix(security): 安全漏洞修复与依赖升级
- 升级 Vert.x 4.5.24 → 4.5.27, postgresql 42.7.3 → 42.7.11, logback 1.5.18 → 1.5.32, axios 1.13.5 → 1.16.1
- 修复 JWT 签名验证和密码比较的时序攻击漏洞 (MessageDigest.isEqual)
- 修复 AESUtils 使用不安全 Random 改为 SecureRandom
- 修复登录用户枚举和异常信息泄露,统一错误提示
- 修复 RateLimiter count++ 非原子操作 (AtomicInteger)
- 修复 JsParserExecutor DCL 模式缺少 volatile
- 修复 Token 日志泄露,仅打印前8字符
- 修复 Playground 密码时序攻击和堆栈泄露
- 所有 window.open 添加 noopener,noreferrer
- LocalConstant 改用 ConcurrentHashMap 保证线程安全
- Dockerfile 添加非 root 用户运行,secret.yml 加入 .gitignore
2026-05-29 14:20:54 +08:00
yukaidi
f81b3852ee fix: Font Awesome CDN 换源为 s4.zstatic.net,避免 bootcdn 投毒风险 2026-05-29 14:10:06 +08:00
yukaidi
37abebf8f8 fix(QQscTool): 简化 filesetId 正则,避免反斜杠转义问题 2026-05-29 13:58:13 +08:00
yukaidi
79fab8c0d6 fix: 修复前端错误信息丢失 & QQscTool filesetId 提取失败
- 前端 axios 对 HTTP 非2xx直接reject,catch块丢失后端错误信息,从 error.response.data.msg 提取实际错误展示给用户

- QQscTool extractFilesetId 正则未适配 Nuxt 转义JSON格式
2026-05-29 13:46:25 +08:00
yukaidi
9b70fb2778 feat(QQscTool): 支持多文件和目录解析,通过 GetFileList API 实现递归目录导航 2026-05-29 13:22:12 +08:00
yukaidi
bd2868748f feat(Home): 从粘贴文本中自动提取分享链接 2026-05-29 13:08:22 +08:00
yukaidi
1f47bf13b5 fix(QQscTool): 检测被和谐文件,避免返回无效直链 2026-05-29 12:56:28 +08:00
yukaidi
7d8b33afe0 refactor: 前端代码质量清理
- fix: Home.vue 组件名 'App' → 'Home'
- fix: DirectoryTree selectAll 补 parserUrl 空值检查
- fix: 提取 previewBaseUrl 到 utils/constants.js,解除 ShowFile 对 Home 的耦合
- fix: Home.vue focus 事件监听器改为命名函数,加 beforeUnmount 移除
- fix: Playground.vue MutationObserver 保存引用,onUnmounted 中 disconnect
- chore: 删除未使用的 api.js
- chore: 删除 ClientLinks.vue 死代码 downloadClient/shouldShowDownloadButton
- chore: 删除 DirectoryTree.vue 死代码 buildTree
2026-05-29 12:38:34 +08:00
yukaidi
367f7c78a4 Merge remote-tracking branch 'upstream/main' 2026-05-29 12:17:51 +08:00
yukaidi
1bd23ec4ae feat: 目录浏览添加复制直链按钮 2026-05-29 12:13:00 +08:00
yukaidi
3461532679 fix: ConfigUtil 读取配置失败时自动尝试 resources/ 目录
当文件系统直接读取 app.yml 失败时(如 Docker 卷挂载场景),
ConfigUtil.readConfig 现在会自动尝试 resources/ 子目录作为
fallback,确保配置文件在各种部署方式下都能被正确加载。
2026-05-29 11:54:13 +08:00
yukaidi
4cfcdfa1f8 fix: Deploy 启动时自动从 resources/ 子目录查找配置文件
当 app.yml 在当前目录不存在时,自动回退到 resources/app.yml,
解决 Docker 部署时配置文件在 resources/ 子目录导致启动失败的问题。
2026-05-29 11:39:21 +08:00
yukaidi
ac2f526a1c fix: clientLinks/clientLink 补全参数注入,统一 _requestOrigin 设置
- clientLinks 无 auth 时调用 URLParamUtil.addParam() 注入代理/认证配置
- clientLink 补设 _requestOrigin 并调用 addParam()
- getFileList/getFileDownUrl 补设 _requestOrigin 保持一致性
- getDownLink 回退地址补上端口号
2026-05-29 11:36:20 +08:00
yukaidi
cfb624e9e0 fix: 统一 origin 解析逻辑,修复反向代理下 domainName 不一致
- ServerApi 添加 resolveOrigin() 统一处理 X-Forwarded-Host 头
- ParserApi.parse() 补设 _requestOrigin,修复 /v2/linkInfo 路径遗漏
- 清理 app-dev.yml 残留注释
2026-05-29 11:31:08 +08:00
yukaidi
e1bf45b5c8 feat: domainName 改为可选,未配置时自动从请求地址推断
- app-dev.yml 注释掉默认 domainName
- ParserApi 添加 getLinkPrefix() 支持 X-Forwarded-Host 反向代理
- ServerApi 传递 _requestOrigin 到 otherParam 供 parser 层使用
- URLParamUtil.addParam() 读不到配置时用 _requestOrigin 兜底
- AppMain 启动日志 domainName 为空时显示本地端口地址
2026-05-29 11:27:32 +08:00
yukaidi
e2dc611aa4 fix: 剪切板自动读取失败时静默,仅手动读取时提示 2026-05-29 11:02:00 +08:00
yukaidi
77c953626f fix: api.js baseURL 改为相对路径,修复反向代理下请求绕过代理的问题 2026-05-29 10:59:12 +08:00
yukaidi
0e14c9a925 refactor: 统一版本号管理,消除硬编码
项目版本(pom.xml revision)和parser版本(parserVersion)统一为单一来源,
前端构建时自动同步,发版只需改根pom.xml的两个属性。
2026-05-29 10:57:49 +08:00
yukaidi
a4e8585e2c fix: 错误处理返回具体异常信息而非通用"服务器内部错误"
RouterHandlerFactory 的 onFailure 和 catch 两处均丢弃了
e.getMessage(),导致前端无法获知具体报错原因。
2026-05-29 10:49:54 +08:00
yukaidi
cf7d64916e fix: Groovy 正则改为字符串形式避免斜杠解析问题 2026-05-29 10:37:31 +08:00
yukaidi
4ac80bbfe8 fix: gmavenplus-plugin 添加 Groovy 依赖 2026-05-29 10:34:24 +08:00
yukaidi
cfe8352d45 refactor: GitHub URL 改为构建时自动从 git remote origin 识别
前端:vue.config.js 通过 DefinePlugin 注入 VUE_APP_GITHUB_REPO_URL,
Home.vue/Playground.vue 中硬编码的 GitHub URL 全部改为动态变量。
后端:parser/pom.xml 添加 gmavenplus-plugin 在 initialize 阶段从
git remote origin 解析 github.owner/github.repo,SCM 字段引用 property。
2026-05-29 10:29:44 +08:00
yukaidi
4a0fe61d30 fix: ParserCreate 正则匹配 PWD 组时捕获 IllegalArgumentException
matcher.group(PWD) 在正则未定义 PWD 命名组时抛出
IllegalArgumentException 而非 IllegalStateException,原 catch 未覆盖
导致无提取码的链接(如QQ文件分享)返回 500。
2026-05-29 10:13:22 +08:00
yukaidi
c62e109aff fix: 将硬编码的上游 GitHub URL 改为 fork 地址
Home.vue、Playground.vue、parser/pom.xml 中的 qaiu/netdisk-fast-download
URL 全部替换为 yukaidi1220/netdisk-fast-download。
2026-05-29 10:09:49 +08:00
qaiu
ff400d3be3 Merge pull request #186 from yukaidi1220/260529
fix: 修复多个内存泄漏问题、资源管理缺陷及安全漏洞
感谢 @yukaidi1220 的贡献! 🎉

本次 PR 对项目做了一次全面深入的审查,涵盖了内存泄漏、资源管理、安全漏洞和代码缺陷,工作量很大,质量也很高,辛苦了👍

几个小建议供参考:

registerPeriodicCleanup 注册时机:目前在 的 块中调用,类加载时机不能保证 Vertx 已完全就绪。建议后续改为实现 接口,在 启动后执行,时机更可控。CacheServiceImplstaticAppRunPostExecVerticle

RateLimiter 并发安全:去掉 方向正确,但需确认 底层是 ,否则 与 并发执行存在竞态风险。另外 不能保证 的原子性,可考虑改用 。synchronizedipRequestMapConcurrentHashMapremoveIfcomputevolatile int countcount++AtomicInteger

PanBase 子类覆写 client:static 共享 WebClient 本身没问题,但如果有子类在构造中重新赋值 用于特殊场景(如代理),需确保这些子类有对应的逻辑,否则泄漏依然存在。this.client = WebClient.create(...)close()
2026-05-29 09:59:56 +08:00
yukaidi
1d243b8f1b fix: Docker EXPOSE 改为仅 6401,entrypoint 添加 -Duser.timezone
审查发现:
- EXPOSE 6400 误导用户映射后端端口,实际只需 6401(反向代理)
- TZ 环境变量不如 JVM -Duser.timezone 可靠
2026-05-29 09:57:05 +08:00
yukaidi
732a7f86fe fix: Docker entrypoint 以 root 运行再降权,彻底解决 volume 权限问题
去掉 USER appuser,entrypoint 以 root 身份运行,先 chown 修复
volume 挂载目录的权限,再通过 su 降权到 appuser 执行应用。
2026-05-29 09:49:22 +08:00
yukaidi
3c428f6a6d fix: ShutdownHook 注册顺序调整,确保 Vert.x 先于 JDBCPoolInit 关闭
JVM ShutdownHook 按注册逆序执行。将 AppMain 的 hook 移到 Deploy.start() 之前注册,
使执行顺序变为:Deploy hook(关闭 Vert.x)-> AppMain hook(关闭 JDBCPoolInit/JsParserExecutor)。
2026-05-29 09:01:08 +08:00
yukaidi
bff17f2d4e fix: run.sh 改用 exec 直接运行 Java,修复 Docker 中 ShutdownHook 失效
原 nohup+tail-f 模式下,Docker SIGTERM 发给 tail 而非 Java 进程,
导致 ShutdownHook 永远不会触发,资源无法优雅关闭。
改为 exec 让 Java 成为 PID 1,正确接收信号。
同时支持通过 JVM_XMX/JVM_OPTS 环境变量自定义 JVM 参数。
2026-05-29 08:46:57 +08:00
yukaidi
df600eaada fix: Dockerfile 预创建 db 和 logs 目录,修复非 root 用户无法写入 H2 数据库
appuser 运行时无法在 /app 下创建新子目录,H2 尝试创建 /app/db/nfdData.mv.db
时因目录不存在导致 AccessDeniedException。在 chown 之前预创建目录。
2026-05-29 08:34:59 +08:00
yukaidi
dd4027c931 fix: LzTool/IzToolWithAuth 最后两处 .get().toString() NPE 风险
- LzTool:221 — obj.get("url").toString() 改为 String.valueOf()
- IzToolWithAuth:434 — get("uuid").toString() 添加 null 检查
2026-05-29 07:54:33 +08:00
yukaidi
d1569195e4 fix: AppMain 注册 ShutdownHook 关闭 JDBCPoolInit 和 JsParserExecutor
审查发现 9c3945f 因模块依赖问题回退了 ShutdownHook 中的清理逻辑,
导致 JDBCPoolInit 连接池和 JsParserExecutor WorkerExecutor 在进程退出时
无法被显式关闭。将清理逻辑移到 web-service 模块的 AppMain(可依赖所有模块)。
2026-05-29 07:22:57 +08:00
yukaidi
d6e88f0c53 fix: PlaygroundApi 移除重复 import 和未使用的 getStackTrace 死代码
审查发现 42925c8 引入了重复的 StandardCharsets import,且 getStackTrace
方法在移除堆栈泄露后无任何调用方,属于死代码。
2026-05-29 07:06:53 +08:00
yukaidi
2a9fa81e56 fix: CacheManager registerPeriodicCleanup 添加防重入和 Vertx 就绪检查
审查发现 static 块中注册定时任务存在时序风险:如果 CacheServiceImpl 在 Vertx
初始化前被加载,定时任务将注册失败且无法恢复。添加 cleanupRegistered 标志防止
重复注册,Vertx 未就绪时跳过并等待下次调用。
2026-05-29 07:02:23 +08:00
yukaidi
5eed1fdfa0 revert: 回退 MyData.java 的构造函数修改,恢复为空 TODO
用户明确表示不需要改动 MyData 的 TODO,回退 741d7aa 对该文件的修改。
2026-05-29 06:58:41 +08:00
yukaidi
cf7fc4f502 fix: FjTool login() 中 token.substring 添加 null 保护
token 脱敏日志在 token 可能为 null 时会抛 NPE,添加 null 检查。
2026-05-29 06:58:09 +08:00
yukaidi
0ea31d631a fix: 移除 IzTool/IzToolWithAuth login() 中未使用的 h 变量(死代码)
并发安全修复引入的 h 变量创建后从未使用,后续请求仍通过
setTemplateParam("appToken", token) 传递 token。删除死代码并为
同一行的 token.substring 添加 null 保护。
2026-05-29 06:57:44 +08:00
yukaidi
74840ab63f fix(FsTool): 收窄 parseFileNameFromContentDisposition 中的 catch 异常类型
将 catch(Exception) 改为 catch(IllegalArgumentException),
只捕获 URLDecoder.decode 在遇到非法百分比编码时抛出的具体异常。
2026-05-29 06:38:35 +08:00
yukaidi
31f33339f1 fix(FsTool): 修复 parseById 中 get("paramJson") 可能导致的 NPE
当 otherParam 中缺少 "paramJson" 键时,后续 getString 调用会抛出 NPE。
添加 null 检查并提前返回失败。
2026-05-29 06:37:53 +08:00
yukaidi
c0a0d0dc47 fix(FjTool): 修复 parseById 中 get("paramJson") 可能导致的 NPE
当 otherParam 中缺少 "paramJson" 键时,后续 getString 调用会抛出 NPE。
添加 null 检查并提前返回失败。
2026-05-29 06:37:12 +08:00
yukaidi
0cd77ee9b9 fix(IzTool): 修复 parseFileList 中 get("uuid") 可能导致的 NPE
当 otherParam 中缺少 "uuid" 键时,原代码直接调用 .toString() 会抛出
NullPointerException。改为先取出 Object 再做 null 检查。
2026-05-29 06:36:43 +08:00
yukaidi
741d7aa8ca fix: implement MyData @DataObject constructor deserialization
Implement the MyData(JsonObject) constructor to deserialize `id` and
`maxSize` fields from the provided JsonObject, replacing the empty TODO.
2026-05-29 06:28:39 +08:00
yukaidi
d06a80dc73 fix: narrow catch exception type in LzTool.java
Replace 2 instances of `catch (Exception ignored)` with
`catch (MalformedURLException ignored)` around `new java.net.URL(url)`
calls, since that constructor only throws MalformedURLException.
2026-05-29 06:28:20 +08:00
yukaidi
86b9c43b8b fix: narrow catch exception type in ParserCreate.java
Replace 5 instances of `catch (Exception ignored)` with
`catch (IllegalStateException ignored)` around matcher.group() calls,
since that method only throws IllegalStateException when a named group
does not exist.
2026-05-29 06:27:51 +08:00
yukaidi
206981d4b4 revert: RouterHandlerFactory failureHandler 恢复返回 failure message
原 ctx.failure().getMessage() 是故意设计——RateLimiter 等组件通过 promise.fail()
传递用户友好的错误消息(如"请求次数太多了"),这些消息需要通过 failureHandler
返回给客户端。改为固定"服务器内部错误"会导致这些消息丢失。
仅添加 null 检查防止 NPE。
2026-05-29 06:15:56 +08:00
yukaidi
7d5831b5f4 fix: 彻底消除用户枚举和异常信息泄露的遗留问题
- UserServiceImpl: 3处"用户不存在"统一改为"用户名或密码错误"/"认证失败"
- RouterHandlerFactory: failureHandler 中 ctx.failure().getMessage() 改为"服务器内部错误"
2026-05-29 05:53:40 +08:00
yukaidi
7ca63985bd fix(test): 删除空的 ParserApiClientLinkTest 文件
该文件仅包含空行,无实际测试代码,直接删除。
2026-05-29 04:06:21 +08:00
yukaidi
06416a4e5f fix(test): JsFetchBridgeTest Vertx 资源泄漏修复
将各 @Test 方法中局部创建的 Vertx.vertx() 统一为成员变量,
通过 @Before 创建并初始化,@After 关闭,避免资源泄漏。
2026-05-29 04:06:13 +08:00
yukaidi
88739e8d1a fix(test): JsParserTest Vertx 资源泄漏修复
将各 @Test 方法中局部创建的 Vertx.vertx() 统一为成员变量,
通过 @Before 创建并初始化,@After 关闭,避免资源泄漏。
2026-05-29 04:04:52 +08:00
yukaidi
ffaba4f496 fix(test): BaiduPhotoParserTest Vertx 资源泄漏修复
将各 @Test 方法中局部创建的 Vertx.vertx() 统一为成员变量,
通过 @Before 创建并初始化,@After 关闭,避免资源泄漏。
2026-05-29 04:03:37 +08:00
yukaidi
c4f94a2bc7 fix: replace printStackTrace/System.out.println with logger in JsHttpClient, PlaygroundApi, LogStatistics, CacheServiceImpl, JsPlaygroundExecutor, JsPlaygroundLogger 2026-05-29 03:48:11 +08:00
yukaidi
49a3918244 fix: replace double-brace init with static block + Collections.unmodifiableMap; add final to UNIQUE_PREFIX 2026-05-29 03:40:06 +08:00
yukaidi
caddff567f fix: replace System.out.println with logger in IpExtractor 2026-05-29 03:39:36 +08:00
yukaidi
aed9e9f10d fix: replace System.out.println/printStackTrace with logger in ReqIpUtil; add final to static fields 2026-05-29 03:39:11 +08:00
yukaidi
6557b49383 fix: replace System.out.println with log.debug in MkgsTool 2026-05-29 03:38:36 +08:00
yukaidi
082cc4c743 fix: replace System.out.println with log in PodTool; mask token in log output 2026-05-29 03:38:07 +08:00
yukaidi
e261ebe698 fix: replace System.out.println with log.debug in WsTool 2026-05-29 03:37:32 +08:00
yukaidi
5a0dc69186 chore: remove debug console.log statements
Remove debug logging from production code while preserving
console.error and console.warn for actual error/warning cases.
2026-05-29 03:28:22 +08:00
yukaidi
29d8bf3ea4 fix(security): add noopener,noreferrer to all window.open calls
Prevent reverse tabnapping by adding security attributes to all
window.open calls that open links in new tabs.
2026-05-29 03:24:53 +08:00
yukaidi
07a330cfd4 fix: LocalConstant 改用 ConcurrentHashMap 保证线程安全,LzTool 方法名拼写修正
- LocalConstant: HashMap → ConcurrentHashMap,put() 改用 putIfAbsent 消除 check-then-act 竞态
- LzTool: 私有方法 setDateAndComplate → setDateAndComplete(拼写修正,仅内部调用)
2026-05-29 03:14:10 +08:00
yukaidi
aa30571709 fix(security): 升级 axios 版本 1.13.5 -> 1.16.1
修复 14 个安全漏洞
2026-05-29 03:08:59 +08:00
yukaidi
2bb9912cf5 fix(security): 升级 Vert.x 版本 4.5.24 -> 4.5.27 (parser 模块)
修复 SslContext 缓存 DoS 漏洞
2026-05-29 03:08:43 +08:00
yukaidi
8f77d9fe98 fix(security): 升级 Vert.x 版本 4.5.24 -> 4.5.27 (根 pom.xml)
修复 SslContext 缓存 DoS 漏洞
2026-05-29 03:08:27 +08:00
yukaidi
9cb32b3e8f fix(security): 升级 postgresql 驱动版本 42.7.3 -> 42.7.11
修复 SCRAM 认证 DoS 漏洞
2026-05-29 03:08:00 +08:00
yukaidi
080206925f fix(security): 升级 logback 版本 1.5.19 -> 1.5.32 (parser 模块)
修复 CVE-2024-12798 等 3 个安全漏洞
2026-05-29 03:07:39 +08:00
yukaidi
54d2a8189c fix(security): 升级 logback 版本 1.5.18 -> 1.5.32 (根 pom.xml)
修复 CVE-2024-12798 等 3 个安全漏洞
2026-05-29 03:07:22 +08:00
yukaidi
377bc12cf9 fix: Dockerfile 添加非 root 用户运行应用,提升容器安全性 2026-05-29 02:55:57 +08:00
yukaidi
da715c8a8f fix: CacheManager 消除双括号初始化,改用标准 HashMap 写法 2026-05-29 02:55:32 +08:00
yukaidi
fa4028296f fix: FjTool parseFileList 中 uuid 参数为 null 时的 NPE 2026-05-29 02:54:00 +08:00
yukaidi
dc629a3126 fix: P115Tool 中 UA 参数为 null 时的 NPE,添加默认 User-Agent 2026-05-29 02:53:32 +08:00
yukaidi
746c7ad5b3 fix: 替换 e.printStackTrace() 和 System.out.println 为 logger 调用
- HttpProxyVerticle: err.printStackTrace() / e.printStackTrace() -> LOGGER.error()
- RouterHandlerFactory: 5处 printStackTrace() -> LOGGER.error()
- CommonUtil: e.printStackTrace() -> LOGGER.error()
- ReflectionUtil: 新增 LOGGER,3处 printStackTrace() -> LOGGER.error()
- CreateDatabase: e.printStackTrace() -> LOGGER.error()
- URLUtil: 新增 LOGGER,e.printStackTrace() -> LOGGER.error()
- LzTool: e.printStackTrace() -> log.error()
- MkwTool: 3处 System.out.println + 1处 printStackTrace -> log.debug()/log.error()
- PdbTool: e.printStackTrace() -> log.error()
- ParserApi: t.printStackTrace() -> log.error()
- CacheManager: 2处 Throwable::printStackTrace -> LOGGER.error()
- QQTool: 3处 System.out.println -> log.debug()
- FjTool: System.out.println -> log.debug()
2026-05-29 02:50:06 +08:00
yukaidi
aef1b9ab11 fix: IzToolWithAuth 并发安全 - token/authFlag 改为 volatile,header 副本替代共享修改 2026-05-29 02:49:01 +08:00
yukaidi
79c9eb3dda fix: FjTool 并发安全 - token/userId/authFlag 改为 volatile,header0 副本替代共享修改 2026-05-29 02:48:13 +08:00
yukaidi
5a08ed68c2 fix: IzTool 并发安全 - token/authFlag 改为 volatile,header 副本替代共享修改 2026-05-29 02:47:27 +08:00
yukaidi
e5a623c5a8 fix: 将 secret.yml 加入 .gitignore 防止敏感配置泄露 2026-05-29 02:41:00 +08:00
yukaidi
4586138bf1 fix: 修复 AESUtils.getRandomString 使用不安全的 Random,改为 SecureRandom 2026-05-29 02:40:32 +08:00
yukaidi
1dddec110e fix: 修复 PasswordUtil.checkPassword 中的时序攻击漏洞,使用 MessageDigest.isEqual() 2026-05-29 02:39:31 +08:00
yukaidi
46e9999e4c fix: 修复 CacheManager.updateTotalByField 中 getShareKeyTotal 缺少 onFailure 导致 Promise 永不完成 2026-05-29 02:39:05 +08:00
yukaidi
a664ae3a56 fix: 修复 ParserApi 中 redirectUrl() 和 viewUrl() 的 Promise 未 complete 问题 2026-05-29 02:38:27 +08:00
yukaidi
9bcdcb2cb7 fix: 修复 MkwTool 中 set-cookie 为 null 时的 NPE 2026-05-29 02:37:22 +08:00
yukaidi
0b8592559a fix: 修复 CommonUtils.getURLParams() 中 fullUrl.getQuery() 返回 null 时的 NPE 2026-05-29 02:36:47 +08:00
yukaidi
c0b18be5ab fix: 修复 ShareLinkInfo.getCacheKey() 中 otherParam.get("UA") 可能导致的 NPE 2026-05-29 02:36:20 +08:00
yukaidi
46b2eb1ccd 修复RouterHandlerFactory异常信息泄露:Future失败和异常捕获时返回通用错误消息,详细异常仅记日志 2026-05-29 02:26:12 +08:00
yukaidi
d323376bed 修复RateLimiter count++非原子操作:将volatile int改为AtomicInteger,使用incrementAndGet() 2026-05-29 02:25:07 +08:00
yukaidi
838c86ae15 修复JsParserExecutor DCL模式缺少volatile:EXECUTOR字段添加volatile保证多线程可见性 2026-05-29 02:23:17 +08:00
yukaidi
42925c857c 修复Playground密码时序攻击和堆栈泄露:使用MessageDigest.isEqual()比较密码,移除返回给客户端的完整堆栈信息 2026-05-29 02:22:52 +08:00
yukaidi
ba981d281f 修复Token日志泄露:日志中token仅打印前8个字符,其余用...替代 2026-05-29 02:21:12 +08:00
yukaidi
4159b884de 修复登录用户枚举和异常信息泄露:统一登录失败提示为'用户名或密码错误',隐藏数据库异常详情 2026-05-29 02:19:22 +08:00
yukaidi
36b38421e5 修复JWT签名验证时序攻击:使用MessageDigest.isEqual()替代String.equals()进行签名比较 2026-05-29 02:18:43 +08:00
yukaidi
b77c8a80e9 fix(web-service): ParserApi 中 CacheManager/ServerApi 改为 static 避免每次请求重复创建
CacheManager 和 ServerApi 无请求级状态,每次 new 会造成不必要的对象分配,
改为 static final 字段复用;同时修复 viewURL 中内联 new ServerApi()。
2026-05-29 02:14:32 +08:00
yukaidi
886dcd039f fix(web-service): DbServiceImpl Thread.sleep 改为 vertx.setTimer 避免阻塞 event loop
sayOk() 中使用 Thread.sleep(4000) 会阻塞 Vert.x event loop 线程,
改为 vertx.setTimer 异步延迟完成 promise。
2026-05-29 02:13:42 +08:00
yukaidi
d99885d396 fix(core): RouterVerticle Router 从 static final 改为实例字段
Router 声明为 static final 会在类加载时提前创建,
与 Vert.x 实例生命周期不匹配,改为在 start() 中初始化为实例字段。
2026-05-29 02:12:37 +08:00
yukaidi
942de9c430 fix(core): ConfigRetriever 成功路径也调用 close() 防止资源泄漏
readConfig() 中 onSuccess 回调未关闭 ConfigRetriever,
文件监听器和底层资源无法释放,现在成功和失败路径均调用 close()。
2026-05-29 02:11:35 +08:00
yukaidi
ae3ff9ecbb fix(parser): JsPlaygroundLogger 日志列表限制最大 1000 条防止内存泄漏
日志列表 Collections.synchronizedList 无容量限制,长时间运行会无界增长。
新增 addLog() 方法,在添加前检查容量,超过 1000 条时移除最早的条目。
2026-05-29 02:09:59 +08:00
yukaidi
bcc4315ea9 fix(parser): JsScriptLoader JarFile 改用 try-with-resources 防止文件句柄泄漏
JarFile 在手动 close() 时若中间抛异常会导致文件句柄未关闭,
改为 try-with-resources 确保无论正常或异常都能释放资源。
2026-05-29 02:08:50 +08:00
yukaidi
2f7304ab2d fix: Docker 镜像地址改为动态获取仓库名,修复 fork 仓库推送被拒绝 2026-05-29 01:47:16 +08:00
yukaidi
0df01ba3d5 fix: Deploy配置读取失败时主线程永久阻塞
BUG-05: 配置读取失败时仅调用printStackTrace,未调用LockSupport.unpark()
导致主线程永远阻塞在LockSupport.park()
现在失败时记录错误日志、unpark主线程并退出进程
2026-05-29 01:40:38 +08:00
yukaidi
710e454fd0 fix: dependency graph 步骤添加 continue-on-error,fork 仓库未启用时不影响 CI 2026-05-29 01:40:30 +08:00
yukaidi
c46dfa00a0 fix: ReverseProxyVerticle HTTPS默认端口应为443而非80
BUG-03: URL使用https://前缀构造,但默认端口设为80(HTTP)
导致所有未指定端口的HTTPS代理目标连接失败
2026-05-29 01:40:05 +08:00
yukaidi
9a3ea05023 fix: HttpProxyVerticle代理认证绕过漏洞
SEC-01: 修复三个安全问题:
1. split.length<=1时直接放行请求,现在返回403
2. Base64解码无异常处理,现在捕获IllegalArgumentException返回403
3. 日志中明文记录密码,现在只记录用户名
2026-05-29 01:39:31 +08:00
yukaidi
66d7a62d3a fix: ReflectionUtil正则拼写错误boolen应为boolean
BUG-02: boolen拼写错误导致boolean[]类型参数永远不会被识别为基本类型数组
参数绑定失败并抛出RuntimeException
2026-05-29 01:38:53 +08:00
yukaidi
f1b6cd3e18 fix: HttpProxyConf构造器port字段从未赋值,timeout被重复赋值
BUG-01: this.timeout = DEFAULT_PORT 应为 this.port = DEFAULT_PORT
导致port字段始终为null,代理服务器无法获取正确端口
2026-05-29 01:38:24 +08:00
yukaidi
189d1477a8 fix: 将 fetch-runtime.js 复制到 test resources,修复测试类加载不到资源文件
CI 运行测试时 JsParserExecutor.loadFetchRuntime() 通过 ClassLoader.getResourceAsStream
找不到 fetch-runtime.js。将文件复制到 parser/src/test/resources/ 确保测试类路径可用。
2026-05-29 01:25:32 +08:00
yukaidi
9c3945f45a fix: 修复编译错误,core 模块不能依赖 web-service/parser/core-database
core 模块的 Deploy.java 和 PostExecVerticle.java 直接引用了上层模块的类,
导致编译失败(package does not exist)。

- Deploy.java: 移除对 JDBCPoolInit 和 JsParserExecutor 的显式调用,
  vertx.close() 会级联关闭 Vert.x 创建的资源
- PostExecVerticle.java: 移除缓存定时清理逻辑(不能引用 web-service 的 CacheManager)
- CacheManager: 添加 registerPeriodicCleanup() 静态方法,通过 VertxHolder 注册定时任务
- CacheServiceImpl: static 块中调用 CacheManager.registerPeriodicCleanup(),服务加载时自动注册
2026-05-29 01:08:15 +08:00
yukaidi
77c7d6c5d6 fix: ShutdownHook 中 JDBCPoolInit.instance() 添加 null 检查,防止未初始化时 NPE
安装引导模式下数据库可能未配置,JDBCPoolInit.instance() 为 null,直接调用 close() 会 NPE。
2026-05-29 00:53:31 +08:00
yukaidi
ab3009e9cc fix: ShutdownHook 接入 JDBCPoolInit.close() 和 JsParserExecutor.shutdownExecutor()
将已实现但未调用的 close()/shutdownExecutor() 接入 JVM ShutdownHook,显式释放资源。
关闭顺序:vertx.close() → JDBC 连接池 → WorkerExecutor 线程池,确保依赖关系正确。
2026-05-29 00:50:45 +08:00
yukaidi
1c2291f9cf Revert "fix(performance): CommonUtil initConfig 改为异步非阻塞读取"
This reverts commit 6dfa770137.
2026-05-29 00:37:27 +08:00
yukaidi
efb135ee48 Revert "fix(error): URLUtil 异常不再吞没,改为抛出 IllegalArgumentException"
This reverts commit 0dfee8ab22.
2026-05-29 00:37:18 +08:00
yukaidi
0699c4a127 Revert "fix(memory): ReflectionUtil 添加 SoftReference + TTL 缓存清理"
This reverts commit be1ed3d46d.
2026-05-29 00:37:09 +08:00
yukaidi
33cef5f8e1 Revert "fix(resource): ReqIpUtil 使用统一 Vertx 单例"
This reverts commit 1fca578c07.
2026-05-29 00:36:55 +08:00
yukaidi
32d467b6d9 Revert "fix(security): SecurityClassFilter 改为白名单策略"
This reverts commit a83665ac44.
2026-05-29 00:35:10 +08:00
yukaidi
6dfa770137 fix(performance): CommonUtil initConfig 改为异步非阻塞读取 2026-05-29 00:33:27 +08:00
yukaidi
0dfee8ab22 fix(error): URLUtil 异常不再吞没,改为抛出 IllegalArgumentException
原代码 catch Exception 后仅打印堆栈,调用方无法感知解析失败。
改为抛出 IllegalArgumentException,让调用方明确知道 URL 解析失败。
2026-05-29 00:33:10 +08:00
yukaidi
85fe910f25 fix(bug): ParamUtil 修复数组越界问题
原代码当 kv.length == 0 时访问 kv[0] 会抛出异常。
改为跳过空参数,使用 split(=, 2) 限制分割次数。
2026-05-29 00:32:56 +08:00
yukaidi
6c60b0116f fix(resource): JDBCPoolInit 实现 AutoCloseable 添加 close() 方法
原代码单例模式无关闭方法,应用退出时数据库连接池无法释放。

改为:
- 实现 AutoCloseable 接口
- 添加 close() 方法关闭连接池
- 关闭后将 pool 置 null 防止重复关闭
2026-05-29 00:32:26 +08:00
yukaidi
8dfcf510f6 fix(resource): JsParserExecutor WorkerExecutor 懒加载 + 关闭支持
原代码静态初始化 WorkerExecutor,应用关闭时无法释放线程资源。

改为:
- 懒加载创建 WorkerExecutor
- 实现 AutoCloseable 接口
- 添加 shutdownExecutor() 静态方法供应用关闭时调用
2026-05-29 00:32:13 +08:00
yukaidi
be1ed3d46d fix(memory): ReflectionUtil 添加 SoftReference + TTL 缓存清理
原代码使用永久缓存 Reflections 实例,占用大量内存且不释放。

改为:
- 使用 SoftReference 允许 GC 在内存不足时回收
- 添加 1 小时 TTL 防止长期占用
- 每次获取时自动清理过期条目
2026-05-29 00:32:02 +08:00
yukaidi
1fca578c07 fix(resource): ReqIpUtil 使用统一 Vertx 单例
原代码在字段级别直接创建 Vertx.vertx() 实例,
可能导致多个 Vertx 实例重复创建,浪费系统资源。

改为使用 WebClientVertxInit.get() 获取统一单例。
2026-05-29 00:31:49 +08:00
yukaidi
a83665ac44 fix(security): SecurityClassFilter 改为白名单策略
原黑名单策略默认放行所有类,存在安全风险。
改为白名单策略,仅允许明确安全的 Java 类被 JS 访问。

允许: java.util.*, java.time.*, java.lang 基础类型, Nashorn API
拒绝: 默认拒绝所有未在白名单中的类
2026-05-29 00:31:38 +08:00
yukaidi
21e8a370c3 fix: ShutdownHook 改为同步等待 vertx.close(),修复 JVM 提前退出导致资源未释放
审查发现 vertx.close() 是异步操作,ShutdownHook 线程提交关闭任务后立即退出,
JVM 在资源实际释放前就终止了,与未修复时行为等价。
改为 CompletableFuture.get(10s) 阻塞等待,超时有 warn 日志。
同时移除无用的 mainVertx 字段,修正 JsExecUtils 误导性注释。
2026-05-28 23:58:52 +08:00
yukaidi
3dd4dd139b fix: 缓存清理异常日志级别从 debug 改为 warn,确保生产环境可见
审查发现数据库异常时 debug 级别会被静默吞掉,运维无法感知。
2026-05-28 23:43:07 +08:00
yukaidi
afe2046bc8 fix: RateLimiter 移除 synchronized 并添加 volatile,修复事件循环阻塞
审查发现 synchronized 在 Vert.x 事件循环中会严重阻塞并发。
ConcurrentHashMap 本身已线程安全,移除 synchronized 锁。
RequestInfo 字段添加 volatile 保证多线程内存可见性。
2026-05-28 23:42:40 +08:00
yukaidi
6d24388690 fix: ServiceVerticle 保存 MessageConsumer 引用,修复 unregister 参数类型错误
审查发现 unregister(address) 参数类型不匹配,ServiceBinder.unregister() 需要
MessageConsumer 而非 String。改为保存 register() 返回的 MessageConsumer,
stop() 中直接调用 consumer.unregister()。同时修复日志在 clear() 后读 size 始终为 0 的 bug。
2026-05-28 23:42:24 +08:00
yukaidi
0b024a849a fix: 添加缓存表定时清理任务,修复 cache_link_info 无限增长
- CacheManager 添加 cleanupExpiredCache() 方法删除过期缓存记录
- PostExecVerticle 注册每小时执行一次的定时清理任务
- 原实现只有读时惰性检查过期,过期记录永远不会被删除,长期运行后数据库持续膨胀
2026-05-28 23:20:17 +08:00
yukaidi
8745dc3567 fix: RateLimiter 添加过期条目清理,修复 ipRequestMap 无限增长
当 Map 超过 1000 条目时触发惰性清理,移除所有已过期的 IP 条目。
原实现中过期条目只重置计数不删除 key,长期运行后 Map 持续膨胀。
同时消除多余的 ipRequestMap.get(ip) 调用,直接使用 compute() 返回值。
2026-05-28 23:16:53 +08:00
yukaidi
1f4c7019d4 fix: ServiceVerticle 添加 stop() 方法注销 EventBus 消费者,修复重部署时消费者累积泄漏
保存已注册的 EventBus 地址列表,在 stop() 中通过 ServiceBinder 逐一注销。
原实现有 start() 无 stop(),Verticle 重部署时旧消费者不会被注销,导致重复注册。
2026-05-28 23:15:12 +08:00
yukaidi
255e7b2fb5 fix: JsParserExecutor 和 JsHttpClient 添加资源清理,修复解析完成后资源泄漏
- JsHttpClient 添加 close() 方法释放 WebClient 连接池
- JsParserExecutor 添加 close() 方法,清除 ScriptEngine 中注入的 Java 对象引用
- parse()/parseFileList()/parseById() 均在 onComplete 回调中调用 close() 释放资源
2026-05-28 23:13:09 +08:00
yukaidi
7419e536cf fix: JsExecUtils 缓存 ScriptEngineManager,避免每次调用都创建新实例
ScriptEngineManager 是重量级对象(含类加载器扫描等),将其缓存为 static 字段,
executeDynamicJs/executeOtherJs 每次调用只创建轻量的 ScriptEngine 实例。
2026-05-28 23:08:50 +08:00
yukaidi
74df000287 fix: PanBase WebClient 改为静态共享单例,修复每请求创建4个实例的资源泄漏
WebClient 是线程安全的,将 client/clientNoRedirects/clientDisableUA 改为 static 共享实例,
避免每次解析请求创建4个独立 WebClient(各含连接池)。
clientSession 仍保持实例级(管理 cookie,非线程安全)。
代理模式下仍创建独立 WebClient 实例。
2026-05-28 23:06:45 +08:00
yukaidi
2e0127d609 fix: 注册 JVM ShutdownHook,修复 Vert.x 实例进程退出时不关闭的资源泄漏
Deploy.deployVerticle() 中创建的 Vert.x 实例是局部变量,进程退出时无法优雅关闭,
导致 Netty EventLoopGroup、JDBC 连接池、内部定时器等资源泄漏。
添加 ShutdownHook 在 JVM 关闭时调用 vertx.close() 级联释放所有资源。
2026-05-28 23:04:54 +08:00
qaiu
2b9168e8df 更新 LzTool.java
fix:蓝奏目录识别问题
2026-05-28 12:33:16 +08:00
qaiu
7bb3cf7c51 Update README.md 2026-05-17 21:59:19 +08:00
qaiu
2ce5058be0 Add professional version cloud storage options 2026-05-17 21:57:39 +08:00
q
a5fc41f152 1 2026-04-29 22:40:57 +08:00
q
3245a27156 release v3.0.2 2026-04-29 22:37:07 +08:00
q
ce0fbf65aa fixed test docx 2026-04-28 15:57:50 +08:00
qaiu
eb87c3d865 Update app.properties 2026-04-27 20:06:19 +08:00
qaiu
990a90e461 更新 README.md 2026-04-27 12:04:29 +08:00
qaiu
45cb255a4d 更新 README.md 2026-04-27 12:01:11 +08:00
qaiu
5e8b8a3575 更新 README.md 2026-04-24 03:05:29 +08:00
qaiu
c317e53c24 Merge pull request #182 from qaiu/copilot/update-readme-netdisk-comparison
README: Remove 奶牛快传(cowtransfer) references
2026-04-23 19:41:33 +08:00
copilot-swe-agent[bot]
29b59d8450 Remove 奶牛快传(cowtransfer) from README.md
Agent-Logs-Url: https://github.com/qaiu/netdisk-fast-download/sessions/63030ac7-158c-43ca-9dcd-254e03c6f8f4

Co-authored-by: qaiu <29825328+qaiu@users.noreply.github.com>
2026-04-23 11:27:04 +00:00
96 changed files with 1726 additions and 792 deletions

View File

@@ -60,6 +60,7 @@ jobs:
- name: Update dependency graph - name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@v3 uses: advanced-security/maven-dependency-submission-action@v3
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
continue-on-error: true
with: with:
ignore-maven-wrapper: true ignore-maven-wrapper: true
@@ -97,5 +98,5 @@ jobs:
push: true push: true
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
tags: | tags: |
ghcr.io/qaiu/netdisk-fast-download:${{ steps.tag.outputs.tag }} ghcr.io/${{ github.repository }}:${{ steps.tag.outputs.tag }}
ghcr.io/qaiu/netdisk-fast-download:latest ghcr.io/${{ github.repository }}:latest

1
.gitignore vendored
View File

@@ -31,6 +31,7 @@ target/
sdkTest.log sdkTest.log
app.yml app.yml
app-local.yml app-local.yml
secret.yml
#some local files #some local files

View File

@@ -10,8 +10,13 @@ COPY ./web-service/target/netdisk-fast-download-bin.zip .
RUN unzip netdisk-fast-download-bin.zip && \ RUN unzip netdisk-fast-download-bin.zip && \
mv netdisk-fast-download/* ./ && \ mv netdisk-fast-download/* ./ && \
rm netdisk-fast-download-bin.zip && \ rm netdisk-fast-download-bin.zip && \
chmod +x run.sh chmod +x run.sh && \
mkdir -p db logs
EXPOSE 6400 6401 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod +x /docker-entrypoint.sh
ENTRYPOINT ["sh", "run.sh"] EXPOSE 6401
RUN addgroup --system appgroup && adduser --system --ingroup appgroup appuser
ENTRYPOINT ["/docker-entrypoint.sh"]

View File

@@ -1,29 +1,28 @@
# 一款网盘分享链接云解析快速下载服务 # 一款网盘分享链接云解析快速下载服务
QQ交流群1017480890 QQ交流群1017480890
<p align="center"> <p align="center">
<a href="https://github.com/qaiu/netdisk-fast-download/actions/workflows/maven.yml"><img src="https://img.shields.io/github/actions/workflow/status/qaiu/netdisk-fast-download/maven.yml?branch=v0.1.9b8a&style=flat"></a> <a href="https://github.com/qaiu/netdisk-fast-download/actions/workflows/maven.yml"><img src="https://img.shields.io/github/actions/workflow/status/qaiu/netdisk-fast-download/maven.yml?style=flat"></a>
<a href="https://www.oracle.com/cn/java/technologies/downloads"><img src="https://img.shields.io/badge/jdk-%3E%3D17-blue"></a> <a href="https://www.oracle.com/cn/java/technologies/downloads"><img src="https://img.shields.io/badge/jdk-%3E%3D17-blue"></a>
<a href="https://vertx-china.github.io"><img src="https://img.shields.io/badge/vert.x-4.5.22-blue?style=flat"></a> <a href="https://vertx-china.github.io"><img src="https://img.shields.io/badge/vert.x-4.5.27-blue?style=flat"></a>
<a href="https://raw.githubusercontent.com/qaiu/netdisk-fast-download/master/LICENSE"><img src="https://img.shields.io/github/license/qaiu/netdisk-fast-download?style=flat"></a> <a href="https://raw.githubusercontent.com/qaiu/netdisk-fast-download/master/LICENSE"><img src="https://img.shields.io/github/license/qaiu/netdisk-fast-download?style=flat"></a>
<a href="https://github.com/qaiu/netdisk-fast-download/releases/"><img src="https://img.shields.io/github/v/release/qaiu/netdisk-fast-download?style=flat"></a> <a href="https://github.com/qaiu/netdisk-fast-download/releases/"><img src="https://img.shields.io/github/v/release/qaiu/netdisk-fast-download?style=flat"></a>
<a href="https://atomgit.com/QAIU/netdisk-fast-download"><img src="https://atomgit.com/QAIU/netdisk-fast-download/star/badge.svg" alt="AtomGit"></a>
<a href="https://oosmetrics.com/repo/qaiu/netdisk-fast-download"><img src="https://api.oosmetrics.com/api/v1/badge/achievement/826aa27a-6e59-4de5-b7fa-cd189f484035.svg"></a>
<p align="center"> <p align="center">
<a href="https://trendshift.io/repositories/12101" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12101" alt="qaiu%2Fnetdisk-fast-download | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a> <a href="https://trendshift.io/repositories/12101" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12101" alt="qaiu%2Fnetdisk-fast-download | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
</p> </p>
<div align="center" style="display:flex; justify-content:center; gap:10px; align-items:flex-start;">
<img
src="https://github.com/user-attachments/assets/bf266d0a-aaf8-4772-9231-e38a4b7bb6cb"
alt="image1"
style="width:300px; max-width:300px; flex:none;"
>
<img
src="https://github.com/user-attachments/assets/bb7a85f0-c256-4b4a-a11b-3ceb55afc302"
alt="image2"
style="width:300px; max-width:300px; flex:none;"
>
</div>
> netdisk-fast-download网盘直链解析可以把云盘分享链接转为直链可广泛应用于各类下载站资源站个人博客图床APP下载更新视频点播等领域。支持市面各大主流云盘的文件分享以及文件夹分享链接已支持蓝奏云/蓝奏云优享/奶牛快传/移动云云空间/小飞机盘/亿方云/123云盘/Cloudreve等支持加密分享以及部分网盘文件夹分享。 ![alt text](web-front/img/image.png)
## 国内镜像
本项目同步托管于 **AtomGit**,国内访问更流畅:👉 [https://atomgit.com/QAIU/netdisk-fast-download](https://atomgit.com/QAIU/netdisk-fast-download)
## 介绍
> netdisk-fast-download网盘直链解析可以把云盘分享链接转为直链可广泛应用于各类下载站资源站个人博客图床APP下载更新视频点播等领域。支持市面各大主流云盘的文件分享以及文件夹分享链接已支持蓝奏云/蓝奏云优享/移动云云空间/小飞机盘/亿方云/123云盘/Cloudreve等支持加密分享以及部分网盘文件夹分享。
[官方文档](https://nfd-parser.github.io/) [官方文档](https://nfd-parser.github.io/)
[API接入](https://nfdparser.apifox.cn/) [API接入](https://nfdparser.apifox.cn/)
@@ -62,7 +61,6 @@ https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.
**注意⚠️请不要过度依赖 lz.qaiu.top建议本地搭建或者云服务器自行搭建。请求量过多的话服务器可能会被云盘厂商限制遇到解析失败的分享链接不要着急提issues请先检查分享是否有效。** **注意⚠️请不要过度依赖 lz.qaiu.top建议本地搭建或者云服务器自行搭建。请求量过多的话服务器可能会被云盘厂商限制遇到解析失败的分享链接不要着急提issues请先检查分享是否有效。**
## 网盘支持情况: ## 网盘支持情况:
> 20230905 奶牛云直链做了防盗链需加入请求头Referer: https://cowtransfer.com/
> 20230824 123云盘解析大文件(>100MB)失效,需要登录 > 20230824 123云盘解析大文件(>100MB)失效,需要登录
> 20230722 UC网盘解析失效需要登录 > 20230722 UC网盘解析失效需要登录
@@ -95,6 +93,13 @@ https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.
- Onedrive-pod - Onedrive-pod
- Dropbox-pdp - Dropbox-pdp
- iCloud-pic - iCloud-pic
### 专业版提供
- 迅雷网盘-xl
- [夸克云盘-qk](https://pan.quark.cn/)
- [UC云盘-uc](https://fast.uc.cn/)
- [移动云盘-p139](https://yun.139.com/)
- [联通云盘-pwo](https://pan.wo.cn/)
- [天翼云盘-p189](https://cloud.189.cn/)
## API接口 ## API接口
@@ -414,7 +419,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow
> 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径 > 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径
```shell ```shell
cd ~ cd ~
wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v0.1.9b7/netdisk-fast-download-bin.zip wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v3.0.2/netdisk-fast-download-bin.zip
unzip netdisk-fast-download-bin.zip unzip netdisk-fast-download-bin.zip
cd netdisk-fast-download cd netdisk-fast-download
bash service-install.sh bash service-install.sh
@@ -513,4 +518,3 @@ Core模块集成Vert.x实现类似spring的注解式路由API

View File

@@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
# set -x # set -x
LAUNCH_JAR="netdisk-fast-download.jar" LAUNCH_JAR="netdisk-fast-download.jar"
nohup java -Xmx512M -jar "$LAUNCH_JAR" "$@" >startup.log 2>&1 & exec java -Xmx${JVM_XMX:-512M} ${JVM_OPTS} -jar "$LAUNCH_JAR" "$@"
tail -f startup.log

View File

@@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>42.7.3</version> <version>42.7.11</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -53,7 +53,7 @@ public class CreateDatabase {
stmt.executeUpdate("CREATE DATABASE IF NOT EXISTS " + dbName + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"); stmt.executeUpdate("CREATE DATABASE IF NOT EXISTS " + dbName + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
LOGGER.info(">>>>>>>>>>> 数据库'{}'创建成功 <<<<<<<<<<<<", dbName); LOGGER.info(">>>>>>>>>>> 数据库'{}'创建成功 <<<<<<<<<<<<", dbName);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); LOGGER.error("创建数据库失败", e);
} }
} }

View File

@@ -24,35 +24,39 @@ import java.util.*;
* @author <a href="https://qaiu.top">QAIU</a> * @author <a href="https://qaiu.top">QAIU</a>
*/ */
public class CreateTable { public class CreateTable {
public static Map<Class<?>, String> javaProperty2SqlColumnMap = new HashMap<>() {{ public static final Map<Class<?>, String> javaProperty2SqlColumnMap;
static {
Map<Class<?>, String> map = new HashMap<>();
// Java类型到SQL类型的映射 // Java类型到SQL类型的映射
put(Integer.class, "INT"); map.put(Integer.class, "INT");
put(Short.class, "SMALLINT"); map.put(Short.class, "SMALLINT");
put(Byte.class, "TINYINT"); map.put(Byte.class, "TINYINT");
put(Long.class, "BIGINT"); map.put(Long.class, "BIGINT");
put(java.math.BigDecimal.class, "DECIMAL"); map.put(java.math.BigDecimal.class, "DECIMAL");
put(Double.class, "DOUBLE"); map.put(Double.class, "DOUBLE");
put(Float.class, "REAL"); map.put(Float.class, "REAL");
put(Boolean.class, "BOOLEAN"); map.put(Boolean.class, "BOOLEAN");
put(String.class, "VARCHAR"); map.put(String.class, "VARCHAR");
put(Date.class, "TIMESTAMP"); map.put(Date.class, "TIMESTAMP");
put(java.time.LocalDateTime.class, "TIMESTAMP"); map.put(java.time.LocalDateTime.class, "TIMESTAMP");
put(java.sql.Timestamp.class, "TIMESTAMP"); map.put(java.sql.Timestamp.class, "TIMESTAMP");
put(java.sql.Date.class, "DATE"); map.put(java.sql.Date.class, "DATE");
put(java.sql.Time.class, "TIME"); map.put(java.sql.Time.class, "TIME");
// 基本数据类型 // 基本数据类型
put(int.class, "INT"); map.put(int.class, "INT");
put(short.class, "SMALLINT"); map.put(short.class, "SMALLINT");
put(byte.class, "TINYINT"); map.put(byte.class, "TINYINT");
put(long.class, "BIGINT"); map.put(long.class, "BIGINT");
put(double.class, "DOUBLE"); map.put(double.class, "DOUBLE");
put(float.class, "REAL"); map.put(float.class, "REAL");
put(boolean.class, "BOOLEAN"); map.put(boolean.class, "BOOLEAN");
}};
javaProperty2SqlColumnMap = Collections.unmodifiableMap(map);
}
private static final Logger LOGGER = LoggerFactory.getLogger(CreateTable.class); private static final Logger LOGGER = LoggerFactory.getLogger(CreateTable.class);
public static String UNIQUE_PREFIX = "idx_"; public static final String UNIQUE_PREFIX = "idx_";
private static Case getCase(Class<?> clz) { private static Case getCase(Class<?> clz) {
return switch (clz.getName()) { return switch (clz.getName()) {

View File

@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
* *
* @author <a href="https://qaiu.top">QAIU</a> * @author <a href="https://qaiu.top">QAIU</a>
*/ */
public class JDBCPoolInit { public class JDBCPoolInit implements AutoCloseable {
private static final Logger LOGGER = LoggerFactory.getLogger(JDBCPoolInit.class); private static final Logger LOGGER = LoggerFactory.getLogger(JDBCPoolInit.class);
@@ -101,4 +101,16 @@ public class JDBCPoolInit {
synchronized public JDBCPool getPool() { synchronized public JDBCPool getPool() {
return pool; return pool;
} }
/**
* 关闭连接池,释放数据库资源
*/
@Override
public synchronized void close() {
if (pool != null) {
pool.close();
LOGGER.info("数据库连接池已关闭: URL={}", url);
pool = null;
}
}
} }

View File

@@ -16,6 +16,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
@@ -62,10 +64,19 @@ public final class Deploy {
path.append("-").append(args[0].replace("app-","")); path.append("-").append(args[0].replace("app-",""));
} }
// 读取yml配置 // 读取yml配置,优先当前目录,其次 resources/ 子目录
String configFile = path + ".yml";
if (!Files.exists(Path.of(configFile)) && Files.exists(Path.of("resources", configFile))) {
path.insert(0, "resources/");
LOGGER.info("从 resources/ 目录加载配置: {}", path + ".yml");
}
ConfigUtil.readYamlConfig(path.toString(), tempVertx) ConfigUtil.readYamlConfig(path.toString(), tempVertx)
.onSuccess(this::readConf) .onSuccess(this::readConf)
.onFailure(Throwable::printStackTrace); .onFailure(err -> {
LOGGER.error("读取配置文件失败: {}", err.getMessage(), err);
LockSupport.unpark(mainThread);
System.exit(-1);
});
LockSupport.park(); LockSupport.park();
deployVerticle(); deployVerticle();
} }
@@ -137,6 +148,17 @@ public final class Deploy {
vertxOptions.getWorkerPoolSize()); vertxOptions.getWorkerPoolSize());
var vertx = Vertx.vertx(vertxOptions); var vertx = Vertx.vertx(vertxOptions);
VertxHolder.init(vertx); VertxHolder.init(vertx);
// 注册 ShutdownHook确保进程退出时优雅关闭资源
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
LOGGER.info("JVM shutting down, closing Vert.x...");
try {
vertx.close().toCompletionStage().toCompletableFuture().get(10, java.util.concurrent.TimeUnit.SECONDS);
LOGGER.info("Vert.x closed successfully");
} catch (Exception e) {
LOGGER.warn("Vert.x close error or timeout", e);
}
}));
//配置保存在共享数据中 //配置保存在共享数据中
var sharedData = vertx.sharedData(); var sharedData = vertx.sharedData();
LocalMap<String, Object> localMap = sharedData.getLocalMap(LOCAL); LocalMap<String, Object> localMap = sharedData.getLocalMap(LOCAL);

View File

@@ -127,8 +127,9 @@ public class RouterHandlerFactory implements BaseHttpApi {
// 错误请求处理 // 错误请求处理
mainRouter.errorHandler(405, ctx -> doFireJsonResultResponse(ctx, JsonResult mainRouter.errorHandler(405, ctx -> doFireJsonResultResponse(ctx, JsonResult
.error("Method Not Allowed", 405))); .error("Method Not Allowed", 405)));
mainRouter.errorHandler(404, ctx -> ctx.response().setStatusCode(404).setChunked(true) mainRouter.errorHandler(404, ctx -> {
.end("Internal server error: 404 not found")); ctx.response().setStatusCode(404).end("404 not found");
});
return mainRouter; return mainRouter;
} }
@@ -179,8 +180,9 @@ public class RouterHandlerFactory implements BaseHttpApi {
if (ctx.statusCode() == 503 || ctx.failure() == null) { if (ctx.statusCode() == 503 || ctx.failure() == null) {
doFireJsonResultResponse(ctx, JsonResult.error("未知异常, 请联系管理员"), 503); doFireJsonResultResponse(ctx, JsonResult.error("未知异常, 请联系管理员"), 503);
} else { } else {
ctx.failure().printStackTrace(); LOGGER.error("路由处理失败", ctx.failure());
doFireJsonResultResponse(ctx, JsonResult.error(ctx.failure().getMessage()), 500); String msg = ctx.failure() != null ? ctx.failure().getMessage() : "未知异常";
doFireJsonResultResponse(ctx, JsonResult.error(msg), 500);
} }
}); });
} else if (method.isAnnotationPresent(SockRouteMapper.class)) { } else if (method.isAnnotationPresent(SockRouteMapper.class)) {
@@ -198,7 +200,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
try { try {
ReflectionUtil.invokeWithArguments(method, instance, sock); ReflectionUtil.invokeWithArguments(method, instance, sock);
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); LOGGER.error("WebSocket处理异常", e);
} }
}); });
if (url.endsWith("*")) { if (url.endsWith("*")) {
@@ -322,7 +324,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
parameterValueList.put(k, entity); parameterValueList.put(k, entity);
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
e.printStackTrace(); LOGGER.error("实体类绑定异常: {}", typeName, e);
} }
} }
}); });
@@ -365,7 +367,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
Object entity = ParamUtil.multiMapToEntity(queryParams, aClass); Object entity = ParamUtil.multiMapToEntity(queryParams, aClass);
parameterValueList.put(k, entity); parameterValueList.put(k, entity);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); LOGGER.error("参数绑定异常: {}", v.getRight().getName(), e);
} }
} else if (parameterValueList.get(k) == null } else if (parameterValueList.get(k) == null
&& JsonObject.class.getName().equals(v.getRight().getName())) { && JsonObject.class.getName().equals(v.getRight().getName())) {
@@ -408,22 +410,19 @@ public class RouterHandlerFactory implements BaseHttpApi {
doFireJsonResultResponse(ctx, JsonResult.data(null)); doFireJsonResultResponse(ctx, JsonResult.data(null));
} }
}).onFailure(e -> doFireJsonResultResponse(ctx, JsonResult.error(e.getMessage()), 500)); }).onFailure(e -> {
LOGGER.error("请求处理失败", e);
String msg = e.getMessage() != null ? e.getMessage() : "服务器内部错误";
doFireJsonResultResponse(ctx, JsonResult.error(msg), 500);
});
} else { } else {
doFireJsonResultResponse(ctx, JsonResult.data(data)); doFireJsonResultResponse(ctx, JsonResult.data(data));
} }
} }
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); LOGGER.error("请求处理异常", e);
String err = e.getMessage(); String msg = e.getMessage() != null ? e.getMessage() : "服务器内部错误";
if (e.getCause() != null) { doFireJsonResultResponse(ctx, JsonResult.error(msg), 500);
if (e.getCause() instanceof InvocationTargetException) {
err = ((InvocationTargetException) e.getCause()).getTargetException().getMessage();
} else {
err = e.getCause().getMessage();
}
}
doFireJsonResultResponse(ctx, JsonResult.error(err), 500);
} }
} }

View File

@@ -153,7 +153,7 @@ public class CommonUtil {
appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build"); appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build");
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); LOGGER.error("读取app.properties失败", e);
} }
} }
return appVersion; return appVersion;

View File

@@ -10,6 +10,8 @@ import io.vertx.core.json.JsonObject;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
/** /**
* 异步读取配置工具类 * 异步读取配置工具类
@@ -62,12 +64,35 @@ public class ConfigUtil {
// 异步获取配置 // 异步获取配置
// 成功直接完成 promise // 成功直接完成 promise
retriever.getConfig() retriever.getConfig()
.onSuccess(promise::complete) .onSuccess(config -> {
promise.complete(config);
retriever.close();
})
.onFailure(err -> { .onFailure(err -> {
// 配置读取失败,直接返回失败 Future retriever.close();
// 读取失败时,尝试从 resources/ 子目录读取(兼容 Docker 卷挂载场景)
String resourcesPath = "resources/" + path;
if (!path.startsWith("resources/") && Files.exists(Path.of(resourcesPath))) {
ConfigStoreOptions fallbackStore = new ConfigStoreOptions()
.setType("file")
.setFormat(format)
.setConfig(new JsonObject().put("path", resourcesPath));
ConfigRetriever fallbackRetriever = ConfigRetriever
.create(vertx, new ConfigRetrieverOptions().addStore(fallbackStore));
fallbackRetriever.getConfig()
.onSuccess(config -> {
promise.complete(config);
fallbackRetriever.close();
})
.onFailure(e2 -> {
promise.fail(new RuntimeException(
"读取配置文件失败: " + path + " (也尝试了 " + resourcesPath + ")", e2));
fallbackRetriever.close();
});
} else {
promise.fail(new RuntimeException( promise.fail(new RuntimeException(
"读取配置文件失败: " + path, err)); "读取配置文件失败: " + path, err));
retriever.close(); }
}); });
return promise.future(); return promise.future();

View File

@@ -1,7 +1,7 @@
package cn.qaiu.vx.core.util; package cn.qaiu.vx.core.util;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* vertx 上下文外的本地容器 为不在vertx线程的方法传递数据 * vertx 上下文外的本地容器 为不在vertx线程的方法传递数据
@@ -10,11 +10,10 @@ import java.util.Map;
* @author <a href="https://qaiu.top">QAIU</a> * @author <a href="https://qaiu.top">QAIU</a>
*/ */
public class LocalConstant { public class LocalConstant {
private static final Map<String, Object> LOCAL_CONST = new HashMap<>(); private static final Map<String, Object> LOCAL_CONST = new ConcurrentHashMap<>();
public static Map<String, Object> put(String k, Object v) { public static Map<String, Object> put(String k, Object v) {
if (LOCAL_CONST.containsKey(k)) return LOCAL_CONST; LOCAL_CONST.putIfAbsent(k, v);
LOCAL_CONST.put(k, v);
return LOCAL_CONST; return LOCAL_CONST;
} }

View File

@@ -36,16 +36,20 @@ public final class ParamUtil {
public static MultiMap paramsToMap(String paramString) { public static MultiMap paramsToMap(String paramString) {
MultiMap entries = MultiMap.caseInsensitiveMultiMap(); MultiMap entries = MultiMap.caseInsensitiveMultiMap();
if (paramString == null) return entries; if (paramString == null || paramString.isEmpty()) return entries;
String[] params = paramString.split("&"); String[] params = paramString.split("&");
if (params.length == 0) return entries; if (params.length == 0) return entries;
for (String param : params) { for (String param : params) {
String[] kv = param.split("="); if (param == null || param.isEmpty()) {
continue;
}
String[] kv = param.split("=", 2);
if (kv.length == 2) { if (kv.length == 2) {
entries.set(kv[0], kv[1]); entries.set(kv[0], kv[1]);
} else { } else if (kv.length == 1) {
entries.set(kv[0], ""); entries.set(kv[0], "");
} }
// kv.length == 0 时(空字符串),跳过
} }
return entries; return entries;
} }

View File

@@ -25,6 +25,9 @@ import java.net.URL;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static cn.qaiu.vx.core.util.ConfigConstant.BASE_LOCATIONS; import static cn.qaiu.vx.core.util.ConfigConstant.BASE_LOCATIONS;
/** /**
@@ -36,6 +39,8 @@ import static cn.qaiu.vx.core.util.ConfigConstant.BASE_LOCATIONS;
*/ */
public final class ReflectionUtil { public final class ReflectionUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(ReflectionUtil.class);
// 缓存Reflections实例避免重复扫描每次扫描约35K+值耗时1-3秒占用大量内存 // 缓存Reflections实例避免重复扫描每次扫描约35K+值耗时1-3秒占用大量内存
private static final Map<String, Reflections> REFLECTIONS_CACHE = new java.util.concurrent.ConcurrentHashMap<>(); private static final Map<String, Reflections> REFLECTIONS_CACHE = new java.util.concurrent.ConcurrentHashMap<>();
@@ -128,7 +133,7 @@ public final class ReflectionUtil {
parameterTypes[j - k])); parameterTypes[j - k]));
} }
} catch (NotFoundException e) { } catch (NotFoundException e) {
e.printStackTrace(); LOGGER.error("获取方法参数失败", e);
} }
return paramMap; return paramMap;
} }
@@ -183,7 +188,7 @@ public final class ReflectionUtil {
try { try {
return DateUtils.parseDate(value, fmt); return DateUtils.parseDate(value, fmt);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); LOGGER.error("日期解析失败: {}", value, e);
throw new RuntimeException("无法将格式化日期"); throw new RuntimeException("无法将格式化日期");
} }
default: default:
@@ -215,7 +220,7 @@ public final class ReflectionUtil {
} }
return arr; return arr;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); LOGGER.error("数组类型转换失败: {}", value, e);
} }
return null; return null;
} }
@@ -241,7 +246,7 @@ public final class ReflectionUtil {
public static boolean isBasicTypeArray(CtClass ctClass) { public static boolean isBasicTypeArray(CtClass ctClass) {
if (!ctClass.isArray()) { if (!ctClass.isArray()) {
return false; return false;
} else return (ctClass.getName().matches("^(boolen|char|byte|short|int|long|float|double|String)\\[]$")); } else return (ctClass.getName().matches("^(boolean|char|byte|short|int|long|float|double|String)\\[]$"));
} }
/** /**

View File

@@ -129,16 +129,25 @@ public class HttpProxyVerticle extends AbstractVerticle {
clientRequest.response().setStatusCode(403).end(); clientRequest.response().setStatusCode(403).end();
return; return;
} }
String[] split = new String(Base64.getDecoder().decode(s.replace("Basic ", ""))).split(":"); String[] split;
if (split.length > 1) { try {
// TODO split = new String(Base64.getDecoder().decode(s.replace("Basic ", ""))).split(":");
String username = proxyServerConf.getString("username"); } catch (IllegalArgumentException e) {
String password = proxyServerConf.getString("password"); LOGGER.warn("Proxy-Authorization header is not valid Base64");
if (!split[0].equals(username) || !split[1].equals(password)) {
LOGGER.info("-----auth failed------\nusername: {}\npassword: {}", username, password);
clientRequest.response().setStatusCode(403).end(); clientRequest.response().setStatusCode(403).end();
return; return;
} }
if (split.length <= 1) {
LOGGER.warn("Proxy-Authorization header format invalid: missing username:password separator");
clientRequest.response().setStatusCode(403).end();
return;
}
String username = proxyServerConf.getString("username");
String password = proxyServerConf.getString("password");
if (!split[0].equals(username) || !split[1].equals(password)) {
LOGGER.info("-----auth failed------\nusername: {}", split[0]);
clientRequest.response().setStatusCode(403).end();
return;
} }
} }
@@ -187,7 +196,7 @@ public class HttpProxyVerticle extends AbstractVerticle {
); );
}) })
.onFailure(err -> { .onFailure(err -> {
err.printStackTrace(); LOGGER.error("HTTP请求失败", err);
clientRequest.response().setStatusCode(502).end("Bad Gateway: Request failed"); clientRequest.response().setStatusCode(502).end("Bad Gateway: Request failed");
}); });
} }
@@ -213,7 +222,7 @@ public class HttpProxyVerticle extends AbstractVerticle {
} }
return port; return port;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); LOGGER.error("提取端口失败: {}", urlString, e);
// 出现异常时返回 -1表示提取失败 // 出现异常时返回 -1表示提取失败
return -1; return -1;
} }

View File

@@ -351,7 +351,7 @@ public class ReverseProxyVerticle extends AbstractVerticle {
String host = url.getHost(); String host = url.getHost();
int port = url.getPort(); int port = url.getPort();
if (port == -1) { if (port == -1) {
port = 80; port = 443;
} }
String originPath = url.getPath(); String originPath = url.getPath();
LOGGER.info("path {}, originPath {}, to {}:{}", path, originPath, host, port); LOGGER.info("path {}, originPath {}, to {}:{}", path, originPath, host, port);

View File

@@ -23,12 +23,11 @@ public class RouterVerticle extends AbstractVerticle {
private static final Logger LOGGER = LoggerFactory.getLogger(RouterVerticle.class); private static final Logger LOGGER = LoggerFactory.getLogger(RouterVerticle.class);
private static final int port = SharedDataUtil.getValueForServerConfig("port"); private static final int port = SharedDataUtil.getValueForServerConfig("port");
private static final Router router = new RouterHandlerFactory(
SharedDataUtil.getJsonStringForServerConfig("contextPath")).createRouter();
private static final JsonObject globalConfig = SharedDataUtil.getJsonConfig("globalConfig"); private static final JsonObject globalConfig = SharedDataUtil.getJsonConfig("globalConfig");
private HttpServer server; private HttpServer server;
private Router router;
static { static {
LOGGER.info(JacksonConfig.class.getSimpleName() + " >> "); LOGGER.info(JacksonConfig.class.getSimpleName() + " >> ");
@@ -61,6 +60,8 @@ public class RouterVerticle extends AbstractVerticle {
.setReuseAddress(true) // 允许地址重用 .setReuseAddress(true) // 允许地址重用
.setReusePort(true); // 允许端口重用 .setReusePort(true); // 允许端口重用
router = new RouterHandlerFactory(
SharedDataUtil.getJsonStringForServerConfig("contextPath")).createRouter();
server = vertx.createHttpServer(options); server = vertx.createHttpServer(options);
server.requestHandler(router).webSocketHandler(s->{}).listen() server.requestHandler(router).webSocketHandler(s->{}).listen()

View File

@@ -5,11 +5,15 @@ import cn.qaiu.vx.core.base.BaseAsyncService;
import cn.qaiu.vx.core.util.ReflectionUtil; import cn.qaiu.vx.core.util.ReflectionUtil;
import io.vertx.core.AbstractVerticle; import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise; import io.vertx.core.Promise;
import io.vertx.core.eventbus.MessageConsumer;
import io.vertx.core.json.JsonObject;
import io.vertx.serviceproxy.ServiceBinder; import io.vertx.serviceproxy.ServiceBinder;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -24,6 +28,7 @@ public class ServiceVerticle extends AbstractVerticle {
Logger LOGGER = LoggerFactory.getLogger(ServiceVerticle.class); Logger LOGGER = LoggerFactory.getLogger(ServiceVerticle.class);
private static final AtomicInteger ID = new AtomicInteger(1); private static final AtomicInteger ID = new AtomicInteger(1);
private static final Set<Class<?>> handlers; private static final Set<Class<?>> handlers;
private final List<MessageConsumer<JsonObject>> consumers = new ArrayList<>();
static { static {
Reflections reflections = ReflectionUtil.getReflections(); Reflections reflections = ReflectionUtil.getReflections();
@@ -39,7 +44,10 @@ public class ServiceVerticle extends AbstractVerticle {
try { try {
serviceNames.append(asyncService.getName()).append("|"); serviceNames.append(asyncService.getName()).append("|");
BaseAsyncService asInstance = (BaseAsyncService) ReflectionUtil.newWithNoParam(asyncService); BaseAsyncService asInstance = (BaseAsyncService) ReflectionUtil.newWithNoParam(asyncService);
binder.setAddress(asInstance.getAddress()).register(asInstance.getAsyncInterfaceClass(), asInstance); String address = asInstance.getAddress();
MessageConsumer<JsonObject> consumer = binder.setAddress(address)
.register(asInstance.getAsyncInterfaceClass(), asInstance);
consumers.add(consumer);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Failed to register service: {}", asyncService.getName(), e); LOGGER.error("Failed to register service: {}", asyncService.getName(), e);
} }
@@ -49,4 +57,19 @@ public class ServiceVerticle extends AbstractVerticle {
} }
startPromise.complete(); startPromise.complete();
} }
@Override
public void stop(Promise<Void> stopPromise) {
int count = consumers.size();
consumers.forEach(consumer -> {
try {
consumer.unregister();
} catch (Exception e) {
LOGGER.warn("Failed to unregister service consumer at address: {}", consumer.address(), e);
}
});
consumers.clear();
LOGGER.info("ServiceVerticle stopped, unregistered {} services", count);
stopPromise.complete();
}
} }

View File

@@ -32,7 +32,7 @@ public class HttpProxyConf {
public HttpProxyConf() { public HttpProxyConf() {
this.username = DEFAULT_USERNAME; this.username = DEFAULT_USERNAME;
this.password = DEFAULT_PASSWORD; this.password = DEFAULT_PASSWORD;
this.timeout = DEFAULT_PORT; this.port = DEFAULT_PORT;
this.timeout = DEFAULT_TIMEOUT; this.timeout = DEFAULT_TIMEOUT;
this.preProxyOptions = new ProxyOptions(); this.preProxyOptions = new ProxyOptions();
} }

View File

@@ -1,2 +1,2 @@
app.version=${project.version} app.version=${project.version}
build=${build.timestamp} build=${maven.build.timestamp}

9
docker-entrypoint.sh Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/sh
set -e
# Fix permissions on volume-mounted directories (runs as root)
chown -R appuser:appgroup /app/db /app/logs /app/resources 2>/dev/null || true
# Run Java directly - entrypoint is PID 1, exec makes Java PID 1
# Docker SIGTERM goes directly to Java, triggering ShutdownHook
exec java -Xmx${JVM_XMX:-512M} ${JVM_OPTS} -Duser.timezone=${TZ:-Asia/Shanghai} -jar /app/netdisk-fast-download.jar

View File

@@ -4,26 +4,26 @@ NFD 解析器模块:聚合各类网盘/分享页解析,统一输出文件列
- 语言Java 17 - 语言Java 17
- 构建Maven - 构建Maven
- 模块版本10.1.17 - 模块版本10.2.5
## 依赖Maven Central ## 依赖Maven Central
```xml ```xml
<dependency> <dependency>
<groupId>cn.qaiu</groupId> <groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId> <artifactId>parser</artifactId>
<version>10.1.17</version> <version>10.2.5</version>
</dependency> </dependency>
``` ```
- Gradle Groovy DSL - Gradle Groovy DSL
```groovy ```groovy
dependencies { dependencies {
implementation 'cn.qaiu:parser:10.1.17' implementation 'cn.qaiu:parser:10.2.5'
} }
``` ```
- Gradle Kotlin DSL - Gradle Kotlin DSL
```kotlin ```kotlin
dependencies { dependencies {
implementation("cn.qaiu:parser:10.1.17") implementation("cn.qaiu:parser:10.2.5")
} }
``` ```

View File

@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>cn.qaiu</groupId> <groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId> <artifactId>parser</artifactId>
<version>10.1.17</version> <version>10.2.5</version>
</dependency> </dependency>
``` ```

View File

@@ -11,7 +11,7 @@
<dependency> <dependency>
<groupId>cn.qaiu</groupId> <groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId> <artifactId>parser</artifactId>
<version>10.1.17</version> <version>10.2.5</version>
</dependency> </dependency>
``` ```

View File

@@ -12,7 +12,7 @@
<groupId>cn.qaiu</groupId> <groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId> <artifactId>parser</artifactId>
<version>10.2.5</version> <version>${parserVersion}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>cn.qaiu:parser</name> <name>cn.qaiu:parser</name>
@@ -35,9 +35,9 @@
</developers> </developers>
<scm> <scm>
<connection>scm:git:https://github.com/qaiu/netdisk-fast-download.git</connection> <connection>scm:git:https://github.com/${github.owner}/${github.repo}.git</connection>
<developerConnection>scm:git:ssh://git@github.com:qaiu/netdisk-fast-download.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com:${github.owner}/${github.repo}.git</developerConnection>
<url>https://github.com/qaiu/netdisk-fast-download</url> <url>https://github.com/${github.owner}/${github.repo}</url>
</scm> </scm>
<distributionManagement> <distributionManagement>
@@ -52,20 +52,19 @@
</distributionManagement> </distributionManagement>
<properties> <properties>
<revision>0.2.1</revision>
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Versions --> <!-- Versions -->
<vertx.version>4.5.24</vertx.version> <vertx.version>4.5.27</vertx.version>
<org.reflections.version>0.10.2</org.reflections.version> <org.reflections.version>0.10.2</org.reflections.version>
<lombok.version>1.18.38</lombok.version> <lombok.version>1.18.38</lombok.version>
<slf4j.version>2.0.16</slf4j.version> <slf4j.version>2.0.16</slf4j.version>
<commons-lang3.version>3.18.0</commons-lang3.version> <commons-lang3.version>3.18.0</commons-lang3.version>
<jackson.version>2.18.6</jackson.version> <jackson.version>2.18.6</jackson.version>
<logback.version>1.5.19</logback.version> <logback.version>1.5.32</logback.version>
<junit.version>4.13.2</junit.version> <junit.version>4.13.2</junit.version>
</properties> </properties>
@@ -124,6 +123,41 @@
<build> <build>
<plugins> <plugins>
<!-- 从 git remote origin 自动识别 GitHub 仓库地址 -->
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>4.1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>4.0.24</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>initialize</phase>
<goals><goal>execute</goal></goals>
<configuration>
<scripts>
<script>
def url = 'git remote get-url origin'.execute().text.trim()
def m = (url =~ 'github\\.com[:/]([^/]+)/([^/.]+?)(?:\\.git)?$')
if (m.find()) {
project.properties.setProperty('github.owner', m.group(1))
project.properties.setProperty('github.repo', m.group(2))
} else {
project.properties.setProperty('github.owner', 'qaiu')
project.properties.setProperty('github.repo', 'netdisk-fast-download')
}
</script>
</scripts>
</configuration>
</execution>
</executions>
</plugin>
<!-- 编译 --> <!-- 编译 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View File

@@ -86,7 +86,10 @@ public class ShareLinkInfo {
// 将type和shareKey组合成一个字符串作为缓存key // 将type和shareKey组合成一个字符串作为缓存key
String key = type + ":" + shareKey; String key = type + ":" + shareKey;
if (type.equals("p115")) { if (type.equals("p115")) {
key += ("_" + otherParam.get("UA").toString().hashCode()); Object ua = otherParam != null ? otherParam.get("UA") : null;
if (ua != null) {
key += ("_" + ua.toString().hashCode());
}
} }
return key; return key;
} }

View File

@@ -40,28 +40,34 @@ public abstract class PanBase implements IPanTool {
protected Promise<String> promise = Promise.promise(); protected Promise<String> promise = Promise.promise();
/** /**
* Http client * 共享的 WebClient 实例(线程安全,避免每请求创建导致资源泄漏)
*/ */
protected WebClient client = WebClient.create(WebClientVertxInit.get(), private static final WebClient SHARED_CLIENT = WebClient.create(WebClientVertxInit.get(),
new WebClientOptions()); new WebClientOptions());
private static final WebClient SHARED_CLIENT_NO_REDIRECTS = WebClient.create(WebClientVertxInit.get(),
new WebClientOptions().setFollowRedirects(false));
private static final WebClient SHARED_CLIENT_DISABLE_UA = WebClient.create(WebClientVertxInit.get(),
new WebClientOptions().setUserAgentEnabled(false));
/** /**
* Http client session (会话管理, 带cookie请求) * Http client (默认使用共享实例,代理模式下使用独立实例)
*/
protected WebClient client = SHARED_CLIENT;
/**
* Http client session (会话管理, 带cookie请求, 每实例独立)
*/ */
protected WebClientSession clientSession = WebClientSession.create(client); protected WebClientSession clientSession = WebClientSession.create(client);
/** /**
* Http client 不自动跳转 * Http client 不自动跳转
*/ */
protected WebClient clientNoRedirects = WebClient.create(WebClientVertxInit.get(), protected WebClient clientNoRedirects = SHARED_CLIENT_NO_REDIRECTS;
new WebClientOptions().setFollowRedirects(false));
/** /**
* Http client disable UserAgent * Http client disable UserAgent
*/ */
protected WebClient clientDisableUA = WebClient.create(WebClientVertxInit.get() protected WebClient clientDisableUA = SHARED_CLIENT_DISABLE_UA;
, new WebClientOptions().setUserAgentEnabled(false)
);
protected ShareLinkInfo shareLinkInfo; protected ShareLinkInfo shareLinkInfo;

View File

@@ -81,7 +81,7 @@ public class ParserCreate {
if (shareKey != null) { if (shareKey != null) {
shareLinkInfo.setShareKey(shareKey); shareLinkInfo.setShareKey(shareKey);
} }
} catch (Exception ignored) {} } catch (IllegalStateException | IllegalArgumentException ignored) {}
// 提取密码 // 提取密码
try { try {
@@ -89,7 +89,7 @@ public class ParserCreate {
if (StringUtils.isNotEmpty(pwd)) { if (StringUtils.isNotEmpty(pwd)) {
shareLinkInfo.setSharePassword(pwd); shareLinkInfo.setSharePassword(pwd);
} }
} catch (Exception ignored) {} } catch (IllegalStateException | IllegalArgumentException ignored) {}
// 设置标准URL // 设置标准URL
if (customParserConfig.getStandardUrlTemplate() != null) { if (customParserConfig.getStandardUrlTemplate() != null) {
@@ -133,7 +133,7 @@ public class ParserCreate {
shareLinkInfo.setSharePassword(pwd); shareLinkInfo.setSharePassword(pwd);
} }
standardUrl = standardUrl.replace("{pwd}", pwd); standardUrl = standardUrl.replace("{pwd}", pwd);
} catch (Exception ignored) {} } catch (IllegalStateException | IllegalArgumentException ignored) {}
shareLinkInfo.setShareUrl(shareUrl); shareLinkInfo.setShareUrl(shareUrl);
shareLinkInfo.setShareKey(shareKey); shareLinkInfo.setShareKey(shareKey);
@@ -266,14 +266,14 @@ public class ParserCreate {
if (shareKey != null) { if (shareKey != null) {
shareLinkInfo.setShareKey(shareKey); shareLinkInfo.setShareKey(shareKey);
} }
} catch (Exception ignored) {} } catch (IllegalStateException | IllegalArgumentException ignored) {}
try { try {
String password = matcher.group("PWD"); String password = matcher.group("PWD");
if (password != null) { if (password != null) {
shareLinkInfo.setSharePassword(password); shareLinkInfo.setSharePassword(password);
} }
} catch (Exception ignored) {} } catch (IllegalStateException | IllegalArgumentException ignored) {}
// 设置标准URL如果有模板 // 设置标准URL如果有模板
if (customConfig.getStandardUrlTemplate() != null) { if (customConfig.getStandardUrlTemplate() != null) {

View File

@@ -61,7 +61,7 @@ public class JsHttpClient {
}; };
public JsHttpClient() { public JsHttpClient() {
this.client = WebClient.create(WebClientVertxInit.get(), new WebClientOptions());; this.client = WebClient.create(WebClientVertxInit.get(), new WebClientOptions());
this.clientSession = WebClientSession.create(client); this.clientSession = WebClientSession.create(client);
this.headers = MultiMap.caseInsensitiveMultiMap(); this.headers = MultiMap.caseInsensitiveMultiMap();
// 设置默认的Accept-Encoding头以支持压缩响应 // 设置默认的Accept-Encoding头以支持压缩响应
@@ -534,7 +534,7 @@ public class JsHttpClient {
} else { } else {
promise.fail(result.cause()); promise.fail(result.cause());
} }
}).onFailure(Throwable::printStackTrace); }).onFailure(e -> log.error("HTTP请求失败", e));
// 等待响应完成(使用配置的超时时间) // 等待响应完成(使用配置的超时时间)
HttpResponse<Buffer> response = promise.future().toCompletionStage() HttpResponse<Buffer> response = promise.future().toCompletionStage()
@@ -677,4 +677,13 @@ public class JsHttpClient {
return buffer.length(); return buffer.length();
} }
} }
/**
* 关闭 WebClient 释放连接池资源
*/
public void close() {
if (client != null) {
client.close();
}
}
} }

View File

@@ -29,11 +29,12 @@ import java.util.stream.Collectors;
* @author <a href="https://qaiu.top">QAIU</a> * @author <a href="https://qaiu.top">QAIU</a>
* Create at 2025/10/17 * Create at 2025/10/17
*/ */
public class JsParserExecutor implements IPanTool { public class JsParserExecutor implements IPanTool, AutoCloseable {
private static final Logger log = LoggerFactory.getLogger(JsParserExecutor.class); private static final Logger log = LoggerFactory.getLogger(JsParserExecutor.class);
private static final WorkerExecutor EXECUTOR = WebClientVertxInit.get().createSharedWorkerExecutor("parser-executor", 32); private static volatile WorkerExecutor EXECUTOR;
private static final Object EXECUTOR_LOCK = new Object();
private static String FETCH_RUNTIME_JS = null; private static String FETCH_RUNTIME_JS = null;
@@ -146,12 +147,57 @@ public class JsParserExecutor implements IPanTool {
} }
} }
/**
* 释放资源ScriptEngine 和 HttpClient避免内存泄漏
*/
@Override
public void close() {
if (httpClient != null) {
httpClient.close();
}
// 清除 ScriptEngine 持有的 Java 对象引用,帮助 GC 回收
if (engine != null) {
engine.put("http", null);
engine.put("logger", null);
engine.put("shareLinkInfo", null);
engine.put("JavaFetch", null);
}
}
/**
* 关闭全局 WorkerExecutor应在应用关闭时调用
*/
public static void shutdownExecutor() {
synchronized (EXECUTOR_LOCK) {
if (EXECUTOR != null) {
EXECUTOR.close();
EXECUTOR = null;
log.info("JsParserExecutor WorkerExecutor 已关闭");
}
}
}
/**
* 获取或创建 WorkerExecutor懒加载
*/
private static WorkerExecutor getExecutor() {
if (EXECUTOR != null) {
return EXECUTOR;
}
synchronized (EXECUTOR_LOCK) {
if (EXECUTOR == null) {
EXECUTOR = WebClientVertxInit.get().createSharedWorkerExecutor("parser-executor", 32);
}
return EXECUTOR;
}
}
@Override @Override
public Future<String> parse() { public Future<String> parse() {
jsLogger.info("开始执行JavaScript解析器: {}", config.getType()); jsLogger.info("开始执行JavaScript解析器: {}", config.getType());
// 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程 // 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程
return EXECUTOR.executeBlocking(() -> { return getExecutor().executeBlocking(() -> {
// 直接调用全局parse函数 // 直接调用全局parse函数
Object parseFunction = engine.get("parse"); Object parseFunction = engine.get("parse");
if (parseFunction == null) { if (parseFunction == null) {
@@ -173,7 +219,7 @@ public class JsParserExecutor implements IPanTool {
} else { } else {
throw new RuntimeException("parse函数类型错误"); throw new RuntimeException("parse函数类型错误");
} }
}); }).onComplete(ar -> close());
} }
@Override @Override
@@ -181,7 +227,7 @@ public class JsParserExecutor implements IPanTool {
jsLogger.info("开始执行JavaScript文件列表解析: {}", config.getType()); jsLogger.info("开始执行JavaScript文件列表解析: {}", config.getType());
// 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程 // 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程
return EXECUTOR.executeBlocking(() -> { return getExecutor().executeBlocking(() -> {
// 直接调用全局parseFileList函数 // 直接调用全局parseFileList函数
Object parseFileListFunction = engine.get("parseFileList"); Object parseFileListFunction = engine.get("parseFileList");
if (parseFileListFunction == null) { if (parseFileListFunction == null) {
@@ -206,7 +252,7 @@ public class JsParserExecutor implements IPanTool {
} else { } else {
throw new RuntimeException("parseFileList函数类型错误"); throw new RuntimeException("parseFileList函数类型错误");
} }
}); }).onComplete(ar -> close());
} }
@Override @Override
@@ -214,7 +260,7 @@ public class JsParserExecutor implements IPanTool {
jsLogger.info("开始执行JavaScript按ID解析: {}", config.getType()); jsLogger.info("开始执行JavaScript按ID解析: {}", config.getType());
// 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程 // 使用executeBlocking在工作线程上执行避免阻塞EventLoop线程
return EXECUTOR.executeBlocking(() -> { return getExecutor().executeBlocking(() -> {
// 直接调用全局parseById函数 // 直接调用全局parseById函数
Object parseByIdFunction = engine.get("parseById"); Object parseByIdFunction = engine.get("parseById");
if (parseByIdFunction == null) { if (parseByIdFunction == null) {
@@ -237,7 +283,7 @@ public class JsParserExecutor implements IPanTool {
} else { } else {
throw new RuntimeException("parseById函数类型错误"); throw new RuntimeException("parseById函数类型错误");
} }
}); }).onComplete(ar -> close());
} }
/** /**

View File

@@ -355,7 +355,7 @@ public class JsPlaygroundExecutor {
*/ */
public List<JsPlaygroundLogger.LogEntry> getLogs() { public List<JsPlaygroundLogger.LogEntry> getLogs() {
List<JsPlaygroundLogger.LogEntry> logs = playgroundLogger.getLogs(); List<JsPlaygroundLogger.LogEntry> logs = playgroundLogger.getLogs();
System.out.println("[JsPlaygroundExecutor] 获取日志,数量: " + logs.size()); log.debug("获取日志,数量: {}", logs.size());
return logs; return logs;
} }

View File

@@ -4,6 +4,9 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* 演练场日志收集器 * 演练场日志收集器
* 收集JavaScript执行过程中的日志信息 * 收集JavaScript执行过程中的日志信息
@@ -13,7 +16,10 @@ import java.util.List;
*/ */
public class JsPlaygroundLogger { public class JsPlaygroundLogger {
private static final Logger log = LoggerFactory.getLogger(JsPlaygroundLogger.class);
// 使用线程安全的列表 // 使用线程安全的列表
private static final int MAX_LOG_SIZE = 1000;
private final List<LogEntry> logs = Collections.synchronizedList(new ArrayList<>()); private final List<LogEntry> logs = Collections.synchronizedList(new ArrayList<>());
/** /**
@@ -59,6 +65,18 @@ public class JsPlaygroundLogger {
return obj.toString(); return obj.toString();
} }
/**
* 添加日志条目,超过最大容量时移除最早的条目
*/
private void addLog(LogEntry entry) {
synchronized (logs) {
if (logs.size() >= MAX_LOG_SIZE) {
logs.remove(0);
}
logs.add(entry);
}
}
/** /**
* 记录日志(内部方法) * 记录日志(内部方法)
* @param level 日志级别 * @param level 日志级别
@@ -67,8 +85,8 @@ public class JsPlaygroundLogger {
*/ */
private void log(String level, Object message, String source) { private void log(String level, Object message, String source) {
String msg = toString(message); String msg = toString(message);
logs.add(new LogEntry(level, msg, source)); addLog(new LogEntry(level, msg, source));
System.out.println("[" + source + "PlaygroundLogger] " + level + ": " + msg); log.debug("[{}PlaygroundLogger] {}: {}", source, level, msg);
} }
/** /**
@@ -111,8 +129,8 @@ public class JsPlaygroundLogger {
if (throwable != null) { if (throwable != null) {
msg = msg + ": " + throwable.getMessage(); msg = msg + ": " + throwable.getMessage();
} }
logs.add(new LogEntry("ERROR", msg, "JS")); addLog(new LogEntry("ERROR", msg, "JS"));
System.out.println("[JSPlaygroundLogger] ERROR: " + msg); log.debug("[JSPlaygroundLogger] ERROR: {}", msg);
} }
// ===== 以下是供Java层调用的内部方法 ===== // ===== 以下是供Java层调用的内部方法 =====
@@ -153,8 +171,8 @@ public class JsPlaygroundLogger {
if (throwable != null) { if (throwable != null) {
msg = msg + ": " + throwable.getMessage(); msg = msg + ": " + throwable.getMessage();
} }
logs.add(new LogEntry("ERROR", msg, "JAVA")); addLog(new LogEntry("ERROR", msg, "JAVA"));
System.out.println("[JAVAPlaygroundLogger] ERROR: " + msg); log.debug("[JAVAPlaygroundLogger] ERROR: {}", msg);
} }
/** /**

View File

@@ -139,8 +139,8 @@ public class JsScriptLoader {
try { try {
String jarPath = jarUrl.getPath().substring(5, jarUrl.getPath().indexOf("!")); String jarPath = jarUrl.getPath().substring(5, jarUrl.getPath().indexOf("!"));
JarFile jarFile = new JarFile(jarPath);
try (JarFile jarFile = new JarFile(jarPath)) {
Enumeration<JarEntry> entries = jarFile.entries(); Enumeration<JarEntry> entries = jarFile.entries();
while (entries.hasMoreElements()) { while (entries.hasMoreElements()) {
JarEntry entry = entries.nextElement(); JarEntry entry = entries.nextElement();
@@ -152,8 +152,7 @@ public class JsScriptLoader {
resourceFiles.add(entryName); resourceFiles.add(entryName);
} }
} }
}
jarFile.close();
} catch (Exception e) { } catch (Exception e) {
log.debug("解析JAR包资源文件失败", e); log.debug("解析JAR包资源文件失败", e);
} }

View File

@@ -109,9 +109,9 @@ public class FjTool extends PanBase {
// String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString() // String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
static String token = null; static volatile String token = null;
static String userId = null; static volatile String userId = null;
public static boolean authFlag = true; public static volatile boolean authFlag = true;
public FjTool(ShareLinkInfo shareLinkInfo) { public FjTool(ShareLinkInfo shareLinkInfo) {
super(shareLinkInfo); super(shareLinkInfo);
@@ -289,12 +289,14 @@ public class FjTool extends PanBase {
JsonObject json = asJson(res2); JsonObject json = asJson(res2);
if (json.getInteger("code") == 200) { if (json.getInteger("code") == 200) {
token = json.getJsonObject("data").getString("appToken"); token = json.getJsonObject("data").getString("appToken");
header0.set("appToken", token); MultiMap h0 = MultiMap.caseInsensitiveMultiMap();
log.info("登录成功 token: {}", token); h0.addAll(header0);
h0.set("appToken", token);
log.info("登录成功 token: {}...", token != null ? token.substring(0, Math.min(8, token.length())) : "null");
client.postAbs(UriTemplate.of(TOKEN_VERIFY_URL)) client.postAbs(UriTemplate.of(TOKEN_VERIFY_URL))
.setTemplateParam("uuid", uuid) .setTemplateParam("uuid", uuid)
.setTemplateParam("ts", tsEncode2) .setTemplateParam("ts", tsEncode2)
.putHeaders(header0).send().onSuccess(res -> { .putHeaders(h0).send().onSuccess(res -> {
if (asJson(res).getInteger("code") == 200) { if (asJson(res).getInteger("code") == 200) {
if (FjTool.userId == null) { if (FjTool.userId == null) {
FjTool.userId = asJson(res).getJsonObject("map").getString("userId"); FjTool.userId = asJson(res).getJsonObject("map").getString("userId");
@@ -454,7 +456,10 @@ public class FjTool extends PanBase {
// 如果参数里的目录ID不为空则直接解析目录 // 如果参数里的目录ID不为空则直接解析目录
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId"); String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
if (dirId != null && !dirId.isEmpty()) { if (dirId != null && !dirId.isEmpty()) {
uuid = shareLinkInfo.getOtherParam().get("uuid").toString(); Object uuidObj = shareLinkInfo.getOtherParam().get("uuid");
if (uuidObj != null) {
uuid = uuidObj.toString();
}
parserDir(dirId, shareId, promise0); parserDir(dirId, shareId, promise0);
return promise0.future(); return promise0.future();
} }
@@ -495,7 +500,7 @@ public class FjTool extends PanBase {
JsonArray list; JsonArray list;
try { try {
JsonObject jsonObject = asJson(res); JsonObject jsonObject = asJson(res);
System.out.println(jsonObject.encodePrettily()); log.debug("目录列表: {}", jsonObject.encodePrettily());
list = jsonObject.getJsonArray("list"); list = jsonObject.getJsonArray("list");
} catch (Exception e) { } catch (Exception e) {
log.error("解析目录失败: {}", res.bodyAsString()); log.error("解析目录失败: {}", res.bodyAsString());
@@ -576,6 +581,10 @@ public class FjTool extends PanBase {
// 第二次请求 // 第二次请求
JsonObject paramJson = (JsonObject)shareLinkInfo.getOtherParam().get("paramJson"); JsonObject paramJson = (JsonObject)shareLinkInfo.getOtherParam().get("paramJson");
if (paramJson == null) {
promise.fail("缺少 paramJson 参数");
return promise.future();
}
clientNoRedirects.getAbs(UriTemplate.of(SECOND_REQUEST_URL_VIP)) clientNoRedirects.getAbs(UriTemplate.of(SECOND_REQUEST_URL_VIP))
.setTemplateParam("fidEncode", paramJson.getString("fidEncode")) .setTemplateParam("fidEncode", paramJson.getString("fidEncode"))
.setTemplateParam("uuid", paramJson.getString("uuid")) .setTemplateParam("uuid", paramJson.getString("uuid"))

View File

@@ -389,6 +389,10 @@ public class FsTool extends PanBase {
try { try {
JsonObject paramJson = (JsonObject) shareLinkInfo.getOtherParam().get("paramJson"); JsonObject paramJson = (JsonObject) shareLinkInfo.getOtherParam().get("paramJson");
if (paramJson == null) {
parsePromise.fail("缺少 paramJson 参数");
return parsePromise.future();
}
String shareUrl = paramJson.getString("shareUrl"); String shareUrl = paramJson.getString("shareUrl");
String objToken = paramJson.getString("objToken"); String objToken = paramJson.getString("objToken");
String tenant = extractTenant(shareUrl); String tenant = extractTenant(shareUrl);
@@ -444,7 +448,7 @@ public class FsTool extends PanBase {
if (m1.find()) { if (m1.find()) {
try { try {
return URLDecoder.decode(m1.group(1).trim(), StandardCharsets.UTF_8); return URLDecoder.decode(m1.group(1).trim(), StandardCharsets.UTF_8);
} catch (Exception ignored) { } catch (IllegalArgumentException ignored) {
} }
} }
@@ -453,7 +457,7 @@ public class FsTool extends PanBase {
if (m2.find()) { if (m2.find()) {
try { try {
return URLDecoder.decode(m2.group(1).trim(), StandardCharsets.UTF_8); return URLDecoder.decode(m2.group(1).trim(), StandardCharsets.UTF_8);
} catch (Exception ignored) { } catch (IllegalArgumentException ignored) {
} }
} }

View File

@@ -89,8 +89,8 @@ public class IzTool extends PanBase {
String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString() String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
public static String token = null; public static volatile String token = null;
public static boolean authFlag = true; public static volatile boolean authFlag = true;
public Future<String> parse() { public Future<String> parse() {
@@ -102,7 +102,7 @@ public class IzTool extends PanBase {
if (shareLinkInfo.getOtherParam().containsKey("auths")) { if (shareLinkInfo.getOtherParam().containsKey("auths")) {
boolean isTempAuth = shareLinkInfo.getOtherParam().containsKey("__TEMP_AUTH_ADDED"); boolean isTempAuth = shareLinkInfo.getOtherParam().containsKey("__TEMP_AUTH_ADDED");
log.info("文件解析检测到认证信息: isTempAuth={}, authFlag={}, token={}", log.info("文件解析检测到认证信息: isTempAuth={}, authFlag={}, token={}",
isTempAuth, authFlag, token != null ? "已登录(" + token.substring(0, Math.min(10, token.length())) + "...)" : "未登录"); isTempAuth, authFlag, token != null ? "已登录(" + token.substring(0, Math.min(8, token.length())) + "...)" : "未登录");
// 如果需要认证但还没有token先执行登录 // 如果需要认证但还没有token先执行登录
if ((isTempAuth || authFlag) && token == null) { if ((isTempAuth || authFlag) && token == null) {
@@ -118,7 +118,7 @@ public class IzTool extends PanBase {
// 登录失败,继续使用免登录模式 // 登录失败,继续使用免登录模式
}); });
} else if (token != null) { } else if (token != null) {
log.info("文件解析使用已有token: {}...", token.substring(0, Math.min(10, token.length()))); log.info("文件解析使用已有token: {}...", token.substring(0, Math.min(8, token.length())));
} }
} else { } else {
log.debug("文件解析无认证信息,使用免登录模式"); log.debug("文件解析无认证信息,使用免登录模式");
@@ -247,7 +247,7 @@ public class IzTool extends PanBase {
log.warn("登录失败: {}", failRes.getMessage()); log.warn("登录失败: {}", failRes.getMessage());
fail(failRes.getMessage()); fail(failRes.getMessage());
}).onSuccess(r-> { }).onSuccess(r-> {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
}); });
@@ -263,12 +263,12 @@ public class IzTool extends PanBase {
log.warn("重新登录失败: {}", failRes.getMessage()); log.warn("重新登录失败: {}", failRes.getMessage());
fail(failRes.getMessage()); fail(failRes.getMessage());
}).onSuccess(r-> { }).onSuccess(r-> {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
}); });
} else { } else {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
} }
@@ -311,8 +311,7 @@ public class IzTool extends PanBase {
JsonObject json = asJson(res2); JsonObject json = asJson(res2);
if (json.getInteger("code") == 200) { if (json.getInteger("code") == 200) {
token = json.getJsonObject("data").getString("appToken"); token = json.getJsonObject("data").getString("appToken");
header.set("appToken", token); log.info("登录成功 token: {}...", token != null ? token.substring(0, Math.min(8, token.length())) : "null");
log.info("登录成功 token: {}", token);
promise1.complete(); promise1.complete();
} else { } else {
// 检查是否为临时认证 // 检查是否为临时认证
@@ -463,7 +462,10 @@ public class IzTool extends PanBase {
// 如果参数里的目录ID不为空则直接解析目录 // 如果参数里的目录ID不为空则直接解析目录
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId"); String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
if (dirId != null && !dirId.isEmpty()) { if (dirId != null && !dirId.isEmpty()) {
uuid = shareLinkInfo.getOtherParam().get("uuid").toString(); Object uuidObj = shareLinkInfo.getOtherParam().get("uuid");
if (uuidObj != null) {
uuid = uuidObj.toString();
}
parserDir(dirId, shareId, promise); parserDir(dirId, shareId, promise);
return promise.future(); return promise.future();
} }

View File

@@ -88,8 +88,8 @@ public class IzToolWithAuth extends PanBase {
String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString() String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
public static String token = null; public static volatile String token = null;
public static boolean authFlag = true; public static volatile boolean authFlag = true;
public Future<String> parse() { public Future<String> parse() {
@@ -216,7 +216,7 @@ public class IzToolWithAuth extends PanBase {
log.warn("登录失败: {}", failRes.getMessage()); log.warn("登录失败: {}", failRes.getMessage());
fail(failRes.getMessage()); fail(failRes.getMessage());
}).onSuccess(r-> { }).onSuccess(r-> {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
}); });
@@ -232,12 +232,12 @@ public class IzToolWithAuth extends PanBase {
log.warn("重新登录失败: {}", failRes.getMessage()); log.warn("重新登录失败: {}", failRes.getMessage());
fail(failRes.getMessage()); fail(failRes.getMessage());
}).onSuccess(r-> { }).onSuccess(r-> {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
}); });
} else { } else {
httpRequest.setTemplateParam("appToken", header.get("appToken")) httpRequest.setTemplateParam("appToken", token)
.putHeaders(header); .putHeaders(header);
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2")); httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
} }
@@ -280,8 +280,7 @@ public class IzToolWithAuth extends PanBase {
JsonObject json = asJson(res2); JsonObject json = asJson(res2);
if (json.getInteger("code") == 200) { if (json.getInteger("code") == 200) {
token = json.getJsonObject("data").getString("appToken"); token = json.getJsonObject("data").getString("appToken");
header.set("appToken", token); log.info("登录成功 token: {}...", token != null ? token.substring(0, Math.min(8, token.length())) : "null");
log.info("登录成功 token: {}", token);
promise1.complete(); promise1.complete();
} else { } else {
// 检查是否为临时认证 // 检查是否为临时认证
@@ -432,7 +431,8 @@ public class IzToolWithAuth extends PanBase {
// 如果参数里的目录ID不为空则直接解析目录 // 如果参数里的目录ID不为空则直接解析目录
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId"); String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
if (dirId != null && !dirId.isEmpty()) { if (dirId != null && !dirId.isEmpty()) {
uuid = shareLinkInfo.getOtherParam().get("uuid").toString(); Object uuidObj = shareLinkInfo.getOtherParam().get("uuid");
uuid = uuidObj != null ? uuidObj.toString() : null;
parserDir(dirId, shareId, promise); parserDir(dirId, shareId, promise);
return promise.future(); return promise.future();
} }
@@ -480,7 +480,7 @@ public class IzToolWithAuth extends PanBase {
requestDirList(id, shareId, tsEncode, promise); requestDirList(id, shareId, tsEncode, promise);
}) })
.onSuccess(r -> { .onSuccess(r -> {
log.info("目录解析登录成功token={}, 使用 VIP 模式", token != null ? token.substring(0, 10) + "..." : "null"); log.info("目录解析登录成功token={}, 使用 VIP 模式", token != null ? token.substring(0, Math.min(8, token.length())) + "..." : "null");
requestDirList(id, shareId, tsEncode, promise); requestDirList(id, shareId, tsEncode, promise);
}); });
return; return;
@@ -627,7 +627,7 @@ public class IzToolWithAuth extends PanBase {
// 如果有 token使用 VIP 接口 // 如果有 token使用 VIP 接口
if (StringUtils.isNotBlank(appToken)) { if (StringUtils.isNotBlank(appToken)) {
log.debug("parseById 使用 VIP 接口, appToken={}", appToken.substring(0, Math.min(10, appToken.length())) + "..."); log.debug("parseById 使用 VIP 接口, appToken={}", appToken.substring(0, Math.min(8, appToken.length())) + "...");
webClientSession.getAbs(UriTemplate.of(SECOND_REQUEST_URL_VIP)) webClientSession.getAbs(UriTemplate.of(SECOND_REQUEST_URL_VIP))
.putHeaders(header) .putHeaders(header)
.setTemplateParam("fidEncode", paramJson.getString("fidEncode")) .setTemplateParam("fidEncode", paramJson.getString("fidEncode"))

View File

@@ -14,6 +14,7 @@ import io.vertx.ext.web.client.WebClientSession;
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror; import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
import javax.script.ScriptException; import javax.script.ScriptException;
import java.net.MalformedURLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -81,8 +82,8 @@ public class LzTool extends PanBase {
} }
private void doParser(String html, String pwd, String sUrl) { private void doParser(String html, String pwd, String sUrl) {
// 检测是否为目录分享链接 (含 /s/、/b/ 路径段或 b0 开头的路径段) // 检测是否为目录分享链接 (含 /s/、/b/ 路径段或 b 开头的路径段)
if (sUrl.matches(".*/(s|b)/[^/]+.*") || sUrl.matches(".*/b0[^/]+.*")) { if (sUrl.matches(".*/(s|b)/[^/]+.*") || sUrl.matches(".*/b[^/]+.*")) {
fail("该链接为蓝奏云目录分享,请使用目录解析接口"); fail("该链接为蓝奏云目录分享,请使用目录解析接口");
return; return;
} }
@@ -107,7 +108,7 @@ public class LzTool extends PanBase {
try { try {
setFileInfo(html, shareLinkInfo); setFileInfo(html, shareLinkInfo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("文件信息解析异常", e);
} }
// 匹配iframe // 匹配iframe
Pattern compile = Pattern.compile("src=\"(/fn\\?[a-zA-Z\\d_+/=]{16,})\""); Pattern compile = Pattern.compile("src=\"(/fn\\?[a-zA-Z\\d_+/=]{16,})\"");
@@ -175,7 +176,7 @@ public class LzTool extends PanBase {
if (firstDot >= 0) { if (firstDot >= 0) {
domain = host.substring(firstDot); // e.g. ".lanzoum.com" domain = host.substring(firstDot); // e.g. ".lanzoum.com"
} }
} catch (Exception ignored) {} } catch (MalformedURLException ignored) {}
// 创建一个 Cookie 并放入 CookieStore // 创建一个 Cookie 并放入 CookieStore
DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2); DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
nettyCookie.setDomain(domain); nettyCookie.setDomain(domain);
@@ -217,7 +218,7 @@ public class LzTool extends PanBase {
return; return;
} }
Map<?, ?> signMap = (Map<?, ?>)obj.get("data"); Map<?, ?> signMap = (Map<?, ?>)obj.get("data");
String url0 = obj.get("url").toString(); String url0 = String.valueOf(obj.get("url"));
MultiMap map = MultiMap.caseInsensitiveMultiMap(); MultiMap map = MultiMap.caseInsensitiveMultiMap();
signMap.forEach((k, v) -> { signMap.forEach((k, v) -> {
map.add((String) k, v.toString()); map.add((String) k, v.toString());
@@ -275,7 +276,7 @@ public class LzTool extends PanBase {
String h = du.getHost(); String h = du.getHost();
int dot = h.indexOf('.'); int dot = h.indexOf('.');
if (dot >= 0) downDomain = h.substring(dot); if (dot >= 0) downDomain = h.substring(dot);
} catch (Exception ignored) {} } catch (MalformedURLException ignored) {}
// 创建一个 Cookie 并放入 CookieStore // 创建一个 Cookie 并放入 CookieStore
DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2); DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
nettyCookie.setDomain(downDomain); nettyCookie.setDomain(downDomain);
@@ -290,12 +291,12 @@ public class LzTool extends PanBase {
if (location0 == null) { if (location0 == null) {
fail(downUrl + " -> 直链获取失败2, 可能分享已失效"); fail(downUrl + " -> 直链获取失败2, 可能分享已失效");
} else { } else {
setDateAndComplate(location0); setDateAndComplete(location0);
} }
}).onFailure(handleFail(downUrl)); }).onFailure(handleFail(downUrl));
return; return;
} }
setDateAndComplate(location); setDateAndComplete(location);
}) })
.onFailure(handleFail(downUrl)); .onFailure(handleFail(downUrl));
} catch (Exception e) { } catch (Exception e) {
@@ -304,7 +305,7 @@ public class LzTool extends PanBase {
}).onFailure(handleFail(url)); }).onFailure(handleFail(url));
} }
private void setDateAndComplate(String location0) { private void setDateAndComplete(String location0) {
// 分享时间 提取url中的时间戳格式lanzoui.com/abc/abc/yyyy/mm/dd/ // 分享时间 提取url中的时间戳格式lanzoui.com/abc/abc/yyyy/mm/dd/
String regex = "(\\d{4}/\\d{1,2}/\\d{1,2})"; String regex = "(\\d{4}/\\d{1,2}/\\d{1,2})";
Matcher matcher = Pattern.compile(regex).matcher(location0); Matcher matcher = Pattern.compile(regex).matcher(location0);
@@ -354,8 +355,8 @@ public class LzTool extends PanBase {
} }
private void handleFileListParse(String html, String pwd, String sUrl, Promise<List<FileInfo>> promise) { private void handleFileListParse(String html, String pwd, String sUrl, Promise<List<FileInfo>> promise) {
// 检测是否为文件分享链接 (不含 /s/、/b/ 路径段且不含 b0 开头的路径段) // 检测是否为文件分享链接 (不含 /s/、/b/ 路径段且不含 b 开头的路径段)
if (!sUrl.matches(".*/(s|b)/[^/]+.*") && !sUrl.matches(".*/b0[^/]+.*")) { if (!sUrl.matches(".*/(s|b)/[^/]+.*") && !sUrl.matches(".*/b[^/]+.*")) {
promise.fail(baseMsg() + "该链接为蓝奏云文件分享,请使用文件解析接口"); promise.fail(baseMsg() + "该链接为蓝奏云文件分享,请使用文件解析接口");
return; return;
} }

View File

@@ -86,10 +86,10 @@ public class MkgsTool extends PanBase {
// 查找并输出 hash 字段的值 // 查找并输出 hash 字段的值
if (matcher.find()) { if (matcher.find()) {
String hashValue = matcher.group(1); // 获取第一个捕获组 String hashValue = matcher.group(1); // 获取第一个捕获组
System.out.println(hashValue); log.debug("hash: {}", hashValue);
client.getAbs(UriTemplate.of(API_URL)).setTemplateParam("hash", hashValue).send().onSuccess(res3 -> { client.getAbs(UriTemplate.of(API_URL)).setTemplateParam("hash", hashValue).send().onSuccess(res3 -> {
JsonObject jsonObject = asJson(res3); JsonObject jsonObject = asJson(res3);
System.out.println(jsonObject.encodePrettily()); log.debug("API response: {}", jsonObject.encodePrettily());
if (jsonObject.containsKey("url")) { if (jsonObject.containsKey("url")) {
promise.complete(jsonObject.getString("url")); promise.complete(jsonObject.getString("url"));
} else { } else {

View File

@@ -29,19 +29,19 @@ public class MkwTool extends PanBase {
clientSession.getAbs(shareUrl).send().onSuccess(result -> { clientSession.getAbs(shareUrl).send().onSuccess(result -> {
String cookie = result.headers().get("set-cookie"); String cookie = result.headers().get("set-cookie");
if (!cookie.isEmpty()) { if (cookie != null && !cookie.isEmpty()) {
String regex = "([A-Za-z0-9_]+)=([A-Za-z0-9]+)"; String regex = "([A-Za-z0-9_]+)=([A-Za-z0-9]+)";
Pattern pattern = Pattern.compile(regex); Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(cookie); Matcher matcher = pattern.matcher(cookie);
if (matcher.find()) { if (matcher.find()) {
System.out.println(matcher.group(1)); log.debug("cookie key: {}", matcher.group(1));
System.out.println(matcher.group(2)); log.debug("cookie value: {}", matcher.group(2));
var key = matcher.group(1); var key = matcher.group(1);
var token = matcher.group(2); var token = matcher.group(2);
String sign = JsExecUtils.getKwSign(token, key); String sign = JsExecUtils.getKwSign(token, key);
System.out.println(sign); log.debug("sign: {}", sign);
clientSession.getAbs(UriTemplate.of(API_URL)).setTemplateParam("mid", shareLinkInfo.getShareKey()) clientSession.getAbs(UriTemplate.of(API_URL)).setTemplateParam("mid", shareLinkInfo.getShareKey())
.putHeader("Secret", sign).send().onSuccess(res -> { .putHeader("Secret", sign).send().onSuccess(res -> {
JsonObject json = asJson(res); JsonObject json = asJson(res);
@@ -54,7 +54,7 @@ public class MkwTool extends PanBase {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("解析失败", e);
fail("解析失败"); fail("解析失败");
} }
}); });

View File

@@ -21,6 +21,8 @@ public class P115Tool extends PanBase {
private static final String SECOND_REQUEST_URL = API_URL_PREFIX + "share/skip_login_downurl"; private static final String SECOND_REQUEST_URL = API_URL_PREFIX + "share/skip_login_downurl";
private static final String DEFAULT_UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36";
private static final MultiMap header; private static final MultiMap header;
static { static {
@@ -49,9 +51,11 @@ public class P115Tool extends PanBase {
public Future<String> parse() { public Future<String> parse() {
// 第一次请求 获取文件信息 // 第一次请求 获取文件信息
Object uaObj = shareLinkInfo.getOtherParam().get("UA");
String ua = uaObj != null ? uaObj.toString() : DEFAULT_UA;
client.getAbs(UriTemplate.of(FIRST_REQUEST_URL)) client.getAbs(UriTemplate.of(FIRST_REQUEST_URL))
.putHeaders(header) .putHeaders(header)
.putHeader("User-Agent", shareLinkInfo.getOtherParam().get("UA").toString()) .putHeader("User-Agent", ua)
.setTemplateParam("dataKey", shareLinkInfo.getShareKey()) .setTemplateParam("dataKey", shareLinkInfo.getShareKey())
.setTemplateParam("dataPwd", shareLinkInfo.getSharePassword()) .setTemplateParam("dataPwd", shareLinkInfo.getSharePassword())
.send().onSuccess(res -> { .send().onSuccess(res -> {
@@ -68,7 +72,7 @@ public class P115Tool extends PanBase {
// share_code={dataKey}&receive_code={dataPwd}&file_id={file_id} // share_code={dataKey}&receive_code={dataPwd}&file_id={file_id}
client.postAbs(SECOND_REQUEST_URL) client.postAbs(SECOND_REQUEST_URL)
.putHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") .putHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
.putHeader("User-Agent", shareLinkInfo.getOtherParam().get("UA").toString()) .putHeader("User-Agent", ua)
.sendForm(MultiMap.caseInsensitiveMultiMap() .sendForm(MultiMap.caseInsensitiveMultiMap()
.set("share_code", shareLinkInfo.getShareKey()) .set("share_code", shareLinkInfo.getShareKey())
.set("receive_code", shareLinkInfo.getSharePassword()) .set("receive_code", shareLinkInfo.getSharePassword())

View File

@@ -85,7 +85,7 @@ public class PdbTool extends PanBase implements IPanTool {
}) })
.onFailure(handleFail()); .onFailure(handleFail());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("URL编码异常", e);
} }
}) })

View File

@@ -129,7 +129,7 @@ public class PodTool extends PanBase {
if (urlMatcher.find()) { if (urlMatcher.find()) {
String url = urlMatcher.group("url"); String url = urlMatcher.group("url");
System.out.println("URL: " + url); log.debug("URL: {}", url);
return url; return url;
} }
throw new RuntimeException("URL匹配失败"); throw new RuntimeException("URL匹配失败");
@@ -172,7 +172,7 @@ public class PodTool extends PanBase {
if (tokenMatcher.find()) { if (tokenMatcher.find()) {
String token = tokenMatcher.group(1); String token = tokenMatcher.group(1);
System.out.println("Token: " + token); log.debug("Token: {}***", token.length() > 4 ? token.substring(0, 4) : "***");
return token; return token;
} }
throw new RuntimeException("token匹配失败"); throw new RuntimeException("token匹配失败");
@@ -198,8 +198,8 @@ public class PodTool extends PanBase {
// 发送请求并处理响应 // 发送请求并处理响应
client.sendAsync(request, HttpResponse.BodyHandlers.ofString()) client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
.thenApply(response -> { .thenApply(response -> {
System.out.println("Response Status Code: " + response.statusCode()); log.debug("Response Status Code: {}", response.statusCode());
System.out.println("Response Body: " + response.body()); log.debug("Response Body: {}", response.body());
promise.complete(response.body()); promise.complete(response.body());
return null; return null;
}); });

View File

@@ -74,9 +74,9 @@ public class QQTool extends PanBase {
}); });
// 调试匹配的情况 // 调试匹配的情况
System.out.println("文件名称: " + filename); log.debug("文件名称: {}", filename);
System.out.println("文件大小: " + filesize); log.debug("文件大小: {}", filesize);
System.out.println("文件直链: " + fileurl); log.debug("文件直链: {}", fileurl);
// 提交 // 提交
promise.complete(fileurl.replace("\\x26", "&")); promise.complete(fileurl.replace("\\x26", "&"));

View File

@@ -3,9 +3,11 @@ package cn.qaiu.parser.impl;
import cn.qaiu.entity.FileInfo; import cn.qaiu.entity.FileInfo;
import cn.qaiu.entity.ShareLinkInfo; import cn.qaiu.entity.ShareLinkInfo;
import cn.qaiu.parser.PanBase; import cn.qaiu.parser.PanBase;
import cn.qaiu.util.CommonUtils;
import cn.qaiu.util.HeaderUtils; import cn.qaiu.util.HeaderUtils;
import io.vertx.core.Future; import io.vertx.core.Future;
import io.vertx.core.MultiMap; import io.vertx.core.MultiMap;
import io.vertx.core.Promise;
import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject; import io.vertx.core.json.JsonObject;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -13,27 +15,33 @@ import org.slf4j.LoggerFactory;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* QQ闪传 <br> * QQ闪传 <br>
* 只能客户端上传 支持Android QQ 9.2.5, MACOS QQ 6.9.78可生成分享链接通过浏览器下载支持超大文件有效期默认7天暂时没找到续期方法。<br> * 支持多文件、多级目录解析。通过 GetFileList API 获取文件列表BatchDownload API 获取下载直链。<br>
* 有效期默认7天。
*/ */
public class QQscTool extends PanBase { public class QQscTool extends PanBase {
Logger LOG = LoggerFactory.getLogger(QQscTool.class); Logger LOG = LoggerFactory.getLogger(QQscTool.class);
private static final String API_URL = "https://qfile.qq.com/http2rpc/gotrpc/noauth/trpc.qqntv2.richmedia.InnerProxy/BatchDownload"; private static final String BATCH_DOWNLOAD_API =
"https://qfile.qq.com/http2rpc/gotrpc/noauth/trpc.qqntv2.richmedia.InnerProxy/BatchDownload";
private static final MultiMap HEADERS = HeaderUtils.parseHeaders(""" private static final String GET_FILE_LIST_API =
"https://qfile.qq.com/http2rpc/gotrpc/noauth/trpc.file.FileFlashTrans/GetFileList";
private static final MultiMap BATCH_DOWNLOAD_HEADERS = HeaderUtils.parseHeaders("""
Accept-Encoding: gzip, deflate Accept-Encoding: gzip, deflate
Accept-Language: zh-CN,zh;q=0.9 Accept-Language: zh-CN,zh;q=0.9
Connection: keep-alive Connection: keep-alive
Cookie: uin=9000002; p_uin=9000002 Cookie: uin=9000002; p_uin=9000002
DNT: 1 DNT: 1
Origin: https://qfile.qq.com Origin: https://qfile.qq.com
Referer: https://qfile.qq.com/q/Xolxtv5b4O
Sec-Fetch-Dest: empty Sec-Fetch-Dest: empty
Sec-Fetch-Mode: cors Sec-Fetch-Mode: cors
Sec-Fetch-Site: same-origin Sec-Fetch-Site: same-origin
@@ -46,84 +54,255 @@ public class QQscTool extends PanBase {
x-oidb: {"uint32_command":"0x9248", "uint32_service_type":"4"} x-oidb: {"uint32_command":"0x9248", "uint32_service_type":"4"}
"""); """);
private static final MultiMap GET_FILE_LIST_HEADERS = HeaderUtils.parseHeaders("""
Accept-Encoding: gzip, deflate
Cookie: uin=9000002; p_uin=9000002
Origin: https://qfile.qq.com
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36 Edg/138.0.0.0
content-type: application/json
x-oidb: {"uint32_command":"0x93d4", "uint32_service_type":"1"}
""");
public QQscTool(ShareLinkInfo shareLinkInfo) { public QQscTool(ShareLinkInfo shareLinkInfo) {
super(shareLinkInfo); super(shareLinkInfo);
} }
@Override
public Future<String> parse() { public Future<String> parse() {
String jsonTemplate = """
{"req_head":{"agent":8},"download_info":[{"batch_id":"%s","scene":{"business_type":4,"app_type":22,"scene_type":5},"index_node":{"file_uuid":"%s"},"url_type":2,"download_scene":0}],"scene_type":103}
""";
client.getAbs(shareLinkInfo.getShareUrl()).send(result -> { client.getAbs(shareLinkInfo.getShareUrl()).send(result -> {
if (result.succeeded()) { if (result.failed()) {
String htmlJs = result.result().bodyAsString(); LOG.error("请求失败: {}", result.cause().getMessage());
LOG.debug("获取到的HTML内容: {}", htmlJs); promise.fail(result.cause());
String fileUUID = getFileUUID(htmlJs); return;
String fileName = extractFileNameFromTitle(htmlJs); }
String html = result.result().bodyAsString();
String fileName = extractFileNameFromTitle(html);
if (fileName != null) { if (fileName != null) {
LOG.info("提取到的文件名: {}", fileName);
FileInfo fileInfo = new FileInfo(); FileInfo fileInfo = new FileInfo();
fileInfo.setFileName(fileName); fileInfo.setFileName(fileName);
shareLinkInfo.getOtherParam().put("fileInfo", fileInfo); shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
} else {
LOG.warn("未能提取到文件名");
} }
if (fileUUID != null) { // 尝试用 GetFileList API 获取第一个文件的下载链接
LOG.info("提取到的文件UUID: {}", fileUUID); String filesetId = extractFilesetId(html);
String formatted = jsonTemplate.formatted(fileUUID, fileUUID); if (filesetId != null) {
JsonObject entries = new JsonObject(formatted); fetchFileList(filesetId, "").onSuccess(fileList -> {
client.postAbs(API_URL) for (int i = 0; i < fileList.size(); i++) {
.putHeaders(HEADERS) JsonObject file = fileList.getJsonObject(i);
.sendJsonObject(entries) if (!file.getBoolean("is_dir", false)) {
.onSuccess(result2 -> { String physicalId = file.getJsonObject("physical").getString("id");
if (result2.statusCode() == 200) { String name = file.getString("name");
JsonObject body = asJson(result2); downloadFile(physicalId, name);
LOG.debug("API响应内容: {}", body.encodePrettily()); return;
// { }
// "retcode": 0, }
// "cost": 132, promise.fail("未找到可下载的文件");
// "message": "", }).onFailure(e -> {
// "error": { LOG.warn("GetFileList 失败,回退到旧解析方式: {}", e.getMessage());
// "message": "", parseLegacy(html, fileName);
// "code": 0 });
// }, } else {
// "data": { parseLegacy(html, fileName);
// "download_rsp": [{ }
});
// 取 download_rsp return promise.future();
if (!body.containsKey("retcode") || body.getInteger("retcode") != 0) { }
promise.fail("API请求失败错误信息: " + body.encodePrettily());
@Override
public Future<List<FileInfo>> parseFileList() {
Promise<List<FileInfo>> resultPromise = Promise.promise();
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
client.getAbs(shareLinkInfo.getShareUrl()).send(result -> {
if (result.failed()) {
resultPromise.fail(result.cause());
return;
}
String html = result.result().bodyAsString();
String filesetId = extractFilesetId(html);
if (filesetId == null) {
resultPromise.fail("无法从页面提取 filesetId");
return;
}
String parentId = dirId != null ? dirId : "";
fetchFileList(filesetId, parentId).onSuccess(fileList -> {
try {
List<FileInfo> list = new ArrayList<>();
String panType = shareLinkInfo.getType();
for (int i = 0; i < fileList.size(); i++) {
JsonObject file = fileList.getJsonObject(i);
FileInfo fileInfo = new FileInfo();
String name = file.getString("name");
String cliFileid = file.getString("cli_fileid");
boolean isDir = file.getBoolean("is_dir", false);
String sizeStr = file.getString("file_size");
fileInfo.setFileName(name)
.setFileId(cliFileid)
.setPanType(panType)
.setSizeStr(sizeStr);
if (isDir) {
fileInfo.setFileType("folder")
.setParserUrl(String.format("%s/v2/getFileList?url=%s&dirId=%s",
getDomainName(),
URLEncoder.encode(shareLinkInfo.getShareUrl(), StandardCharsets.UTF_8),
cliFileid));
} else {
String physicalId = file.getJsonObject("physical").getString("id");
JsonObject paramJson = new JsonObject()
.put("fileId", physicalId)
.put("fileName", name)
.put("cliFileid", cliFileid);
String param = CommonUtils.urlBase64Encode(paramJson.encode());
fileInfo.setFileType("file")
.setParserUrl(String.format("%s/v2/redirectUrl/%s/%s",
getDomainName(), panType, param));
}
list.add(fileInfo);
}
resultPromise.complete(list);
} catch (Exception e) {
resultPromise.fail(e);
}
}).onFailure(resultPromise::fail);
});
return resultPromise.future();
}
@Override
public Future<String> parseById() {
JsonObject paramJson = (JsonObject) shareLinkInfo.getOtherParam().get("paramJson");
String fileId = paramJson.getString("fileId");
String fileName = paramJson.getString("fileName");
Promise<String> p = Promise.promise();
callBatchDownload(fileId, fileName, p);
return p.future();
}
// ========== 内部方法 ==========
/**
* 调用 BatchDownload API 获取单个文件的下载直链
*/
private void downloadFile(String physicalId, String fileName) {
callBatchDownload(physicalId, fileName, promise);
}
private void callBatchDownload(String physicalId, String fileName, Promise<String> p) {
String body = """
{"req_head":{"agent":8},"download_info":[{"batch_id":"%s","scene":{"business_type":4,"app_type":22,"scene_type":5},"index_node":{"file_uuid":"%s"},"url_type":2,"download_scene":0}],"scene_type":103}
""".formatted(physicalId, physicalId);
client.postAbs(BATCH_DOWNLOAD_API)
.putHeaders(BATCH_DOWNLOAD_HEADERS)
.sendJsonObject(new JsonObject(body))
.onSuccess(resp -> {
if (resp.statusCode() != 200) {
p.fail("BatchDownload 请求失败,状态码: " + resp.statusCode());
return;
}
JsonObject respBody = asJson(resp);
if (!respBody.containsKey("retcode") || respBody.getInteger("retcode") != 0) {
p.fail("BatchDownload 请求失败: " + respBody.encodePrettily());
return;
}
JsonArray downloadRsp = respBody.getJsonObject("data").getJsonArray("download_rsp");
if (downloadRsp == null || downloadRsp.isEmpty()) {
p.fail("BatchDownload 响应中缺少 download_rsp");
return; return;
} }
JsonArray downloadRsp = body.getJsonObject("data").getJsonArray("download_rsp");
if (downloadRsp != null && !downloadRsp.isEmpty()) {
String url = downloadRsp.getJsonObject(0).getString("url"); String url = downloadRsp.getJsonObject(0).getString("url");
if (url != null && url.startsWith("&filename=")) {
p.fail("该文件已被和谐");
return;
}
if (fileName != null) { if (fileName != null) {
url = url + "&filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8); url = url + "&filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8);
} }
promise.complete(url); p.complete(url);
} else { })
promise.fail("API响应中缺少 download_rsp"); .onFailure(e -> {
} LOG.error("BatchDownload 请求异常", e);
} else { p.fail(e);
promise.fail("API请求失败状态码: " + result2.statusCode());
}
}).onFailure(e -> {
LOG.error("API请求异常", e);
promise.fail(e);
}); });
} else {
LOG.error("未能提取到文件UUID");
promise.fail("未能提取到文件UUID");
} }
} else {
LOG.error("请求失败: {}", result.cause().getMessage());
promise.fail(result.cause());
}
});
return promise.future(); /**
* 调用 GetFileList API 获取指定目录下的文件列表
*/
private Future<JsonArray> fetchFileList(String filesetId, String parentId) {
Promise<JsonArray> p = Promise.promise();
JsonObject body = new JsonObject()
.put("fileset_id", filesetId)
.put("req_infos", new JsonArray()
.add(new JsonObject()
.put("parent_id", parentId)
.put("req_depth", 1)
.put("count", 50)
.put("filter_condition", new JsonObject().put("file_category", 0))
.put("sort_conditions", new JsonArray()
.add(new JsonObject()
.put("sort_field", 0)
.put("sort_order", 0)))))
.put("support_folder_status", true);
MultiMap headers = GET_FILE_LIST_HEADERS.set("Referer", shareLinkInfo.getShareUrl());
client.postAbs(GET_FILE_LIST_API)
.putHeaders(headers)
.sendJsonObject(body)
.onSuccess(resp -> {
if (resp.statusCode() != 200) {
p.fail("GetFileList 请求失败,状态码: " + resp.statusCode());
return;
}
JsonObject respBody = asJson(resp);
if (respBody.getInteger("retcode", -1) != 0) {
p.fail("GetFileList 请求失败: " + respBody.getString("message", "未知错误"));
return;
}
JsonArray fileLists = respBody.getJsonObject("data").getJsonArray("file_lists");
if (fileLists == null || fileLists.isEmpty()) {
p.fail("GetFileList 响应中缺少 file_lists");
return;
}
JsonArray fileList = fileLists.getJsonObject(0).getJsonArray("file_list");
p.complete(fileList != null ? fileList : new JsonArray());
})
.onFailure(e -> {
LOG.error("GetFileList 请求异常", e);
p.fail(e);
});
return p.future();
}
/**
* 从 HTML 的 __NUXT_DATA__ 中提取 fileset_id
*/
String extractFilesetId(String html) {
// Nuxt __NUXT_DATA__ 中 fileset_id 出现在缓存 key 的嵌套 JSON 中
// 直接匹配 fileset_id 后面最近的 UUID跳过转义引号、冒号等非hex字符
Pattern pattern = Pattern.compile(
"fileset_id[^a-f0-9]*([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})");
Matcher matcher = pattern.matcher(html);
if (matcher.find()) {
return matcher.group(1);
}
return null;
}
/**
* 旧版解析方式(兼容单文件链接,通过 HTML 字符串搜索提取 UUID
*/
private void parseLegacy(String html, String fileName) {
String fileUUID = getFileUUID(html);
if (fileUUID == null) {
promise.fail("未能提取到文件UUID");
return;
}
LOG.info("使用旧版解析提取到的文件UUID: {}", fileUUID);
downloadFile(fileUUID, fileName);
} }
String getFileUUID(String htmlJs) { String getFileUUID(String htmlJs) {
@@ -140,32 +319,23 @@ public class QQscTool extends PanBase {
String extracted = htmlJs.substring(quoteStart, quoteEnd); String extracted = htmlJs.substring(quoteStart, quoteEnd);
LOG.debug("提取结果: {}", extracted); LOG.debug("提取结果: {}", extracted);
return extracted; return extracted;
} else {
LOG.error("未找到结束引号: {}", marker);
} }
} else {
LOG.error("未找到标记: {} 在关键字: {} 之后", marker, keyword);
} }
} else {
LOG.error("未找到关键字: {}", keyword);
} }
return null; return null;
} }
public static String extractFileNameFromTitle(String content) { public static String extractFileNameFromTitle(String content) {
// 匹配<title>和</title>之间的内容
Pattern pattern = Pattern.compile("<title>(.*?)</title>"); Pattern pattern = Pattern.compile("<title>(.*?)</title>");
Matcher matcher = pattern.matcher(content); Matcher matcher = pattern.matcher(content);
if (matcher.find()) { if (matcher.find()) {
String fullTitle = matcher.group(1); String fullTitle = matcher.group(1);
// 按 "" 分割,取前半部分
int sepIndex = fullTitle.indexOf(""); int sepIndex = fullTitle.indexOf("");
if (sepIndex != -1) { if (sepIndex != -1) {
return fullTitle.substring(0, sepIndex); return fullTitle.substring(0, sepIndex);
} }
return fullTitle; // 如果没有分隔符,就返回全部 return fullTitle;
} }
return null; return null;
} }
} }

View File

@@ -3,10 +3,11 @@ package cn.qaiu.parser.impl;
import cn.qaiu.entity.FileInfo; import cn.qaiu.entity.FileInfo;
import cn.qaiu.entity.ShareLinkInfo; import cn.qaiu.entity.ShareLinkInfo;
import io.vertx.core.Future; import io.vertx.core.Future;
import java.util.HashMap; import io.vertx.core.buffer.Buffer;
import java.util.Map; import io.vertx.core.json.JsonObject;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
public class QQwTool extends QQTool { public class QQwTool extends QQTool {
@@ -16,54 +17,51 @@ public class QQwTool extends QQTool {
@Override @Override
public Future<String> parse() { public Future<String> parse() {
client.getAbs(shareLinkInfo.getShareUrl()).send().onSuccess(res -> { String k = shareLinkInfo.getShareKey();
String html = res.bodyAsString(); String postBody = "f=json&k=" + URLEncoder.encode(k, StandardCharsets.UTF_8);
Map<String, String> stringStringMap = extractVariables(html);
String url = stringStringMap.get("url");
String fn = stringStringMap.get("filename");
String size = stringStringMap.get("filesize");
String createBy = stringStringMap.get("nick");
FileInfo fileInfo = new FileInfo().setFileName(fn).setSize(Long.parseLong(size)).setCreateBy(createBy);
shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
if (url != null) {
String url302 = url.replace("\\x26", "&");
promise.complete(url302);
/* client.postAbs("https://wx.mail.qq.com/s")
clientNoRedirects.getAbs(url302).send().onSuccess(res2 -> { .putHeader("Content-Type", "application/x-www-form-urlencoded")
MultiMap headers = res2.headers(); .putHeader("Accept", "application/json, text/plain, */*")
if (headers.contains("Location")) { .putHeader("Referer", shareLinkInfo.getShareUrl())
promise.complete(headers.get("Location")); .putHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
} else { + "(KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36 Edg/134.0.0.0")
fail("找不到重定向URL"); .sendBuffer(Buffer.buffer(postBody))
.onSuccess(res -> {
try {
JsonObject data = asJson(res);
JsonObject head = data.getJsonObject("head");
if (head == null || head.getInteger("ret", -1) != 0) {
String msg = head != null ? head.getString("msg", "未知错误") : "未知错误";
fail("API错误: " + msg);
return;
} }
}).onFailure(handleFail()); JsonObject body = data.getJsonObject("body");
*/ if (body == null) {
} else { fail("文件信息为空");
return;
}
String url = body.getString("url");
String fn = body.getString("name", "");
long size = body.getLong("size", 0L);
if (url == null || url.isEmpty()) {
fail("分享链接解析失败, 可能是链接失效"); fail("分享链接解析失败, 可能是链接失效");
return;
}
FileInfo fileInfo = new FileInfo().setFileName(fn).setSize(size);
shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
String url302 = url.replace("\\x26", "&");
complete(url302);
} catch (Exception e) {
fail(e, "解析响应失败");
} }
}).onFailure(handleFail()); }).onFailure(handleFail());
return promise.future(); return promise.future();
} }
private Map<String, String> extractVariables(String jsCode) {
Map<String, String> variables = new HashMap<>();
// 正则表达式匹配 var 变量定义
String regex = "\\s+var\\s+(\\w+)\\s*=\\s*(?:\"([^\"]*)\"|'([^']*)'|([^;\\r\\n]*))";
Pattern p = Pattern.compile(regex);
Matcher m = p.matcher(jsCode);
while (m.find()) {
String name = m.group(1);
String value = m.group(2) != null ? m.group(2)
: m.group(3) != null ? m.group(3)
: m.group(4);
variables.put(name, value);
}
return variables;
}
} }

View File

@@ -67,11 +67,7 @@ public class WsTool extends PanBase {
String filepid = asJson(res2).getJsonObject("data").getString("ufileid"); // 文件夹pid String filepid = asJson(res2).getJsonObject("data").getString("ufileid"); // 文件夹pid
String filebid = asJson(res2).getJsonObject("data").getString("boxid"); // 文件夹bid String filebid = asJson(res2).getJsonObject("data").getString("boxid"); // 文件夹bid
// 调试输出文件夹信息 log.debug("文件夹期限: {}, 大小: {}, pid: {}, bid: {}", filetime, filesize, filepid, filebid);
System.out.println("文件夹期限: " + filetime);
System.out.println("文件夹大小: " + filesize);
System.out.println("文件夹pid: " + filepid);
System.out.println("文件夹bid: " + filebid);
// 获取文件信息 // 获取文件信息
httpClient.postAbs(SHARE_URL_API + "ufile/list").putHeaders(headers) httpClient.postAbs(SHARE_URL_API + "ufile/list").putHeaders(headers)
@@ -97,9 +93,7 @@ public class WsTool extends PanBase {
String filefid = asJson(res3).getJsonObject("data") String filefid = asJson(res3).getJsonObject("data")
.getJsonArray("fileList").getJsonObject(0).getString("fid"); // 文件fid .getJsonArray("fileList").getJsonObject(0).getString("fid"); // 文件fid
// 调试输出文件信息 log.debug("文件名称: {}, fid: {}", filename, filefid);
System.out.println("文件名称: " + filename);
System.out.println("文件fid: " + filefid);
// 检查文件是否失效 // 检查文件是否失效
httpClient.postAbs(SHARE_URL_API + "dl/sign").putHeaders(headers) httpClient.postAbs(SHARE_URL_API + "dl/sign").putHeaders(headers)
@@ -114,8 +108,7 @@ public class WsTool extends PanBase {
// 获取直链 // 获取直链
String fileurl = asJson(res4).getJsonObject("data").getString("url"); String fileurl = asJson(res4).getJsonObject("data").getString("url");
// 调试输出文件直链 log.debug("文件直链: {}", fileurl);
System.out.println("文件直链: " + fileurl);
if (!fileurl.equals("")) { if (!fileurl.equals("")) {
promise.complete(URLDecoder.decode(fileurl, StandardCharsets.UTF_8)); promise.complete(URLDecoder.decode(fileurl, StandardCharsets.UTF_8));

View File

@@ -14,7 +14,6 @@ import java.security.spec.X509EncodedKeySpec;
import java.util.Base64; import java.util.Base64;
import java.util.Date; import java.util.Date;
import java.util.HexFormat; import java.util.HexFormat;
import java.util.Random;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -299,7 +298,7 @@ public class AESUtils {
//length用户要求产生字符串的长度 //length用户要求产生字符串的长度
public static String getRandomString(int length){ public static String getRandomString(int length){
String str="abcdefghijklmnopqrstuvwxyz0123456789"; String str="abcdefghijklmnopqrstuvwxyz0123456789";
Random random=new Random(); SecureRandom random=new SecureRandom();
StringBuilder sb=new StringBuilder(); StringBuilder sb=new StringBuilder();
for(int i=0;i<length;i++){ for(int i=0;i<length;i++){
int number=random.nextInt(36); int number=random.nextInt(36);

View File

@@ -33,6 +33,9 @@ public class CommonUtils {
public static Map<String, String> getURLParams(String url) throws MalformedURLException { public static Map<String, String> getURLParams(String url) throws MalformedURLException {
URL fullUrl = new URL(url); URL fullUrl = new URL(url);
String query = fullUrl.getQuery(); String query = fullUrl.getQuery();
if (query == null || query.isEmpty()) {
return new HashMap<>();
}
String[] params = query.split("&"); String[] params = query.split("&");
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
for (String param : params) { for (String param : params) {

View File

@@ -5,6 +5,8 @@ import io.vertx.core.Vertx;
import io.vertx.core.http.impl.headers.HeadersMultiMap; import io.vertx.core.http.impl.headers.HeadersMultiMap;
import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.WebClient;
import io.vertx.ext.web.client.WebClientSession; import io.vertx.ext.web.client.WebClientSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -15,6 +17,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class IpExtractor { public class IpExtractor {
private static final Logger log = LoggerFactory.getLogger(IpExtractor.class);
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
@@ -42,9 +46,9 @@ public class IpExtractor {
WebClient client = WebClient.create(Vertx.vertx()); WebClient client = WebClient.create(Vertx.vertx());
WebClientSession webClientSession = WebClientSession.create(client); WebClientSession webClientSession = WebClientSession.create(client);
webClientSession.getAbs("https://ip.ihuan.me").putHeaders(headers).send().onSuccess(res->{ webClientSession.getAbs("https://ip.ihuan.me").putHeaders(headers).send().onSuccess(res->{
System.out.println(res.toString()); log.debug("response: {}", res.toString());
webClientSession.getAbs("https://ip.ihuan.me").putHeaders(headers).send().onSuccess(res2->{ webClientSession.getAbs("https://ip.ihuan.me").putHeaders(headers).send().onSuccess(res2->{
System.out.println(res2.toString()); log.debug("response2: {}", res2.toString());
}); });
}); });

View File

@@ -21,11 +21,11 @@ import static cn.qaiu.util.AESUtils.encrypt;
*/ */
public class JsExecUtils { public class JsExecUtils {
private static final Invocable inv; private static final Invocable inv;
private static final ScriptEngineManager ENGINE_MANAGER = new ScriptEngineManager();
// 初始化脚本引擎 // 初始化脚本引擎
static { static {
ScriptEngineManager engineManager = new ScriptEngineManager(); ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
try { try {
engine.eval(JsContent.ye123); engine.eval(JsContent.ye123);
@@ -45,12 +45,11 @@ public class JsExecUtils {
} }
/** /**
* 调用执行蓝奏云js文件 * 调用执行蓝奏云js文件每次动态JS代码无法复用引擎
*/ */
public static ScriptObjectMirror executeDynamicJs(String jsText, String funName) throws ScriptException, public static ScriptObjectMirror executeDynamicJs(String jsText, String funName) throws ScriptException,
NoSuchMethodException { NoSuchMethodException {
ScriptEngineManager engineManager = new ScriptEngineManager(); ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
engine.eval(JsContent.lz + "\n" + jsText); engine.eval(JsContent.lz + "\n" + jsText);
Invocable inv = (Invocable) engine; Invocable inv = (Invocable) engine;
//调用js中的函数 //调用js中的函数
@@ -63,12 +62,11 @@ public class JsExecUtils {
/** /**
* 调用执行蓝奏云js文件 * 调用执行js文件(使用缓存的 ScriptEngineManager 创建新引擎实例)
*/ */
public static Object executeOtherJs(String jsText, String funName, Object ... args) throws ScriptException, public static Object executeOtherJs(String jsText, String funName, Object ... args) throws ScriptException,
NoSuchMethodException { NoSuchMethodException {
ScriptEngineManager engineManager = new ScriptEngineManager(); ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
engine.eval(jsText); engine.eval(jsText);
Invocable inv = (Invocable) engine; Invocable inv = (Invocable) engine;
//调用js中的函数 //调用js中的函数

View File

@@ -8,15 +8,19 @@ import io.vertx.core.http.impl.headers.HeadersMultiMap;
import io.vertx.ext.web.client.HttpResponse; import io.vertx.ext.web.client.HttpResponse;
import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.WebClient;
import io.vertx.ext.web.client.WebClientSession; import io.vertx.ext.web.client.WebClientSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ReqIpUtil { public class ReqIpUtil {
public static String BASE_URL = "https://ip.ihuan.me"; private static final Logger log = LoggerFactory.getLogger(ReqIpUtil.class);
public static String BASE_URL_TEMPLATE = BASE_URL + "/{path}";
public static final String BASE_URL = "https://ip.ihuan.me";
public static final String BASE_URL_TEMPLATE = BASE_URL + "/{path}";
// GET https://ip.ihuan.me/mouse.do -> $("input[name='key']").val("30b4975b5547fed806bd2b9caa18485a"); // GET https://ip.ihuan.me/mouse.do -> $("input[name='key']").val("30b4975b5547fed806bd2b9caa18485a");
public static String PATH1 = "mouse.do"; public static final String PATH1 = "mouse.do";
public static String PATH2 = "tqdl.html"; public static final String PATH2 = "tqdl.html";
// 创建请求头Map // 创建请求头Map
static MultiMap headers = new HeadersMultiMap(); static MultiMap headers = new HeadersMultiMap();
@@ -58,15 +62,15 @@ public class ReqIpUtil {
void next(AsyncResult<HttpResponse<Buffer>> response) { void next(AsyncResult<HttpResponse<Buffer>> response) {
if (response.failed()) { if (response.failed()) {
response.cause().printStackTrace(); log.error("请求失败", response.cause());
} else { } else {
HttpResponse<Buffer> res = response.result(); HttpResponse<Buffer> res = response.result();
System.out.println("Received response with status code " + res.statusCode()); log.debug("Received response with status code {}", res.statusCode());
System.out.println("Body: " + res.body()); log.debug("Body: {}", res.body());
webClientSession.getAbs(BASE_URL_TEMPLATE).setTemplateParam("path", PATH1) webClientSession.getAbs(BASE_URL_TEMPLATE).setTemplateParam("path", PATH1)
.putHeaders(headers) // 将请求头Map添加到请求中 .putHeaders(headers) // 将请求头Map添加到请求中
.send(response2 -> { .send(response2 -> {
System.out.println(response2.result().bodyAsString()); log.debug("response2: {}", response2.result().bodyAsString());
}); });
} }

View File

@@ -2,6 +2,9 @@ package cn.qaiu.util;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URL; import java.net.URL;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -10,6 +13,8 @@ import java.util.Map;
public class URLUtil { public class URLUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(URLUtil.class);
private final Map<String, String> queryParams = new HashMap<>(); private final Map<String, String> queryParams = new HashMap<>();
// 构造函数传入URL并解析参数 // 构造函数传入URL并解析参数
@@ -31,7 +36,7 @@ public class URLUtil {
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); LOGGER.error("URL解析失败: {}", url, e);
} }
} }

View File

@@ -8,6 +8,8 @@ import cn.qaiu.parser.customjs.JsParserExecutor;
import cn.qaiu.WebClientVertxInit; import cn.qaiu.WebClientVertxInit;
import io.vertx.core.Vertx; import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject; import io.vertx.core.json.JsonObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.util.HashMap; import java.util.HashMap;
@@ -22,15 +24,26 @@ import java.util.Map;
*/ */
public class BaiduPhotoParserTest { public class BaiduPhotoParserTest {
private Vertx vertx;
@Before
public void setUp() {
vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
}
@After
public void tearDown() {
if (vertx != null) {
vertx.close();
}
}
@Test @Test
public void testBaiduPhotoParserRegistration() { public void testBaiduPhotoParserRegistration() {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
// 检查是否加载了百度相册解析器 // 检查是否加载了百度相册解析器
CustomParserConfig config = CustomParserRegistry.get("baidu_photo"); CustomParserConfig config = CustomParserRegistry.get("baidu_photo");
assert config != null : "百度相册解析器未加载"; assert config != null : "百度相册解析器未加载";
@@ -45,10 +58,6 @@ public class BaiduPhotoParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建解析器 - 测试文件分享链接 // 创建解析器 - 测试文件分享链接
IPanTool tool = ParserCreate.fromType("baidu_photo") IPanTool tool = ParserCreate.fromType("baidu_photo")
@@ -77,10 +86,6 @@ public class BaiduPhotoParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建解析器 - 测试文件夹分享链接 // 创建解析器 - 测试文件夹分享链接
IPanTool tool = ParserCreate.fromType("baidu_photo") IPanTool tool = ParserCreate.fromType("baidu_photo")
@@ -109,10 +114,6 @@ public class BaiduPhotoParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
IPanTool tool = ParserCreate.fromType("baidu_photo") IPanTool tool = ParserCreate.fromType("baidu_photo")
// 分享key PPgOEodBVE // 分享key PPgOEodBVE
@@ -167,10 +168,6 @@ public class BaiduPhotoParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建ShareLinkInfo // 创建ShareLinkInfo
Map<String, Object> otherParam = new HashMap<>(); Map<String, Object> otherParam = new HashMap<>();

View File

@@ -7,6 +7,8 @@ import cn.qaiu.parser.custom.CustomParserRegistry;
import cn.qaiu.parser.customjs.JsParserExecutor; import cn.qaiu.parser.customjs.JsParserExecutor;
import cn.qaiu.WebClientVertxInit; import cn.qaiu.WebClientVertxInit;
import io.vertx.core.Vertx; import io.vertx.core.Vertx;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.util.HashMap; import java.util.HashMap;
@@ -21,15 +23,26 @@ import java.util.Map;
*/ */
public class JsParserTest { public class JsParserTest {
private Vertx vertx;
@Before
public void setUp() {
vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
}
@After
public void tearDown() {
if (vertx != null) {
vertx.close();
}
}
@Test @Test
public void testJsParserRegistration() { public void testJsParserRegistration() {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
// 检查是否加载了JavaScript解析器 // 检查是否加载了JavaScript解析器
CustomParserConfig config = CustomParserRegistry.get("demo_js"); CustomParserConfig config = CustomParserRegistry.get("demo_js");
assert config != null : "JavaScript解析器未加载"; assert config != null : "JavaScript解析器未加载";
@@ -44,10 +57,6 @@ public class JsParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建解析器 // 创建解析器
IPanTool tool = ParserCreate.fromType("demo_js") IPanTool tool = ParserCreate.fromType("demo_js")
@@ -75,10 +84,6 @@ public class JsParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建解析器 // 创建解析器
IPanTool tool = ParserCreate.fromType("demo_js") IPanTool tool = ParserCreate.fromType("demo_js")
@@ -115,10 +120,6 @@ public class JsParserTest {
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
try { try {
// 创建ShareLinkInfo // 创建ShareLinkInfo
Map<String, Object> otherParam = new HashMap<>(); Map<String, Object> otherParam = new HashMap<>();

View File

@@ -7,6 +7,8 @@ import cn.qaiu.parser.ParserCreate;
import cn.qaiu.parser.custom.CustomParserConfig; import cn.qaiu.parser.custom.CustomParserConfig;
import cn.qaiu.parser.custom.CustomParserRegistry; import cn.qaiu.parser.custom.CustomParserRegistry;
import io.vertx.core.Vertx; import io.vertx.core.Vertx;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -19,12 +21,23 @@ public class JsFetchBridgeTest {
private static final Logger log = LoggerFactory.getLogger(JsFetchBridgeTest.class); private static final Logger log = LoggerFactory.getLogger(JsFetchBridgeTest.class);
private Vertx vertx;
@Before
public void setUp() {
vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
}
@After
public void tearDown() {
if (vertx != null) {
vertx.close();
}
}
@Test @Test
public void testFetchPolyfillLoaded() { public void testFetchPolyfillLoaded() {
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();
@@ -83,10 +96,6 @@ public class JsFetchBridgeTest {
@Test @Test
public void testPromiseBasicUsage() { public void testPromiseBasicUsage() {
// 初始化Vertx
Vertx vertx = Vertx.vertx();
WebClientVertxInit.init(vertx);
// 清理注册表 // 清理注册表
CustomParserRegistry.clear(); CustomParserRegistry.clear();

View File

@@ -11,7 +11,7 @@
## 测试配置 ## 测试配置
### 小飞机网盘 ✅ ### 小飞机网盘 ✅
- **用户名**: 15764091073 - **用户名**: 15x
- **URL**: https://share.feijipan.com/s/ZWYoZ31c - **URL**: https://share.feijipan.com/s/ZWYoZ31c
- **文件**: 资源.rar (1.13 GB) - **文件**: 资源.rar (1.13 GB)
- **认证方式**: username/password - **认证方式**: username/password
@@ -32,7 +32,7 @@
``` ```
=== 测试小飞机网盘解析(带认证)=== === 测试小飞机网盘解析(带认证)===
分享链接: https://share.feijipan.com/s/ZWYoZ31c 分享链接: https://share.feijipan.com/s/ZWYoZ31c
用户名: 15764091073 用户名: 15x
密码: ****** 密码: ******
开始解析... 开始解析...

View File

@@ -0,0 +1,329 @@
// ==FetchRuntime==
// @name Fetch API Polyfill for ES5
// @description Fetch API and Promise implementation for ES5 JavaScript engines
// @version 1.0.0
// @author QAIU
// ==============
/**
* Simple Promise implementation compatible with ES5
* Supports basic Promise functionality needed for fetch API
*/
function SimplePromise(executor) {
var state = 'pending';
var value;
var handlers = [];
var self = this;
function resolve(result) {
if (state !== 'pending') return;
state = 'fulfilled';
value = result;
handlers.forEach(handle);
handlers = [];
}
function reject(err) {
if (state !== 'pending') return;
state = 'rejected';
value = err;
handlers.forEach(handle);
handlers = [];
}
function handle(handler) {
if (state === 'pending') {
handlers.push(handler);
} else {
setTimeout(function() {
if (state === 'fulfilled' && typeof handler.onFulfilled === 'function') {
try {
var result = handler.onFulfilled(value);
if (result && typeof result.then === 'function') {
result.then(handler.resolve, handler.reject);
} else {
handler.resolve(result);
}
} catch (e) {
handler.reject(e);
}
}
if (state === 'rejected' && typeof handler.onRejected === 'function') {
try {
var result = handler.onRejected(value);
if (result && typeof result.then === 'function') {
result.then(handler.resolve, handler.reject);
} else {
handler.resolve(result);
}
} catch (e) {
handler.reject(e);
}
} else if (state === 'rejected' && !handler.onRejected) {
handler.reject(value);
}
}, 0);
}
}
this.then = function(onFulfilled, onRejected) {
return new SimplePromise(function(resolveNext, rejectNext) {
handle({
onFulfilled: onFulfilled,
onRejected: onRejected,
resolve: resolveNext,
reject: rejectNext
});
});
};
this['catch'] = function(onRejected) {
return this.then(null, onRejected);
};
this['finally'] = function(onFinally) {
return this.then(
function(value) {
return SimplePromise.resolve(onFinally()).then(function() {
return value;
});
},
function(reason) {
return SimplePromise.resolve(onFinally()).then(function() {
throw reason;
});
}
);
};
try {
executor(resolve, reject);
} catch (e) {
reject(e);
}
}
// Static methods
SimplePromise.resolve = function(value) {
if (value && typeof value.then === 'function') {
return value;
}
return new SimplePromise(function(resolve) {
resolve(value);
});
};
SimplePromise.reject = function(reason) {
return new SimplePromise(function(resolve, reject) {
reject(reason);
});
};
SimplePromise.all = function(promises) {
return new SimplePromise(function(resolve, reject) {
var results = [];
var remaining = promises.length;
if (remaining === 0) {
resolve(results);
return;
}
function handleResult(index, value) {
results[index] = value;
remaining--;
if (remaining === 0) {
resolve(results);
}
}
for (var i = 0; i < promises.length; i++) {
(function(index) {
var promise = promises[index];
if (promise && typeof promise.then === 'function') {
promise.then(
function(value) { handleResult(index, value); },
reject
);
} else {
handleResult(index, promise);
}
})(i);
}
});
};
SimplePromise.race = function(promises) {
return new SimplePromise(function(resolve, reject) {
if (promises.length === 0) {
// Per spec, Promise.race with empty array stays pending forever
return;
}
for (var i = 0; i < promises.length; i++) {
var promise = promises[i];
if (promise && typeof promise.then === 'function') {
promise.then(resolve, reject);
} else {
resolve(promise);
return;
}
}
});
};
// Make Promise global if not already defined
if (typeof Promise === 'undefined') {
var Promise = SimplePromise;
}
/**
* Response object that mimics the Fetch API Response
*/
function FetchResponse(jsHttpResponse) {
this._jsResponse = jsHttpResponse;
this.status = jsHttpResponse.statusCode();
this.ok = this.status >= 200 && this.status < 300;
// Map HTTP status codes to standard status text
var statusTexts = {
200: 'OK',
201: 'Created',
204: 'No Content',
301: 'Moved Permanently',
302: 'Found',
304: 'Not Modified',
400: 'Bad Request',
401: 'Unauthorized',
403: 'Forbidden',
404: 'Not Found',
405: 'Method Not Allowed',
408: 'Request Timeout',
409: 'Conflict',
410: 'Gone',
500: 'Internal Server Error',
501: 'Not Implemented',
502: 'Bad Gateway',
503: 'Service Unavailable',
504: 'Gateway Timeout'
};
this.statusText = statusTexts[this.status] || (this.ok ? 'OK' : 'Error');
this.headers = {
get: function(name) {
return jsHttpResponse.header(name);
},
has: function(name) {
return jsHttpResponse.header(name) !== null;
},
entries: function() {
var headerMap = jsHttpResponse.headers();
var entries = [];
for (var key in headerMap) {
if (headerMap.hasOwnProperty(key)) {
entries.push([key, headerMap[key]]);
}
}
return entries;
}
};
}
FetchResponse.prototype.text = function() {
var body = this._jsResponse.body();
return SimplePromise.resolve(body || '');
};
FetchResponse.prototype.json = function() {
var self = this;
return this.text().then(function(text) {
try {
return JSON.parse(text);
} catch (e) {
throw new Error('Invalid JSON: ' + e.message);
}
});
};
FetchResponse.prototype.arrayBuffer = function() {
var bytes = this._jsResponse.bodyBytes();
return SimplePromise.resolve(bytes);
};
FetchResponse.prototype.blob = function() {
// Blob not supported in ES5, return bytes
return this.arrayBuffer();
};
/**
* Fetch API implementation using JavaFetch bridge
* @param {string} url - Request URL
* @param {Object} options - Fetch options (method, headers, body, etc.)
* @returns {Promise<FetchResponse>}
*/
function fetch(url, options) {
return new SimplePromise(function(resolve, reject) {
try {
// Parse options
options = options || {};
var method = (options.method || 'GET').toUpperCase();
var headers = options.headers || {};
var body = options.body;
// Prepare request options for JavaFetch
var requestOptions = {
method: method,
headers: {}
};
// Convert headers to simple object
if (headers) {
if (typeof headers.forEach === 'function') {
// Headers object
headers.forEach(function(value, key) {
requestOptions.headers[key] = value;
});
} else if (typeof headers === 'object') {
// Plain object
for (var key in headers) {
if (headers.hasOwnProperty(key)) {
requestOptions.headers[key] = headers[key];
}
}
}
}
// Add body if present
if (body !== undefined && body !== null) {
if (typeof body === 'string') {
requestOptions.body = body;
} else if (typeof body === 'object') {
// Assume JSON
requestOptions.body = JSON.stringify(body);
if (!requestOptions.headers['Content-Type'] && !requestOptions.headers['content-type']) {
requestOptions.headers['Content-Type'] = 'application/json';
}
}
}
// Call JavaFetch bridge
var jsHttpResponse = JavaFetch.fetch(url, requestOptions);
// Create Response object
var response = new FetchResponse(jsHttpResponse);
resolve(response);
} catch (e) {
reject(e);
}
});
}
// Export for global use
if (typeof window !== 'undefined') {
window.fetch = fetch;
window.Promise = Promise;
} else if (typeof global !== 'undefined') {
global.fetch = fetch;
global.Promise = Promise;
}

11
pom.xml
View File

@@ -17,7 +17,7 @@
</modules> </modules>
<properties> <properties>
<revision>0.2.1</revision> <revision>0.3.4</revision>
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
@@ -25,16 +25,17 @@
<packageDirectory>${project.basedir}/web-service/target/package</packageDirectory> <packageDirectory>${project.basedir}/web-service/target/package</packageDirectory>
<!-- Vert.x 4.5.24 已包含安全修复,无需单独指定 Netty 版本 --> <!-- Vert.x 4.5.27 包含安全修复,无需单独指定 Netty 版本 -->
<vertx.version>4.5.24</vertx.version> <vertx.version>4.5.27</vertx.version>
<org.reflections.version>0.10.2</org.reflections.version> <org.reflections.version>0.10.2</org.reflections.version>
<lombok.version>1.18.38</lombok.version> <lombok.version>1.18.38</lombok.version>
<slf4j.version>2.0.16</slf4j.version> <slf4j.version>2.0.16</slf4j.version>
<commons-lang3.version>3.18.0</commons-lang3.version> <commons-lang3.version>3.18.0</commons-lang3.version>
<commons-beanutils2.version>2.0.0</commons-beanutils2.version> <commons-beanutils2.version>2.0.0</commons-beanutils2.version>
<parserVersion>10.2.5</parserVersion>
<jackson.version>2.18.6</jackson.version> <jackson.version>2.18.6</jackson.version>
<!-- Logback 最新稳定版 --> <!-- Logback 最新稳定版 -->
<logback.version>1.5.18</logback.version> <logback.version>1.5.32</logback.version>
<junit.version>4.13.2</junit.version> <junit.version>4.13.2</junit.version>
</properties> </properties>
@@ -74,7 +75,7 @@
<dependency> <dependency>
<groupId>cn.qaiu</groupId> <groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId> <artifactId>parser</artifactId>
<version>10.2.5</version> <version>${parserVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

BIN
web-front/img/image.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

View File

@@ -5,15 +5,15 @@
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build": "vue-cli-service build && node scripts/compress-vs.js", "build": "node scripts/sync-version.js && vue-cli-service build && node scripts/compress-vs.js",
"build:no-compress": "vue-cli-service build", "build:no-compress": "node scripts/sync-version.js && vue-cli-service build",
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@monaco-editor/loader": "^1.4.0", "@monaco-editor/loader": "^1.4.0",
"@vueuse/core": "^11.2.0", "@vueuse/core": "^11.2.0",
"axios": "1.13.5", "axios": "1.16.1",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 KiB

View File

@@ -10,7 +10,7 @@
<meta name="description" <meta name="description"
content="Netdisk fast download 网盘直链解析工具"> content="Netdisk fast download 网盘直链解析工具">
<!-- Font Awesome 图标库 - 使用国内CDN --> <!-- Font Awesome 图标库 - 使用国内CDN -->
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/font-awesome/6.4.0/css/all.min.css"> <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/font-awesome/6.4.0/css/all.min.css">
<!-- 迅雷 JS-SDK --> <!-- 迅雷 JS-SDK -->
<script src="//open.thunderurl.com/thunder-link.js"></script> <script src="//open.thunderurl.com/thunder-link.js"></script>
<style> <style>

View File

@@ -0,0 +1,23 @@
const fs = require('fs');
const path = require('path');
const pomPath = path.resolve(__dirname, '../../pom.xml');
const pkgPath = path.resolve(__dirname, '../package.json');
const pomContent = fs.readFileSync(pomPath, 'utf-8');
const match = pomContent.match(/<revision>([^<]+)<\/revision>/);
if (!match) {
console.error('sync-version: <revision> not found in root pom.xml');
process.exit(1);
}
const version = match[1];
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
if (pkg.version === version) {
console.log(`sync-version: package.json already at ${version}`);
process.exit(0);
}
pkg.version = version;
fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
console.log(`sync-version: package.json ${pkg.version} -> ${version}`);

View File

@@ -36,7 +36,6 @@ if (item) {
const darkMode = ref(item) const darkMode = ref(item)
watch(darkMode, (newValue) => { watch(darkMode, (newValue) => {
console.log(`darkMode: ${newValue}`)
window.localStorage.setItem("darkMode", newValue); window.localStorage.setItem("darkMode", newValue);
// 发射主题变化事件 // 发射主题变化事件

View File

@@ -190,6 +190,14 @@
> >
<i class="fas fa-paper-plane"></i> 发送到下载器 <i class="fas fa-paper-plane"></i> 发送到下载器
</el-button> </el-button>
<el-button
v-if="selectedNode.parserUrl"
size="small"
@click="copyDirectLink(selectedNode)"
:loading="copyLinkLoading"
>
<i class="fas fa-link"></i> 复制直链
</el-button>
</div> </div>
</div> </div>
<div v-else class="file-detail-empty"> <div v-else class="file-detail-empty">
@@ -258,6 +266,14 @@
> >
<i class="fas fa-paper-plane"></i> 发送到下载器 <i class="fas fa-paper-plane"></i> 发送到下载器
</el-button> </el-button>
<el-button
v-if="selectedNode.parserUrl"
size="small"
@click="copyDirectLink(selectedNode)"
:loading="copyLinkLoading"
>
<i class="fas fa-link"></i> 复制直链
</el-button>
</div> </div>
</div> </div>
<div v-else class="file-detail-empty"> <div v-else class="file-detail-empty">
@@ -324,6 +340,14 @@
> >
发送到下载器 发送到下载器
</el-button> </el-button>
<el-button
v-if="selectedFile && selectedFile.parserUrl"
@click="copyDirectLink(selectedFile)"
style="margin-left: 8px;"
:loading="copyLinkLoading"
>
复制直链
</el-button>
</span> </span>
</el-dialog> </el-dialog>
<div v-if="isPreviewing" class="preview-mask"> <div v-if="isPreviewing" class="preview-mask">
@@ -391,6 +415,7 @@ export default {
downloadInfo: null, downloadInfo: null,
downloadLoading: false, downloadLoading: false,
singleSendLoading: false, singleSendLoading: false,
copyLinkLoading: false,
treeProps: { treeProps: {
label: 'fileName', label: 'fileName',
children: 'children', children: 'children',
@@ -462,10 +487,6 @@ export default {
} }
return `${baseUrl}?${params.toString()}` return `${baseUrl}?${params.toString()}`
}, },
// 文件树与窗格同源:直接返回当前目录数据
buildTree(list) {
return list || []
},
// 懒加载子节点 // 懒加载子节点
loadNode(node, resolve) { loadNode(node, resolve) {
if (node.level === 0) { if (node.level === 0) {
@@ -479,9 +500,14 @@ export default {
})) }))
resolve(children) resolve(children)
} else { } else {
this.$message.error(res.data.msg || '获取子节点失败')
resolve([]) resolve([])
} }
}).catch(() => resolve([])) }).catch(err => {
const msg = err.response?.data?.msg || err.message
if (msg) this.$message.error(msg)
resolve([])
})
} else { } else {
resolve([]) resolve([])
} }
@@ -491,7 +517,6 @@ export default {
}, },
// 处理文件点击 // 处理文件点击
handleFileClick(file) { handleFileClick(file) {
console.log('点击文件', file, this.viewMode)
if (file.fileType === 'folder') { if (file.fileType === 'folder') {
this.enterFolder(file) this.enterFolder(file)
} else if (this.viewMode === 'pane') { } else if (this.viewMode === 'pane') {
@@ -520,7 +545,8 @@ export default {
} }
} catch (error) { } catch (error) {
console.error('进入文件夹失败:', error) console.error('进入文件夹失败:', error)
this.$message.error('进入文件夹失败') const msg = error.response?.data?.msg || error.message || '进入文件夹失败'
this.$message.error(msg)
} finally { } finally {
this.loading = false this.loading = false
} }
@@ -551,7 +577,8 @@ export default {
} }
} catch (error) { } catch (error) {
console.error('加载目录失败:', error) console.error('加载目录失败:', error)
this.$message.error('加载目录失败') const msg = error.response?.data?.msg || error.message || '加载目录失败'
this.$message.error(msg)
} finally { } finally {
this.loading = false this.loading = false
} }
@@ -649,7 +676,8 @@ export default {
} }
} catch (error) { } catch (error) {
console.error('获取下载信息失败:', error) console.error('获取下载信息失败:', error)
this.$message.error('获取下载信息失败,尝试直接下载') const msg = error.response?.data?.msg || '获取下载信息失败,尝试直接下载'
this.$message.error(msg)
this.downloadFile(file) this.downloadFile(file)
} finally { } finally {
this.downloadLoading = false this.downloadLoading = false
@@ -735,7 +763,8 @@ export default {
} }
} catch (error) { } catch (error) {
console.error('发送到下载器失败:', error) console.error('发送到下载器失败:', error)
this.$message.error('发送到下载器失败: ' + error.message) const msg = error.response?.data?.msg || error.message || '发送到下载器失败'
this.$message.error(msg)
} finally { } finally {
this.singleSendLoading = false this.singleSendLoading = false
} }
@@ -744,6 +773,32 @@ export default {
this.fileDialogVisible = false this.fileDialogVisible = false
this.selectedFile = null this.selectedFile = null
}, },
async copyDirectLink(file) {
if (!file?.parserUrl) {
this.$message.warning('该文件暂无直链')
return
}
const rawUrl = file.parserUrl.startsWith('http') ? file.parserUrl : (window.location.origin + file.parserUrl)
const url = this.appendToken(rawUrl)
this.copyLinkLoading = true
try {
await navigator.clipboard.writeText(url)
this.$message.success('直链已复制到剪贴板')
} catch {
// fallback
const ta = document.createElement('textarea')
ta.value = url
ta.style.position = 'fixed'
ta.style.opacity = '0'
document.body.appendChild(ta)
ta.select()
document.execCommand('copy')
document.body.removeChild(ta)
this.$message.success('直链已复制到剪贴板')
} finally {
this.copyLinkLoading = false
}
},
closePreview() { closePreview() {
this.isPreviewing = false this.isPreviewing = false
this.previewUrl = '' this.previewUrl = ''
@@ -802,7 +857,7 @@ export default {
this.toggleFileSelect(file) this.toggleFileSelect(file)
}, },
selectAll() { selectAll() {
this.selectedFiles = this.currentFileList.filter(f => f.fileType !== 'folder') this.selectedFiles = this.currentFileList.filter(f => f.fileType !== 'folder' && f.parserUrl)
}, },
deselectAll() { deselectAll() {
this.selectedFiles = [] this.selectedFiles = []

View File

@@ -1,125 +0,0 @@
import axios from 'axios'
// 创建 axios 实例
const api = axios.create({
baseURL: process.env.VUE_APP_API_BASE_URL || 'http://localhost:6400',
timeout: 30000,
headers: {
'Content-Type': 'application/json'
}
})
// 请求拦截器
api.interceptors.request.use(
config => {
// 可以在这里添加认证token等
return config
},
error => {
return Promise.reject(error)
}
)
// 响应拦截器
api.interceptors.response.use(
response => {
return response.data
},
error => {
console.error('API请求错误:', error)
if (error.response) {
// 服务器返回错误状态码
const message = error.response.data?.message || error.response.data?.error || '服务器错误'
return Promise.reject(new Error(message))
} else if (error.request) {
// 网络错误
return Promise.reject(new Error('网络连接失败,请检查网络设置'))
} else {
// 其他错误
return Promise.reject(new Error(error.message || '请求失败'))
}
}
)
// 客户端链接 API
export const clientLinksApi = {
/**
* 获取所有客户端下载链接
* @param {string} shareUrl - 分享链接
* @param {string} password - 提取码(可选)
* @returns {Promise} 客户端链接响应
*/
async getClientLinks(shareUrl, password = '') {
const params = new URLSearchParams()
params.append('url', shareUrl)
if (password) {
params.append('pwd', password)
}
return await api.get(`/v2/clientLinks?${params.toString()}`)
},
/**
* 获取指定类型的客户端下载链接
* @param {string} shareUrl - 分享链接
* @param {string} password - 提取码(可选)
* @param {string} clientType - 客户端类型
* @returns {Promise} 指定类型的客户端链接
*/
async getClientLink(shareUrl, password = '', clientType) {
const params = new URLSearchParams()
params.append('url', shareUrl)
if (password) {
params.append('pwd', password)
}
params.append('clientType', clientType)
return await api.get(`/v2/clientLink?${params.toString()}`)
}
}
// 其他 API如果需要的话
export const parserApi = {
/**
* 解析分享链接
* @param {string} shareUrl - 分享链接
* @param {string} password - 提取码(可选)
* @returns {Promise} 解析结果
*/
async parseLink(shareUrl, password = '') {
const params = new URLSearchParams()
params.append('url', shareUrl)
if (password) {
params.append('pwd', password)
}
return await api.get(`/v2/linkInfo?${params.toString()}`)
},
/**
* 获取文件列表
* @param {string} shareUrl - 分享链接
* @param {string} password - 提取码(可选)
* @param {string} dirId - 目录ID可选
* @param {string} uuid - UUID可选
* @returns {Promise} 文件列表
*/
async getFileList(shareUrl, password = '', dirId = '', uuid = '') {
const params = new URLSearchParams()
params.append('url', shareUrl)
if (password) {
params.append('pwd', password)
}
if (dirId) {
params.append('dirId', dirId)
}
if (uuid) {
params.append('uuid', uuid)
}
return await api.get(`/v2/getFileList?${params.toString()}`)
}
}
export default api

View File

@@ -0,0 +1,6 @@
/**
* 前端全局常量
*/
/** 预览服务基础 URL */
export const PREVIEW_BASE_URL = 'https://nfd-parser.github.io/nfd-preview/preview.html?src='

View File

@@ -410,7 +410,6 @@ function addThunderDownload(tasks, config) {
if (userAgent) taskParam.userAgent = userAgent if (userAgent) taskParam.userAgent = userAgent
taskParam.threadCount = '1' taskParam.threadCount = '1'
console.log('[Thunder SDK] newTask params:', JSON.stringify(taskParam))
window.thunderLink.newTask(taskParam) window.thunderLink.newTask(taskParam)
return Promise.resolve('thunder-ok') return Promise.resolve('thunder-ok')
} }

View File

@@ -313,7 +313,6 @@ export async function loadTypesFromApi(monaco) {
cachedContent, cachedContent,
'file:///types.js' 'file:///types.js'
); );
console.log('从缓存加载types.js成功');
// 异步更新缓存 // 异步更新缓存
updateTypesJsCache(); updateTypesJsCache();
return; return;
@@ -334,7 +333,6 @@ export async function loadTypesFromApi(monaco) {
typesJsContent, typesJsContent,
'file:///types.js' 'file:///types.js'
); );
console.log('加载types.js成功并已缓存');
} }
} catch (error) { } catch (error) {
console.warn('加载types.js失败使用内置类型定义:', error); console.warn('加载types.js失败使用内置类型定义:', error);
@@ -350,7 +348,6 @@ async function updateTypesJsCache() {
if (response.ok) { if (response.ok) {
const typesJsContent = await response.text(); const typesJsContent = await response.text();
localStorage.setItem('playground_types_js', typesJsContent); localStorage.setItem('playground_types_js', typesJsContent);
console.log('types.js缓存已更新');
} }
} catch (error) { } catch (error) {
console.warn('更新types.js缓存失败:', error); console.warn('更新types.js缓存失败:', error);

View File

@@ -293,24 +293,6 @@ export default {
return clientConfig[type]?.downloadUrl || '#' return clientConfig[type]?.downloadUrl || '#'
} }
// 判断是否应该显示下载客户端按钮
const shouldShowDownloadButton = (type) => {
const os = getOSInfo()
switch (type) {
case 'CURL':
// cURL 在 Windows 上可能需要安装
return os === 'windows'
case 'ARIA2':
// Aria2 需要手动安装
return true
case 'THUNDER':
// 迅雷主要在 Windows 上使用
return os === 'windows'
default:
return false
}
}
// 获取操作系统信息 // 获取操作系统信息
const getOSInfo = () => { const getOSInfo = () => {
const userAgent = navigator.userAgent.toLowerCase() const userAgent = navigator.userAgent.toLowerCase()
@@ -369,7 +351,7 @@ export default {
copyToClipboard(link) copyToClipboard(link)
return return
} }
window.open(link, '_blank') window.open(link, '_blank', 'noopener,noreferrer')
ElMessage.success('正在唤起迅雷下载') ElMessage.success('正在唤起迅雷下载')
break break
@@ -383,13 +365,6 @@ export default {
} }
} }
// 下载客户端
const downloadClient = (type) => {
const url = getClientDownloadUrl(type)
window.open(url, '_blank')
ElMessage.success(`正在跳转到 ${getClientDisplayName(type)} 下载页面`)
}
// 格式化文件大小 // 格式化文件大小
const formatFileSize = (bytes) => { const formatFileSize = (bytes) => {
if (!bytes) return '未知' if (!bytes) return '未知'
@@ -440,9 +415,7 @@ export default {
getTextareaRows, getTextareaRows,
goBack, goBack,
getClientLogo, getClientLogo,
downloadClient,
handleImageError, handleImageError,
shouldShowDownloadButton,
getClientSupportsCookie, getClientSupportsCookie,
goToAuthConfig goToAuthConfig
} }

View File

@@ -19,11 +19,11 @@
</el-dialog> --> </el-dialog> -->
<!-- 顶部反馈栏小号灰色无红边框 --> <!-- 顶部反馈栏小号灰色无红边框 -->
<div class="feedback-bar"> <div class="feedback-bar">
<a href="https://github.com/qaiu/netdisk-fast-download/issues" target="_blank" rel="noopener" class="feedback-link mini"> <a :href="githubRepoUrl + '/issues'" target="_blank" rel="noopener" class="feedback-link mini">
<i class="fas fa-bug feedback-icon"></i> <i class="fas fa-bug feedback-icon"></i>
反馈 反馈
</a> </a>
<a href="https://github.com/qaiu/netdisk-fast-download" target="_blank" rel="noopener" class="feedback-link mini"> <a :href="githubRepoUrl" target="_blank" rel="noopener" class="feedback-link mini">
<i class="fab fa-github feedback-icon"></i> <i class="fab fa-github feedback-icon"></i>
源码 源码
</a> </a>
@@ -68,14 +68,14 @@
</div> </div>
<div class="demo-basic--circle"> <div class="demo-basic--circle">
<div class="block" style="text-align: center;"> <div class="block" style="text-align: center;">
<img :height="150" src="../../public/images/lanzou111.png" alt="lz"> <img :height="150" src="../../public/images/logo01.png" alt="lz">
</div> </div>
</div> </div>
<!-- 项目简介移到卡片内 --> <!-- 项目简介移到卡片内 -->
<div class="project-intro"> <div class="project-intro">
<div class="intro-title">NFD网盘直链解析0.3.0</div> <div class="intro-title">NFD网盘直链解析 {{ projectVersion }}</div>
<div class="intro-desc"> <div class="intro-desc">
<div>支持网盘蓝奏云蓝奏云优享小飞机盘123云盘iCloud移动云空间联想乐云QQ闪传等 <el-link style="color:#606cf5" href="https://github.com/qaiu/netdisk-fast-download?tab=readme-ov-file#%E7%BD%91%E7%9B%98%E6%94%AF%E6%8C%81%E6%83%85%E5%86%B5" target="_blank"> &gt;&gt; </el-link></div> <div>支持网盘蓝奏云蓝奏云优享小飞机盘123云盘iCloud移动云空间联想乐云QQ闪传等 <el-link style="color:#606cf5" :href="githubRepoUrl + '?tab=readme-ov-file#%E7%BD%91%E7%9B%98%E6%94%AF%E6%8C%81%E6%83%85%E5%86%B5'" target="_blank"> &gt;&gt; </el-link></div>
<div>文件夹解析支持蓝奏云蓝奏云优享小飞机盘123云盘</div> <div>文件夹解析支持蓝奏云蓝奏云优享小飞机盘123云盘</div>
</div> </div>
</div> </div>
@@ -90,7 +90,7 @@
<!-- 开关按钮控制是否自动读取剪切板 --> <!-- 开关按钮控制是否自动读取剪切板 -->
<el-switch v-model="autoReadClipboard" active-text="自动识别剪切板"></el-switch> <el-switch v-model="autoReadClipboard" active-text="自动识别剪切板"></el-switch>
<el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url"> <el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url" @paste="onPaste">
<template #prepend>分享链接</template> <template #prepend>分享链接</template>
<template #append v-if="!autoReadClipboard"> <template #append v-if="!autoReadClipboard">
<el-button @click="getPaste(true)">读取剪切板</el-button> <el-button @click="getPaste(true)">读取剪切板</el-button>
@@ -257,28 +257,44 @@
</el-descriptions> </el-descriptions>
</div> </div>
<!-- 错误时显示小按钮 --> <!-- 错误徽章解析失败时显示可手动关闭解析成功自动关闭 -->
<div v-if="errorButtonVisible" style="text-align: center; margin-top: 10px;"> <transition name="el-fade-in">
<el-button type="text" @click="errorDialogVisible = true"> 反馈错误详情>> </el-button> <div v-if="errorBadgeVisible"
style="position:fixed;z-index:9999;top:80px;right:24px;display:flex;align-items:center;background:#fff1f0;border:1px solid #ffccc7;border-radius:16px;padding:6px 8px 6px 14px;box-shadow:0 2px 10px rgba(217,48,38,.12);cursor:pointer;"
@click.self="errorDialogVisible=true">
<i class="fas fa-exclamation-circle" style="color:#d93026;font-size:15px;margin-right:7px;pointer-events:none;"></i>
<span style="font-size:14px;color:#d93026;margin-right:8px;pointer-events:none;" @click="errorDialogVisible=true">解析出错</span>
<el-button
size="small" circle
style="width:20px;height:20px;min-height:20px;padding:0;background:transparent;border:none;color:#d93026;"
@click.stop="errorBadgeVisible=false">
<i class="el-icon-close" style="font-size:12px;"></i>
</el-button>
</div> </div>
</transition>
<!-- 错误 JSON 弹窗 --> <!-- 错误弹窗 -->
<el-dialog <el-dialog v-model="errorDialogVisible" width="500px" :show-close="true" @close="errorMsgExpanded=false">
v-model="errorDialogVisible"
width="60%">
<template #title> <template #title>
错误详情 <i class="fas fa-exclamation-circle" style="color:#d93026;margin-right:8px;"></i>
<el-link <span style="color:#d93026;font-weight:600;">解析出错</span>
@click.prevent="copyErrorDetails"
target="_blank"
style="margin-left:8px"
type="primary">
复制当前错误信息提交Issue
</el-link>
</template> </template>
<json-viewer :value="errorDetail" :expand-depth="5" copyable boxed sort /> <div style="font-size:13px;color:#606266;margin-bottom:12px;word-break:break-all;line-height:1.6;">
<template v-if="errorDetail">
<span>{{ errorMsgExpanded ? (errorDetail.msg || errorDetail.message) : truncateMsg(errorDetail.msg || errorDetail.message) }}</span>
<a v-if="!errorMsgExpanded && (errorDetail.msg || errorDetail.message || '').length > 150"
href="#" style="color:#1677ff;margin-left:4px;"
@click.prevent="errorMsgExpanded=true">展开</a>
<a v-if="errorMsgExpanded"
href="#" style="color:#1677ff;margin-left:4px;"
@click.prevent="errorMsgExpanded=false">收起</a>
</template>
</div>
<template #footer> <template #footer>
<el-button @click="errorDialogVisible = false">关闭</el-button> <el-button @click="errorDialogVisible = false">关闭</el-button>
<el-button type="danger" plain @click="copyErrorDetails">
<i class="fab fa-github" style="margin-right:6px;"></i>复制信息并前往 GitHub Issues
</el-button>
</template> </template>
</el-dialog> </el-dialog>
@@ -595,11 +611,10 @@ import fileTypeUtils from '@/utils/fileTypeUtils'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { playgroundApi } from '@/utils/playgroundApi' import { playgroundApi } from '@/utils/playgroundApi'
import { testConnection, autoDetect, addDownload, getConfig, saveConfig } from '@/utils/downloaderService' import { testConnection, autoDetect, addDownload, getConfig, saveConfig } from '@/utils/downloaderService'
import { PREVIEW_BASE_URL } from '@/utils/constants'
export const previewBaseUrl = 'https://nfd-parser.github.io/nfd-preview/preview.html?src=';
export default { export default {
name: 'App', name: 'Home',
components: { DarkMode, DirectoryTree, DownloadDialog }, components: { DarkMode, DirectoryTree, DownloadDialog },
mixins: [fileTypeUtils], mixins: [fileTypeUtils],
data() { data() {
@@ -608,6 +623,8 @@ export default {
autoReadClipboard: true, autoReadClipboard: true,
isDarkMode: false, isDarkMode: false,
isLoading: false, isLoading: false,
errorBadgeVisible: false,
errorMsgExpanded: false,
// 输入数据 // 输入数据
link: "", link: "",
@@ -617,7 +634,7 @@ export default {
parseResult: {}, parseResult: {},
downloadUrl: null, downloadUrl: null,
directLink: '', directLink: '',
previewBaseUrl, previewBaseUrl: PREVIEW_BASE_URL,
// 功能结果 // 功能结果
markdownText: '', markdownText: '',
@@ -714,6 +731,12 @@ export default {
} }
}, },
computed: { computed: {
githubRepoUrl() {
return process.env.VUE_APP_GITHUB_REPO_URL
},
projectVersion() {
return process.env.VUE_APP_VERSION || '0.0.0'
},
// 检查是否配置了认证信息(针对当前链接的网盘类型) // 检查是否配置了认证信息(针对当前链接的网盘类型)
hasAuthConfig() { hasAuthConfig() {
const panType = this.getCurrentPanType() const panType = this.getCurrentPanType()
@@ -959,18 +982,16 @@ export default {
// 优先使用个人配置 // 优先使用个人配置
if (this.allAuthConfigs[panType]) { if (this.allAuthConfigs[panType]) {
config = this.allAuthConfigs[panType] config = this.allAuthConfigs[panType]
console.log(`[认证] 使用个人配置: ${this.getPanDisplayName(panType)}`)
} else { } else {
// 从后端随机获取捐赠账号(后端已加密,直接使用 encryptedAuth // 从后端随机获取捐赠账号(后端已加密,直接使用 encryptedAuth
try { try {
const response = await axios.get(`${this.baseAPI}/v2/randomAuth`, { params: { panType } }) const response = await axios.get(`${this.baseAPI}/v2/randomAuth`, { params: { panType } })
const encryptedAuth = response.data?.data?.encryptedAuth const encryptedAuth = response.data?.data?.encryptedAuth
if (encryptedAuth) { if (encryptedAuth) {
console.log(`[认证] 使用捐赠账号: ${this.getPanDisplayName(panType)}`)
return encryptedAuth return encryptedAuth
} }
} catch (e) { } catch (e) {
console.log(`[认证] 无可用捐赠账号: ${this.getPanDisplayName(panType)}`) // no available donated account
} }
return '' return ''
} }
@@ -1091,17 +1112,45 @@ export default {
} }
}, },
// 识别并转换短链输入(如 lz:shareKey@pwd // 识别并转换短链输入(如 lz:shareKey@pwd,或从文本中提取链接
normalizeShortcutInput() { normalizeShortcutInput() {
const shortInfo = this.expandShortFormat(this.link) if (!this.link) return
if (!shortInfo) return const trimmed = this.link.trim()
if (!trimmed) return
// 已经是直接链接,跳过
if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) return
// 尝试短格式
const shortInfo = this.expandShortFormat(trimmed)
if (shortInfo) {
this.link = shortInfo.link this.link = shortInfo.link
if (!this.password && shortInfo.pwd) { if (!this.password && shortInfo.pwd) {
this.password = shortInfo.pwd this.password = shortInfo.pwd
} }
this.$message.success(`已识别短格式并自动转换,网盘类型: ${shortInfo.name}`) this.$message.success(`已识别短格式并自动转换,网盘类型: ${shortInfo.name}`)
this.updateDirectLink() this.updateDirectLink()
return
}
// 从文本中自动提取链接
const linkInfo = parserUrl.parseLink(trimmed)
if (linkInfo.link) {
this.link = linkInfo.link
const pwd = parserUrl.parsePwd(trimmed)
if (!this.password && pwd) {
this.password = pwd
}
this.$message.success(`已从文本中识别到 ${linkInfo.name} 分享链接`)
this.updateDirectLink()
}
},
// 粘贴事件:从粘贴的文本中自动提取链接
onPaste(e) {
this.$nextTick(() => {
this.normalizeShortcutInput()
})
}, },
// 清除结果 // 清除结果
@@ -1118,6 +1167,7 @@ export default {
// 统一API调用自动添加认证参数 // 统一API调用自动添加认证参数
async callAPI(endpoint, params = {}) { async callAPI(endpoint, params = {}) {
this.errorButtonVisible = false this.errorButtonVisible = false
this.errorBadgeVisible = false
try { try {
this.isLoading = true this.isLoading = true
// 添加认证参数(异步获取) // 添加认证参数(异步获取)
@@ -1129,14 +1179,28 @@ export default {
if (response.data.code === 200) { if (response.data.code === 200) {
// this.$message.success(response.data.msg || '操作成功') // this.$message.success(response.data.msg || '操作成功')
this.errorBadgeVisible = false
return response.data return response.data
} else { } else {
// 在页面右下角显示一个“查看详情”按钮 可以查看原json // 解析失败,显示徽章和弹窗
this.errorDetail = response?.data this.errorDetail = response?.data
this.errorButtonVisible = true this.errorButtonVisible = true
this.errorBadgeVisible = true
this.errorDialogVisible = true
throw new Error(response.data.msg || '操作失败') throw new Error(response.data.msg || '操作失败')
} }
} catch (error) { } catch (error) {
// HTTP 非2xx时从响应体中提取后端返回的错误信息
if (error.response?.data?.msg) {
this.errorDetail = error.response.data
this.errorButtonVisible = true
this.errorBadgeVisible = true
this.errorDialogVisible = true
this.$message.error(error.response.data.msg)
throw new Error(error.response.data.msg)
}
this.errorBadgeVisible = true
this.errorDialogVisible = true
this.$message.error(error.message || '网络错误') this.$message.error(error.message || '网络错误')
throw error throw error
} finally { } finally {
@@ -1309,7 +1373,7 @@ export default {
// 文件点击处理 // 文件点击处理
handleFileClick(file) { handleFileClick(file) {
if (file.parserUrl) { if (file.parserUrl) {
window.open(file.parserUrl, '_blank') window.open(file.parserUrl, '_blank', 'noopener,noreferrer')
} else { } else {
this.$message.warning('该文件暂无下载链接') this.$message.warning('该文件暂无下载链接')
} }
@@ -1319,7 +1383,6 @@ export default {
async getPaste(isManual = false) { async getPaste(isManual = false) {
try { try {
const text = await navigator.clipboard.readText() const text = await navigator.clipboard.readText()
console.log('获取到的文本内容是:', text)
const shortInfo = this.expandShortFormat(text) const shortInfo = this.expandShortFormat(text)
if (shortInfo) { if (shortInfo) {
@@ -1364,7 +1427,9 @@ export default {
} }
} catch (error) { } catch (error) {
console.error('读取剪切板失败:', error) console.error('读取剪切板失败:', error)
this.$message.error('读取剪切板失败,请检查浏览器权限') if (isManual) {
this.$message.warning('读取剪切板失败,请手动粘贴链接到输入框')
}
} }
}, },
@@ -1433,13 +1498,18 @@ export default {
}) })
}, },
truncateMsg(msg) {
if (!msg) return ''
return msg.length > 150 ? msg.slice(0, 150) + '...' : msg
},
copyErrorDetails() { copyErrorDetails() {
const text = `分享链接:${this.link} const text = `分享链接:${this.link}
分享密码:${this.password || ''} 分享密码:${this.password || ''}
错误信息:${JSON.stringify(this.errorDetail, null, 2)}`; 错误信息:${JSON.stringify(this.errorDetail, null, 2)}`;
navigator.clipboard.writeText(text).then(() => { navigator.clipboard.writeText(text).then(() => {
this.$message.success('已复制分享信息和错误详情'); this.$message.success('已复制分享信息和错误详情');
window.open('https://github.com/qaiu/netdisk-fast-download/issues/new', '_blank'); window.open(`${this.githubRepoUrl}/issues/new`, '_blank', 'noopener,noreferrer');
}).catch(() => { }).catch(() => {
this.$message.error('复制失败'); this.$message.error('复制失败');
}); });
@@ -1786,12 +1856,13 @@ export default {
} }
// 监听窗口焦点事件 // 监听窗口焦点事件
window.addEventListener('focus', () => { this._onFocusHandler = () => {
if (this.autoReadClipboard) { if (this.autoReadClipboard) {
this.hasClipboardSuccessTip = false // 聚焦时重置,只提示一次 this.hasClipboardSuccessTip = false // 聚焦时重置,只提示一次
this.getPaste() this.getPaste()
} }
}) }
window.addEventListener('focus', this._onFocusHandler)
// 首次打开页面弹出风险提示 // 首次打开页面弹出风险提示
if (!window.localStorage.getItem('nfd_risk_ack')) { if (!window.localStorage.getItem('nfd_risk_ack')) {
@@ -1799,6 +1870,12 @@ export default {
} }
}, },
beforeUnmount() {
if (this._onFocusHandler) {
window.removeEventListener('focus', this._onFocusHandler)
}
},
watch: { watch: {
downloadUrl(val) { downloadUrl(val) {
if (!val) { if (!val) {

View File

@@ -653,22 +653,22 @@
<p>更多详细信息请参考 GitHub 仓库文档</p> <p>更多详细信息请参考 GitHub 仓库文档</p>
<ul> <ul>
<li> <li>
<a href="https://github.com/qaiu/netdisk-fast-download/blob/main/parser/doc/JAVASCRIPT_PARSER_GUIDE.md" target="_blank" rel="noopener noreferrer"> <a :href="githubRepoUrl + '/blob/main/parser/doc/JAVASCRIPT_PARSER_GUIDE.md'" target="_blank" rel="noopener noreferrer">
JavaScript 解析器开发指南 JavaScript 解析器开发指南
</a> </a>
</li> </li>
<li> <li>
<a href="https://github.com/qaiu/netdisk-fast-download/blob/main/parser/doc/CUSTOM_PARSER_GUIDE.md" target="_blank" rel="noopener noreferrer"> <a :href="githubRepoUrl + '/blob/main/parser/doc/CUSTOM_PARSER_GUIDE.md'" target="_blank" rel="noopener noreferrer">
自定义解析器扩展指南 自定义解析器扩展指南
</a> </a>
</li> </li>
<li> <li>
<a href="https://github.com/qaiu/netdisk-fast-download/blob/main/parser/doc/CUSTOM_PARSER_QUICKSTART.md" target="_blank" rel="noopener noreferrer"> <a :href="githubRepoUrl + '/blob/main/parser/doc/CUSTOM_PARSER_QUICKSTART.md'" target="_blank" rel="noopener noreferrer">
快速开始教程 快速开始教程
</a> </a>
</li> </li>
<li> <li>
<a href="https://github.com/qaiu/netdisk-fast-download/blob/main/parser/README.md" target="_blank" rel="noopener noreferrer"> <a :href="githubRepoUrl + '/blob/main/parser/README.md'" target="_blank" rel="noopener noreferrer">
解析器模块文档 解析器模块文档
</a> </a>
</li> </li>
@@ -858,6 +858,7 @@ export default {
}, },
setup() { setup() {
const router = useRouter(); const router = useRouter();
const githubRepoUrl = process.env.VUE_APP_GITHUB_REPO_URL;
// 语言常量 // 语言常量
const LANGUAGE = { const LANGUAGE = {
@@ -1178,7 +1179,7 @@ function parseById(shareLinkInfo, http, logger) {
// 新窗口打开首页 // 新窗口打开首页
const goHomeInNewWindow = () => { const goHomeInNewWindow = () => {
window.open('/', '_blank'); window.open('/', '_blank', 'noopener,noreferrer');
}; };
// 检查是否有未保存的文件 // 检查是否有未保存的文件
@@ -1758,7 +1759,6 @@ function parseFileList(shareLinkInfo, http, logger) {
testParams.value.method testParams.value.method
); );
console.log('测试结果:', result);
testResult.value = result; testResult.value = result;
// 将日志添加到控制台 // 将日志添加到控制台
@@ -1820,10 +1820,8 @@ function parseFileList(shareLinkInfo, http, logger) {
loadingList.value = true; loadingList.value = true;
try { try {
const result = await playgroundApi.getParserList(); const result = await playgroundApi.getParserList();
console.log('获取解析器列表响应:', result);
// 检查响应格式 // 检查响应格式
if (result.code === 200 || result.success) { if (result.code === 200 || result.success) {
console.log('列表数据:', result.data);
parserList.value = result.data || []; parserList.value = result.data || [];
} else if (result.data && Array.isArray(result.data)) { } else if (result.data && Array.isArray(result.data)) {
// 如果data直接是数组 // 如果data直接是数组
@@ -1857,7 +1855,6 @@ function parseFileList(shareLinkInfo, http, logger) {
try { try {
const codeToPublish = currentCode.value; const codeToPublish = currentCode.value;
const result = await playgroundApi.saveParser(codeToPublish); const result = await playgroundApi.saveParser(codeToPublish);
console.log('保存解析器响应:', result);
// 检查响应格式 // 检查响应格式
if (result.code === 200 || result.success) { if (result.code === 200 || result.success) {
// 从响应或代码中提取type信息 // 从响应或代码中提取type信息
@@ -2223,6 +2220,8 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
}, 100); }, 100);
}; };
let themeObserver = null;
onMounted(async () => { onMounted(async () => {
// 初始化移动端检测 // 初始化移动端检测
updateIsMobile(); updateIsMobile();
@@ -2249,10 +2248,10 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
const html = document.documentElement; const html = document.documentElement;
if (html && html.classList) { if (html && html.classList) {
try { try {
const observer = new MutationObserver(() => { themeObserver = new MutationObserver(() => {
checkDarkMode(); checkDarkMode();
}); });
observer.observe(html, { themeObserver.observe(html, {
attributes: true, attributes: true,
attributeFilter: ['class', 'data-theme'] attributeFilter: ['class', 'data-theme']
}); });
@@ -2269,9 +2268,11 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
window.removeEventListener('resize', updateIsMobile); window.removeEventListener('resize', updateIsMobile);
// 移除页面关闭/刷新前的提示 // 移除页面关闭/刷新前的提示
window.removeEventListener('beforeunload', handleBeforeUnload); window.removeEventListener('beforeunload', handleBeforeUnload);
themeObserver?.disconnect();
}); });
return { return {
githubRepoUrl,
LANGUAGE, LANGUAGE,
editorRef, editorRef,
jsCode, jsCode,

View File

@@ -32,7 +32,7 @@
<script> <script>
import axios from 'axios' import axios from 'axios'
import fileTypeUtils from '@/utils/fileTypeUtils' import fileTypeUtils from '@/utils/fileTypeUtils'
import { previewBaseUrl } from '@/views/Home.vue' import { PREVIEW_BASE_URL } from '@/utils/constants'
export default { export default {
name: 'ShowFile', name: 'ShowFile',
@@ -44,7 +44,7 @@ export default {
downloadUrl: '', downloadUrl: '',
shareUrl: '', // 添加原始分享链接 shareUrl: '', // 添加原始分享链接
fileTypeUtils, fileTypeUtils,
previewBaseUrl previewBaseUrl: PREVIEW_BASE_URL
} }
}, },
methods: { methods: {
@@ -73,7 +73,7 @@ export default {
this.parseResult = res.data this.parseResult = res.data
this.downloadUrl = res.data.data?.directLink this.downloadUrl = res.data.data?.directLink
} catch (e) { } catch (e) {
this.error = '解析失败' this.error = e.response?.data?.msg || e.response?.data?.error || '解析失败'
} finally { } finally {
this.loading = false this.loading = false
} }

View File

@@ -55,7 +55,7 @@ export default {
const res = await axios.get('/v2/getFileList', { params: { url: this.url } }) const res = await axios.get('/v2/getFileList', { params: { url: this.url } })
this.directoryData = res.data.data || [] this.directoryData = res.data.data || []
} catch (e) { } catch (e) {
this.error = '目录解析失败' this.error = e.response?.data?.msg || e.response?.data?.error || '目录解析失败'
} finally { } finally {
this.loading = false this.loading = false
} }

View File

@@ -1,10 +1,34 @@
const path = require("path"); const path = require("path");
const { execSync } = require("child_process");
const webpack = require("webpack");
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
// 从 git remote origin 自动识别 GitHub 仓库地址
function getGitHubRepoUrl() {
try {
const remoteUrl = execSync('git remote get-url origin', { encoding: 'utf-8', cwd: path.resolve(__dirname, '..') }).trim();
const match = remoteUrl.match(/github\.com[:/]([^/]+\/[^/.]+?)(?:\.git)?$/);
if (match) return `https://github.com/${match[1]}`;
} catch (e) {}
return 'https://github.com/qaiu/netdisk-fast-download';
}
// 从根 pom.xml 读取项目版本号(单一版本来源)
function getProjectVersion() {
try {
const pomContent = require('fs').readFileSync(path.resolve(__dirname, '../pom.xml'), 'utf-8');
const match = pomContent.match(/<revision>([^<]+)<\/revision>/);
if (match) return match[1];
} catch (e) {}
return require('./package.json').version;
}
const PROJECT_VERSION = getProjectVersion();
const GITHUB_REPO_URL = getGitHubRepoUrl();
const CompressionPlugin = require('compression-webpack-plugin'); const CompressionPlugin = require('compression-webpack-plugin');
const FileManagerPlugin = require('filemanager-webpack-plugin'); const FileManagerPlugin = require('filemanager-webpack-plugin');
const MonacoEditorPlugin = require('monaco-editor-webpack-plugin'); const MonacoEditorPlugin = require('monaco-editor-webpack-plugin');
@@ -55,6 +79,10 @@ module.exports = {
] ]
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({
'process.env.VUE_APP_GITHUB_REPO_URL': JSON.stringify(GITHUB_REPO_URL),
'process.env.VUE_APP_VERSION': JSON.stringify(PROJECT_VERSION)
}),
new MonacoEditorPlugin({ new MonacoEditorPlugin({
languages: ['javascript', 'typescript', 'json'], languages: ['javascript', 'typescript', 'json'],
features: ['coreCommands', 'find', 'format', 'suggest', 'quickCommand'], features: ['coreCommands', 'find', 'format', 'suggest', 'quickCommand'],

View File

@@ -36,6 +36,20 @@ import static cn.qaiu.vx.core.util.ConfigConstant.LOCAL;
public class AppMain { public class AppMain {
public static void main(String[] args) { public static void main(String[] args) {
// 先注册 ShutdownHookJVM 逆序执行,先注册的后执行)
// 确保关闭顺序Vert.x -> JDBCPoolInit -> JsParserExecutor
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
try {
JDBCPoolInit.instance().close();
} catch (Exception e) {
// ignore
}
try {
cn.qaiu.parser.customjs.JsParserExecutor.shutdownExecutor();
} catch (Exception e) {
// ignore
}
}));
// start // start
Deploy.instance().start(args, AppMain::exec); Deploy.instance().start(args, AppMain::exec);
} }
@@ -67,6 +81,9 @@ public class AppMain {
loadPlaygroundParsers(); loadPlaygroundParsers();
String addr = jsonObject.getJsonObject(ConfigConstant.SERVER).getString("domainName"); String addr = jsonObject.getJsonObject(ConfigConstant.SERVER).getString("domainName");
if (addr == null || addr.isBlank()) {
addr = "http://127.0.0.1:" + jsonObject.getJsonObject(ConfigConstant.SERVER).getInteger("port", 6400);
}
System.out.println("启动成功: \n本地服务地址: " + addr); System.out.println("启动成功: \n本地服务地址: " + addr);
}); });
}); });

View File

@@ -89,7 +89,7 @@ public class CacheManager {
} else { } else {
LOGGER.warn("No rows affected when updating cache link info for shareKey: {}", cacheLinkInfo.getShareKey()); LOGGER.warn("No rows affected when updating cache link info for shareKey: {}", cacheLinkInfo.getShareKey());
} }
}).onFailure(Throwable::printStackTrace); }).onFailure(e -> LOGGER.error("缓存链接更新失败", e));
if (cacheLinkInfo.getFileInfo() != null) { if (cacheLinkInfo.getFileInfo() != null) {
String sql2 = """ String sql2 = """
@@ -123,7 +123,7 @@ public class CacheManager {
} else { } else {
LOGGER.warn("No rows affected when inserting pan file info for shareKey: {}", cacheLinkInfo.getShareKey()); LOGGER.warn("No rows affected when inserting pan file info for shareKey: {}", cacheLinkInfo.getShareKey());
} }
}).onFailure(Throwable::printStackTrace); }).onFailure(e -> LOGGER.error("文件信息插入失败", e));
} }
}); });
} }
@@ -153,18 +153,21 @@ public class CacheManager {
getShareKeyTotal(shareKey, fieldLower).onSuccess(total -> { getShareKeyTotal(shareKey, fieldLower).onSuccess(total -> {
Integer newTotal = (total == null ? 0 : total) + 1; Integer newTotal = (total == null ? 0 : total) + 1;
Map<String, Object> updateParams = new HashMap<>();
updateParams.put("panType", getShareType(shareKey));
updateParams.put("shareKey", shareKey);
updateParams.put("total", newTotal);
updateParams.put("ts", System.currentTimeMillis());
SqlTemplate.forUpdate(jdbcPool, sql) SqlTemplate.forUpdate(jdbcPool, sql)
.execute(new HashMap<>() {{ .execute(updateParams)
put("panType", getShareType(shareKey));
put("shareKey", shareKey);
put("total", newTotal);
put("ts", System.currentTimeMillis());
}})
.onSuccess(res -> promise.complete(res.rowCount())) .onSuccess(res -> promise.complete(res.rowCount()))
.onFailure(e->{ .onFailure(e->{
promise.fail(e); promise.fail(e);
LOGGER.error("updateTotalByField: ", e); LOGGER.error("updateTotalByField: ", e);
}); });
}).onFailure(e -> {
promise.fail(e);
LOGGER.error("getShareKeyTotal in updateTotalByField: ", e);
}); });
return promise.future(); return promise.future();
} }
@@ -200,6 +203,59 @@ public class CacheManager {
return promise.future(); return promise.future();
} }
/**
* 清理过期缓存记录,防止数据库无限增长
* @return 删除的行数
*/
public Future<Integer> cleanupExpiredCache() {
String sql = "DELETE FROM cache_link_info WHERE expiration > 0 AND expiration < #{now}";
Map<String, Object> params = new HashMap<>();
params.put("now", System.currentTimeMillis());
Promise<Integer> promise = Promise.promise();
SqlTemplate.forUpdate(jdbcPool, sql)
.execute(params)
.onSuccess(res -> {
int deleted = res.rowCount();
if (deleted > 0) {
LOGGER.info("清理过期缓存记录 {} 条", deleted);
}
promise.complete(deleted);
})
.onFailure(e -> {
LOGGER.error("清理过期缓存失败", e);
promise.fail(e);
});
return promise.future();
}
/**
* 注册定时清理过期缓存任务(每小时执行一次)
* 应在应用启动后调用
*/
private static volatile boolean cleanupRegistered = false;
public static void registerPeriodicCleanup() {
if (cleanupRegistered) return;
try {
io.vertx.core.Vertx vertx = cn.qaiu.vx.core.util.VertxHolder.getVertxInstance();
if (vertx == null) {
LOGGER.warn("Vertx 未就绪,缓存定时清理任务延迟注册");
return;
}
cleanupRegistered = true;
vertx.setPeriodic(3600_000, 3600_000, id -> {
try {
new CacheManager().cleanupExpiredCache();
} catch (Exception e) {
LOGGER.warn("定时清理缓存任务跳过(数据库可能未就绪)", e);
}
});
LOGGER.info("缓存定时清理任务已注册(每小时执行)");
} catch (Exception e) {
LOGGER.warn("注册缓存定时清理任务失败", e);
}
}
public Future<Map<String, Integer>> getShareKeyTotal(String shareKey) { public Future<Map<String, Integer>> getShareKeyTotal(String shareKey) {
String sql = """ String sql = """
SELECT `share_key`, SUM(cache_hit_total) AS hit_total, SUM(api_parser_total) AS parser_total SELECT `share_key`, SUM(cache_hit_total) AS hit_total, SUM(api_parser_total) AS parser_total
@@ -217,10 +273,9 @@ public class CacheManager {
.onSuccess(res -> { .onSuccess(res -> {
if(res.iterator().hasNext()) { if(res.iterator().hasNext()) {
JsonObject next = res.iterator().next(); JsonObject next = res.iterator().next();
Map<String, Integer> resp = new HashMap<>(){{ Map<String, Integer> resp = new HashMap<>();
put("hit_total" ,next.getInteger("hit_total")); resp.put("hit_total", next.getInteger("hit_total"));
put("parser_total" ,next.getInteger("parser_total")); resp.put("parser_total", next.getInteger("parser_total"));
}};
promise.complete(resp); promise.complete(resp);
} else { } else {
promise.complete(); promise.complete();

View File

@@ -48,6 +48,6 @@ public class LogStatistics implements AfterInterceptor {
.execute(info) .execute(info)
.onSuccess(res -> { .onSuccess(res -> {
log.info("inserted log: id={}, path={}, code={}", info.getId(), info.getPath(), info.getCode()); log.info("inserted log: id={}, path={}, code={}", info.getId(), info.getPath(), info.getCode());
}).onFailure(Throwable::printStackTrace); }).onFailure(e -> log.error("插入解析日志失败: id={}", info.getId(), e));
} }
} }

View File

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@Slf4j @Slf4j
public class RateLimiter { public class RateLimiter {
@@ -28,7 +29,7 @@ public class RateLimiter {
MAX_REQUESTS, TIME_WINDOW, PATH_REG); MAX_REQUESTS, TIME_WINDOW, PATH_REG);
} }
synchronized public static Future<Void> checkRateLimit(HttpServerRequest request) { public static Future<Void> checkRateLimit(HttpServerRequest request) {
Promise<Void> promise = Promise.promise(); Promise<Void> promise = Promise.promise();
if (!request.path().matches(PATH_REG)) { if (!request.path().matches(PATH_REG)) {
// 如果请求路径不匹配正则,则不进行限流 // 如果请求路径不匹配正则,则不进行限流
@@ -38,20 +39,25 @@ public class RateLimiter {
String ip = request.remoteAddress().host(); String ip = request.remoteAddress().host();
ipRequestMap.compute(ip, (key, requestInfo) -> { // 定期清理过期条目,防止 Map 无限增长
if (ipRequestMap.size() > 1000) {
long now = System.currentTimeMillis();
ipRequestMap.entrySet().removeIf(entry -> now - entry.getValue().timestamp > TIME_WINDOW);
}
RequestInfo info = ipRequestMap.compute(ip, (key, requestInfo) -> {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
if (requestInfo == null || currentTime - requestInfo.timestamp > TIME_WINDOW) { if (requestInfo == null || currentTime - requestInfo.timestamp > TIME_WINDOW) {
// 初始化或重置计数器 // 初始化或重置计数器
return new RequestInfo(1, currentTime); return new RequestInfo(1, currentTime);
} else { } else {
// 增加计数器 // 增加计数器
requestInfo.count++; requestInfo.count.incrementAndGet();
return requestInfo; return requestInfo;
} }
}); });
RequestInfo info = ipRequestMap.get(ip); if (info.count.get() > MAX_REQUESTS) {
if (info.count > MAX_REQUESTS) {
// 超过限制 // 超过限制
// 计算剩余时间 // 计算剩余时间
long remainingTime = TIME_WINDOW - (System.currentTimeMillis() - info.timestamp); long remainingTime = TIME_WINDOW - (System.currentTimeMillis() - info.timestamp);
@@ -66,11 +72,11 @@ public class RateLimiter {
} }
private static class RequestInfo { private static class RequestInfo {
int count; final AtomicInteger count;
long timestamp; volatile long timestamp;
RequestInfo(int count, long time) { RequestInfo(int count, long time) {
this.count = count; this.count = new AtomicInteger(count);
this.timestamp = time; this.timestamp = time;
} }
} }

View File

@@ -7,6 +7,7 @@ import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -93,9 +94,10 @@ public class JwtUtil {
String encodedPayload = parts[1]; String encodedPayload = parts[1];
String signature = parts[2]; String signature = parts[2];
// 验证签名 // 验证签名(使用常量时间比较防止时序攻击)
String expectedSignature = hmacSha256(encodedHeader + "." + encodedPayload, SECRET_KEY); String expectedSignature = hmacSha256(encodedHeader + "." + encodedPayload, SECRET_KEY);
if (!expectedSignature.equals(signature)) { if (!MessageDigest.isEqual(expectedSignature.getBytes(StandardCharsets.UTF_8),
signature.getBytes(StandardCharsets.UTF_8))) {
return false; return false;
} }

View File

@@ -80,8 +80,10 @@ public class PasswordUtil {
byte[] calculatedHash = md.digest(plainPassword.getBytes(StandardCharsets.UTF_8)); byte[] calculatedHash = md.digest(plainPassword.getBytes(StandardCharsets.UTF_8));
String calculatedHashBase64 = Base64.getEncoder().encodeToString(calculatedHash); String calculatedHashBase64 = Base64.getEncoder().encodeToString(calculatedHash);
// 比较计算出的哈希值和存储的哈希值 // 比较计算出的哈希值和存储的哈希值(使用常量时间比较防止时序攻击)
return hashBase64.equals(calculatedHashBase64); return MessageDigest.isEqual(
hashBase64.getBytes(StandardCharsets.UTF_8),
calculatedHashBase64.getBytes(StandardCharsets.UTF_8));
} catch (Exception e) { } catch (Exception e) {
// 如果发生异常例如格式不正确返回false // 如果发生异常例如格式不正确返回false
return false; return false;

View File

@@ -119,11 +119,17 @@ public class URLParamUtil {
} }
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName"); String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
if (StringUtils.isBlank(linkPrefix)) {
// 未配置 domainName 时,从请求地址推断
linkPrefix = parserCreate.getShareLinkInfo().getOtherParam()
.getOrDefault("_requestOrigin", "").toString();
}
if (StringUtils.isNotBlank(linkPrefix)) {
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix); parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
} }
}
/** /**
* 添加临时认证参数(一次性,不保存到数据库或共享内存)
* 如果提供了临时认证参数,将覆盖后台配置的认证信息 * 如果提供了临时认证参数,将覆盖后台配置的认证信息
* *
* @param parserCreate ParserCreate对象 * @param parserCreate ParserCreate对象
@@ -155,7 +161,13 @@ public class URLParamUtil {
} }
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName"); String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
if (StringUtils.isBlank(linkPrefix)) {
linkPrefix = parserCreate.getShareLinkInfo().getOtherParam()
.getOrDefault("_requestOrigin", "").toString();
}
if (StringUtils.isNotBlank(linkPrefix)) {
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix); parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
}
// 构建临时认证信息 // 构建临时认证信息
MultiMap tempAuth = MultiMap.caseInsensitiveMultiMap(); MultiMap tempAuth = MultiMap.caseInsensitiveMultiMap();

View File

@@ -43,14 +43,38 @@ public class ParserApi {
private final DbService dbService = AsyncServiceUtil.getAsyncServiceInstance(DbService.class); private final DbService dbService = AsyncServiceUtil.getAsyncServiceInstance(DbService.class);
/**
* 获取链接前缀:优先用配置的 domainName未配置则从请求头推断
* 支持反向代理:优先读 X-Forwarded-Host/X-Forwarded-Proto再回退到 Host 头
*/
private static String getLinkPrefix(HttpServerRequest request) {
String domainName = SharedDataUtil.getJsonConfig("server").getString("domainName");
if (StringUtils.isNotBlank(domainName)) {
return domainName;
}
if (request != null) {
// 反向代理场景:优先从转发头获取原始域名
String forwardedHost = request.getHeader("X-Forwarded-Host");
if (StringUtils.isNotBlank(forwardedHost)) {
String proto = request.getHeader("X-Forwarded-Proto");
if (StringUtils.isBlank(proto)) {
proto = request.scheme();
}
return proto + "://" + forwardedHost;
}
return request.scheme() + "://" + request.host();
}
return "";
}
@RouteMapping(value = "/statisticsInfo", method = RouteMethod.GET, order = 99) @RouteMapping(value = "/statisticsInfo", method = RouteMethod.GET, order = 99)
public Future<StatisticsInfo> statisticsInfo() { public Future<StatisticsInfo> statisticsInfo() {
return dbService.getStatisticsInfo(); return dbService.getStatisticsInfo();
} }
private final CacheManager cacheManager = new CacheManager(); private static final CacheManager cacheManager = new CacheManager();
private final ServerApi serverApi = new ServerApi(); private static final ServerApi serverApi = new ServerApi();
@RouteMapping(value = "/linkInfo", method = RouteMethod.GET) @RouteMapping(value = "/linkInfo", method = RouteMethod.GET)
public Future<LinkInfoResp> parse(HttpServerRequest request, String pwd, String auth) { public Future<LinkInfoResp> parse(HttpServerRequest request, String pwd, String auth) {
@@ -61,10 +85,11 @@ public class ParserApi {
// 构建链接信息响应,如果有 auth 参数则附加到链接中 // 构建链接信息响应,如果有 auth 参数则附加到链接中
String authSuffix = (auth != null && !auth.isEmpty()) ? "&auth=" + auth : ""; String authSuffix = (auth != null && !auth.isEmpty()) ? "&auth=" + auth : "";
shareLinkInfo.getOtherParam().put("_requestOrigin", getLinkPrefix(request));
LinkInfoResp build = LinkInfoResp.builder() LinkInfoResp build = LinkInfoResp.builder()
.downLink(getDownLink(parserCreate, false) + authSuffix) .downLink(getDownLink(parserCreate, false, request) + authSuffix)
.apiLink(getDownLink(parserCreate, true) + authSuffix) .apiLink(getDownLink(parserCreate, true, request) + authSuffix)
.viewLink(getViewLink(parserCreate) + authSuffix) .viewLink(getViewLink(parserCreate, request) + authSuffix)
.shareLinkInfo(shareLinkInfo).build(); .shareLinkInfo(shareLinkInfo).build();
// 解析次数统计 // 解析次数统计
shareLinkInfo.getOtherParam().put("UA",request.headers().get("user-agent")); shareLinkInfo.getOtherParam().put("UA",request.headers().get("user-agent"));
@@ -76,25 +101,23 @@ public class ParserApi {
} }
promise.complete(build); promise.complete(build);
}).onFailure(t->{ }).onFailure(t->{
t.printStackTrace(); log.error("获取统计信息失败", t);
promise.complete(build); promise.complete(build);
}); });
return promise.future(); return promise.future();
} }
private static String getDownLink(ParserCreate create, boolean isJson) { private static String getDownLink(ParserCreate create, boolean isJson, HttpServerRequest request) {
String linkPrefix = getLinkPrefix(request);
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
if (StringUtils.isBlank(linkPrefix)) { if (StringUtils.isBlank(linkPrefix)) {
linkPrefix = "http://127.0.0.1"; linkPrefix = "http://127.0.0.1:" + SharedDataUtil.getJsonConfig("server").getInteger("port", 6400);
} }
// 下载短链前缀 /d // 下载短链前缀 /d
return linkPrefix + (isJson ? "/json/" : "/d/") + create.genPathSuffix(); return linkPrefix + (isJson ? "/json/" : "/d/") + create.genPathSuffix();
} }
private static String getViewLink(ParserCreate create) { private static String getViewLink(ParserCreate create, HttpServerRequest request) {
String linkPrefix = getLinkPrefix(request);
String linkPrefix = SharedDataUtil.getJsonStringForServerConfig("domainName");
if (StringUtils.isBlank(linkPrefix)) { if (StringUtils.isBlank(linkPrefix)) {
return ""; return "";
} }
@@ -119,8 +142,9 @@ public class ParserApi {
public Future<List<FileInfo>> getFileList(HttpServerRequest request, String pwd, String dirId, String uuid) { public Future<List<FileInfo>> getFileList(HttpServerRequest request, String pwd, String dirId, String uuid) {
String url = URLParamUtil.parserParams(request); String url = URLParamUtil.parserParams(request);
ParserCreate parserCreate = ParserCreate.fromShareUrl(url).setShareLinkInfoPwd(pwd); ParserCreate parserCreate = ParserCreate.fromShareUrl(url).setShareLinkInfoPwd(pwd);
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName"); String linkPrefix = getLinkPrefix(request);
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix); parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
parserCreate.getShareLinkInfo().getOtherParam().put("_requestOrigin", linkPrefix);
if (StringUtils.isNotBlank(dirId)) { if (StringUtils.isNotBlank(dirId)) {
parserCreate.getShareLinkInfo().getOtherParam().put("dirId", dirId); parserCreate.getShareLinkInfo().getOtherParam().put("dirId", dirId);
} }
@@ -132,7 +156,7 @@ public class ParserApi {
// 目录解析下载文件 // 目录解析下载文件
// @RouteMapping("/getFileDownUrl/:type/:param") // @RouteMapping("/getFileDownUrl/:type/:param")
public Future<String> getFileDownUrl(String type, String param) { public Future<String> getFileDownUrl(HttpServerRequest request, String type, String param) {
ParserCreate parserCreate = ParserCreate.fromType(type).shareKey("-") // shareKey not null ParserCreate parserCreate = ParserCreate.fromType(type).shareKey("-") // shareKey not null
.setShareLinkInfoPwd("-"); .setShareLinkInfoPwd("-");
@@ -147,17 +171,21 @@ public class ParserApi {
shareLinkInfo.getOtherParam().put("paramJson", new JsonObject(paramStr)); shareLinkInfo.getOtherParam().put("paramJson", new JsonObject(paramStr));
// domainName // domainName
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName"); String linkPrefix = getLinkPrefix(request);
shareLinkInfo.getOtherParam().put("domainName", linkPrefix); shareLinkInfo.getOtherParam().put("domainName", linkPrefix);
shareLinkInfo.getOtherParam().put("_requestOrigin", linkPrefix);
return parserCreate.createTool().parseById(); return parserCreate.createTool().parseById();
} }
@RouteMapping("/redirectUrl/:type/:param") @RouteMapping("/redirectUrl/:type/:param")
public Future<Void> redirectUrl(HttpServerResponse response, String type, String param) { public Future<Void> redirectUrl(HttpServerRequest request, HttpServerResponse response, String type, String param) {
Promise<Void> promise = Promise.promise(); Promise<Void> promise = Promise.promise();
getFileDownUrl(type, param) getFileDownUrl(request, type, param)
.onSuccess(res -> ResponseUtil.redirect(response, res)) .onSuccess(res -> {
ResponseUtil.redirect(response, res);
promise.complete();
})
.onFailure(t -> promise.fail(t.fillInStackTrace())); .onFailure(t -> promise.fail(t.fillInStackTrace()));
return promise.future(); return promise.future();
} }
@@ -220,7 +248,7 @@ public class ParserApi {
} }
String previewURL = SharedDataUtil.getJsonStringForServerConfig("previewURL"); String previewURL = SharedDataUtil.getJsonStringForServerConfig("previewURL");
new ServerApi().parseJson(request, pwd, null).onSuccess(res -> { serverApi.parseJson(request, pwd, null).onSuccess(res -> {
redirect(response, previewURL, res); redirect(response, previewURL, res);
}).onFailure(e -> { }).onFailure(e -> {
ResponseUtil.fireJsonResultResponse(response, JsonResult.error(e.toString())); ResponseUtil.fireJsonResultResponse(response, JsonResult.error(e.toString()));
@@ -229,14 +257,15 @@ public class ParserApi {
@RouteMapping("/viewUrl/:type/:param") @RouteMapping("/viewUrl/:type/:param")
public Future<Void> viewUrl(HttpServerResponse response, String type, String param) { public Future<Void> viewUrl(HttpServerRequest request, HttpServerResponse response, String type, String param) {
Promise<Void> promise = Promise.promise(); Promise<Void> promise = Promise.promise();
String viewPrefix = SharedDataUtil.getJsonConfig("server").getString("previewURL"); String viewPrefix = SharedDataUtil.getJsonConfig("server").getString("previewURL");
getFileDownUrl(type, param) getFileDownUrl(request, type, param)
.onSuccess(res -> { .onSuccess(res -> {
String url = viewPrefix + URLEncoder.encode(res, StandardCharsets.UTF_8); String url = viewPrefix + URLEncoder.encode(res, StandardCharsets.UTF_8);
ResponseUtil.redirect(response, url); ResponseUtil.redirect(response, url);
promise.complete();
}) })
.onFailure(t -> promise.fail(t.fillInStackTrace())); .onFailure(t -> promise.fail(t.fillInStackTrace()));
return promise.future(); return promise.future();
@@ -269,6 +298,7 @@ public class ParserApi {
String shareUrl = URLParamUtil.parserParams(request); String shareUrl = URLParamUtil.parserParams(request);
ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd); ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd);
ShareLinkInfo shareLinkInfo = parserCreate.getShareLinkInfo(); ShareLinkInfo shareLinkInfo = parserCreate.getShareLinkInfo();
shareLinkInfo.getOtherParam().put("_requestOrigin", getLinkPrefix(request));
// 处理认证参数 // 处理认证参数
if (auth != null && !auth.isEmpty()) { if (auth != null && !auth.isEmpty()) {
@@ -285,6 +315,8 @@ public class ParserApi {
authParam.getExt5()); authParam.getExt5());
log.debug("客户端链接API: 已解码认证参数 authType={}", authParam.getAuthType()); log.debug("客户端链接API: 已解码认证参数 authType={}", authParam.getAuthType());
} }
} else {
URLParamUtil.addParam(parserCreate);
} }
// 使用默认方法解析并生成客户端链接 // 使用默认方法解析并生成客户端链接
@@ -326,6 +358,8 @@ public class ParserApi {
try { try {
String shareUrl = URLParamUtil.parserParams(request); String shareUrl = URLParamUtil.parserParams(request);
ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd); ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd);
parserCreate.getShareLinkInfo().getOtherParam().put("_requestOrigin", getLinkPrefix(request));
URLParamUtil.addParam(parserCreate);
// 使用默认方法解析并生成客户端链接 // 使用默认方法解析并生成客户端链接
parserCreate.createTool().parseWithClientLinks() parserCreate.createTool().parseWithClientLinks()

View File

@@ -28,6 +28,7 @@ import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -129,8 +130,11 @@ public class PlaygroundApi {
return promise.future(); return promise.future();
} }
// 验证密码 // 验证密码(使用常量时间比较防止时序攻击)
if (config.getPassword().equals(password)) { String storedPassword = config.getPassword();
if (storedPassword != null && MessageDigest.isEqual(
storedPassword.getBytes(StandardCharsets.UTF_8),
password.getBytes(StandardCharsets.UTF_8))) {
String token = config.generateToken(); String token = config.generateToken();
JsonObject tokenData = new JsonObject().put("token", token); JsonObject tokenData = new JsonObject().put("token", token);
promise.complete(JsonResult.data(tokenData).toJsonObject()); promise.complete(JsonResult.data(tokenData).toJsonObject());
@@ -299,7 +303,6 @@ public class PlaygroundApi {
}).onFailure(e -> { }).onFailure(e -> {
long executionTime = System.currentTimeMillis() - startTime; long executionTime = System.currentTimeMillis() - startTime;
String errorMessage = e.getMessage(); String errorMessage = e.getMessage();
String stackTrace = getStackTrace(e);
log.error("演练场执行失败", e); log.error("演练场执行失败", e);
@@ -317,7 +320,6 @@ public class PlaygroundApi {
PlaygroundTestResp response = PlaygroundTestResp.builder() PlaygroundTestResp response = PlaygroundTestResp.builder()
.success(false) .success(false)
.error(errorMessage) .error(errorMessage)
.stackTrace(stackTrace)
.executionTime(executionTime) .executionTime(executionTime)
.logs(respLogs) .logs(respLogs)
.build(); .build();
@@ -328,14 +330,12 @@ public class PlaygroundApi {
} catch (Exception e) { } catch (Exception e) {
long executionTime = System.currentTimeMillis() - startTime; long executionTime = System.currentTimeMillis() - startTime;
String errorMessage = e.getMessage(); String errorMessage = e.getMessage();
String stackTrace = getStackTrace(e);
log.error("演练场初始化失败", e); log.error("演练场初始化失败", e);
PlaygroundTestResp response = PlaygroundTestResp.builder() PlaygroundTestResp response = PlaygroundTestResp.builder()
.success(false) .success(false)
.error(errorMessage) .error(errorMessage)
.stackTrace(stackTrace)
.executionTime(executionTime) .executionTime(executionTime)
.logs(new ArrayList<>()) .logs(new ArrayList<>())
.build(); .build();
@@ -346,8 +346,7 @@ public class PlaygroundApi {
log.error("解析请求参数失败", e); log.error("解析请求参数失败", e);
promise.complete(JsonObject.mapFrom(PlaygroundTestResp.builder() promise.complete(JsonObject.mapFrom(PlaygroundTestResp.builder()
.success(false) .success(false)
.error("解析请求参数失败: " + e.getMessage()) .error("解析请求参数失败")
.stackTrace(getStackTrace(e))
.build())); .build()));
} }
@@ -696,18 +695,5 @@ public class PlaygroundApi {
} }
return ip; return ip;
} }
/**
* 获取异常堆栈信息
*/
private String getStackTrace(Throwable throwable) {
if (throwable == null) {
return "";
}
java.io.StringWriter sw = new java.io.StringWriter();
java.io.PrintWriter pw = new java.io.PrintWriter(sw);
throwable.printStackTrace(pw);
return sw.toString();
}
} }

View File

@@ -68,7 +68,8 @@ public class ServerApi {
key = keys[0]; key = keys[0];
pwd = keys[1]; pwd = keys[1];
} }
return cacheService.getCachedByShareKeyAndPwd(type, key, pwd, JsonObject.of("UA",request.headers().get("user-agent"))); String origin = resolveOrigin(request);
return cacheService.getCachedByShareKeyAndPwd(type, key, pwd, JsonObject.of("UA",request.headers().get("user-agent"), "_requestOrigin", origin));
} }
@RouteMapping(value = "/:type/:key", method = RouteMethod.GET) @RouteMapping(value = "/:type/:key", method = RouteMethod.GET)
@@ -80,7 +81,8 @@ public class ServerApi {
key = keys[0]; key = keys[0];
pwd = keys[1]; pwd = keys[1];
} }
cacheService.getCachedByShareKeyAndPwd(type, key, pwd, JsonObject.of("UA",request.headers().get("user-agent"))) String origin = resolveOrigin(request);
cacheService.getCachedByShareKeyAndPwd(type, key, pwd, JsonObject.of("UA",request.headers().get("user-agent"), "_requestOrigin", origin))
.onSuccess(res -> ResponseUtil.redirect( .onSuccess(res -> ResponseUtil.redirect(
response.putHeader("nfd-cache-hit", res.getCacheHit().toString()) response.putHeader("nfd-cache-hit", res.getCacheHit().toString())
.putHeader("nfd-cache-expires", res.getExpires()), .putHeader("nfd-cache-expires", res.getExpires()),
@@ -89,6 +91,21 @@ public class ServerApi {
return promise.future(); return promise.future();
} }
/**
* 解析请求来源地址,支持反向代理
*/
private static String resolveOrigin(HttpServerRequest request) {
String forwardedHost = request.getHeader("X-Forwarded-Host");
if (forwardedHost != null && !forwardedHost.isBlank()) {
String proto = request.getHeader("X-Forwarded-Proto");
if (proto == null || proto.isBlank()) {
proto = request.scheme();
}
return proto + "://" + forwardedHost;
}
return request.scheme() + "://" + request.host();
}
/** /**
* 构建 otherParam包含 UA 和解码后的认证参数 * 构建 otherParam包含 UA 和解码后的认证参数
* *
@@ -97,7 +114,7 @@ public class ServerApi {
* @return JsonObject * @return JsonObject
*/ */
private JsonObject buildOtherParam(HttpServerRequest request, String auth) { private JsonObject buildOtherParam(HttpServerRequest request, String auth) {
JsonObject otherParam = JsonObject.of("UA", request.headers().get("user-agent")); JsonObject otherParam = JsonObject.of("UA", request.headers().get("user-agent"), "_requestOrigin", resolveOrigin(request));
// 解码认证参数 // 解码认证参数
if (auth != null && !auth.isEmpty()) { if (auth != null && !auth.isEmpty()) {

View File

@@ -29,6 +29,11 @@ public class CacheServiceImpl implements CacheService {
private final CacheManager cacheManager = new CacheManager(); private final CacheManager cacheManager = new CacheManager();
static {
// 服务类加载时注册缓存定时清理任务
CacheManager.registerPeriodicCleanup();
}
private Future<CacheLinkInfo> getAndSaveCachedShareLink(ParserCreate parserCreate) { private Future<CacheLinkInfo> getAndSaveCachedShareLink(ParserCreate parserCreate) {
// 认证、域名相关(检查是否已经添加过参数,避免重复调用) // 认证、域名相关(检查是否已经添加过参数,避免重复调用)
@@ -99,7 +104,7 @@ public class CacheServiceImpl implements CacheService {
promise.complete(result); promise.complete(result);
// 更新缓存 // 更新缓存
cacheManager.cacheShareLink(cacheLinkInfo); cacheManager.cacheShareLink(cacheLinkInfo);
cacheManager.updateTotalByField(cacheKey, CacheTotalField.API_PARSER_TOTAL).onFailure(Throwable::printStackTrace); cacheManager.updateTotalByField(cacheKey, CacheTotalField.API_PARSER_TOTAL).onFailure(e -> log.error("更新API解析计数失败: cacheKey={}", cacheKey, e));
}).onFailure(promise::fail); }).onFailure(promise::fail);
} else { } else {
// 缓存命中,生成过期时间并生成下载命令 // 缓存命中,生成过期时间并生成下载命令
@@ -115,7 +120,7 @@ public class CacheServiceImpl implements CacheService {
promise.complete(result); promise.complete(result);
cacheManager.updateTotalByField(cacheKey, CacheTotalField.CACHE_HIT_TOTAL) cacheManager.updateTotalByField(cacheKey, CacheTotalField.CACHE_HIT_TOTAL)
.onFailure(Throwable::printStackTrace); .onFailure(e -> log.error("更新缓存命中计数失败: cacheKey={}", cacheKey, e));
} }
}).onFailure(t -> promise.fail(t.fillInStackTrace())); }).onFailure(t -> promise.fail(t.fillInStackTrace()));

View File

@@ -42,12 +42,11 @@ public class DbServiceImpl implements DbService {
@Override @Override
public Future<JsonObject> sayOk(String data) { public Future<JsonObject> sayOk(String data) {
log.info("say ok1 -> wait..."); log.info("say ok1 -> wait...");
try { Promise<JsonObject> promise = Promise.promise();
Thread.sleep(4000); cn.qaiu.vx.core.util.VertxHolder.getVertxInstance().setTimer(4000, id -> {
} catch (InterruptedException e) { promise.complete(JsonObject.mapFrom(JsonResult.data("Hi: " + data)));
e.printStackTrace(); });
} return promise.future();
return Future.succeededFuture(JsonObject.mapFrom(JsonResult.data("Hi: " + data)));
} }
@Override @Override

View File

@@ -125,7 +125,7 @@ public class UserServiceImpl implements UserService {
if (rows.size() == 0) { if (rows.size() == 0) {
promise.complete(new JsonObject() promise.complete(new JsonObject()
.put("success", false) .put("success", false)
.put("message", "用户不存在")); .put("message", "用户名或密码错误"));
return; return;
} }
@@ -136,7 +136,7 @@ public class UserServiceImpl implements UserService {
if (!PasswordUtil.checkPassword(user.getPassword(), existUser.getPassword())) { if (!PasswordUtil.checkPassword(user.getPassword(), existUser.getPassword())) {
promise.complete(new JsonObject() promise.complete(new JsonObject()
.put("success", false) .put("success", false)
.put("message", "密码错误")); .put("message", "用户名或密码错误"));
return; return;
} }
@@ -169,7 +169,7 @@ public class UserServiceImpl implements UserService {
log.error("登录查询失败", err); log.error("登录查询失败", err);
promise.complete(new JsonObject() promise.complete(new JsonObject()
.put("success", false) .put("success", false)
.put("message", "登录失败: " + err.getMessage())); .put("message", "登录失败,请稍后重试"));
}); });
return promise.future(); return promise.future();
@@ -189,7 +189,7 @@ public class UserServiceImpl implements UserService {
.execute(Tuple.of(username)) .execute(Tuple.of(username))
.onSuccess(rows -> { .onSuccess(rows -> {
if (rows.size() == 0) { if (rows.size() == 0) {
promise.fail("用户不存在"); promise.fail("用户名或密码错误");
return; return;
} }
@@ -296,7 +296,7 @@ public class UserServiceImpl implements UserService {
.execute(Tuple.of(user.getUsername())) .execute(Tuple.of(user.getUsername()))
.onSuccess(rows -> { .onSuccess(rows -> {
if (rows.size() == 0) { if (rows.size() == 0) {
promise.fail("用户不存在"); promise.fail("用户名或密码错误");
return; return;
} }
@@ -406,7 +406,7 @@ public class UserServiceImpl implements UserService {
.onFailure(err -> { .onFailure(err -> {
promise.complete(new JsonObject() promise.complete(new JsonObject()
.put("success", false) .put("success", false)
.put("message", "用户不存在")); .put("message", "认证失败,请重新登录"));
}); });
return promise.future(); return promise.future();

View File

@@ -4,13 +4,12 @@ server:
contextPath: / contextPath: /
# 使用数据库 # 使用数据库
enableDatabase: true enableDatabase: true
# 服务域名或者IP 生成二维码链接时需要 # 服务域名或者IP 生成二维码链接时需要,不设置则自动从请求地址获取
domainName: http://127.0.0.1:6401 # domainName: http://127.0.0.1:6401
# 预览服务URL # 预览服务URL
previewURL: https://nfd-parser.github.io/nfd-preview/preview.html?src= previewURL: https://nfd-parser.github.io/nfd-preview/preview.html?src=
# auth参数加密密钥16位AES密钥 # auth参数加密密钥16位AES密钥
authEncryptKey: 'nfd_auth_key2026' authEncryptKey: 'nfd_auth_key2026'
# domainName: https://lz.qaiu.top
# 反向代理服务器配置路径(不用加后缀) # 反向代理服务器配置路径(不用加后缀)
proxyConf: server-proxy proxyConf: server-proxy