mirror of
https://github.com/qaiu/netdisk-fast-download.git
synced 2026-06-10 07:27:28 +00:00
Compare commits
161 Commits
2161190d9a
...
v3.0.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
452fd0ea2c | ||
|
|
dd8f2efb37 | ||
|
|
0feb8e798a | ||
|
|
d55d8edd2f | ||
|
|
451496f102 | ||
|
|
6d6351bd58 | ||
|
|
1a5fc8d1ef | ||
|
|
a44f30f7e5 | ||
|
|
f9ebd34de3 | ||
|
|
b47db300a6 | ||
|
|
d19d8573f9 | ||
|
|
799e120069 | ||
|
|
13f83e8795 | ||
|
|
7b5900aae4 | ||
|
|
e36c0bbe45 | ||
|
|
af723aed3a | ||
|
|
0978186679 | ||
|
|
17460ff271 | ||
|
|
f81b3852ee | ||
|
|
37abebf8f8 | ||
|
|
79fab8c0d6 | ||
|
|
9b70fb2778 | ||
|
|
bd2868748f | ||
|
|
1f47bf13b5 | ||
|
|
7d8b33afe0 | ||
|
|
367f7c78a4 | ||
|
|
1bd23ec4ae | ||
|
|
3461532679 | ||
|
|
4cfcdfa1f8 | ||
|
|
ac2f526a1c | ||
|
|
cfb624e9e0 | ||
|
|
e1bf45b5c8 | ||
|
|
e2dc611aa4 | ||
|
|
77c953626f | ||
|
|
0e14c9a925 | ||
|
|
a4e8585e2c | ||
|
|
cf7d64916e | ||
|
|
4ac80bbfe8 | ||
|
|
cfe8352d45 | ||
|
|
4a0fe61d30 | ||
|
|
c62e109aff | ||
|
|
ff400d3be3 | ||
|
|
1d243b8f1b | ||
|
|
732a7f86fe | ||
|
|
3c428f6a6d | ||
|
|
bff17f2d4e | ||
|
|
df600eaada | ||
|
|
dd4027c931 | ||
|
|
d1569195e4 | ||
|
|
d6e88f0c53 | ||
|
|
2a9fa81e56 | ||
|
|
5eed1fdfa0 | ||
|
|
cf7fc4f502 | ||
|
|
0ea31d631a | ||
|
|
74840ab63f | ||
|
|
31f33339f1 | ||
|
|
c0a0d0dc47 | ||
|
|
0cd77ee9b9 | ||
|
|
741d7aa8ca | ||
|
|
d06a80dc73 | ||
|
|
86b9c43b8b | ||
|
|
206981d4b4 | ||
|
|
7d5831b5f4 | ||
|
|
7ca63985bd | ||
|
|
06416a4e5f | ||
|
|
88739e8d1a | ||
|
|
ffaba4f496 | ||
|
|
c4f94a2bc7 | ||
|
|
49a3918244 | ||
|
|
caddff567f | ||
|
|
aed9e9f10d | ||
|
|
6557b49383 | ||
|
|
082cc4c743 | ||
|
|
e261ebe698 | ||
|
|
5a0dc69186 | ||
|
|
29d8bf3ea4 | ||
|
|
07a330cfd4 | ||
|
|
aa30571709 | ||
|
|
2bb9912cf5 | ||
|
|
8f77d9fe98 | ||
|
|
9cb32b3e8f | ||
|
|
080206925f | ||
|
|
54d2a8189c | ||
|
|
377bc12cf9 | ||
|
|
da715c8a8f | ||
|
|
fa4028296f | ||
|
|
dc629a3126 | ||
|
|
746c7ad5b3 | ||
|
|
aef1b9ab11 | ||
|
|
79c9eb3dda | ||
|
|
5a08ed68c2 | ||
|
|
e5a623c5a8 | ||
|
|
4586138bf1 | ||
|
|
1dddec110e | ||
|
|
46e9999e4c | ||
|
|
a664ae3a56 | ||
|
|
9bcdcb2cb7 | ||
|
|
0b8592559a | ||
|
|
c0b18be5ab | ||
|
|
46b2eb1ccd | ||
|
|
d323376bed | ||
|
|
838c86ae15 | ||
|
|
42925c857c | ||
|
|
ba981d281f | ||
|
|
4159b884de | ||
|
|
36b38421e5 | ||
|
|
b77c8a80e9 | ||
|
|
886dcd039f | ||
|
|
d99885d396 | ||
|
|
942de9c430 | ||
|
|
ae3ff9ecbb | ||
|
|
bcc4315ea9 | ||
|
|
2f7304ab2d | ||
|
|
0df01ba3d5 | ||
|
|
710e454fd0 | ||
|
|
c46dfa00a0 | ||
|
|
9a3ea05023 | ||
|
|
66d7a62d3a | ||
|
|
f1b6cd3e18 | ||
|
|
189d1477a8 | ||
|
|
9c3945f45a | ||
|
|
77c7d6c5d6 | ||
|
|
ab3009e9cc | ||
|
|
1c2291f9cf | ||
|
|
efb135ee48 | ||
|
|
0699c4a127 | ||
|
|
33cef5f8e1 | ||
|
|
32d467b6d9 | ||
|
|
6dfa770137 | ||
|
|
0dfee8ab22 | ||
|
|
85fe910f25 | ||
|
|
6c60b0116f | ||
|
|
8dfcf510f6 | ||
|
|
be1ed3d46d | ||
|
|
1fca578c07 | ||
|
|
a83665ac44 | ||
|
|
21e8a370c3 | ||
|
|
3dd4dd139b | ||
|
|
afe2046bc8 | ||
|
|
6d24388690 | ||
|
|
0b024a849a | ||
|
|
8745dc3567 | ||
|
|
1f4c7019d4 | ||
|
|
255e7b2fb5 | ||
|
|
7419e536cf | ||
|
|
74df000287 | ||
|
|
2e0127d609 | ||
|
|
2b9168e8df | ||
|
|
7bb3cf7c51 | ||
|
|
2ce5058be0 | ||
|
|
a5fc41f152 | ||
|
|
3245a27156 | ||
|
|
ce0fbf65aa | ||
|
|
eb87c3d865 | ||
|
|
990a90e461 | ||
|
|
45cb255a4d | ||
|
|
5e8b8a3575 | ||
|
|
c317e53c24 | ||
|
|
29b59d8450 | ||
|
|
97b7e2f86e | ||
|
|
2f55294b58 |
249
.github/workflows/maven.yml
vendored
249
.github/workflows/maven.yml
vendored
@@ -1,14 +1,5 @@
|
||||
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
||||
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
|
||||
name: Java CI(Maven 构建 + Docker 镜像 + 原生环境打包)
|
||||
|
||||
# This workflow uses actions that are not certified by GitHub.
|
||||
# They are provided by a third-party and are governed by
|
||||
# separate terms of service, privacy policy, and support
|
||||
# documentation.
|
||||
|
||||
name: Java CI with Maven
|
||||
|
||||
# The API requires write permission on the repository to submit dependencies
|
||||
permissions:
|
||||
contents: write
|
||||
packages: write
|
||||
@@ -16,9 +7,9 @@ permissions:
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '*' # 只有推送tag时才会触发构建
|
||||
- '*'
|
||||
branches-ignore:
|
||||
- '*' # 排除所有分支的提交
|
||||
- '*'
|
||||
paths-ignore:
|
||||
- 'bin/**'
|
||||
- '.github/**'
|
||||
@@ -32,70 +23,250 @@ on:
|
||||
- "main"
|
||||
|
||||
jobs:
|
||||
# ================================================================
|
||||
# 阶段一:构建前端 + Maven 打包(只执行一次,产物共享)
|
||||
# ================================================================
|
||||
build:
|
||||
|
||||
name: 编译构建
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: 检出代码
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: actions/setup-node@v4
|
||||
- name: 设置 Node.js 18
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '18'
|
||||
|
||||
- name: Set up JDK 17
|
||||
- name: 设置 JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
cache: maven
|
||||
|
||||
- name: Build Frontend
|
||||
- name: 构建前端
|
||||
run: cd web-front && yarn install && yarn run build
|
||||
|
||||
- name: Build with Maven
|
||||
- name: Maven 编译打包
|
||||
run: mvn -B package -DskipTests --file pom.xml
|
||||
|
||||
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
|
||||
- name: Update dependency graph
|
||||
- name: 更新依赖图谱
|
||||
uses: advanced-security/maven-dependency-submission-action@v3
|
||||
if: github.event_name != 'pull_request'
|
||||
continue-on-error: true
|
||||
with:
|
||||
ignore-maven-wrapper: true
|
||||
|
||||
# - uses: release-drafter/release-drafter@v5
|
||||
# env:
|
||||
# GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
|
||||
|
||||
- name: Upload Artifact
|
||||
- name: 分享应用打包目录(供原生包和 Docker 复用)
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: app-package
|
||||
path: web-service/target/package/
|
||||
|
||||
- name: 分享 bin-zip(供 Docker 复用)
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: app-bin-zip
|
||||
path: web-service/target/netdisk-fast-download-bin.zip
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: github.event_name != 'pull_request'
|
||||
# ================================================================
|
||||
# 阶段二-A:Docker 镜像构建(并行)
|
||||
# ================================================================
|
||||
docker:
|
||||
name: Docker 镜像
|
||||
needs: build
|
||||
if: github.event_name != 'pull_request'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: 检出代码
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 下载 bin-zip 产物
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: app-bin-zip
|
||||
path: web-service/target/
|
||||
|
||||
- name: 登录 GitHub 容器仓库
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
- name: 设置 QEMU(多平台构建支持)
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: 设置 Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Extract git tag
|
||||
id: tag
|
||||
run: |
|
||||
GIT_TAG=$(git tag --points-at HEAD | head -n 1)
|
||||
echo "tag=$GIT_TAG" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build and push Docker image
|
||||
if: github.event_name != 'pull_request'
|
||||
- name: 构建并推送 Docker 镜像
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||
tags: |
|
||||
ghcr.io/qaiu/netdisk-fast-download:${{ steps.tag.outputs.tag }}
|
||||
ghcr.io/qaiu/netdisk-fast-download:latest
|
||||
ghcr.io/${{ github.repository }}:${{ github.ref_name }}
|
||||
ghcr.io/${{ github.repository }}:latest
|
||||
|
||||
|
||||
# ================================================================
|
||||
# 阶段二-B:原生环境打包 Linux + Windows(并行)
|
||||
# ================================================================
|
||||
native-package:
|
||||
name: 原生环境打包 → ${{ matrix.artifact-name }}
|
||||
needs: build
|
||||
if: github.event_name != 'pull_request'
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
artifact-name: netdisk-fast-download-linux-amd64
|
||||
- os: windows-latest
|
||||
artifact-name: netdisk-fast-download-windows-amd64
|
||||
runs-on: ${{ matrix.os }}
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
|
||||
steps:
|
||||
- name: 设置 JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
|
||||
- name: 下载 Maven 构建产物
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: app-package
|
||||
path: web-service/target/package
|
||||
|
||||
# ============================================================
|
||||
# jdeps 分析 → 确定所需 JDK 模块
|
||||
# ============================================================
|
||||
- name: 分析所需 JDK 模块(jdeps)
|
||||
run: |
|
||||
MAIN_JAR="web-service/target/package/netdisk-fast-download.jar"
|
||||
LIB_DIR="web-service/target/package/lib"
|
||||
|
||||
CP=""
|
||||
for jar in "$LIB_DIR"/*.jar; do
|
||||
CP="$CP${CP:+:}$jar"
|
||||
done
|
||||
|
||||
RAW_MODULES=$(jdeps --print-module-deps --ignore-missing-deps --multi-release 17 \
|
||||
--class-path "$CP" "$MAIN_JAR" 2>/dev/null | head -n 1 | tr -d '\r\n' || true)
|
||||
|
||||
if [ -z "$RAW_MODULES" ] || [[ "$RAW_MODULES" == *"Missing"* ]] || [[ "$RAW_MODULES" == *"Error"* ]]; then
|
||||
# ⚠️ 回退列表:若项目新增了需要 java.* / jdk.* 模块的依赖,需同步更新此处
|
||||
RAW_MODULES="java.base,java.logging,java.sql,java.naming,java.management,java.xml,jdk.unsupported,java.net.http,java.instrument,java.security.jgss,java.security.sasl,java.desktop,jdk.crypto.ec"
|
||||
echo "jdeps 分析失败,使用回退模块列表"
|
||||
else
|
||||
# 补上 jdeps 无法检测的反射/SPI依赖
|
||||
RAW_MODULES="$RAW_MODULES,java.desktop,jdk.crypto.ec"
|
||||
fi
|
||||
|
||||
echo "detected modules: $RAW_MODULES"
|
||||
printf 'JDK_MODULES=%s\n' "$RAW_MODULES" >> $GITHUB_ENV
|
||||
|
||||
# ============================================================
|
||||
# jlink 生成精简 JRE
|
||||
# ============================================================
|
||||
- name: 生成精简 JRE(jlink)
|
||||
run: |
|
||||
jlink \
|
||||
--module-path "$JAVA_HOME/jmods" \
|
||||
--add-modules "$JDK_MODULES" \
|
||||
--output "native-package/netdisk-fast-download/jre" \
|
||||
--strip-debug \
|
||||
--compress=2 \
|
||||
--no-header-files \
|
||||
--no-man-pages
|
||||
|
||||
echo "JRE size:"
|
||||
du -sh native-package/netdisk-fast-download/jre || true
|
||||
|
||||
# Windows: 确保 MSVC 运行时 DLL 到位
|
||||
if [[ "$RUNNER_OS" == "Windows" ]]; then
|
||||
JRE_BIN="native-package/netdisk-fast-download/jre/bin"
|
||||
for dll in vcruntime140.dll msvcp140.dll vcruntime140_1.dll; do
|
||||
if [ ! -f "$JRE_BIN/$dll" ] && [ -f "$JAVA_HOME/bin/$dll" ]; then
|
||||
echo "jlink 未包含 $dll,从 JDK 补拷"
|
||||
cp "$JAVA_HOME/bin/$dll" "$JRE_BIN/"
|
||||
fi
|
||||
done
|
||||
echo "=== JRE bin 目录 DLL 清单 ==="
|
||||
ls -la "$JRE_BIN"/*.dll 2>/dev/null || echo "(无 .dll 文件)"
|
||||
fi
|
||||
|
||||
# ============================================================
|
||||
# 组装包目录
|
||||
# ============================================================
|
||||
- name: 组装包目录
|
||||
run: |
|
||||
PKG="native-package/netdisk-fast-download"
|
||||
SRC="web-service/target/package"
|
||||
|
||||
cp "$SRC/netdisk-fast-download.jar" "$PKG/"
|
||||
cp -r "$SRC/lib" "$PKG/"
|
||||
cp -r "$SRC/resources" "$PKG/"
|
||||
cp -r "$SRC/webroot" "$PKG/"
|
||||
|
||||
mkdir -p "$PKG/db"
|
||||
mkdir -p "$PKG/logs"
|
||||
|
||||
# ============================================================
|
||||
# 生成启动脚本
|
||||
# ============================================================
|
||||
- name: 生成启动脚本(Linux)
|
||||
run: |
|
||||
PKG="native-package/netdisk-fast-download"
|
||||
echo '#!/bin/bash' > "$PKG/run.sh"
|
||||
echo 'DIR="$(cd "$(dirname "$0")" && pwd)"' >> "$PKG/run.sh"
|
||||
echo 'cd "$DIR" || exit 1' >> "$PKG/run.sh"
|
||||
echo 'exec "$DIR/jre/bin/java" -Xmx512M -Dfile.encoding=utf-8 -jar "$DIR/netdisk-fast-download.jar" "$@"' >> "$PKG/run.sh"
|
||||
chmod +x "$PKG/run.sh"
|
||||
|
||||
- name: 生成启动脚本(Windows)
|
||||
run: |
|
||||
PKG="native-package/netdisk-fast-download"
|
||||
echo '@echo off' > "$PKG/run.bat"
|
||||
echo 'chcp 65001 > nul' >> "$PKG/run.bat"
|
||||
echo 'pushd %~dp0' >> "$PKG/run.bat"
|
||||
echo '"%~dp0jre\bin\java.exe" -Xmx512M -Dfile.encoding=utf-8 -jar "%~dp0netdisk-fast-download.jar" %*' >> "$PKG/run.bat"
|
||||
|
||||
# ============================================================
|
||||
# 打包为 zip
|
||||
# ============================================================
|
||||
- name: 打包 ZIP(Linux)
|
||||
if: runner.os == 'Linux'
|
||||
run: |
|
||||
cd native-package
|
||||
zip -r "../${{ matrix.artifact-name }}.zip" netdisk-fast-download/
|
||||
|
||||
- name: 打包 ZIP(Windows)
|
||||
if: runner.os == 'Windows'
|
||||
shell: pwsh
|
||||
run: |
|
||||
Compress-Archive -Path native-package/netdisk-fast-download -DestinationPath "${{ matrix.artifact-name }}.zip"
|
||||
|
||||
# ============================================================
|
||||
# 上传产物
|
||||
# ============================================================
|
||||
- name: 上传原生安装包
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ matrix.artifact-name }}
|
||||
path: ${{ matrix.artifact-name }}.zip
|
||||
|
||||
- name: 上传到 Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
files: ${{ matrix.artifact-name }}.zip
|
||||
tag_name: ${{ github.ref_name }}
|
||||
generate_release_notes: true
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -31,6 +31,7 @@ target/
|
||||
sdkTest.log
|
||||
app.yml
|
||||
app-local.yml
|
||||
secret.yml
|
||||
|
||||
|
||||
#some local files
|
||||
@@ -91,3 +92,4 @@ yarn-error.log*
|
||||
**/${project.build.directory}/
|
||||
**/${project.basedir}/target/
|
||||
**/${basedir}/target/
|
||||
.spec-workflow/
|
||||
|
||||
11
Dockerfile
11
Dockerfile
@@ -10,8 +10,13 @@ COPY ./web-service/target/netdisk-fast-download-bin.zip .
|
||||
RUN unzip netdisk-fast-download-bin.zip && \
|
||||
mv netdisk-fast-download/* ./ && \
|
||||
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"]
|
||||
|
||||
40
README.md
40
README.md
@@ -1,29 +1,28 @@
|
||||
# 一款网盘分享链接云解析快速下载服务
|
||||
QQ交流群:1017480890
|
||||
<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/build.yml?branch=main&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://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://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">
|
||||
<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>
|
||||
|
||||
<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等,支持加密分享,以及部分网盘文件夹分享。
|
||||

|
||||
|
||||
|
||||
## 国内镜像
|
||||
|
||||
本项目同步托管于 **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/)
|
||||
[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,请先检查分享是否有效。**
|
||||
|
||||
## 网盘支持情况:
|
||||
> 20230905 奶牛云直链做了防盗链,需加入请求头:Referer: https://cowtransfer.com/
|
||||
> 20230824 123云盘解析大文件(>100MB)失效,需要登录
|
||||
> 20230722 UC网盘解析失效,需要登录
|
||||
|
||||
@@ -95,6 +93,13 @@ https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.
|
||||
- Onedrive-pod
|
||||
- Dropbox-pdp
|
||||
- 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接口
|
||||
|
||||
@@ -414,7 +419,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow
|
||||
> 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径
|
||||
```shell
|
||||
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
|
||||
cd netdisk-fast-download
|
||||
bash service-install.sh
|
||||
@@ -513,4 +518,3 @@ Core模块集成Vert.x实现类似spring的注解式路由API
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#!/bin/bash
|
||||
# set -x
|
||||
LAUNCH_JAR="netdisk-fast-download.jar"
|
||||
nohup java -Xmx512M -jar "$LAUNCH_JAR" "$@" >startup.log 2>&1 &
|
||||
tail -f startup.log
|
||||
exec java -Xmx${JVM_XMX:-512M} ${JVM_OPTS} -jar "$LAUNCH_JAR" "$@"
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>42.7.3</version>
|
||||
<version>42.7.11</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
@@ -53,7 +53,7 @@ public class CreateDatabase {
|
||||
stmt.executeUpdate("CREATE DATABASE IF NOT EXISTS " + dbName + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
|
||||
LOGGER.info(">>>>>>>>>>> 数据库'{}'创建成功 <<<<<<<<<<<<", dbName);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("创建数据库失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,35 +24,39 @@ import java.util.*;
|
||||
* @author <a href="https://qaiu.top">QAIU</a>
|
||||
*/
|
||||
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类型的映射
|
||||
put(Integer.class, "INT");
|
||||
put(Short.class, "SMALLINT");
|
||||
put(Byte.class, "TINYINT");
|
||||
put(Long.class, "BIGINT");
|
||||
put(java.math.BigDecimal.class, "DECIMAL");
|
||||
put(Double.class, "DOUBLE");
|
||||
put(Float.class, "REAL");
|
||||
put(Boolean.class, "BOOLEAN");
|
||||
put(String.class, "VARCHAR");
|
||||
put(Date.class, "TIMESTAMP");
|
||||
put(java.time.LocalDateTime.class, "TIMESTAMP");
|
||||
put(java.sql.Timestamp.class, "TIMESTAMP");
|
||||
put(java.sql.Date.class, "DATE");
|
||||
put(java.sql.Time.class, "TIME");
|
||||
map.put(Integer.class, "INT");
|
||||
map.put(Short.class, "SMALLINT");
|
||||
map.put(Byte.class, "TINYINT");
|
||||
map.put(Long.class, "BIGINT");
|
||||
map.put(java.math.BigDecimal.class, "DECIMAL");
|
||||
map.put(Double.class, "DOUBLE");
|
||||
map.put(Float.class, "REAL");
|
||||
map.put(Boolean.class, "BOOLEAN");
|
||||
map.put(String.class, "VARCHAR");
|
||||
map.put(Date.class, "TIMESTAMP");
|
||||
map.put(java.time.LocalDateTime.class, "TIMESTAMP");
|
||||
map.put(java.sql.Timestamp.class, "TIMESTAMP");
|
||||
map.put(java.sql.Date.class, "DATE");
|
||||
map.put(java.sql.Time.class, "TIME");
|
||||
|
||||
// 基本数据类型
|
||||
put(int.class, "INT");
|
||||
put(short.class, "SMALLINT");
|
||||
put(byte.class, "TINYINT");
|
||||
put(long.class, "BIGINT");
|
||||
put(double.class, "DOUBLE");
|
||||
put(float.class, "REAL");
|
||||
put(boolean.class, "BOOLEAN");
|
||||
}};
|
||||
map.put(int.class, "INT");
|
||||
map.put(short.class, "SMALLINT");
|
||||
map.put(byte.class, "TINYINT");
|
||||
map.put(long.class, "BIGINT");
|
||||
map.put(double.class, "DOUBLE");
|
||||
map.put(float.class, "REAL");
|
||||
map.put(boolean.class, "BOOLEAN");
|
||||
|
||||
javaProperty2SqlColumnMap = Collections.unmodifiableMap(map);
|
||||
}
|
||||
|
||||
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) {
|
||||
return switch (clz.getName()) {
|
||||
|
||||
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
|
||||
*
|
||||
* @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);
|
||||
|
||||
@@ -101,4 +101,16 @@ public class JDBCPoolInit {
|
||||
synchronized public JDBCPool getPool() {
|
||||
return pool;
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭连接池,释放数据库资源
|
||||
*/
|
||||
@Override
|
||||
public synchronized void close() {
|
||||
if (pool != null) {
|
||||
pool.close();
|
||||
LOGGER.info("数据库连接池已关闭: URL={}", url);
|
||||
pool = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
@@ -62,10 +64,19 @@ public final class Deploy {
|
||||
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)
|
||||
.onSuccess(this::readConf)
|
||||
.onFailure(Throwable::printStackTrace);
|
||||
.onFailure(err -> {
|
||||
LOGGER.error("读取配置文件失败: {}", err.getMessage(), err);
|
||||
LockSupport.unpark(mainThread);
|
||||
System.exit(-1);
|
||||
});
|
||||
LockSupport.park();
|
||||
deployVerticle();
|
||||
}
|
||||
@@ -137,6 +148,17 @@ public final class Deploy {
|
||||
vertxOptions.getWorkerPoolSize());
|
||||
var vertx = Vertx.vertx(vertxOptions);
|
||||
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();
|
||||
LocalMap<String, Object> localMap = sharedData.getLocalMap(LOCAL);
|
||||
|
||||
@@ -127,8 +127,9 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
// 错误请求处理
|
||||
mainRouter.errorHandler(405, ctx -> doFireJsonResultResponse(ctx, JsonResult
|
||||
.error("Method Not Allowed", 405)));
|
||||
mainRouter.errorHandler(404, ctx -> ctx.response().setStatusCode(404).setChunked(true)
|
||||
.end("Internal server error: 404 not found"));
|
||||
mainRouter.errorHandler(404, ctx -> {
|
||||
ctx.response().setStatusCode(404).end("404 not found");
|
||||
});
|
||||
|
||||
return mainRouter;
|
||||
}
|
||||
@@ -179,8 +180,9 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
if (ctx.statusCode() == 503 || ctx.failure() == null) {
|
||||
doFireJsonResultResponse(ctx, JsonResult.error("未知异常, 请联系管理员"), 503);
|
||||
} else {
|
||||
ctx.failure().printStackTrace();
|
||||
doFireJsonResultResponse(ctx, JsonResult.error(ctx.failure().getMessage()), 500);
|
||||
LOGGER.error("路由处理失败", ctx.failure());
|
||||
String msg = ctx.failure() != null ? ctx.failure().getMessage() : "未知异常";
|
||||
doFireJsonResultResponse(ctx, JsonResult.error(msg), 500);
|
||||
}
|
||||
});
|
||||
} else if (method.isAnnotationPresent(SockRouteMapper.class)) {
|
||||
@@ -198,7 +200,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
try {
|
||||
ReflectionUtil.invokeWithArguments(method, instance, sock);
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("WebSocket处理异常", e);
|
||||
}
|
||||
});
|
||||
if (url.endsWith("*")) {
|
||||
@@ -322,7 +324,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
parameterValueList.put(k, entity);
|
||||
}
|
||||
} catch (ClassNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("实体类绑定异常: {}", typeName, e);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -365,7 +367,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
Object entity = ParamUtil.multiMapToEntity(queryParams, aClass);
|
||||
parameterValueList.put(k, entity);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("参数绑定异常: {}", v.getRight().getName(), e);
|
||||
}
|
||||
} else if (parameterValueList.get(k) == null
|
||||
&& JsonObject.class.getName().equals(v.getRight().getName())) {
|
||||
@@ -408,22 +410,19 @@ public class RouterHandlerFactory implements BaseHttpApi {
|
||||
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 {
|
||||
doFireJsonResultResponse(ctx, JsonResult.data(data));
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
String err = e.getMessage();
|
||||
if (e.getCause() != null) {
|
||||
if (e.getCause() instanceof InvocationTargetException) {
|
||||
err = ((InvocationTargetException) e.getCause()).getTargetException().getMessage();
|
||||
} else {
|
||||
err = e.getCause().getMessage();
|
||||
}
|
||||
}
|
||||
doFireJsonResultResponse(ctx, JsonResult.error(err), 500);
|
||||
LOGGER.error("请求处理异常", e);
|
||||
String msg = e.getMessage() != null ? e.getMessage() : "服务器内部错误";
|
||||
doFireJsonResultResponse(ctx, JsonResult.error(msg), 500);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ public class CommonUtil {
|
||||
appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("读取app.properties失败", e);
|
||||
}
|
||||
}
|
||||
return appVersion;
|
||||
|
||||
@@ -10,6 +10,8 @@ import io.vertx.core.json.JsonObject;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
/**
|
||||
* 异步读取配置工具类
|
||||
@@ -62,12 +64,35 @@ public class ConfigUtil {
|
||||
// 异步获取配置
|
||||
// 成功直接完成 promise
|
||||
retriever.getConfig()
|
||||
.onSuccess(promise::complete)
|
||||
.onFailure(err -> {
|
||||
// 配置读取失败,直接返回失败 Future
|
||||
promise.fail(new RuntimeException(
|
||||
"读取配置文件失败: " + path, err));
|
||||
.onSuccess(config -> {
|
||||
promise.complete(config);
|
||||
retriever.close();
|
||||
})
|
||||
.onFailure(err -> {
|
||||
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(
|
||||
"读取配置文件失败: " + path, err));
|
||||
}
|
||||
});
|
||||
|
||||
return promise.future();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.qaiu.vx.core.util;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* vertx 上下文外的本地容器 为不在vertx线程的方法传递数据
|
||||
@@ -10,11 +10,10 @@ import java.util.Map;
|
||||
* @author <a href="https://qaiu.top">QAIU</a>
|
||||
*/
|
||||
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) {
|
||||
if (LOCAL_CONST.containsKey(k)) return LOCAL_CONST;
|
||||
LOCAL_CONST.put(k, v);
|
||||
LOCAL_CONST.putIfAbsent(k, v);
|
||||
return LOCAL_CONST;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,16 +36,20 @@ public final class ParamUtil {
|
||||
|
||||
public static MultiMap paramsToMap(String paramString) {
|
||||
MultiMap entries = MultiMap.caseInsensitiveMultiMap();
|
||||
if (paramString == null) return entries;
|
||||
if (paramString == null || paramString.isEmpty()) return entries;
|
||||
String[] params = paramString.split("&");
|
||||
if (params.length == 0) return entries;
|
||||
for (String param : params) {
|
||||
String[] kv = param.split("=");
|
||||
if (param == null || param.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
String[] kv = param.split("=", 2);
|
||||
if (kv.length == 2) {
|
||||
entries.set(kv[0], kv[1]);
|
||||
} else {
|
||||
} else if (kv.length == 1) {
|
||||
entries.set(kv[0], "");
|
||||
}
|
||||
// kv.length == 0 时(空字符串),跳过
|
||||
}
|
||||
return entries;
|
||||
}
|
||||
|
||||
@@ -25,6 +25,9 @@ import java.net.URL;
|
||||
import java.text.ParseException;
|
||||
import java.util.*;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
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 {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ReflectionUtil.class);
|
||||
|
||||
// 缓存Reflections实例,避免重复扫描(每次扫描约35K+值,耗时1-3秒,占用大量内存)
|
||||
private static final Map<String, Reflections> REFLECTIONS_CACHE = new java.util.concurrent.ConcurrentHashMap<>();
|
||||
|
||||
@@ -128,7 +133,7 @@ public final class ReflectionUtil {
|
||||
parameterTypes[j - k]));
|
||||
}
|
||||
} catch (NotFoundException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("获取方法参数失败", e);
|
||||
}
|
||||
return paramMap;
|
||||
}
|
||||
@@ -183,7 +188,7 @@ public final class ReflectionUtil {
|
||||
try {
|
||||
return DateUtils.parseDate(value, fmt);
|
||||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("日期解析失败: {}", value, e);
|
||||
throw new RuntimeException("无法将格式化日期");
|
||||
}
|
||||
default:
|
||||
@@ -215,7 +220,7 @@ public final class ReflectionUtil {
|
||||
}
|
||||
return arr;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("数组类型转换失败: {}", value, e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -241,7 +246,7 @@ public final class ReflectionUtil {
|
||||
public static boolean isBasicTypeArray(CtClass ctClass) {
|
||||
if (!ctClass.isArray()) {
|
||||
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)\\[]$"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -129,16 +129,25 @@ public class HttpProxyVerticle extends AbstractVerticle {
|
||||
clientRequest.response().setStatusCode(403).end();
|
||||
return;
|
||||
}
|
||||
String[] split = new String(Base64.getDecoder().decode(s.replace("Basic ", ""))).split(":");
|
||||
if (split.length > 1) {
|
||||
// TODO
|
||||
String username = proxyServerConf.getString("username");
|
||||
String password = proxyServerConf.getString("password");
|
||||
if (!split[0].equals(username) || !split[1].equals(password)) {
|
||||
LOGGER.info("-----auth failed------\nusername: {}\npassword: {}", username, password);
|
||||
clientRequest.response().setStatusCode(403).end();
|
||||
return;
|
||||
}
|
||||
String[] split;
|
||||
try {
|
||||
split = new String(Base64.getDecoder().decode(s.replace("Basic ", ""))).split(":");
|
||||
} catch (IllegalArgumentException e) {
|
||||
LOGGER.warn("Proxy-Authorization header is not valid Base64");
|
||||
clientRequest.response().setStatusCode(403).end();
|
||||
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 -> {
|
||||
err.printStackTrace();
|
||||
LOGGER.error("HTTP请求失败", err);
|
||||
clientRequest.response().setStatusCode(502).end("Bad Gateway: Request failed");
|
||||
});
|
||||
}
|
||||
@@ -213,7 +222,7 @@ public class HttpProxyVerticle extends AbstractVerticle {
|
||||
}
|
||||
return port;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("提取端口失败: {}", urlString, e);
|
||||
// 出现异常时返回 -1,表示提取失败
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public class PostExecVerticle extends AbstractVerticle {
|
||||
return;
|
||||
}
|
||||
LOGGER.info("PostExecVerticle 开始执行...");
|
||||
|
||||
|
||||
if (appRunImplementations != null && !appRunImplementations.isEmpty()) {
|
||||
appRunImplementations.forEach(appRun -> {
|
||||
try {
|
||||
@@ -61,7 +61,7 @@ public class PostExecVerticle extends AbstractVerticle {
|
||||
} else {
|
||||
LOGGER.info("未找到 AppRun 接口的实现类");
|
||||
}
|
||||
|
||||
|
||||
LOGGER.info("PostExecVerticle 执行完成");
|
||||
startPromise.complete();
|
||||
}
|
||||
|
||||
@@ -351,7 +351,7 @@ public class ReverseProxyVerticle extends AbstractVerticle {
|
||||
String host = url.getHost();
|
||||
int port = url.getPort();
|
||||
if (port == -1) {
|
||||
port = 80;
|
||||
port = 443;
|
||||
}
|
||||
String originPath = url.getPath();
|
||||
LOGGER.info("path {}, originPath {}, to {}:{}", path, originPath, host, port);
|
||||
|
||||
@@ -23,12 +23,11 @@ public class RouterVerticle extends AbstractVerticle {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(RouterVerticle.class);
|
||||
|
||||
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 HttpServer server;
|
||||
private Router router;
|
||||
|
||||
static {
|
||||
LOGGER.info(JacksonConfig.class.getSimpleName() + " >> ");
|
||||
@@ -61,6 +60,8 @@ public class RouterVerticle extends AbstractVerticle {
|
||||
.setReuseAddress(true) // 允许地址重用
|
||||
.setReusePort(true); // 允许端口重用
|
||||
|
||||
router = new RouterHandlerFactory(
|
||||
SharedDataUtil.getJsonStringForServerConfig("contextPath")).createRouter();
|
||||
server = vertx.createHttpServer(options);
|
||||
|
||||
server.requestHandler(router).webSocketHandler(s->{}).listen()
|
||||
|
||||
@@ -5,11 +5,15 @@ import cn.qaiu.vx.core.base.BaseAsyncService;
|
||||
import cn.qaiu.vx.core.util.ReflectionUtil;
|
||||
import io.vertx.core.AbstractVerticle;
|
||||
import io.vertx.core.Promise;
|
||||
import io.vertx.core.eventbus.MessageConsumer;
|
||||
import io.vertx.core.json.JsonObject;
|
||||
import io.vertx.serviceproxy.ServiceBinder;
|
||||
import org.reflections.Reflections;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@@ -24,6 +28,7 @@ public class ServiceVerticle extends AbstractVerticle {
|
||||
Logger LOGGER = LoggerFactory.getLogger(ServiceVerticle.class);
|
||||
private static final AtomicInteger ID = new AtomicInteger(1);
|
||||
private static final Set<Class<?>> handlers;
|
||||
private final List<MessageConsumer<JsonObject>> consumers = new ArrayList<>();
|
||||
|
||||
static {
|
||||
Reflections reflections = ReflectionUtil.getReflections();
|
||||
@@ -39,7 +44,10 @@ public class ServiceVerticle extends AbstractVerticle {
|
||||
try {
|
||||
serviceNames.append(asyncService.getName()).append("|");
|
||||
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) {
|
||||
LOGGER.error("Failed to register service: {}", asyncService.getName(), e);
|
||||
}
|
||||
@@ -49,4 +57,19 @@ public class ServiceVerticle extends AbstractVerticle {
|
||||
}
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ public class HttpProxyConf {
|
||||
public HttpProxyConf() {
|
||||
this.username = DEFAULT_USERNAME;
|
||||
this.password = DEFAULT_PASSWORD;
|
||||
this.timeout = DEFAULT_PORT;
|
||||
this.port = DEFAULT_PORT;
|
||||
this.timeout = DEFAULT_TIMEOUT;
|
||||
this.preProxyOptions = new ProxyOptions();
|
||||
}
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
app.version=${project.version}
|
||||
build=${build.timestamp}
|
||||
build=${maven.build.timestamp}
|
||||
|
||||
9
docker-entrypoint.sh
Normal file
9
docker-entrypoint.sh
Normal 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
|
||||
@@ -4,26 +4,26 @@ NFD 解析器模块:聚合各类网盘/分享页解析,统一输出文件列
|
||||
|
||||
- 语言:Java 17
|
||||
- 构建:Maven
|
||||
- 模块版本:10.1.17
|
||||
- 模块版本:10.2.5
|
||||
|
||||
## 依赖(Maven Central)
|
||||
```xml
|
||||
<dependency>
|
||||
<groupId>cn.qaiu</groupId>
|
||||
<artifactId>parser</artifactId>
|
||||
<version>10.1.17</version>
|
||||
<version>10.2.5</version>
|
||||
</dependency>
|
||||
```
|
||||
- Gradle Groovy DSL:
|
||||
```groovy
|
||||
dependencies {
|
||||
implementation 'cn.qaiu:parser:10.1.17'
|
||||
implementation 'cn.qaiu:parser:10.2.5'
|
||||
}
|
||||
```
|
||||
- Gradle Kotlin DSL:
|
||||
```kotlin
|
||||
dependencies {
|
||||
implementation("cn.qaiu:parser:10.1.17")
|
||||
implementation("cn.qaiu:parser:10.2.5")
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<dependency>
|
||||
<groupId>cn.qaiu</groupId>
|
||||
<artifactId>parser</artifactId>
|
||||
<version>10.1.17</version>
|
||||
<version>10.2.5</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<dependency>
|
||||
<groupId>cn.qaiu</groupId>
|
||||
<artifactId>parser</artifactId>
|
||||
<version>10.1.17</version>
|
||||
<version>10.2.5</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<groupId>cn.qaiu</groupId>
|
||||
<artifactId>parser</artifactId>
|
||||
<version>10.2.5</version>
|
||||
<version>${parserVersion}</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>cn.qaiu:parser</name>
|
||||
@@ -35,9 +35,9 @@
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://github.com/qaiu/netdisk-fast-download.git</connection>
|
||||
<developerConnection>scm:git:ssh://git@github.com:qaiu/netdisk-fast-download.git</developerConnection>
|
||||
<url>https://github.com/qaiu/netdisk-fast-download</url>
|
||||
<connection>scm:git:https://github.com/${github.owner}/${github.repo}.git</connection>
|
||||
<developerConnection>scm:git:ssh://git@github.com:${github.owner}/${github.repo}.git</developerConnection>
|
||||
<url>https://github.com/${github.owner}/${github.repo}</url>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -52,20 +52,19 @@
|
||||
</distributionManagement>
|
||||
|
||||
<properties>
|
||||
<revision>0.2.1</revision>
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<!-- Versions -->
|
||||
<vertx.version>4.5.24</vertx.version>
|
||||
<vertx.version>4.5.27</vertx.version>
|
||||
<org.reflections.version>0.10.2</org.reflections.version>
|
||||
<lombok.version>1.18.38</lombok.version>
|
||||
<slf4j.version>2.0.16</slf4j.version>
|
||||
<commons-lang3.version>3.18.0</commons-lang3.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>
|
||||
</properties>
|
||||
|
||||
@@ -124,6 +123,41 @@
|
||||
<build>
|
||||
<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>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
||||
@@ -86,7 +86,10 @@ public class ShareLinkInfo {
|
||||
// 将type和shareKey组合成一个字符串作为缓存key
|
||||
String key = type + ":" + shareKey;
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -40,28 +40,34 @@ public abstract class PanBase implements IPanTool {
|
||||
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());
|
||||
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);
|
||||
|
||||
/**
|
||||
* Http client 不自动跳转
|
||||
*/
|
||||
protected WebClient clientNoRedirects = WebClient.create(WebClientVertxInit.get(),
|
||||
new WebClientOptions().setFollowRedirects(false));
|
||||
protected WebClient clientNoRedirects = SHARED_CLIENT_NO_REDIRECTS;
|
||||
|
||||
/**
|
||||
* Http client disable UserAgent
|
||||
*/
|
||||
protected WebClient clientDisableUA = WebClient.create(WebClientVertxInit.get()
|
||||
, new WebClientOptions().setUserAgentEnabled(false)
|
||||
);
|
||||
protected WebClient clientDisableUA = SHARED_CLIENT_DISABLE_UA;
|
||||
|
||||
protected ShareLinkInfo shareLinkInfo;
|
||||
|
||||
|
||||
@@ -81,16 +81,16 @@ public class ParserCreate {
|
||||
if (shareKey != null) {
|
||||
shareLinkInfo.setShareKey(shareKey);
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
|
||||
} catch (IllegalStateException | IllegalArgumentException ignored) {}
|
||||
|
||||
// 提取密码
|
||||
try {
|
||||
String pwd = matcher.group("PWD");
|
||||
if (StringUtils.isNotEmpty(pwd)) {
|
||||
shareLinkInfo.setSharePassword(pwd);
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
|
||||
} catch (IllegalStateException | IllegalArgumentException ignored) {}
|
||||
|
||||
// 设置标准URL
|
||||
if (customParserConfig.getStandardUrlTemplate() != null) {
|
||||
String standardUrl = customParserConfig.getStandardUrlTemplate()
|
||||
@@ -133,7 +133,7 @@ public class ParserCreate {
|
||||
shareLinkInfo.setSharePassword(pwd);
|
||||
}
|
||||
standardUrl = standardUrl.replace("{pwd}", pwd);
|
||||
} catch (Exception ignored) {}
|
||||
} catch (IllegalStateException | IllegalArgumentException ignored) {}
|
||||
|
||||
shareLinkInfo.setShareUrl(shareUrl);
|
||||
shareLinkInfo.setShareKey(shareKey);
|
||||
@@ -266,15 +266,15 @@ public class ParserCreate {
|
||||
if (shareKey != null) {
|
||||
shareLinkInfo.setShareKey(shareKey);
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
|
||||
} catch (IllegalStateException | IllegalArgumentException ignored) {}
|
||||
|
||||
try {
|
||||
String password = matcher.group("PWD");
|
||||
if (password != null) {
|
||||
shareLinkInfo.setSharePassword(password);
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
|
||||
} catch (IllegalStateException | IllegalArgumentException ignored) {}
|
||||
|
||||
// 设置标准URL(如果有模板)
|
||||
if (customConfig.getStandardUrlTemplate() != null) {
|
||||
String standardUrl = customConfig.getStandardUrlTemplate()
|
||||
|
||||
@@ -61,7 +61,7 @@ public class 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.headers = MultiMap.caseInsensitiveMultiMap();
|
||||
// 设置默认的Accept-Encoding头以支持压缩响应
|
||||
@@ -534,8 +534,8 @@ public class JsHttpClient {
|
||||
} else {
|
||||
promise.fail(result.cause());
|
||||
}
|
||||
}).onFailure(Throwable::printStackTrace);
|
||||
|
||||
}).onFailure(e -> log.error("HTTP请求失败", e));
|
||||
|
||||
// 等待响应完成(使用配置的超时时间)
|
||||
HttpResponse<Buffer> response = promise.future().toCompletionStage()
|
||||
.toCompletableFuture()
|
||||
@@ -677,4 +677,13 @@ public class JsHttpClient {
|
||||
return buffer.length();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭 WebClient 释放连接池资源
|
||||
*/
|
||||
public void close() {
|
||||
if (client != null) {
|
||||
client.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,12 +29,13 @@ import java.util.stream.Collectors;
|
||||
* @author <a href="https://qaiu.top">QAIU</a>
|
||||
* 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 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 final CustomParserConfig config;
|
||||
@@ -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
|
||||
public Future<String> parse() {
|
||||
jsLogger.info("开始执行JavaScript解析器: {}", config.getType());
|
||||
|
||||
// 使用executeBlocking在工作线程上执行,避免阻塞EventLoop线程
|
||||
return EXECUTOR.executeBlocking(() -> {
|
||||
return getExecutor().executeBlocking(() -> {
|
||||
// 直接调用全局parse函数
|
||||
Object parseFunction = engine.get("parse");
|
||||
if (parseFunction == null) {
|
||||
@@ -173,7 +219,7 @@ public class JsParserExecutor implements IPanTool {
|
||||
} else {
|
||||
throw new RuntimeException("parse函数类型错误");
|
||||
}
|
||||
});
|
||||
}).onComplete(ar -> close());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -181,7 +227,7 @@ public class JsParserExecutor implements IPanTool {
|
||||
jsLogger.info("开始执行JavaScript文件列表解析: {}", config.getType());
|
||||
|
||||
// 使用executeBlocking在工作线程上执行,避免阻塞EventLoop线程
|
||||
return EXECUTOR.executeBlocking(() -> {
|
||||
return getExecutor().executeBlocking(() -> {
|
||||
// 直接调用全局parseFileList函数
|
||||
Object parseFileListFunction = engine.get("parseFileList");
|
||||
if (parseFileListFunction == null) {
|
||||
@@ -206,7 +252,7 @@ public class JsParserExecutor implements IPanTool {
|
||||
} else {
|
||||
throw new RuntimeException("parseFileList函数类型错误");
|
||||
}
|
||||
});
|
||||
}).onComplete(ar -> close());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -214,7 +260,7 @@ public class JsParserExecutor implements IPanTool {
|
||||
jsLogger.info("开始执行JavaScript按ID解析: {}", config.getType());
|
||||
|
||||
// 使用executeBlocking在工作线程上执行,避免阻塞EventLoop线程
|
||||
return EXECUTOR.executeBlocking(() -> {
|
||||
return getExecutor().executeBlocking(() -> {
|
||||
// 直接调用全局parseById函数
|
||||
Object parseByIdFunction = engine.get("parseById");
|
||||
if (parseByIdFunction == null) {
|
||||
@@ -237,7 +283,7 @@ public class JsParserExecutor implements IPanTool {
|
||||
} else {
|
||||
throw new RuntimeException("parseById函数类型错误");
|
||||
}
|
||||
});
|
||||
}).onComplete(ar -> close());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -355,7 +355,7 @@ public class JsPlaygroundExecutor {
|
||||
*/
|
||||
public List<JsPlaygroundLogger.LogEntry> getLogs() {
|
||||
List<JsPlaygroundLogger.LogEntry> logs = playgroundLogger.getLogs();
|
||||
System.out.println("[JsPlaygroundExecutor] 获取日志,数量: " + logs.size());
|
||||
log.debug("获取日志,数量: {}", logs.size());
|
||||
return logs;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,9 @@ import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* 演练场日志收集器
|
||||
* 收集JavaScript执行过程中的日志信息
|
||||
@@ -12,8 +15,11 @@ import java.util.List;
|
||||
* @author <a href="https://qaiu.top">QAIU</a>
|
||||
*/
|
||||
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<>());
|
||||
|
||||
/**
|
||||
@@ -59,6 +65,18 @@ public class JsPlaygroundLogger {
|
||||
return obj.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加日志条目,超过最大容量时移除最早的条目
|
||||
*/
|
||||
private void addLog(LogEntry entry) {
|
||||
synchronized (logs) {
|
||||
if (logs.size() >= MAX_LOG_SIZE) {
|
||||
logs.remove(0);
|
||||
}
|
||||
logs.add(entry);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录日志(内部方法)
|
||||
* @param level 日志级别
|
||||
@@ -67,8 +85,8 @@ public class JsPlaygroundLogger {
|
||||
*/
|
||||
private void log(String level, Object message, String source) {
|
||||
String msg = toString(message);
|
||||
logs.add(new LogEntry(level, msg, source));
|
||||
System.out.println("[" + source + "PlaygroundLogger] " + level + ": " + msg);
|
||||
addLog(new LogEntry(level, msg, source));
|
||||
log.debug("[{}PlaygroundLogger] {}: {}", source, level, msg);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -111,8 +129,8 @@ public class JsPlaygroundLogger {
|
||||
if (throwable != null) {
|
||||
msg = msg + ": " + throwable.getMessage();
|
||||
}
|
||||
logs.add(new LogEntry("ERROR", msg, "JS"));
|
||||
System.out.println("[JSPlaygroundLogger] ERROR: " + msg);
|
||||
addLog(new LogEntry("ERROR", msg, "JS"));
|
||||
log.debug("[JSPlaygroundLogger] ERROR: {}", msg);
|
||||
}
|
||||
|
||||
// ===== 以下是供Java层调用的内部方法 =====
|
||||
@@ -153,8 +171,8 @@ public class JsPlaygroundLogger {
|
||||
if (throwable != null) {
|
||||
msg = msg + ": " + throwable.getMessage();
|
||||
}
|
||||
logs.add(new LogEntry("ERROR", msg, "JAVA"));
|
||||
System.out.println("[JAVAPlaygroundLogger] ERROR: " + msg);
|
||||
addLog(new LogEntry("ERROR", msg, "JAVA"));
|
||||
log.debug("[JAVAPlaygroundLogger] ERROR: {}", msg);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -139,21 +139,20 @@ public class JsScriptLoader {
|
||||
|
||||
try {
|
||||
String jarPath = jarUrl.getPath().substring(5, jarUrl.getPath().indexOf("!"));
|
||||
JarFile jarFile = new JarFile(jarPath);
|
||||
|
||||
Enumeration<JarEntry> entries = jarFile.entries();
|
||||
while (entries.hasMoreElements()) {
|
||||
JarEntry entry = entries.nextElement();
|
||||
String entryName = entry.getName();
|
||||
|
||||
if (entryName.startsWith(RESOURCE_PATH + "/") &&
|
||||
entryName.endsWith(".js") &&
|
||||
!isExcludedFile(entryName.substring(entryName.lastIndexOf('/') + 1))) {
|
||||
resourceFiles.add(entryName);
|
||||
|
||||
try (JarFile jarFile = new JarFile(jarPath)) {
|
||||
Enumeration<JarEntry> entries = jarFile.entries();
|
||||
while (entries.hasMoreElements()) {
|
||||
JarEntry entry = entries.nextElement();
|
||||
String entryName = entry.getName();
|
||||
|
||||
if (entryName.startsWith(RESOURCE_PATH + "/") &&
|
||||
entryName.endsWith(".js") &&
|
||||
!isExcludedFile(entryName.substring(entryName.lastIndexOf('/') + 1))) {
|
||||
resourceFiles.add(entryName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jarFile.close();
|
||||
} catch (Exception e) {
|
||||
log.debug("解析JAR包资源文件失败", e);
|
||||
}
|
||||
|
||||
@@ -109,9 +109,9 @@ public class FjTool extends PanBase {
|
||||
|
||||
// String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
|
||||
|
||||
static String token = null;
|
||||
static String userId = null;
|
||||
public static boolean authFlag = true;
|
||||
static volatile String token = null;
|
||||
static volatile String userId = null;
|
||||
public static volatile boolean authFlag = true;
|
||||
|
||||
public FjTool(ShareLinkInfo shareLinkInfo) {
|
||||
super(shareLinkInfo);
|
||||
@@ -289,12 +289,14 @@ public class FjTool extends PanBase {
|
||||
JsonObject json = asJson(res2);
|
||||
if (json.getInteger("code") == 200) {
|
||||
token = json.getJsonObject("data").getString("appToken");
|
||||
header0.set("appToken", token);
|
||||
log.info("登录成功 token: {}", token);
|
||||
MultiMap h0 = MultiMap.caseInsensitiveMultiMap();
|
||||
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))
|
||||
.setTemplateParam("uuid", uuid)
|
||||
.setTemplateParam("ts", tsEncode2)
|
||||
.putHeaders(header0).send().onSuccess(res -> {
|
||||
.putHeaders(h0).send().onSuccess(res -> {
|
||||
if (asJson(res).getInteger("code") == 200) {
|
||||
if (FjTool.userId == null) {
|
||||
FjTool.userId = asJson(res).getJsonObject("map").getString("userId");
|
||||
@@ -454,7 +456,10 @@ public class FjTool extends PanBase {
|
||||
// 如果参数里的目录ID不为空,则直接解析目录
|
||||
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
|
||||
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);
|
||||
return promise0.future();
|
||||
}
|
||||
@@ -495,7 +500,7 @@ public class FjTool extends PanBase {
|
||||
JsonArray list;
|
||||
try {
|
||||
JsonObject jsonObject = asJson(res);
|
||||
System.out.println(jsonObject.encodePrettily());
|
||||
log.debug("目录列表: {}", jsonObject.encodePrettily());
|
||||
list = jsonObject.getJsonArray("list");
|
||||
} catch (Exception e) {
|
||||
log.error("解析目录失败: {}", res.bodyAsString());
|
||||
@@ -576,6 +581,10 @@ public class FjTool extends PanBase {
|
||||
|
||||
// 第二次请求
|
||||
JsonObject paramJson = (JsonObject)shareLinkInfo.getOtherParam().get("paramJson");
|
||||
if (paramJson == null) {
|
||||
promise.fail("缺少 paramJson 参数");
|
||||
return promise.future();
|
||||
}
|
||||
clientNoRedirects.getAbs(UriTemplate.of(SECOND_REQUEST_URL_VIP))
|
||||
.setTemplateParam("fidEncode", paramJson.getString("fidEncode"))
|
||||
.setTemplateParam("uuid", paramJson.getString("uuid"))
|
||||
|
||||
@@ -389,6 +389,10 @@ public class FsTool extends PanBase {
|
||||
|
||||
try {
|
||||
JsonObject paramJson = (JsonObject) shareLinkInfo.getOtherParam().get("paramJson");
|
||||
if (paramJson == null) {
|
||||
parsePromise.fail("缺少 paramJson 参数");
|
||||
return parsePromise.future();
|
||||
}
|
||||
String shareUrl = paramJson.getString("shareUrl");
|
||||
String objToken = paramJson.getString("objToken");
|
||||
String tenant = extractTenant(shareUrl);
|
||||
@@ -444,7 +448,7 @@ public class FsTool extends PanBase {
|
||||
if (m1.find()) {
|
||||
try {
|
||||
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()) {
|
||||
try {
|
||||
return URLDecoder.decode(m2.group(1).trim(), StandardCharsets.UTF_8);
|
||||
} catch (Exception ignored) {
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -89,8 +89,8 @@ public class IzTool extends PanBase {
|
||||
|
||||
String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
|
||||
|
||||
public static String token = null;
|
||||
public static boolean authFlag = true;
|
||||
public static volatile String token = null;
|
||||
public static volatile boolean authFlag = true;
|
||||
|
||||
public Future<String> parse() {
|
||||
|
||||
@@ -101,8 +101,8 @@ public class IzTool extends PanBase {
|
||||
// 检查并输出认证状态
|
||||
if (shareLinkInfo.getOtherParam().containsKey("auths")) {
|
||||
boolean isTempAuth = shareLinkInfo.getOtherParam().containsKey("__TEMP_AUTH_ADDED");
|
||||
log.info("文件解析检测到认证信息: isTempAuth={}, authFlag={}, token={}",
|
||||
isTempAuth, authFlag, token != null ? "已登录(" + token.substring(0, Math.min(10, token.length())) + "...)" : "未登录");
|
||||
log.info("文件解析检测到认证信息: isTempAuth={}, authFlag={}, token={}",
|
||||
isTempAuth, authFlag, token != null ? "已登录(" + token.substring(0, Math.min(8, token.length())) + "...)" : "未登录");
|
||||
|
||||
// 如果需要认证但还没有token,先执行登录
|
||||
if ((isTempAuth || authFlag) && token == null) {
|
||||
@@ -118,7 +118,7 @@ public class IzTool extends PanBase {
|
||||
// 登录失败,继续使用免登录模式
|
||||
});
|
||||
} 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 {
|
||||
log.debug("文件解析无认证信息,使用免登录模式");
|
||||
@@ -247,7 +247,7 @@ public class IzTool extends PanBase {
|
||||
log.warn("登录失败: {}", failRes.getMessage());
|
||||
fail(failRes.getMessage());
|
||||
}).onSuccess(r-> {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
});
|
||||
@@ -263,12 +263,12 @@ public class IzTool extends PanBase {
|
||||
log.warn("重新登录失败: {}", failRes.getMessage());
|
||||
fail(failRes.getMessage());
|
||||
}).onSuccess(r-> {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
});
|
||||
} else {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
}
|
||||
@@ -311,8 +311,7 @@ public class IzTool extends PanBase {
|
||||
JsonObject json = asJson(res2);
|
||||
if (json.getInteger("code") == 200) {
|
||||
token = json.getJsonObject("data").getString("appToken");
|
||||
header.set("appToken", token);
|
||||
log.info("登录成功 token: {}", token);
|
||||
log.info("登录成功 token: {}...", token != null ? token.substring(0, Math.min(8, token.length())) : "null");
|
||||
promise1.complete();
|
||||
} else {
|
||||
// 检查是否为临时认证
|
||||
@@ -463,7 +462,10 @@ public class IzTool extends PanBase {
|
||||
// 如果参数里的目录ID不为空,则直接解析目录
|
||||
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
|
||||
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);
|
||||
return promise.future();
|
||||
}
|
||||
|
||||
@@ -88,8 +88,8 @@ public class IzToolWithAuth extends PanBase {
|
||||
|
||||
String uuid = UUID.randomUUID().toString().toLowerCase(); // 也可以使用 UUID.randomUUID().toString()
|
||||
|
||||
public static String token = null;
|
||||
public static boolean authFlag = true;
|
||||
public static volatile String token = null;
|
||||
public static volatile boolean authFlag = true;
|
||||
|
||||
public Future<String> parse() {
|
||||
|
||||
@@ -216,7 +216,7 @@ public class IzToolWithAuth extends PanBase {
|
||||
log.warn("登录失败: {}", failRes.getMessage());
|
||||
fail(failRes.getMessage());
|
||||
}).onSuccess(r-> {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
});
|
||||
@@ -232,12 +232,12 @@ public class IzToolWithAuth extends PanBase {
|
||||
log.warn("重新登录失败: {}", failRes.getMessage());
|
||||
fail(failRes.getMessage());
|
||||
}).onSuccess(r-> {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
});
|
||||
} else {
|
||||
httpRequest.setTemplateParam("appToken", header.get("appToken"))
|
||||
httpRequest.setTemplateParam("appToken", token)
|
||||
.putHeaders(header);
|
||||
httpRequest.send().onSuccess(this::down).onFailure(handleFail("请求2"));
|
||||
}
|
||||
@@ -280,8 +280,7 @@ public class IzToolWithAuth extends PanBase {
|
||||
JsonObject json = asJson(res2);
|
||||
if (json.getInteger("code") == 200) {
|
||||
token = json.getJsonObject("data").getString("appToken");
|
||||
header.set("appToken", token);
|
||||
log.info("登录成功 token: {}", token);
|
||||
log.info("登录成功 token: {}...", token != null ? token.substring(0, Math.min(8, token.length())) : "null");
|
||||
promise1.complete();
|
||||
} else {
|
||||
// 检查是否为临时认证
|
||||
@@ -432,7 +431,8 @@ public class IzToolWithAuth extends PanBase {
|
||||
// 如果参数里的目录ID不为空,则直接解析目录
|
||||
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");
|
||||
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);
|
||||
return promise.future();
|
||||
}
|
||||
@@ -480,7 +480,7 @@ public class IzToolWithAuth extends PanBase {
|
||||
requestDirList(id, shareId, tsEncode, promise);
|
||||
})
|
||||
.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);
|
||||
});
|
||||
return;
|
||||
@@ -627,7 +627,7 @@ public class IzToolWithAuth extends PanBase {
|
||||
|
||||
// 如果有 token,使用 VIP 接口
|
||||
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))
|
||||
.putHeaders(header)
|
||||
.setTemplateParam("fidEncode", paramJson.getString("fidEncode"))
|
||||
|
||||
@@ -14,6 +14,7 @@ import io.vertx.ext.web.client.WebClientSession;
|
||||
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
|
||||
|
||||
import javax.script.ScriptException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -81,8 +82,8 @@ public class LzTool extends PanBase {
|
||||
}
|
||||
|
||||
private void doParser(String html, String pwd, String sUrl) {
|
||||
// 检测是否为目录分享链接 (含 /s/、/b/ 路径段或 b0 开头的路径段)
|
||||
if (sUrl.matches(".*/(s|b)/[^/]+.*") || sUrl.matches(".*/b0[^/]+.*")) {
|
||||
// 检测是否为目录分享链接 (含 /s/、/b/ 路径段或 b 开头的路径段)
|
||||
if (sUrl.matches(".*/(s|b)/[^/]+.*") || sUrl.matches(".*/b[^/]+.*")) {
|
||||
fail("该链接为蓝奏云目录分享,请使用目录解析接口");
|
||||
return;
|
||||
}
|
||||
@@ -107,7 +108,7 @@ public class LzTool extends PanBase {
|
||||
try {
|
||||
setFileInfo(html, shareLinkInfo);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.error("文件信息解析异常", e);
|
||||
}
|
||||
// 匹配iframe
|
||||
Pattern compile = Pattern.compile("src=\"(/fn\\?[a-zA-Z\\d_+/=]{16,})\"");
|
||||
@@ -175,7 +176,7 @@ public class LzTool extends PanBase {
|
||||
if (firstDot >= 0) {
|
||||
domain = host.substring(firstDot); // e.g. ".lanzoum.com"
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
} catch (MalformedURLException ignored) {}
|
||||
// 创建一个 Cookie 并放入 CookieStore
|
||||
DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
|
||||
nettyCookie.setDomain(domain);
|
||||
@@ -217,7 +218,7 @@ public class LzTool extends PanBase {
|
||||
return;
|
||||
}
|
||||
Map<?, ?> signMap = (Map<?, ?>)obj.get("data");
|
||||
String url0 = obj.get("url").toString();
|
||||
String url0 = String.valueOf(obj.get("url"));
|
||||
MultiMap map = MultiMap.caseInsensitiveMultiMap();
|
||||
signMap.forEach((k, v) -> {
|
||||
map.add((String) k, v.toString());
|
||||
@@ -275,7 +276,7 @@ public class LzTool extends PanBase {
|
||||
String h = du.getHost();
|
||||
int dot = h.indexOf('.');
|
||||
if (dot >= 0) downDomain = h.substring(dot);
|
||||
} catch (Exception ignored) {}
|
||||
} catch (MalformedURLException ignored) {}
|
||||
// 创建一个 Cookie 并放入 CookieStore
|
||||
DefaultCookie nettyCookie = new DefaultCookie("acw_sc__v2", acw_sc__v2);
|
||||
nettyCookie.setDomain(downDomain);
|
||||
@@ -290,12 +291,12 @@ public class LzTool extends PanBase {
|
||||
if (location0 == null) {
|
||||
fail(downUrl + " -> 直链获取失败2, 可能分享已失效");
|
||||
} else {
|
||||
setDateAndComplate(location0);
|
||||
setDateAndComplete(location0);
|
||||
}
|
||||
}).onFailure(handleFail(downUrl));
|
||||
return;
|
||||
}
|
||||
setDateAndComplate(location);
|
||||
setDateAndComplete(location);
|
||||
})
|
||||
.onFailure(handleFail(downUrl));
|
||||
} catch (Exception e) {
|
||||
@@ -304,7 +305,7 @@ public class LzTool extends PanBase {
|
||||
}).onFailure(handleFail(url));
|
||||
}
|
||||
|
||||
private void setDateAndComplate(String location0) {
|
||||
private void setDateAndComplete(String location0) {
|
||||
// 分享时间 提取url中的时间戳格式:lanzoui.com/abc/abc/yyyy/mm/dd/
|
||||
String regex = "(\\d{4}/\\d{1,2}/\\d{1,2})";
|
||||
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) {
|
||||
// 检测是否为文件分享链接 (不含 /s/、/b/ 路径段且不含 b0 开头的路径段)
|
||||
if (!sUrl.matches(".*/(s|b)/[^/]+.*") && !sUrl.matches(".*/b0[^/]+.*")) {
|
||||
// 检测是否为文件分享链接 (不含 /s/、/b/ 路径段且不含 b 开头的路径段)
|
||||
if (!sUrl.matches(".*/(s|b)/[^/]+.*") && !sUrl.matches(".*/b[^/]+.*")) {
|
||||
promise.fail(baseMsg() + "该链接为蓝奏云文件分享,请使用文件解析接口");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -86,10 +86,10 @@ public class MkgsTool extends PanBase {
|
||||
// 查找并输出 hash 字段的值
|
||||
if (matcher.find()) {
|
||||
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 -> {
|
||||
JsonObject jsonObject = asJson(res3);
|
||||
System.out.println(jsonObject.encodePrettily());
|
||||
log.debug("API response: {}", jsonObject.encodePrettily());
|
||||
if (jsonObject.containsKey("url")) {
|
||||
promise.complete(jsonObject.getString("url"));
|
||||
} else {
|
||||
|
||||
@@ -29,19 +29,19 @@ public class MkwTool extends PanBase {
|
||||
clientSession.getAbs(shareUrl).send().onSuccess(result -> {
|
||||
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]+)";
|
||||
Pattern pattern = Pattern.compile(regex);
|
||||
Matcher matcher = pattern.matcher(cookie);
|
||||
if (matcher.find()) {
|
||||
System.out.println(matcher.group(1));
|
||||
System.out.println(matcher.group(2));
|
||||
log.debug("cookie key: {}", matcher.group(1));
|
||||
log.debug("cookie value: {}", matcher.group(2));
|
||||
|
||||
var key = matcher.group(1);
|
||||
var token = matcher.group(2);
|
||||
String sign = JsExecUtils.getKwSign(token, key);
|
||||
System.out.println(sign);
|
||||
log.debug("sign: {}", sign);
|
||||
clientSession.getAbs(UriTemplate.of(API_URL)).setTemplateParam("mid", shareLinkInfo.getShareKey())
|
||||
.putHeader("Secret", sign).send().onSuccess(res -> {
|
||||
JsonObject json = asJson(res);
|
||||
@@ -54,7 +54,7 @@ public class MkwTool extends PanBase {
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.error("解析失败", e);
|
||||
fail("解析失败");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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 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;
|
||||
|
||||
static {
|
||||
@@ -49,9 +51,11 @@ public class P115Tool extends PanBase {
|
||||
|
||||
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))
|
||||
.putHeaders(header)
|
||||
.putHeader("User-Agent", shareLinkInfo.getOtherParam().get("UA").toString())
|
||||
.putHeader("User-Agent", ua)
|
||||
.setTemplateParam("dataKey", shareLinkInfo.getShareKey())
|
||||
.setTemplateParam("dataPwd", shareLinkInfo.getSharePassword())
|
||||
.send().onSuccess(res -> {
|
||||
@@ -68,7 +72,7 @@ public class P115Tool extends PanBase {
|
||||
// share_code={dataKey}&receive_code={dataPwd}&file_id={file_id}
|
||||
client.postAbs(SECOND_REQUEST_URL)
|
||||
.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()
|
||||
.set("share_code", shareLinkInfo.getShareKey())
|
||||
.set("receive_code", shareLinkInfo.getSharePassword())
|
||||
|
||||
@@ -85,7 +85,7 @@ public class PdbTool extends PanBase implements IPanTool {
|
||||
})
|
||||
.onFailure(handleFail());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.error("URL编码异常", e);
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@@ -129,7 +129,7 @@ public class PodTool extends PanBase {
|
||||
|
||||
if (urlMatcher.find()) {
|
||||
String url = urlMatcher.group("url");
|
||||
System.out.println("URL: " + url);
|
||||
log.debug("URL: {}", url);
|
||||
return url;
|
||||
}
|
||||
throw new RuntimeException("URL匹配失败");
|
||||
@@ -172,7 +172,7 @@ public class PodTool extends PanBase {
|
||||
|
||||
if (tokenMatcher.find()) {
|
||||
String token = tokenMatcher.group(1);
|
||||
System.out.println("Token: " + token);
|
||||
log.debug("Token: {}***", token.length() > 4 ? token.substring(0, 4) : "***");
|
||||
return token;
|
||||
}
|
||||
throw new RuntimeException("token匹配失败");
|
||||
@@ -198,8 +198,8 @@ public class PodTool extends PanBase {
|
||||
// 发送请求并处理响应
|
||||
client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
|
||||
.thenApply(response -> {
|
||||
System.out.println("Response Status Code: " + response.statusCode());
|
||||
System.out.println("Response Body: " + response.body());
|
||||
log.debug("Response Status Code: {}", response.statusCode());
|
||||
log.debug("Response Body: {}", response.body());
|
||||
promise.complete(response.body());
|
||||
return null;
|
||||
});
|
||||
|
||||
@@ -74,9 +74,9 @@ public class QQTool extends PanBase {
|
||||
});
|
||||
|
||||
// 调试匹配的情况
|
||||
System.out.println("文件名称: " + filename);
|
||||
System.out.println("文件大小: " + filesize);
|
||||
System.out.println("文件直链: " + fileurl);
|
||||
log.debug("文件名称: {}", filename);
|
||||
log.debug("文件大小: {}", filesize);
|
||||
log.debug("文件直链: {}", fileurl);
|
||||
|
||||
// 提交
|
||||
promise.complete(fileurl.replace("\\x26", "&"));
|
||||
|
||||
@@ -3,9 +3,11 @@ package cn.qaiu.parser.impl;
|
||||
import cn.qaiu.entity.FileInfo;
|
||||
import cn.qaiu.entity.ShareLinkInfo;
|
||||
import cn.qaiu.parser.PanBase;
|
||||
import cn.qaiu.util.CommonUtils;
|
||||
import cn.qaiu.util.HeaderUtils;
|
||||
import io.vertx.core.Future;
|
||||
import io.vertx.core.MultiMap;
|
||||
import io.vertx.core.Promise;
|
||||
import io.vertx.core.json.JsonArray;
|
||||
import io.vertx.core.json.JsonObject;
|
||||
import org.slf4j.Logger;
|
||||
@@ -13,27 +15,33 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* 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 {
|
||||
|
||||
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-Language: zh-CN,zh;q=0.9
|
||||
Connection: keep-alive
|
||||
Cookie: uin=9000002; p_uin=9000002
|
||||
DNT: 1
|
||||
Origin: https://qfile.qq.com
|
||||
Referer: https://qfile.qq.com/q/Xolxtv5b4O
|
||||
Sec-Fetch-Dest: empty
|
||||
Sec-Fetch-Mode: cors
|
||||
Sec-Fetch-Site: same-origin
|
||||
@@ -46,86 +54,257 @@ public class QQscTool extends PanBase {
|
||||
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) {
|
||||
super(shareLinkInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
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 -> {
|
||||
if (result.succeeded()) {
|
||||
String htmlJs = result.result().bodyAsString();
|
||||
LOG.debug("获取到的HTML内容: {}", htmlJs);
|
||||
String fileUUID = getFileUUID(htmlJs);
|
||||
String fileName = extractFileNameFromTitle(htmlJs);
|
||||
if (fileName != null) {
|
||||
LOG.info("提取到的文件名: {}", fileName);
|
||||
FileInfo fileInfo = new FileInfo();
|
||||
fileInfo.setFileName(fileName);
|
||||
shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
|
||||
} else {
|
||||
LOG.warn("未能提取到文件名");
|
||||
}
|
||||
if (fileUUID != null) {
|
||||
LOG.info("提取到的文件UUID: {}", fileUUID);
|
||||
String formatted = jsonTemplate.formatted(fileUUID, fileUUID);
|
||||
JsonObject entries = new JsonObject(formatted);
|
||||
client.postAbs(API_URL)
|
||||
.putHeaders(HEADERS)
|
||||
.sendJsonObject(entries)
|
||||
.onSuccess(result2 -> {
|
||||
if (result2.statusCode() == 200) {
|
||||
JsonObject body = asJson(result2);
|
||||
LOG.debug("API响应内容: {}", body.encodePrettily());
|
||||
// {
|
||||
// "retcode": 0,
|
||||
// "cost": 132,
|
||||
// "message": "",
|
||||
// "error": {
|
||||
// "message": "",
|
||||
// "code": 0
|
||||
// },
|
||||
// "data": {
|
||||
// "download_rsp": [{
|
||||
|
||||
// 取 download_rsp
|
||||
if (!body.containsKey("retcode") || body.getInteger("retcode") != 0) {
|
||||
promise.fail("API请求失败,错误信息: " + body.encodePrettily());
|
||||
return;
|
||||
}
|
||||
JsonArray downloadRsp = body.getJsonObject("data").getJsonArray("download_rsp");
|
||||
if (downloadRsp != null && !downloadRsp.isEmpty()) {
|
||||
String url = downloadRsp.getJsonObject(0).getString("url");
|
||||
if (fileName != null) {
|
||||
url = url + "&filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8);
|
||||
}
|
||||
promise.complete(url);
|
||||
} else {
|
||||
promise.fail("API响应中缺少 download_rsp");
|
||||
}
|
||||
} else {
|
||||
promise.fail("API请求失败,状态码: " + result2.statusCode());
|
||||
}
|
||||
}).onFailure(e -> {
|
||||
LOG.error("API请求异常", e);
|
||||
promise.fail(e);
|
||||
});
|
||||
} else {
|
||||
LOG.error("未能提取到文件UUID");
|
||||
promise.fail("未能提取到文件UUID");
|
||||
}
|
||||
} else {
|
||||
if (result.failed()) {
|
||||
LOG.error("请求失败: {}", result.cause().getMessage());
|
||||
promise.fail(result.cause());
|
||||
return;
|
||||
}
|
||||
String html = result.result().bodyAsString();
|
||||
String fileName = extractFileNameFromTitle(html);
|
||||
if (fileName != null) {
|
||||
FileInfo fileInfo = new FileInfo();
|
||||
fileInfo.setFileName(fileName);
|
||||
shareLinkInfo.getOtherParam().put("fileInfo", fileInfo);
|
||||
}
|
||||
// 尝试用 GetFileList API 获取第一个文件的下载链接
|
||||
String filesetId = extractFilesetId(html);
|
||||
if (filesetId != null) {
|
||||
fetchFileList(filesetId, "").onSuccess(fileList -> {
|
||||
for (int i = 0; i < fileList.size(); i++) {
|
||||
JsonObject file = fileList.getJsonObject(i);
|
||||
if (!file.getBoolean("is_dir", false)) {
|
||||
String physicalId = file.getJsonObject("physical").getString("id");
|
||||
String name = file.getString("name");
|
||||
downloadFile(physicalId, name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
promise.fail("未找到可下载的文件");
|
||||
}).onFailure(e -> {
|
||||
LOG.warn("GetFileList 失败,回退到旧解析方式: {}", e.getMessage());
|
||||
parseLegacy(html, fileName);
|
||||
});
|
||||
} else {
|
||||
parseLegacy(html, fileName);
|
||||
}
|
||||
});
|
||||
|
||||
return promise.future();
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
String url = downloadRsp.getJsonObject(0).getString("url");
|
||||
if (url != null && url.startsWith("&filename=")) {
|
||||
p.fail("该文件已被和谐");
|
||||
return;
|
||||
}
|
||||
if (fileName != null) {
|
||||
url = url + "&filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8);
|
||||
}
|
||||
p.complete(url);
|
||||
})
|
||||
.onFailure(e -> {
|
||||
LOG.error("BatchDownload 请求异常", e);
|
||||
p.fail(e);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 调用 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 keyword = "\"download_limit_status\"";
|
||||
String marker = "},\"";
|
||||
@@ -140,32 +319,23 @@ public class QQscTool extends PanBase {
|
||||
String extracted = htmlJs.substring(quoteStart, quoteEnd);
|
||||
LOG.debug("提取结果: {}", extracted);
|
||||
return extracted;
|
||||
} else {
|
||||
LOG.error("未找到结束引号: {}", marker);
|
||||
}
|
||||
} else {
|
||||
LOG.error("未找到标记: {} 在关键字: {} 之后", marker, keyword);
|
||||
}
|
||||
} else {
|
||||
LOG.error("未找到关键字: {}", keyword);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String extractFileNameFromTitle(String content) {
|
||||
// 匹配<title>和</title>之间的内容
|
||||
Pattern pattern = Pattern.compile("<title>(.*?)</title>");
|
||||
Matcher matcher = pattern.matcher(content);
|
||||
if (matcher.find()) {
|
||||
String fullTitle = matcher.group(1);
|
||||
// 按 "|" 分割,取前半部分
|
||||
int sepIndex = fullTitle.indexOf("|");
|
||||
if (sepIndex != -1) {
|
||||
return fullTitle.substring(0, sepIndex);
|
||||
}
|
||||
return fullTitle; // 如果没有分隔符,就返回全部
|
||||
return fullTitle;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,10 +3,11 @@ package cn.qaiu.parser.impl;
|
||||
import cn.qaiu.entity.FileInfo;
|
||||
import cn.qaiu.entity.ShareLinkInfo;
|
||||
import io.vertx.core.Future;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import io.vertx.core.buffer.Buffer;
|
||||
import io.vertx.core.json.JsonObject;
|
||||
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public class QQwTool extends QQTool {
|
||||
|
||||
@@ -16,54 +17,51 @@ public class QQwTool extends QQTool {
|
||||
|
||||
@Override
|
||||
public Future<String> parse() {
|
||||
client.getAbs(shareLinkInfo.getShareUrl()).send().onSuccess(res -> {
|
||||
String html = res.bodyAsString();
|
||||
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);
|
||||
String k = shareLinkInfo.getShareKey();
|
||||
String postBody = "f=json&k=" + URLEncoder.encode(k, StandardCharsets.UTF_8);
|
||||
|
||||
/*
|
||||
clientNoRedirects.getAbs(url302).send().onSuccess(res2 -> {
|
||||
MultiMap headers = res2.headers();
|
||||
if (headers.contains("Location")) {
|
||||
promise.complete(headers.get("Location"));
|
||||
} else {
|
||||
fail("找不到重定向URL");
|
||||
client.postAbs("https://wx.mail.qq.com/s")
|
||||
.putHeader("Content-Type", "application/x-www-form-urlencoded")
|
||||
.putHeader("Accept", "application/json, text/plain, */*")
|
||||
.putHeader("Referer", shareLinkInfo.getShareUrl())
|
||||
.putHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
|
||||
+ "(KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36 Edg/134.0.0.0")
|
||||
.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;
|
||||
}
|
||||
|
||||
JsonObject body = data.getJsonObject("body");
|
||||
if (body == null) {
|
||||
fail("文件信息为空");
|
||||
return;
|
||||
}
|
||||
|
||||
String url = body.getString("url");
|
||||
String fn = body.getString("name", "");
|
||||
long size = body.getLong("size", 0L);
|
||||
|
||||
if (url == null || url.isEmpty()) {
|
||||
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());
|
||||
*/
|
||||
} else {
|
||||
fail("分享链接解析失败, 可能是链接失效");
|
||||
}
|
||||
}).onFailure(handleFail());
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,11 +67,7 @@ public class WsTool extends PanBase {
|
||||
String filepid = asJson(res2).getJsonObject("data").getString("ufileid"); // 文件夹pid
|
||||
String filebid = asJson(res2).getJsonObject("data").getString("boxid"); // 文件夹bid
|
||||
|
||||
// 调试输出文件夹信息
|
||||
System.out.println("文件夹期限: " + filetime);
|
||||
System.out.println("文件夹大小: " + filesize);
|
||||
System.out.println("文件夹pid: " + filepid);
|
||||
System.out.println("文件夹bid: " + filebid);
|
||||
log.debug("文件夹期限: {}, 大小: {}, pid: {}, bid: {}", filetime, filesize, filepid, filebid);
|
||||
|
||||
// 获取文件信息
|
||||
httpClient.postAbs(SHARE_URL_API + "ufile/list").putHeaders(headers)
|
||||
@@ -97,9 +93,7 @@ public class WsTool extends PanBase {
|
||||
String filefid = asJson(res3).getJsonObject("data")
|
||||
.getJsonArray("fileList").getJsonObject(0).getString("fid"); // 文件fid
|
||||
|
||||
// 调试输出文件信息
|
||||
System.out.println("文件名称: " + filename);
|
||||
System.out.println("文件fid: " + filefid);
|
||||
log.debug("文件名称: {}, fid: {}", filename, filefid);
|
||||
|
||||
// 检查文件是否失效
|
||||
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");
|
||||
|
||||
// 调试输出文件直链
|
||||
System.out.println("文件直链: " + fileurl);
|
||||
log.debug("文件直链: {}", fileurl);
|
||||
|
||||
if (!fileurl.equals("")) {
|
||||
promise.complete(URLDecoder.decode(fileurl, StandardCharsets.UTF_8));
|
||||
|
||||
@@ -14,7 +14,6 @@ import java.security.spec.X509EncodedKeySpec;
|
||||
import java.util.Base64;
|
||||
import java.util.Date;
|
||||
import java.util.HexFormat;
|
||||
import java.util.Random;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@@ -299,7 +298,7 @@ public class AESUtils {
|
||||
//length用户要求产生字符串的长度
|
||||
public static String getRandomString(int length){
|
||||
String str="abcdefghijklmnopqrstuvwxyz0123456789";
|
||||
Random random=new Random();
|
||||
SecureRandom random=new SecureRandom();
|
||||
StringBuilder sb=new StringBuilder();
|
||||
for(int i=0;i<length;i++){
|
||||
int number=random.nextInt(36);
|
||||
|
||||
@@ -33,6 +33,9 @@ public class CommonUtils {
|
||||
public static Map<String, String> getURLParams(String url) throws MalformedURLException {
|
||||
URL fullUrl = new URL(url);
|
||||
String query = fullUrl.getQuery();
|
||||
if (query == null || query.isEmpty()) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
String[] params = query.split("&");
|
||||
Map<String, String> map = new HashMap<>();
|
||||
for (String param : params) {
|
||||
|
||||
@@ -5,6 +5,8 @@ import io.vertx.core.Vertx;
|
||||
import io.vertx.core.http.impl.headers.HeadersMultiMap;
|
||||
import io.vertx.ext.web.client.WebClient;
|
||||
import io.vertx.ext.web.client.WebClientSession;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
@@ -15,6 +17,8 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class IpExtractor {
|
||||
private static final Logger log = LoggerFactory.getLogger(IpExtractor.class);
|
||||
|
||||
public static void main(String[] args) throws InterruptedException {
|
||||
|
||||
|
||||
@@ -42,9 +46,9 @@ public class IpExtractor {
|
||||
WebClient client = WebClient.create(Vertx.vertx());
|
||||
WebClientSession webClientSession = WebClientSession.create(client);
|
||||
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->{
|
||||
System.out.println(res2.toString());
|
||||
log.debug("response2: {}", res2.toString());
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
@@ -21,11 +21,11 @@ import static cn.qaiu.util.AESUtils.encrypt;
|
||||
*/
|
||||
public class JsExecUtils {
|
||||
private static final Invocable inv;
|
||||
private static final ScriptEngineManager ENGINE_MANAGER = new ScriptEngineManager();
|
||||
|
||||
// 初始化脚本引擎
|
||||
static {
|
||||
ScriptEngineManager engineManager = new ScriptEngineManager();
|
||||
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
|
||||
try {
|
||||
engine.eval(JsContent.ye123);
|
||||
@@ -45,12 +45,11 @@ public class JsExecUtils {
|
||||
}
|
||||
|
||||
/**
|
||||
* 调用执行蓝奏云js文件
|
||||
* 调用执行蓝奏云js文件(每次动态JS代码,无法复用引擎)
|
||||
*/
|
||||
public static ScriptObjectMirror executeDynamicJs(String jsText, String funName) throws ScriptException,
|
||||
NoSuchMethodException {
|
||||
ScriptEngineManager engineManager = new ScriptEngineManager();
|
||||
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
engine.eval(JsContent.lz + "\n" + jsText);
|
||||
Invocable inv = (Invocable) engine;
|
||||
//调用js中的函数
|
||||
@@ -63,12 +62,11 @@ public class JsExecUtils {
|
||||
|
||||
|
||||
/**
|
||||
* 调用执行蓝奏云js文件
|
||||
* 调用执行js文件(使用缓存的 ScriptEngineManager 创建新引擎实例)
|
||||
*/
|
||||
public static Object executeOtherJs(String jsText, String funName, Object ... args) throws ScriptException,
|
||||
NoSuchMethodException {
|
||||
ScriptEngineManager engineManager = new ScriptEngineManager();
|
||||
ScriptEngine engine = engineManager.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
ScriptEngine engine = ENGINE_MANAGER.getEngineByName("JavaScript"); // 得到脚本引擎
|
||||
engine.eval(jsText);
|
||||
Invocable inv = (Invocable) engine;
|
||||
//调用js中的函数
|
||||
|
||||
@@ -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.WebClient;
|
||||
import io.vertx.ext.web.client.WebClientSession;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class ReqIpUtil {
|
||||
public static String BASE_URL = "https://ip.ihuan.me";
|
||||
public static String BASE_URL_TEMPLATE = BASE_URL + "/{path}";
|
||||
private static final Logger log = LoggerFactory.getLogger(ReqIpUtil.class);
|
||||
|
||||
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");
|
||||
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
|
||||
static MultiMap headers = new HeadersMultiMap();
|
||||
@@ -58,15 +62,15 @@ public class ReqIpUtil {
|
||||
|
||||
void next(AsyncResult<HttpResponse<Buffer>> response) {
|
||||
if (response.failed()) {
|
||||
response.cause().printStackTrace();
|
||||
log.error("请求失败", response.cause());
|
||||
} else {
|
||||
HttpResponse<Buffer> res = response.result();
|
||||
System.out.println("Received response with status code " + res.statusCode());
|
||||
System.out.println("Body: " + res.body());
|
||||
log.debug("Received response with status code {}", res.statusCode());
|
||||
log.debug("Body: {}", res.body());
|
||||
webClientSession.getAbs(BASE_URL_TEMPLATE).setTemplateParam("path", PATH1)
|
||||
.putHeaders(headers) // 将请求头Map添加到请求中
|
||||
.send(response2 -> {
|
||||
System.out.println(response2.result().bodyAsString());
|
||||
log.debug("response2: {}", response2.result().bodyAsString());
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,9 @@ package cn.qaiu.util;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.net.URL;
|
||||
import java.net.URLDecoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@@ -10,6 +13,8 @@ import java.util.Map;
|
||||
|
||||
public class URLUtil {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(URLUtil.class);
|
||||
|
||||
private final Map<String, String> queryParams = new HashMap<>();
|
||||
|
||||
// 构造函数,传入URL并解析参数
|
||||
@@ -31,7 +36,7 @@ public class URLUtil {
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("URL解析失败: {}", url, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@ import cn.qaiu.parser.customjs.JsParserExecutor;
|
||||
import cn.qaiu.WebClientVertxInit;
|
||||
import io.vertx.core.Vertx;
|
||||
import io.vertx.core.json.JsonObject;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -22,15 +24,26 @@ import java.util.Map;
|
||||
*/
|
||||
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
|
||||
public void testBaiduPhotoParserRegistration() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
// 检查是否加载了百度相册解析器
|
||||
CustomParserConfig config = CustomParserRegistry.get("baidu_photo");
|
||||
assert config != null : "百度相册解析器未加载";
|
||||
@@ -44,11 +57,7 @@ public class BaiduPhotoParserTest {
|
||||
public void testBaiduPhotoFileShareExecution() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建解析器 - 测试文件分享链接
|
||||
IPanTool tool = ParserCreate.fromType("baidu_photo")
|
||||
@@ -76,11 +85,7 @@ public class BaiduPhotoParserTest {
|
||||
public void testBaiduPhotoFolderShareExecution() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建解析器 - 测试文件夹分享链接
|
||||
IPanTool tool = ParserCreate.fromType("baidu_photo")
|
||||
@@ -108,11 +113,7 @@ public class BaiduPhotoParserTest {
|
||||
public void testBaiduPhotoParserFileList() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
IPanTool tool = ParserCreate.fromType("baidu_photo")
|
||||
// 分享key PPgOEodBVE
|
||||
@@ -166,11 +167,7 @@ public class BaiduPhotoParserTest {
|
||||
public void testBaiduPhotoParserById() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建ShareLinkInfo
|
||||
Map<String, Object> otherParam = new HashMap<>();
|
||||
|
||||
@@ -7,6 +7,8 @@ import cn.qaiu.parser.custom.CustomParserRegistry;
|
||||
import cn.qaiu.parser.customjs.JsParserExecutor;
|
||||
import cn.qaiu.WebClientVertxInit;
|
||||
import io.vertx.core.Vertx;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -21,15 +23,26 @@ import java.util.Map;
|
||||
*/
|
||||
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
|
||||
public void testJsParserRegistration() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
// 检查是否加载了JavaScript解析器
|
||||
CustomParserConfig config = CustomParserRegistry.get("demo_js");
|
||||
assert config != null : "JavaScript解析器未加载";
|
||||
@@ -43,11 +56,7 @@ public class JsParserTest {
|
||||
public void testJsParserExecution() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建解析器
|
||||
IPanTool tool = ParserCreate.fromType("demo_js")
|
||||
@@ -74,11 +83,7 @@ public class JsParserTest {
|
||||
public void testJsParserFileList() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建解析器
|
||||
IPanTool tool = ParserCreate.fromType("demo_js")
|
||||
@@ -114,11 +119,7 @@ public class JsParserTest {
|
||||
public void testJsParserById() {
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
|
||||
try {
|
||||
// 创建ShareLinkInfo
|
||||
Map<String, Object> otherParam = new HashMap<>();
|
||||
|
||||
@@ -7,6 +7,8 @@ import cn.qaiu.parser.ParserCreate;
|
||||
import cn.qaiu.parser.custom.CustomParserConfig;
|
||||
import cn.qaiu.parser.custom.CustomParserRegistry;
|
||||
import io.vertx.core.Vertx;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -16,18 +18,29 @@ import org.slf4j.LoggerFactory;
|
||||
* 测试fetch API和Promise polyfill功能
|
||||
*/
|
||||
public class JsFetchBridgeTest {
|
||||
|
||||
|
||||
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
|
||||
public void testFetchPolyfillLoaded() {
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
|
||||
// 创建一个简单的解析器配置
|
||||
String jsCode = """
|
||||
// 测试Promise是否可用
|
||||
@@ -83,13 +96,9 @@ public class JsFetchBridgeTest {
|
||||
|
||||
@Test
|
||||
public void testPromiseBasicUsage() {
|
||||
// 初始化Vertx
|
||||
Vertx vertx = Vertx.vertx();
|
||||
WebClientVertxInit.init(vertx);
|
||||
|
||||
// 清理注册表
|
||||
CustomParserRegistry.clear();
|
||||
|
||||
|
||||
String jsCode = """
|
||||
function parse(shareLinkInfo, http, logger) {
|
||||
logger.info("测试Promise基本用法");
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
## 测试配置
|
||||
|
||||
### 小飞机网盘 ✅
|
||||
- **用户名**: 15764091073
|
||||
- **用户名**: 15x
|
||||
- **URL**: https://share.feijipan.com/s/ZWYoZ31c
|
||||
- **文件**: 资源.rar (1.13 GB)
|
||||
- **认证方式**: username/password
|
||||
@@ -32,7 +32,7 @@
|
||||
```
|
||||
=== 测试小飞机网盘解析(带认证)===
|
||||
分享链接: https://share.feijipan.com/s/ZWYoZ31c
|
||||
用户名: 15764091073
|
||||
用户名: 15x
|
||||
密码: ******
|
||||
|
||||
开始解析...
|
||||
|
||||
329
parser/src/test/resources/fetch-runtime.js
Normal file
329
parser/src/test/resources/fetch-runtime.js
Normal 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
11
pom.xml
@@ -17,7 +17,7 @@
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<revision>0.2.1</revision>
|
||||
<revision>0.3.4</revision>
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
@@ -25,16 +25,17 @@
|
||||
|
||||
<packageDirectory>${project.basedir}/web-service/target/package</packageDirectory>
|
||||
|
||||
<!-- Vert.x 4.5.24 已包含安全修复,无需单独指定 Netty 版本 -->
|
||||
<vertx.version>4.5.24</vertx.version>
|
||||
<!-- Vert.x 4.5.27 包含安全修复,无需单独指定 Netty 版本 -->
|
||||
<vertx.version>4.5.27</vertx.version>
|
||||
<org.reflections.version>0.10.2</org.reflections.version>
|
||||
<lombok.version>1.18.38</lombok.version>
|
||||
<slf4j.version>2.0.16</slf4j.version>
|
||||
<commons-lang3.version>3.18.0</commons-lang3.version>
|
||||
<commons-beanutils2.version>2.0.0</commons-beanutils2.version>
|
||||
<parserVersion>10.2.5</parserVersion>
|
||||
<jackson.version>2.18.6</jackson.version>
|
||||
<!-- Logback 最新稳定版 -->
|
||||
<logback.version>1.5.18</logback.version>
|
||||
<logback.version>1.5.32</logback.version>
|
||||
<junit.version>4.13.2</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -74,7 +75,7 @@
|
||||
<dependency>
|
||||
<groupId>cn.qaiu</groupId>
|
||||
<artifactId>parser</artifactId>
|
||||
<version>10.2.5</version>
|
||||
<version>${parserVersion}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
BIN
web-front/img/image.png
Normal file
BIN
web-front/img/image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 MiB |
@@ -5,15 +5,15 @@
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"dev": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build && node scripts/compress-vs.js",
|
||||
"build:no-compress": "vue-cli-service build",
|
||||
"build": "node scripts/sync-version.js && vue-cli-service build && node scripts/compress-vs.js",
|
||||
"build:no-compress": "node scripts/sync-version.js && vue-cli-service build",
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
"@monaco-editor/loader": "^1.4.0",
|
||||
"@vueuse/core": "^11.2.0",
|
||||
"axios": "1.13.5",
|
||||
"axios": "1.16.1",
|
||||
"clipboard": "^2.0.11",
|
||||
"core-js": "^3.8.3",
|
||||
"crypto-js": "^4.2.0",
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB |
BIN
web-front/public/images/logo01.png
Normal file
BIN
web-front/public/images/logo01.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 302 KiB |
BIN
web-front/public/images/logo02.png
Normal file
BIN
web-front/public/images/logo02.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 482 KiB |
@@ -10,7 +10,7 @@
|
||||
<meta name="description"
|
||||
content="Netdisk fast download 网盘直链解析工具">
|
||||
<!-- 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 -->
|
||||
<script src="//open.thunderurl.com/thunder-link.js"></script>
|
||||
<style>
|
||||
|
||||
23
web-front/scripts/sync-version.js
Normal file
23
web-front/scripts/sync-version.js
Normal 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}`);
|
||||
@@ -36,7 +36,6 @@ if (item) {
|
||||
const darkMode = ref(item)
|
||||
|
||||
watch(darkMode, (newValue) => {
|
||||
console.log(`darkMode: ${newValue}`)
|
||||
window.localStorage.setItem("darkMode", newValue);
|
||||
|
||||
// 发射主题变化事件
|
||||
|
||||
@@ -190,6 +190,14 @@
|
||||
>
|
||||
<i class="fas fa-paper-plane"></i> 发送到下载器
|
||||
</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 v-else class="file-detail-empty">
|
||||
@@ -258,6 +266,14 @@
|
||||
>
|
||||
<i class="fas fa-paper-plane"></i> 发送到下载器
|
||||
</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 v-else class="file-detail-empty">
|
||||
@@ -324,6 +340,14 @@
|
||||
>
|
||||
发送到下载器
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="selectedFile && selectedFile.parserUrl"
|
||||
@click="copyDirectLink(selectedFile)"
|
||||
style="margin-left: 8px;"
|
||||
:loading="copyLinkLoading"
|
||||
>
|
||||
复制直链
|
||||
</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
<div v-if="isPreviewing" class="preview-mask">
|
||||
@@ -391,6 +415,7 @@ export default {
|
||||
downloadInfo: null,
|
||||
downloadLoading: false,
|
||||
singleSendLoading: false,
|
||||
copyLinkLoading: false,
|
||||
treeProps: {
|
||||
label: 'fileName',
|
||||
children: 'children',
|
||||
@@ -462,10 +487,6 @@ export default {
|
||||
}
|
||||
return `${baseUrl}?${params.toString()}`
|
||||
},
|
||||
// 文件树与窗格同源:直接返回当前目录数据
|
||||
buildTree(list) {
|
||||
return list || []
|
||||
},
|
||||
// 懒加载子节点
|
||||
loadNode(node, resolve) {
|
||||
if (node.level === 0) {
|
||||
@@ -479,9 +500,14 @@ export default {
|
||||
}))
|
||||
resolve(children)
|
||||
} else {
|
||||
this.$message.error(res.data.msg || '获取子节点失败')
|
||||
resolve([])
|
||||
}
|
||||
}).catch(() => resolve([]))
|
||||
}).catch(err => {
|
||||
const msg = err.response?.data?.msg || err.message
|
||||
if (msg) this.$message.error(msg)
|
||||
resolve([])
|
||||
})
|
||||
} else {
|
||||
resolve([])
|
||||
}
|
||||
@@ -491,7 +517,6 @@ export default {
|
||||
},
|
||||
// 处理文件点击
|
||||
handleFileClick(file) {
|
||||
console.log('点击文件', file, this.viewMode)
|
||||
if (file.fileType === 'folder') {
|
||||
this.enterFolder(file)
|
||||
} else if (this.viewMode === 'pane') {
|
||||
@@ -520,7 +545,8 @@ export default {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('进入文件夹失败:', error)
|
||||
this.$message.error('进入文件夹失败')
|
||||
const msg = error.response?.data?.msg || error.message || '进入文件夹失败'
|
||||
this.$message.error(msg)
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
@@ -551,7 +577,8 @@ export default {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('加载目录失败:', error)
|
||||
this.$message.error('加载目录失败')
|
||||
const msg = error.response?.data?.msg || error.message || '加载目录失败'
|
||||
this.$message.error(msg)
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
@@ -649,7 +676,8 @@ export default {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取下载信息失败:', error)
|
||||
this.$message.error('获取下载信息失败,尝试直接下载')
|
||||
const msg = error.response?.data?.msg || '获取下载信息失败,尝试直接下载'
|
||||
this.$message.error(msg)
|
||||
this.downloadFile(file)
|
||||
} finally {
|
||||
this.downloadLoading = false
|
||||
@@ -735,7 +763,8 @@ export default {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('发送到下载器失败:', error)
|
||||
this.$message.error('发送到下载器失败: ' + error.message)
|
||||
const msg = error.response?.data?.msg || error.message || '发送到下载器失败'
|
||||
this.$message.error(msg)
|
||||
} finally {
|
||||
this.singleSendLoading = false
|
||||
}
|
||||
@@ -744,6 +773,32 @@ export default {
|
||||
this.fileDialogVisible = false
|
||||
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() {
|
||||
this.isPreviewing = false
|
||||
this.previewUrl = ''
|
||||
@@ -802,7 +857,7 @@ export default {
|
||||
this.toggleFileSelect(file)
|
||||
},
|
||||
selectAll() {
|
||||
this.selectedFiles = this.currentFileList.filter(f => f.fileType !== 'folder')
|
||||
this.selectedFiles = this.currentFileList.filter(f => f.fileType !== 'folder' && f.parserUrl)
|
||||
},
|
||||
deselectAll() {
|
||||
this.selectedFiles = []
|
||||
|
||||
@@ -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
|
||||
6
web-front/src/utils/constants.js
Normal file
6
web-front/src/utils/constants.js
Normal file
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* 前端全局常量
|
||||
*/
|
||||
|
||||
/** 预览服务基础 URL */
|
||||
export const PREVIEW_BASE_URL = 'https://nfd-parser.github.io/nfd-preview/preview.html?src='
|
||||
@@ -410,7 +410,6 @@ function addThunderDownload(tasks, config) {
|
||||
if (userAgent) taskParam.userAgent = userAgent
|
||||
taskParam.threadCount = '1'
|
||||
|
||||
console.log('[Thunder SDK] newTask params:', JSON.stringify(taskParam))
|
||||
window.thunderLink.newTask(taskParam)
|
||||
return Promise.resolve('thunder-ok')
|
||||
}
|
||||
|
||||
@@ -313,7 +313,6 @@ export async function loadTypesFromApi(monaco) {
|
||||
cachedContent,
|
||||
'file:///types.js'
|
||||
);
|
||||
console.log('从缓存加载types.js成功');
|
||||
// 异步更新缓存
|
||||
updateTypesJsCache();
|
||||
return;
|
||||
@@ -334,7 +333,6 @@ export async function loadTypesFromApi(monaco) {
|
||||
typesJsContent,
|
||||
'file:///types.js'
|
||||
);
|
||||
console.log('加载types.js成功并已缓存');
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('加载types.js失败,使用内置类型定义:', error);
|
||||
@@ -350,7 +348,6 @@ async function updateTypesJsCache() {
|
||||
if (response.ok) {
|
||||
const typesJsContent = await response.text();
|
||||
localStorage.setItem('playground_types_js', typesJsContent);
|
||||
console.log('types.js缓存已更新');
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('更新types.js缓存失败:', error);
|
||||
|
||||
@@ -5,6 +5,15 @@ const axiosInstance = axios.create({
|
||||
withCredentials: true // 重要:允许跨域请求携带cookie
|
||||
});
|
||||
|
||||
// 请求拦截器:将存储的Token添加到Authorization请求头
|
||||
axiosInstance.interceptors.request.use(config => {
|
||||
const token = localStorage.getItem('playground_token');
|
||||
if (token) {
|
||||
config.headers['Authorization'] = `Bearer ${token}`;
|
||||
}
|
||||
return config;
|
||||
});
|
||||
|
||||
/**
|
||||
* 演练场API服务
|
||||
*/
|
||||
@@ -30,7 +39,12 @@ export const playgroundApi = {
|
||||
async login(password) {
|
||||
try {
|
||||
const response = await axiosInstance.post('/v2/playground/login', { password });
|
||||
return response.data;
|
||||
const data = response.data;
|
||||
// 登录成功时从响应中提取并保存Token
|
||||
if ((data.code === 200 || data.success) && data.data?.token) {
|
||||
localStorage.setItem('playground_token', data.data.token);
|
||||
}
|
||||
return data;
|
||||
} catch (error) {
|
||||
throw new Error(error.response?.data?.error || error.message || '登录失败');
|
||||
}
|
||||
|
||||
@@ -293,24 +293,6 @@ export default {
|
||||
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 userAgent = navigator.userAgent.toLowerCase()
|
||||
@@ -369,7 +351,7 @@ export default {
|
||||
copyToClipboard(link)
|
||||
return
|
||||
}
|
||||
window.open(link, '_blank')
|
||||
window.open(link, '_blank', 'noopener,noreferrer')
|
||||
ElMessage.success('正在唤起迅雷下载')
|
||||
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) => {
|
||||
if (!bytes) return '未知'
|
||||
@@ -440,9 +415,7 @@ export default {
|
||||
getTextareaRows,
|
||||
goBack,
|
||||
getClientLogo,
|
||||
downloadClient,
|
||||
handleImageError,
|
||||
shouldShowDownloadButton,
|
||||
getClientSupportsCookie,
|
||||
goToAuthConfig
|
||||
}
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
</el-dialog> -->
|
||||
<!-- 顶部反馈栏(小号、灰色、无红边框) -->
|
||||
<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>
|
||||
反馈
|
||||
</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>
|
||||
源码
|
||||
</a>
|
||||
@@ -68,14 +68,14 @@
|
||||
</div>
|
||||
<div class="demo-basic--circle">
|
||||
<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 class="project-intro">
|
||||
<div class="intro-title">NFD网盘直链解析0.3.0</div>
|
||||
<div class="intro-title">NFD网盘直链解析 {{ projectVersion }}</div>
|
||||
<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"> >> </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"> >> </el-link></div>
|
||||
<div>文件夹解析支持:蓝奏云、蓝奏云优享、小飞机盘、123云盘</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -90,7 +90,7 @@
|
||||
<!-- 开关按钮,控制是否自动读取剪切板 -->
|
||||
<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 #append v-if="!autoReadClipboard">
|
||||
<el-button @click="getPaste(true)">读取剪切板</el-button>
|
||||
@@ -257,28 +257,44 @@
|
||||
</el-descriptions>
|
||||
</div>
|
||||
|
||||
<!-- 错误时显示小按钮 -->
|
||||
<div v-if="errorButtonVisible" style="text-align: center; margin-top: 10px;">
|
||||
<el-button type="text" @click="errorDialogVisible = true"> 反馈错误详情>> </el-button>
|
||||
</div>
|
||||
<!-- 错误徽章,解析失败时显示,可手动关闭,解析成功自动关闭 -->
|
||||
<transition name="el-fade-in">
|
||||
<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>
|
||||
</transition>
|
||||
|
||||
<!-- 错误 JSON 弹窗 -->
|
||||
<el-dialog
|
||||
v-model="errorDialogVisible"
|
||||
width="60%">
|
||||
<!-- 错误弹窗 -->
|
||||
<el-dialog v-model="errorDialogVisible" width="500px" :show-close="true" @close="errorMsgExpanded=false">
|
||||
<template #title>
|
||||
错误详情
|
||||
<el-link
|
||||
@click.prevent="copyErrorDetails"
|
||||
target="_blank"
|
||||
style="margin-left:8px"
|
||||
type="primary">
|
||||
复制当前错误信息,提交Issue
|
||||
</el-link>
|
||||
<i class="fas fa-exclamation-circle" style="color:#d93026;margin-right:8px;"></i>
|
||||
<span style="color:#d93026;font-weight:600;">解析出错</span>
|
||||
</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>
|
||||
<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>
|
||||
</el-dialog>
|
||||
|
||||
@@ -595,11 +611,10 @@ import fileTypeUtils from '@/utils/fileTypeUtils'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { playgroundApi } from '@/utils/playgroundApi'
|
||||
import { testConnection, autoDetect, addDownload, getConfig, saveConfig } from '@/utils/downloaderService'
|
||||
|
||||
export const previewBaseUrl = 'https://nfd-parser.github.io/nfd-preview/preview.html?src=';
|
||||
import { PREVIEW_BASE_URL } from '@/utils/constants'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
name: 'Home',
|
||||
components: { DarkMode, DirectoryTree, DownloadDialog },
|
||||
mixins: [fileTypeUtils],
|
||||
data() {
|
||||
@@ -608,7 +623,9 @@ export default {
|
||||
autoReadClipboard: true,
|
||||
isDarkMode: false,
|
||||
isLoading: false,
|
||||
|
||||
errorBadgeVisible: false,
|
||||
errorMsgExpanded: false,
|
||||
|
||||
// 输入数据
|
||||
link: "",
|
||||
password: "",
|
||||
@@ -617,7 +634,7 @@ export default {
|
||||
parseResult: {},
|
||||
downloadUrl: null,
|
||||
directLink: '',
|
||||
previewBaseUrl,
|
||||
previewBaseUrl: PREVIEW_BASE_URL,
|
||||
|
||||
// 功能结果
|
||||
markdownText: '',
|
||||
@@ -714,6 +731,12 @@ export default {
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
githubRepoUrl() {
|
||||
return process.env.VUE_APP_GITHUB_REPO_URL
|
||||
},
|
||||
projectVersion() {
|
||||
return process.env.VUE_APP_VERSION || '0.0.0'
|
||||
},
|
||||
// 检查是否配置了认证信息(针对当前链接的网盘类型)
|
||||
hasAuthConfig() {
|
||||
const panType = this.getCurrentPanType()
|
||||
@@ -959,18 +982,16 @@ export default {
|
||||
// 优先使用个人配置
|
||||
if (this.allAuthConfigs[panType]) {
|
||||
config = this.allAuthConfigs[panType]
|
||||
console.log(`[认证] 使用个人配置: ${this.getPanDisplayName(panType)}`)
|
||||
} else {
|
||||
// 从后端随机获取捐赠账号(后端已加密,直接使用 encryptedAuth)
|
||||
try {
|
||||
const response = await axios.get(`${this.baseAPI}/v2/randomAuth`, { params: { panType } })
|
||||
const encryptedAuth = response.data?.data?.encryptedAuth
|
||||
if (encryptedAuth) {
|
||||
console.log(`[认证] 使用捐赠账号: ${this.getPanDisplayName(panType)}`)
|
||||
return encryptedAuth
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(`[认证] 无可用捐赠账号: ${this.getPanDisplayName(panType)}`)
|
||||
// no available donated account
|
||||
}
|
||||
return ''
|
||||
}
|
||||
@@ -1091,17 +1112,45 @@ export default {
|
||||
}
|
||||
},
|
||||
|
||||
// 识别并转换短链输入(如 lz:shareKey@pwd)
|
||||
// 识别并转换短链输入(如 lz:shareKey@pwd),或从文本中提取链接
|
||||
normalizeShortcutInput() {
|
||||
const shortInfo = this.expandShortFormat(this.link)
|
||||
if (!shortInfo) return
|
||||
if (!this.link) return
|
||||
const trimmed = this.link.trim()
|
||||
if (!trimmed) return
|
||||
|
||||
this.link = shortInfo.link
|
||||
if (!this.password && shortInfo.pwd) {
|
||||
this.password = shortInfo.pwd
|
||||
// 已经是直接链接,跳过
|
||||
if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) return
|
||||
|
||||
// 尝试短格式
|
||||
const shortInfo = this.expandShortFormat(trimmed)
|
||||
if (shortInfo) {
|
||||
this.link = shortInfo.link
|
||||
if (!this.password && shortInfo.pwd) {
|
||||
this.password = shortInfo.pwd
|
||||
}
|
||||
this.$message.success(`已识别短格式并自动转换,网盘类型: ${shortInfo.name}`)
|
||||
this.updateDirectLink()
|
||||
return
|
||||
}
|
||||
this.$message.success(`已识别短格式并自动转换,网盘类型: ${shortInfo.name}`)
|
||||
this.updateDirectLink()
|
||||
|
||||
// 从文本中自动提取链接
|
||||
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调用(自动添加认证参数)
|
||||
async callAPI(endpoint, params = {}) {
|
||||
this.errorButtonVisible = false
|
||||
this.errorBadgeVisible = false
|
||||
try {
|
||||
this.isLoading = true
|
||||
// 添加认证参数(异步获取)
|
||||
@@ -1126,17 +1176,31 @@ export default {
|
||||
params.auth = authParam
|
||||
}
|
||||
const response = await axios.get(`${this.baseAPI}${endpoint}`, { params })
|
||||
|
||||
|
||||
if (response.data.code === 200) {
|
||||
// this.$message.success(response.data.msg || '操作成功')
|
||||
this.errorBadgeVisible = false
|
||||
return response.data
|
||||
} else {
|
||||
// 在页面右下角显示一个“查看详情”按钮 可以查看原json
|
||||
// 解析失败,显示徽章和弹窗
|
||||
this.errorDetail = response?.data
|
||||
this.errorButtonVisible = true
|
||||
this.errorBadgeVisible = true
|
||||
this.errorDialogVisible = true
|
||||
throw new Error(response.data.msg || '操作失败')
|
||||
}
|
||||
} 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 || '网络错误')
|
||||
throw error
|
||||
} finally {
|
||||
@@ -1309,7 +1373,7 @@ export default {
|
||||
// 文件点击处理
|
||||
handleFileClick(file) {
|
||||
if (file.parserUrl) {
|
||||
window.open(file.parserUrl, '_blank')
|
||||
window.open(file.parserUrl, '_blank', 'noopener,noreferrer')
|
||||
} else {
|
||||
this.$message.warning('该文件暂无下载链接')
|
||||
}
|
||||
@@ -1319,7 +1383,6 @@ export default {
|
||||
async getPaste(isManual = false) {
|
||||
try {
|
||||
const text = await navigator.clipboard.readText()
|
||||
console.log('获取到的文本内容是:', text)
|
||||
|
||||
const shortInfo = this.expandShortFormat(text)
|
||||
if (shortInfo) {
|
||||
@@ -1364,7 +1427,9 @@ export default {
|
||||
}
|
||||
} catch (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() {
|
||||
const text = `分享链接:${this.link}
|
||||
分享密码:${this.password || ''}
|
||||
错误信息:${JSON.stringify(this.errorDetail, null, 2)}`;
|
||||
navigator.clipboard.writeText(text).then(() => {
|
||||
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(() => {
|
||||
this.$message.error('复制失败');
|
||||
});
|
||||
@@ -1786,19 +1856,26 @@ export default {
|
||||
}
|
||||
|
||||
// 监听窗口焦点事件
|
||||
window.addEventListener('focus', () => {
|
||||
this._onFocusHandler = () => {
|
||||
if (this.autoReadClipboard) {
|
||||
this.hasClipboardSuccessTip = false // 聚焦时重置,只提示一次
|
||||
this.getPaste()
|
||||
}
|
||||
})
|
||||
}
|
||||
window.addEventListener('focus', this._onFocusHandler)
|
||||
|
||||
// 首次打开页面弹出风险提示
|
||||
if (!window.localStorage.getItem('nfd_risk_ack')) {
|
||||
this.showRiskDialog = true
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
beforeUnmount() {
|
||||
if (this._onFocusHandler) {
|
||||
window.removeEventListener('focus', this._onFocusHandler)
|
||||
}
|
||||
},
|
||||
|
||||
watch: {
|
||||
downloadUrl(val) {
|
||||
if (!val) {
|
||||
|
||||
@@ -653,22 +653,22 @@
|
||||
<p>更多详细信息,请参考 GitHub 仓库文档:</p>
|
||||
<ul>
|
||||
<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 解析器开发指南
|
||||
</a>
|
||||
</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>
|
||||
</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>
|
||||
</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>
|
||||
</li>
|
||||
@@ -858,6 +858,7 @@ export default {
|
||||
},
|
||||
setup() {
|
||||
const router = useRouter();
|
||||
const githubRepoUrl = process.env.VUE_APP_GITHUB_REPO_URL;
|
||||
|
||||
// 语言常量
|
||||
const LANGUAGE = {
|
||||
@@ -1146,10 +1147,11 @@ function parseById(shareLinkInfo, http, logger) {
|
||||
const isAuthed = res.data.authed || res.data.public;
|
||||
authed.value = isAuthed;
|
||||
|
||||
// 如果后端session已失效,清除localStorage
|
||||
// 如果后端认证已失效,清除localStorage中的认证信息
|
||||
if (!isAuthed && savedAuth === 'true') {
|
||||
localStorage.removeItem('playground_authed');
|
||||
localStorage.removeItem('playground_auth_time');
|
||||
localStorage.removeItem('playground_token');
|
||||
}
|
||||
|
||||
return isAuthed;
|
||||
@@ -1177,7 +1179,7 @@ function parseById(shareLinkInfo, http, logger) {
|
||||
|
||||
// 新窗口打开首页
|
||||
const goHomeInNewWindow = () => {
|
||||
window.open('/', '_blank');
|
||||
window.open('/', '_blank', 'noopener,noreferrer');
|
||||
};
|
||||
|
||||
// 检查是否有未保存的文件
|
||||
@@ -1757,7 +1759,6 @@ function parseFileList(shareLinkInfo, http, logger) {
|
||||
testParams.value.method
|
||||
);
|
||||
|
||||
console.log('测试结果:', result);
|
||||
testResult.value = result;
|
||||
|
||||
// 将日志添加到控制台
|
||||
@@ -1819,10 +1820,8 @@ function parseFileList(shareLinkInfo, http, logger) {
|
||||
loadingList.value = true;
|
||||
try {
|
||||
const result = await playgroundApi.getParserList();
|
||||
console.log('获取解析器列表响应:', result);
|
||||
// 检查响应格式
|
||||
if (result.code === 200 || result.success) {
|
||||
console.log('列表数据:', result.data);
|
||||
parserList.value = result.data || [];
|
||||
} else if (result.data && Array.isArray(result.data)) {
|
||||
// 如果data直接是数组
|
||||
@@ -1856,7 +1855,6 @@ function parseFileList(shareLinkInfo, http, logger) {
|
||||
try {
|
||||
const codeToPublish = currentCode.value;
|
||||
const result = await playgroundApi.saveParser(codeToPublish);
|
||||
console.log('保存解析器响应:', result);
|
||||
// 检查响应格式
|
||||
if (result.code === 200 || result.success) {
|
||||
// 从响应或代码中提取type信息
|
||||
@@ -2222,6 +2220,8 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
|
||||
}, 100);
|
||||
};
|
||||
|
||||
let themeObserver = null;
|
||||
|
||||
onMounted(async () => {
|
||||
// 初始化移动端检测
|
||||
updateIsMobile();
|
||||
@@ -2248,10 +2248,10 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
|
||||
const html = document.documentElement;
|
||||
if (html && html.classList) {
|
||||
try {
|
||||
const observer = new MutationObserver(() => {
|
||||
themeObserver = new MutationObserver(() => {
|
||||
checkDarkMode();
|
||||
});
|
||||
observer.observe(html, {
|
||||
themeObserver.observe(html, {
|
||||
attributes: true,
|
||||
attributeFilter: ['class', 'data-theme']
|
||||
});
|
||||
@@ -2268,9 +2268,11 @@ curl "${baseUrl}/json/parser?url=${encodeURIComponent(exampleUrl)}"</pre>
|
||||
window.removeEventListener('resize', updateIsMobile);
|
||||
// 移除页面关闭/刷新前的提示
|
||||
window.removeEventListener('beforeunload', handleBeforeUnload);
|
||||
themeObserver?.disconnect();
|
||||
});
|
||||
|
||||
return {
|
||||
githubRepoUrl,
|
||||
LANGUAGE,
|
||||
editorRef,
|
||||
jsCode,
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<script>
|
||||
import axios from 'axios'
|
||||
import fileTypeUtils from '@/utils/fileTypeUtils'
|
||||
import { previewBaseUrl } from '@/views/Home.vue'
|
||||
import { PREVIEW_BASE_URL } from '@/utils/constants'
|
||||
|
||||
export default {
|
||||
name: 'ShowFile',
|
||||
@@ -44,7 +44,7 @@ export default {
|
||||
downloadUrl: '',
|
||||
shareUrl: '', // 添加原始分享链接
|
||||
fileTypeUtils,
|
||||
previewBaseUrl
|
||||
previewBaseUrl: PREVIEW_BASE_URL
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -73,7 +73,7 @@ export default {
|
||||
this.parseResult = res.data
|
||||
this.downloadUrl = res.data.data?.directLink
|
||||
} catch (e) {
|
||||
this.error = '解析失败'
|
||||
this.error = e.response?.data?.msg || e.response?.data?.error || '解析失败'
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ export default {
|
||||
const res = await axios.get('/v2/getFileList', { params: { url: this.url } })
|
||||
this.directoryData = res.data.data || []
|
||||
} catch (e) {
|
||||
this.error = '目录解析失败'
|
||||
this.error = e.response?.data?.msg || e.response?.data?.error || '目录解析失败'
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
|
||||
@@ -1,10 +1,34 @@
|
||||
|
||||
const path = require("path");
|
||||
const { execSync } = require("child_process");
|
||||
const webpack = require("webpack");
|
||||
|
||||
function resolve(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 FileManagerPlugin = require('filemanager-webpack-plugin');
|
||||
const MonacoEditorPlugin = require('monaco-editor-webpack-plugin');
|
||||
@@ -55,6 +79,10 @@ module.exports = {
|
||||
]
|
||||
},
|
||||
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({
|
||||
languages: ['javascript', 'typescript', 'json'],
|
||||
features: ['coreCommands', 'find', 'format', 'suggest', 'quickCommand'],
|
||||
|
||||
@@ -21,6 +21,8 @@ import io.vertx.core.shareddata.LocalMap;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.time.DateFormatUtils;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Date;
|
||||
|
||||
import static cn.qaiu.vx.core.util.ConfigConstant.LOCAL;
|
||||
@@ -36,6 +38,20 @@ import static cn.qaiu.vx.core.util.ConfigConstant.LOCAL;
|
||||
public class AppMain {
|
||||
|
||||
public static void main(String[] args) {
|
||||
// 先注册 ShutdownHook(JVM 逆序执行,先注册的后执行)
|
||||
// 确保关闭顺序: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
|
||||
Deploy.instance().start(args, AppMain::exec);
|
||||
}
|
||||
@@ -64,9 +80,35 @@ public class AppMain {
|
||||
System.out.println("数据库连接成功");
|
||||
|
||||
// 加载演练场解析器
|
||||
loadPlaygroundParsers();
|
||||
|
||||
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);
|
||||
}
|
||||
// 读取代理配置获取前端页面端口(同步读取小文件,仅启动时执行一次)
|
||||
String proxyConfName = jsonObject.getString("proxyConf", "server-proxy");
|
||||
String pageAddr = addr;
|
||||
try {
|
||||
String configFile = proxyConfName + ".yml";
|
||||
// 与 Deploy 保持一致:优先当前目录,其次 resources/
|
||||
Path configPath = Path.of(configFile);
|
||||
if (!Files.exists(configPath)) {
|
||||
configPath = Path.of("resources", configFile);
|
||||
}
|
||||
if (Files.exists(configPath)) {
|
||||
String yamlContent = Files.readString(configPath);
|
||||
// 匹配项目约定的 YAML 格式: "- listen: 8080"
|
||||
java.util.regex.Matcher m = java.util.regex.Pattern
|
||||
.compile("^\\s*-\\s+listen:\\s*(\\d+)", java.util.regex.Pattern.MULTILINE)
|
||||
.matcher(yamlContent);
|
||||
if (m.find()) {
|
||||
int pagePort = Integer.parseInt(m.group(1));
|
||||
pageAddr = "http://127.0.0.1:" + pagePort;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("读取代理配置失败,使用默认页面地址: {}", e.getMessage());
|
||||
}
|
||||
loadPlaygroundParsers(pageAddr);
|
||||
System.out.println("启动成功: \n本地服务地址: " + addr);
|
||||
});
|
||||
});
|
||||
@@ -108,7 +150,7 @@ public class AppMain {
|
||||
/**
|
||||
* 在启动时加载所有已发布的演练场解析器
|
||||
*/
|
||||
private static void loadPlaygroundParsers() {
|
||||
private static void loadPlaygroundParsers(String accessAddr) {
|
||||
DbService dbService = AsyncServiceUtil.getAsyncServiceInstance(DbService.class);
|
||||
|
||||
dbService.getPlaygroundParserList().onSuccess(result -> {
|
||||
@@ -148,6 +190,8 @@ public class AppMain {
|
||||
}
|
||||
}).onFailure(e -> {
|
||||
log.error("加载演练场解析器列表失败", e);
|
||||
}).onComplete(ar -> {
|
||||
log.info("服务已启动,可通过 {} 访问页面", accessAddr);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public class CacheManager {
|
||||
} else {
|
||||
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) {
|
||||
String sql2 = """
|
||||
@@ -123,7 +123,7 @@ public class CacheManager {
|
||||
} else {
|
||||
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 -> {
|
||||
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)
|
||||
.execute(new HashMap<>() {{
|
||||
put("panType", getShareType(shareKey));
|
||||
put("shareKey", shareKey);
|
||||
put("total", newTotal);
|
||||
put("ts", System.currentTimeMillis());
|
||||
}})
|
||||
.execute(updateParams)
|
||||
.onSuccess(res -> promise.complete(res.rowCount()))
|
||||
.onFailure(e->{
|
||||
promise.fail(e);
|
||||
LOGGER.error("updateTotalByField: ", e);
|
||||
});
|
||||
}).onFailure(e -> {
|
||||
promise.fail(e);
|
||||
LOGGER.error("getShareKeyTotal in updateTotalByField: ", e);
|
||||
});
|
||||
return promise.future();
|
||||
}
|
||||
@@ -200,6 +203,59 @@ public class CacheManager {
|
||||
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) {
|
||||
String sql = """
|
||||
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 -> {
|
||||
if(res.iterator().hasNext()) {
|
||||
JsonObject next = res.iterator().next();
|
||||
Map<String, Integer> resp = new HashMap<>(){{
|
||||
put("hit_total" ,next.getInteger("hit_total"));
|
||||
put("parser_total" ,next.getInteger("parser_total"));
|
||||
}};
|
||||
Map<String, Integer> resp = new HashMap<>();
|
||||
resp.put("hit_total", next.getInteger("hit_total"));
|
||||
resp.put("parser_total", next.getInteger("parser_total"));
|
||||
promise.complete(resp);
|
||||
} else {
|
||||
promise.complete();
|
||||
|
||||
@@ -48,6 +48,6 @@ public class LogStatistics implements AfterInterceptor {
|
||||
.execute(info)
|
||||
.onSuccess(res -> {
|
||||
log.info("inserted log: id={}, path={}, code={}", info.getId(), info.getPath(), info.getCode());
|
||||
}).onFailure(Throwable::printStackTrace);
|
||||
}).onFailure(e -> log.error("插入解析日志失败: id={}", info.getId(), e));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@Slf4j
|
||||
public class RateLimiter {
|
||||
@@ -28,7 +29,7 @@ public class RateLimiter {
|
||||
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();
|
||||
if (!request.path().matches(PATH_REG)) {
|
||||
// 如果请求路径不匹配正则,则不进行限流
|
||||
@@ -38,20 +39,25 @@ public class RateLimiter {
|
||||
|
||||
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();
|
||||
if (requestInfo == null || currentTime - requestInfo.timestamp > TIME_WINDOW) {
|
||||
// 初始化或重置计数器
|
||||
return new RequestInfo(1, currentTime);
|
||||
} else {
|
||||
// 增加计数器
|
||||
requestInfo.count++;
|
||||
requestInfo.count.incrementAndGet();
|
||||
return requestInfo;
|
||||
}
|
||||
});
|
||||
|
||||
RequestInfo info = ipRequestMap.get(ip);
|
||||
if (info.count > MAX_REQUESTS) {
|
||||
if (info.count.get() > MAX_REQUESTS) {
|
||||
// 超过限制
|
||||
// 计算剩余时间
|
||||
long remainingTime = TIME_WINDOW - (System.currentTimeMillis() - info.timestamp);
|
||||
@@ -66,11 +72,11 @@ public class RateLimiter {
|
||||
}
|
||||
|
||||
private static class RequestInfo {
|
||||
int count;
|
||||
long timestamp;
|
||||
final AtomicInteger count;
|
||||
volatile long timestamp;
|
||||
|
||||
RequestInfo(int count, long time) {
|
||||
this.count = count;
|
||||
this.count = new AtomicInteger(count);
|
||||
this.timestamp = time;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -93,9 +94,10 @@ public class JwtUtil {
|
||||
String encodedPayload = parts[1];
|
||||
String signature = parts[2];
|
||||
|
||||
// 验证签名
|
||||
// 验证签名(使用常量时间比较防止时序攻击)
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -80,8 +80,10 @@ public class PasswordUtil {
|
||||
byte[] calculatedHash = md.digest(plainPassword.getBytes(StandardCharsets.UTF_8));
|
||||
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) {
|
||||
// 如果发生异常(例如格式不正确),返回false
|
||||
return false;
|
||||
|
||||
@@ -119,11 +119,17 @@ public class URLParamUtil {
|
||||
}
|
||||
|
||||
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
|
||||
if (StringUtils.isBlank(linkPrefix)) {
|
||||
// 未配置 domainName 时,从请求地址推断
|
||||
linkPrefix = parserCreate.getShareLinkInfo().getOtherParam()
|
||||
.getOrDefault("_requestOrigin", "").toString();
|
||||
}
|
||||
if (StringUtils.isNotBlank(linkPrefix)) {
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加临时认证参数(一次性,不保存到数据库或共享内存)
|
||||
* 如果提供了临时认证参数,将覆盖后台配置的认证信息
|
||||
*
|
||||
* @param parserCreate ParserCreate对象
|
||||
@@ -155,7 +161,13 @@ public class URLParamUtil {
|
||||
}
|
||||
|
||||
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
|
||||
if (StringUtils.isBlank(linkPrefix)) {
|
||||
linkPrefix = parserCreate.getShareLinkInfo().getOtherParam()
|
||||
.getOrDefault("_requestOrigin", "").toString();
|
||||
}
|
||||
if (StringUtils.isNotBlank(linkPrefix)) {
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("domainName", linkPrefix);
|
||||
}
|
||||
|
||||
// 构建临时认证信息
|
||||
MultiMap tempAuth = MultiMap.caseInsensitiveMultiMap();
|
||||
|
||||
@@ -4,6 +4,10 @@ import io.vertx.core.json.JsonObject;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* JS演练场配置
|
||||
*
|
||||
@@ -12,11 +16,21 @@ import lombok.extern.slf4j.Slf4j;
|
||||
@Data
|
||||
@Slf4j
|
||||
public class PlaygroundConfig {
|
||||
|
||||
|
||||
/** Token有效期:24小时 */
|
||||
private static final long TOKEN_EXPIRY_MS = 24 * 60 * 60 * 1000L;
|
||||
|
||||
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
|
||||
|
||||
/**
|
||||
* 单例实例
|
||||
*/
|
||||
private static PlaygroundConfig instance;
|
||||
|
||||
/**
|
||||
* 已颁发的认证Token及其创建时间
|
||||
*/
|
||||
private final Map<String, Long> validTokens = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 是否启用演练场
|
||||
@@ -41,6 +55,39 @@ public class PlaygroundConfig {
|
||||
*/
|
||||
private PlaygroundConfig() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成并存储一个新的认证Token,同时清理过期Token
|
||||
*/
|
||||
public String generateToken() {
|
||||
// 清理过期Token,防止Map无限增长
|
||||
long now = System.currentTimeMillis();
|
||||
validTokens.entrySet().removeIf(e -> now - e.getValue() > TOKEN_EXPIRY_MS);
|
||||
// 使用SecureRandom生成32字节的密码学安全Token
|
||||
byte[] bytes = new byte[32];
|
||||
SECURE_RANDOM.nextBytes(bytes);
|
||||
StringBuilder sb = new StringBuilder(64);
|
||||
for (byte b : bytes) {
|
||||
sb.append(String.format("%02x", b));
|
||||
}
|
||||
String token = sb.toString();
|
||||
validTokens.put(token, now);
|
||||
return token;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验Token是否合法且未过期
|
||||
*/
|
||||
public boolean validateToken(String token) {
|
||||
if (token == null || token.isEmpty()) return false;
|
||||
Long createdAt = validTokens.get(token);
|
||||
if (createdAt == null) return false;
|
||||
if (System.currentTimeMillis() - createdAt > TOKEN_EXPIRY_MS) {
|
||||
validTokens.remove(token);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单例实例
|
||||
|
||||
@@ -43,14 +43,38 @@ public class ParserApi {
|
||||
|
||||
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)
|
||||
public Future<StatisticsInfo> statisticsInfo() {
|
||||
return dbService.getStatisticsInfo();
|
||||
}
|
||||
|
||||
private final CacheManager cacheManager = new CacheManager();
|
||||
private final ServerApi serverApi = new ServerApi();
|
||||
private static final CacheManager cacheManager = new CacheManager();
|
||||
private static final ServerApi serverApi = new ServerApi();
|
||||
|
||||
@RouteMapping(value = "/linkInfo", method = RouteMethod.GET)
|
||||
public Future<LinkInfoResp> parse(HttpServerRequest request, String pwd, String auth) {
|
||||
@@ -61,10 +85,11 @@ public class ParserApi {
|
||||
|
||||
// 构建链接信息响应,如果有 auth 参数则附加到链接中
|
||||
String authSuffix = (auth != null && !auth.isEmpty()) ? "&auth=" + auth : "";
|
||||
shareLinkInfo.getOtherParam().put("_requestOrigin", getLinkPrefix(request));
|
||||
LinkInfoResp build = LinkInfoResp.builder()
|
||||
.downLink(getDownLink(parserCreate, false) + authSuffix)
|
||||
.apiLink(getDownLink(parserCreate, true) + authSuffix)
|
||||
.viewLink(getViewLink(parserCreate) + authSuffix)
|
||||
.downLink(getDownLink(parserCreate, false, request) + authSuffix)
|
||||
.apiLink(getDownLink(parserCreate, true, request) + authSuffix)
|
||||
.viewLink(getViewLink(parserCreate, request) + authSuffix)
|
||||
.shareLinkInfo(shareLinkInfo).build();
|
||||
// 解析次数统计
|
||||
shareLinkInfo.getOtherParam().put("UA",request.headers().get("user-agent"));
|
||||
@@ -76,25 +101,23 @@ public class ParserApi {
|
||||
}
|
||||
promise.complete(build);
|
||||
}).onFailure(t->{
|
||||
t.printStackTrace();
|
||||
log.error("获取统计信息失败", t);
|
||||
promise.complete(build);
|
||||
});
|
||||
return promise.future();
|
||||
}
|
||||
|
||||
private static String getDownLink(ParserCreate create, boolean isJson) {
|
||||
|
||||
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
|
||||
private static String getDownLink(ParserCreate create, boolean isJson, HttpServerRequest request) {
|
||||
String linkPrefix = getLinkPrefix(request);
|
||||
if (StringUtils.isBlank(linkPrefix)) {
|
||||
linkPrefix = "http://127.0.0.1";
|
||||
linkPrefix = "http://127.0.0.1:" + SharedDataUtil.getJsonConfig("server").getInteger("port", 6400);
|
||||
}
|
||||
// 下载短链前缀 /d
|
||||
return linkPrefix + (isJson ? "/json/" : "/d/") + create.genPathSuffix();
|
||||
}
|
||||
|
||||
private static String getViewLink(ParserCreate create) {
|
||||
|
||||
String linkPrefix = SharedDataUtil.getJsonStringForServerConfig("domainName");
|
||||
private static String getViewLink(ParserCreate create, HttpServerRequest request) {
|
||||
String linkPrefix = getLinkPrefix(request);
|
||||
if (StringUtils.isBlank(linkPrefix)) {
|
||||
return "";
|
||||
}
|
||||
@@ -119,8 +142,9 @@ public class ParserApi {
|
||||
public Future<List<FileInfo>> getFileList(HttpServerRequest request, String pwd, String dirId, String uuid) {
|
||||
String url = URLParamUtil.parserParams(request);
|
||||
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("_requestOrigin", linkPrefix);
|
||||
if (StringUtils.isNotBlank(dirId)) {
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("dirId", dirId);
|
||||
}
|
||||
@@ -132,7 +156,7 @@ public class ParserApi {
|
||||
|
||||
// 目录解析下载文件
|
||||
// @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
|
||||
.setShareLinkInfoPwd("-");
|
||||
|
||||
@@ -147,17 +171,21 @@ public class ParserApi {
|
||||
shareLinkInfo.getOtherParam().put("paramJson", new JsonObject(paramStr));
|
||||
|
||||
// domainName
|
||||
String linkPrefix = SharedDataUtil.getJsonConfig("server").getString("domainName");
|
||||
String linkPrefix = getLinkPrefix(request);
|
||||
shareLinkInfo.getOtherParam().put("domainName", linkPrefix);
|
||||
shareLinkInfo.getOtherParam().put("_requestOrigin", linkPrefix);
|
||||
return parserCreate.createTool().parseById();
|
||||
}
|
||||
|
||||
@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();
|
||||
|
||||
getFileDownUrl(type, param)
|
||||
.onSuccess(res -> ResponseUtil.redirect(response, res))
|
||||
getFileDownUrl(request, type, param)
|
||||
.onSuccess(res -> {
|
||||
ResponseUtil.redirect(response, res);
|
||||
promise.complete();
|
||||
})
|
||||
.onFailure(t -> promise.fail(t.fillInStackTrace()));
|
||||
return promise.future();
|
||||
}
|
||||
@@ -220,7 +248,7 @@ public class ParserApi {
|
||||
}
|
||||
|
||||
String previewURL = SharedDataUtil.getJsonStringForServerConfig("previewURL");
|
||||
new ServerApi().parseJson(request, pwd, null).onSuccess(res -> {
|
||||
serverApi.parseJson(request, pwd, null).onSuccess(res -> {
|
||||
redirect(response, previewURL, res);
|
||||
}).onFailure(e -> {
|
||||
ResponseUtil.fireJsonResultResponse(response, JsonResult.error(e.toString()));
|
||||
@@ -229,14 +257,15 @@ public class ParserApi {
|
||||
|
||||
|
||||
@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();
|
||||
|
||||
String viewPrefix = SharedDataUtil.getJsonConfig("server").getString("previewURL");
|
||||
getFileDownUrl(type, param)
|
||||
getFileDownUrl(request, type, param)
|
||||
.onSuccess(res -> {
|
||||
String url = viewPrefix + URLEncoder.encode(res, StandardCharsets.UTF_8);
|
||||
ResponseUtil.redirect(response, url);
|
||||
promise.complete();
|
||||
})
|
||||
.onFailure(t -> promise.fail(t.fillInStackTrace()));
|
||||
return promise.future();
|
||||
@@ -269,7 +298,8 @@ public class ParserApi {
|
||||
String shareUrl = URLParamUtil.parserParams(request);
|
||||
ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd);
|
||||
ShareLinkInfo shareLinkInfo = parserCreate.getShareLinkInfo();
|
||||
|
||||
shareLinkInfo.getOtherParam().put("_requestOrigin", getLinkPrefix(request));
|
||||
|
||||
// 处理认证参数
|
||||
if (auth != null && !auth.isEmpty()) {
|
||||
AuthParam authParam = AuthParamCodec.decode(auth);
|
||||
@@ -285,6 +315,8 @@ public class ParserApi {
|
||||
authParam.getExt5());
|
||||
log.debug("客户端链接API: 已解码认证参数 authType={}", authParam.getAuthType());
|
||||
}
|
||||
} else {
|
||||
URLParamUtil.addParam(parserCreate);
|
||||
}
|
||||
|
||||
// 使用默认方法解析并生成客户端链接
|
||||
@@ -326,7 +358,9 @@ public class ParserApi {
|
||||
try {
|
||||
String shareUrl = URLParamUtil.parserParams(request);
|
||||
ParserCreate parserCreate = ParserCreate.fromShareUrl(shareUrl).setShareLinkInfoPwd(pwd);
|
||||
|
||||
parserCreate.getShareLinkInfo().getOtherParam().put("_requestOrigin", getLinkPrefix(request));
|
||||
URLParamUtil.addParam(parserCreate);
|
||||
|
||||
// 使用默认方法解析并生成客户端链接
|
||||
parserCreate.createTool().parseWithClientLinks()
|
||||
.onSuccess(clientLinks -> {
|
||||
|
||||
@@ -21,7 +21,6 @@ import io.vertx.core.http.HttpServerRequest;
|
||||
import io.vertx.core.http.HttpServerResponse;
|
||||
import io.vertx.core.json.JsonObject;
|
||||
import io.vertx.ext.web.RoutingContext;
|
||||
import io.vertx.ext.web.Session;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
@@ -29,6 +28,7 @@ import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
@@ -47,7 +47,6 @@ public class PlaygroundApi {
|
||||
|
||||
private static final int MAX_PARSER_COUNT = 100;
|
||||
private static final int MAX_CODE_LENGTH = 128 * 1024; // 128KB 代码长度限制
|
||||
private static final String SESSION_AUTH_KEY = "playgroundAuthed";
|
||||
private final DbService dbService = AsyncServiceUtil.getAsyncServiceInstance(DbService.class);
|
||||
|
||||
/**
|
||||
@@ -74,14 +73,14 @@ public class PlaygroundApi {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 否则检查Session中的认证状态
|
||||
Session session = ctx.session();
|
||||
if (session == null) {
|
||||
return false;
|
||||
// 检查 Authorization: Bearer <token> 请求头
|
||||
String authHeader = ctx.request().getHeader("Authorization");
|
||||
if (authHeader != null && authHeader.startsWith("Bearer ") && authHeader.length() > 7) {
|
||||
String token = authHeader.substring(7).trim();
|
||||
return config.validateToken(token);
|
||||
}
|
||||
|
||||
Boolean authed = session.get(SESSION_AUTH_KEY);
|
||||
return authed != null && authed;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -116,12 +115,8 @@ public class PlaygroundApi {
|
||||
try {
|
||||
PlaygroundConfig config = PlaygroundConfig.getInstance();
|
||||
|
||||
// 如果是公开模式,直接成功
|
||||
// 如果是公开模式,直接成功(不需要token)
|
||||
if (config.isPublic()) {
|
||||
Session session = ctx.session();
|
||||
if (session != null) {
|
||||
session.put(SESSION_AUTH_KEY, true);
|
||||
}
|
||||
promise.complete(JsonResult.success("公开模式,无需密码").toJsonObject());
|
||||
return promise.future();
|
||||
}
|
||||
@@ -135,13 +130,14 @@ public class PlaygroundApi {
|
||||
return promise.future();
|
||||
}
|
||||
|
||||
// 验证密码
|
||||
if (config.getPassword().equals(password)) {
|
||||
Session session = ctx.session();
|
||||
if (session != null) {
|
||||
session.put(SESSION_AUTH_KEY, true);
|
||||
}
|
||||
promise.complete(JsonResult.success("登录成功").toJsonObject());
|
||||
// 验证密码(使用常量时间比较防止时序攻击)
|
||||
String storedPassword = config.getPassword();
|
||||
if (storedPassword != null && MessageDigest.isEqual(
|
||||
storedPassword.getBytes(StandardCharsets.UTF_8),
|
||||
password.getBytes(StandardCharsets.UTF_8))) {
|
||||
String token = config.generateToken();
|
||||
JsonObject tokenData = new JsonObject().put("token", token);
|
||||
promise.complete(JsonResult.data(tokenData).toJsonObject());
|
||||
} else {
|
||||
promise.complete(JsonResult.error("密码错误").toJsonObject());
|
||||
}
|
||||
@@ -307,7 +303,6 @@ public class PlaygroundApi {
|
||||
}).onFailure(e -> {
|
||||
long executionTime = System.currentTimeMillis() - startTime;
|
||||
String errorMessage = e.getMessage();
|
||||
String stackTrace = getStackTrace(e);
|
||||
|
||||
log.error("演练场执行失败", e);
|
||||
|
||||
@@ -325,7 +320,6 @@ public class PlaygroundApi {
|
||||
PlaygroundTestResp response = PlaygroundTestResp.builder()
|
||||
.success(false)
|
||||
.error(errorMessage)
|
||||
.stackTrace(stackTrace)
|
||||
.executionTime(executionTime)
|
||||
.logs(respLogs)
|
||||
.build();
|
||||
@@ -336,14 +330,12 @@ public class PlaygroundApi {
|
||||
} catch (Exception e) {
|
||||
long executionTime = System.currentTimeMillis() - startTime;
|
||||
String errorMessage = e.getMessage();
|
||||
String stackTrace = getStackTrace(e);
|
||||
|
||||
log.error("演练场初始化失败", e);
|
||||
|
||||
PlaygroundTestResp response = PlaygroundTestResp.builder()
|
||||
.success(false)
|
||||
.error(errorMessage)
|
||||
.stackTrace(stackTrace)
|
||||
.executionTime(executionTime)
|
||||
.logs(new ArrayList<>())
|
||||
.build();
|
||||
@@ -354,8 +346,7 @@ public class PlaygroundApi {
|
||||
log.error("解析请求参数失败", e);
|
||||
promise.complete(JsonObject.mapFrom(PlaygroundTestResp.builder()
|
||||
.success(false)
|
||||
.error("解析请求参数失败: " + e.getMessage())
|
||||
.stackTrace(getStackTrace(e))
|
||||
.error("解析请求参数失败")
|
||||
.build()));
|
||||
}
|
||||
|
||||
@@ -704,18 +695,5 @@ public class PlaygroundApi {
|
||||
}
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -68,7 +68,8 @@ public class ServerApi {
|
||||
key = keys[0];
|
||||
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)
|
||||
@@ -80,7 +81,8 @@ public class ServerApi {
|
||||
key = keys[0];
|
||||
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(
|
||||
response.putHeader("nfd-cache-hit", res.getCacheHit().toString())
|
||||
.putHeader("nfd-cache-expires", res.getExpires()),
|
||||
@@ -89,6 +91,21 @@ public class ServerApi {
|
||||
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 和解码后的认证参数
|
||||
*
|
||||
@@ -97,7 +114,7 @@ public class ServerApi {
|
||||
* @return JsonObject
|
||||
*/
|
||||
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()) {
|
||||
|
||||
@@ -29,6 +29,11 @@ public class CacheServiceImpl implements CacheService {
|
||||
|
||||
private final CacheManager cacheManager = new CacheManager();
|
||||
|
||||
static {
|
||||
// 服务类加载时注册缓存定时清理任务
|
||||
CacheManager.registerPeriodicCleanup();
|
||||
}
|
||||
|
||||
private Future<CacheLinkInfo> getAndSaveCachedShareLink(ParserCreate parserCreate) {
|
||||
|
||||
// 认证、域名相关(检查是否已经添加过参数,避免重复调用)
|
||||
@@ -99,7 +104,7 @@ public class CacheServiceImpl implements CacheService {
|
||||
promise.complete(result);
|
||||
// 更新缓存
|
||||
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);
|
||||
} else {
|
||||
// 缓存命中,生成过期时间并生成下载命令
|
||||
@@ -115,7 +120,7 @@ public class CacheServiceImpl implements CacheService {
|
||||
|
||||
promise.complete(result);
|
||||
cacheManager.updateTotalByField(cacheKey, CacheTotalField.CACHE_HIT_TOTAL)
|
||||
.onFailure(Throwable::printStackTrace);
|
||||
.onFailure(e -> log.error("更新缓存命中计数失败: cacheKey={}", cacheKey, e));
|
||||
}
|
||||
}).onFailure(t -> promise.fail(t.fillInStackTrace()));
|
||||
|
||||
|
||||
@@ -42,12 +42,11 @@ public class DbServiceImpl implements DbService {
|
||||
@Override
|
||||
public Future<JsonObject> sayOk(String data) {
|
||||
log.info("say ok1 -> wait...");
|
||||
try {
|
||||
Thread.sleep(4000);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return Future.succeededFuture(JsonObject.mapFrom(JsonResult.data("Hi: " + data)));
|
||||
Promise<JsonObject> promise = Promise.promise();
|
||||
cn.qaiu.vx.core.util.VertxHolder.getVertxInstance().setTimer(4000, id -> {
|
||||
promise.complete(JsonObject.mapFrom(JsonResult.data("Hi: " + data)));
|
||||
});
|
||||
return promise.future();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -125,18 +125,18 @@ public class UserServiceImpl implements UserService {
|
||||
if (rows.size() == 0) {
|
||||
promise.complete(new JsonObject()
|
||||
.put("success", false)
|
||||
.put("message", "用户不存在"));
|
||||
.put("message", "用户名或密码错误"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Row row = rows.iterator().next();
|
||||
SysUser existUser = rowToUser(row);
|
||||
|
||||
|
||||
// 验证密码
|
||||
if (!PasswordUtil.checkPassword(user.getPassword(), existUser.getPassword())) {
|
||||
promise.complete(new JsonObject()
|
||||
.put("success", false)
|
||||
.put("message", "密码错误"));
|
||||
.put("message", "用户名或密码错误"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ public class UserServiceImpl implements UserService {
|
||||
log.error("登录查询失败", err);
|
||||
promise.complete(new JsonObject()
|
||||
.put("success", false)
|
||||
.put("message", "登录失败: " + err.getMessage()));
|
||||
.put("message", "登录失败,请稍后重试"));
|
||||
});
|
||||
|
||||
return promise.future();
|
||||
@@ -189,10 +189,10 @@ public class UserServiceImpl implements UserService {
|
||||
.execute(Tuple.of(username))
|
||||
.onSuccess(rows -> {
|
||||
if (rows.size() == 0) {
|
||||
promise.fail("用户不存在");
|
||||
promise.fail("用户名或密码错误");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Row row = rows.iterator().next();
|
||||
SysUser user = rowToUser(row);
|
||||
promise.complete(filterSensitiveInfo(user));
|
||||
@@ -296,10 +296,10 @@ public class UserServiceImpl implements UserService {
|
||||
.execute(Tuple.of(user.getUsername()))
|
||||
.onSuccess(rows -> {
|
||||
if (rows.size() == 0) {
|
||||
promise.fail("用户不存在");
|
||||
promise.fail("用户名或密码错误");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Row row = rows.iterator().next();
|
||||
SysUser existUser = rowToUser(row);
|
||||
|
||||
@@ -406,7 +406,7 @@ public class UserServiceImpl implements UserService {
|
||||
.onFailure(err -> {
|
||||
promise.complete(new JsonObject()
|
||||
.put("success", false)
|
||||
.put("message", "用户不存在"));
|
||||
.put("message", "认证失败,请重新登录"));
|
||||
});
|
||||
|
||||
return promise.future();
|
||||
|
||||
@@ -4,13 +4,12 @@ server:
|
||||
contextPath: /
|
||||
# 使用数据库
|
||||
enableDatabase: true
|
||||
# 服务域名或者IP 生成二维码链接时需要
|
||||
domainName: http://127.0.0.1:6401
|
||||
# 服务域名或者IP 生成二维码链接时需要,不设置则自动从请求地址获取
|
||||
# domainName: http://127.0.0.1:6401
|
||||
# 预览服务URL
|
||||
previewURL: https://nfd-parser.github.io/nfd-preview/preview.html?src=
|
||||
# auth参数加密密钥(16位AES密钥)
|
||||
authEncryptKey: 'nfd_auth_key2026'
|
||||
# domainName: https://lz.qaiu.top
|
||||
|
||||
# 反向代理服务器配置路径(不用加后缀)
|
||||
proxyConf: server-proxy
|
||||
|
||||
Reference in New Issue
Block a user