Compare commits
86 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc78bb11c0 | |||
| e2e3386128 | |||
| 8c01f46fec | |||
| d1e18a5fd4 | |||
| 4c052df342 | |||
| fb5be70529 | |||
| 412ce4c2e7 | |||
| 2937cf8748 | |||
| ab2ee4f7b2 | |||
| 8aeaa629f1 | |||
| 708d204967 | |||
| 89f6196d1f | |||
| 3ce1bd1ce4 | |||
| 62072a5558 | |||
| 87fac5ce53 | |||
| 07cdaafcb2 | |||
| 142c780b50 | |||
| d83e2c6f42 | |||
| 0d4b6537d0 | |||
| 617ad6504d | |||
| bdfad48656 | |||
| f0d2ea9d14 | |||
| a378bad209 | |||
| 87e401738f | |||
| 0874cac2ae | |||
| 427056f4ad | |||
| c484dde326 | |||
| 736bf531f9 | |||
| 0e8ea7003a | |||
| 24e9dd9b5d | |||
| b9c59a3066 | |||
| af192b35ed | |||
| 4c421bcf5f | |||
| 40cbd617ee | |||
| 1811d20d2a | |||
| b83fd3f8c6 | |||
| 2efcf6a812 | |||
| 2197294cce | |||
| 9a5564b3cf | |||
| db08179eb0 | |||
| ff388a8085 | |||
| b1651dabfc | |||
| 88e48b8599 | |||
| 235358c8c2 | |||
| b06665788f | |||
| 86ebbb2cf6 | |||
| c9429efba6 | |||
| 5427dbcb0f | |||
| b255965de3 | |||
| 11779e6d24 | |||
| fac3f4bfc7 | |||
| 9005ed327e | |||
| 0679fe98eb | |||
| 22c68b7e19 | |||
| 82485d1939 | |||
| 63120d418b | |||
| 8f23545439 | |||
| 62f70a9bf5 | |||
| 275b5ed9d0 | |||
| dcc6d4cef2 | |||
| c5c8aa43f2 | |||
| 07a68b01a4 | |||
| fb47b3d358 | |||
| b73b52bc05 | |||
| 235259c24d | |||
| c755a6d466 | |||
| b9222cf33d | |||
| 63d0942b66 | |||
| d6ea0a4748 | |||
| b0deb7eedc | |||
| ab147dd19a | |||
| 4b9f87f7f8 | |||
| 9083d83355 | |||
| f02a027a2a | |||
| 035f15cd7f | |||
| db651d5a55 | |||
| f121b06b91 | |||
| 475d8f0334 | |||
| b54d626496 | |||
| 5202a4b11a | |||
| af73306814 | |||
| f0bbcf00dc | |||
| 9aeef4bc63 | |||
| d6e14b2d00 | |||
| 981137afe9 | |||
| ae22119708 |
@@ -0,0 +1,52 @@
|
||||
# KatelyaTV Cloudflare Pages + D1 部署环境变量示例
|
||||
# 在 Cloudflare Pages 中设置这些环境变量
|
||||
|
||||
# ==================== 数据库配置 ====================
|
||||
# 存储类型:使用 D1
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1
|
||||
|
||||
# ==================== 应用配置 ====================
|
||||
# NextAuth 配置
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here_32_chars_min
|
||||
NEXTAUTH_URL=https://your-domain.pages.dev
|
||||
|
||||
# 站点访问密码配置(可选)
|
||||
# PASSWORD=your_site_password
|
||||
|
||||
# 站点配置
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION=高性能影视播放平台
|
||||
|
||||
# ==================== 可选配置 ====================
|
||||
# Douban API 配置(可选)
|
||||
# DOUBAN_API_KEY=your_douban_api_key
|
||||
|
||||
# 图片代理配置
|
||||
IMAGE_PROXY_ENABLED=true
|
||||
|
||||
# 缓存配置
|
||||
CACHE_TTL=3600
|
||||
|
||||
# ==================== 安全配置 ====================
|
||||
# CORS 配置
|
||||
CORS_ORIGIN=*
|
||||
|
||||
# Rate Limiting 配置
|
||||
RATE_LIMIT_MAX=100
|
||||
RATE_LIMIT_WINDOW=60000
|
||||
|
||||
# ==================== 监控配置 ====================
|
||||
# 健康检查配置
|
||||
HEALTH_CHECK_ENABLED=true
|
||||
HEALTH_CHECK_INTERVAL=30
|
||||
|
||||
# 日志配置
|
||||
LOG_LEVEL=info
|
||||
LOG_FORMAT=json
|
||||
|
||||
# ==================== 生产环境配置 ====================
|
||||
NODE_ENV=production
|
||||
|
||||
# ==================== Cloudflare 特有配置 ====================
|
||||
# D1 数据库绑定名称(在 wrangler.toml 中配置)
|
||||
# D1_DATABASE_BINDING=DB
|
||||
+13
-3
@@ -6,9 +6,12 @@
|
||||
NEXT_PUBLIC_STORAGE_TYPE=kvrocks
|
||||
|
||||
# Kvrocks 连接配置
|
||||
KVROCKS_URL=redis://localhost:6666
|
||||
# KVROCKS_URL=redis://kvrocks:6666 # Docker 部署时使用此配置
|
||||
KVROCKS_PASSWORD=your_secure_password_here
|
||||
KVROCKS_URL=redis://kvrocks:6666
|
||||
# Kvrocks 密码配置(可选)
|
||||
# 选项1:不使用密码(推荐用于开发环境)
|
||||
# KVROCKS_PASSWORD=
|
||||
# 选项2:使用密码(推荐用于生产环境)
|
||||
# KVROCKS_PASSWORD=your_secure_password_here
|
||||
KVROCKS_DATABASE=0
|
||||
|
||||
# ==================== 应用配置 ====================
|
||||
@@ -16,6 +19,13 @@ KVROCKS_DATABASE=0
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here
|
||||
NEXTAUTH_URL=http://localhost:3000
|
||||
|
||||
# 管理员账号配置(必填)
|
||||
USERNAME=admin
|
||||
PASSWORD=your_admin_password
|
||||
|
||||
# 用户注册配置
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
|
||||
# 站点配置
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION=高性能影视播放平台
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
# KatelyaTV Redis 部署环境变量示例
|
||||
# 复制此文件为 .env 并修改相应值
|
||||
|
||||
# ==================== 数据库配置 ====================
|
||||
# 存储类型:使用 Redis
|
||||
NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
|
||||
# Redis 连接配置
|
||||
REDIS_URL=redis://katelyatv-redis:6379
|
||||
# Redis 密码配置(可选)
|
||||
# REDIS_PASSWORD=your_redis_password
|
||||
REDIS_DATABASE=0
|
||||
|
||||
# ==================== 应用配置 ====================
|
||||
# NextAuth 配置
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here
|
||||
NEXTAUTH_URL=http://localhost:3000
|
||||
|
||||
# 站点访问密码配置(可选)
|
||||
# PASSWORD=your_site_password
|
||||
|
||||
# 站点配置
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION=高性能影视播放平台
|
||||
|
||||
# ==================== 部署配置 ====================
|
||||
# 生产环境配置
|
||||
NODE_ENV=production
|
||||
PORT=3000
|
||||
|
||||
# Docker 配置
|
||||
DOCKER_IMAGE_TAG=latest
|
||||
|
||||
# ==================== 可选配置 ====================
|
||||
# Douban API 配置(可选)
|
||||
# DOUBAN_API_KEY=your_douban_api_key
|
||||
|
||||
# 图片代理配置(可选)
|
||||
IMAGE_PROXY_ENABLED=true
|
||||
|
||||
# 缓存配置
|
||||
CACHE_TTL=3600
|
||||
|
||||
# ==================== 安全配置 ====================
|
||||
# CORS 配置
|
||||
CORS_ORIGIN=*
|
||||
|
||||
# Rate Limiting 配置
|
||||
RATE_LIMIT_MAX=100
|
||||
RATE_LIMIT_WINDOW=60000
|
||||
|
||||
# ==================== 监控配置 ====================
|
||||
# 健康检查配置
|
||||
HEALTH_CHECK_ENABLED=true
|
||||
HEALTH_CHECK_INTERVAL=30
|
||||
|
||||
# 日志配置
|
||||
LOG_LEVEL=info
|
||||
LOG_FORMAT=json
|
||||
@@ -0,0 +1,62 @@
|
||||
# KatelyaTV Vercel 环境变量配置示例
|
||||
# 复制此文件为 .env.local 并填入实际值
|
||||
|
||||
# ==============================================
|
||||
# 基础配置(必填)
|
||||
# ==============================================
|
||||
|
||||
# 访问密码(必填)
|
||||
PASSWORD=your_secure_password_here
|
||||
|
||||
# 管理员用户名(可选,用于管理界面登录)
|
||||
USERNAME=admin
|
||||
|
||||
# ==============================================
|
||||
# 存储配置
|
||||
# ==============================================
|
||||
|
||||
# 存储类型:localstorage(默认)/ redis / upstash / d1
|
||||
NEXT_PUBLIC_STORAGE_TYPE=localstorage
|
||||
|
||||
# ==============================================
|
||||
# Upstash Redis 配置(选择 upstash 存储时需要)
|
||||
# ==============================================
|
||||
|
||||
# Upstash Redis 连接 URL
|
||||
# UPSTASH_URL=https://xxx.upstash.io
|
||||
|
||||
# Upstash Redis 访问令牌
|
||||
# UPSTASH_TOKEN=AX_xxx
|
||||
|
||||
# ==============================================
|
||||
# Redis 配置(选择 redis 存储时需要)
|
||||
# ==============================================
|
||||
|
||||
# Redis 连接字符串
|
||||
# REDIS_URL=redis://localhost:6379
|
||||
|
||||
# ==============================================
|
||||
# 站点配置(可选)
|
||||
# ==============================================
|
||||
|
||||
# 站点显示名称
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV
|
||||
|
||||
# 站点描述
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION=高性能影视播放平台
|
||||
|
||||
# 是否允许用户注册(true/false)
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=false
|
||||
|
||||
# ==============================================
|
||||
# 高级配置(可选)
|
||||
# ==============================================
|
||||
|
||||
# 跨域配置
|
||||
# CORS_ORIGIN=*
|
||||
|
||||
# 启用访问统计(true/false)
|
||||
# ENABLE_ANALYTICS=false
|
||||
|
||||
# Node.js 运行时优化
|
||||
# NODE_OPTIONS=--max-old-space-size=1024
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
platforms: linux/amd64,linux/arm64
|
||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||
push: false
|
||||
tags: |
|
||||
katelyatv:latest
|
||||
@@ -58,7 +58,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
platforms: linux/amd64,linux/arm64
|
||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/${{ github.repository_owner }}/katelyatv:latest
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
- name: Test Summary
|
||||
run: |
|
||||
echo "✅ Docker build completed successfully!"
|
||||
echo "📦 Multi-platform support: linux/amd64, linux/arm64"
|
||||
echo "📦 Multi-platform support: linux/amd64, linux/arm64, linux/arm/v7"
|
||||
echo "🔄 Cache optimization enabled"
|
||||
if [ "${{ github.event_name }}" != "pull_request" ] && [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
||||
echo "🚀 Images pushed to GitHub Container Registry"
|
||||
|
||||
@@ -16,9 +16,12 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
IMAGE_NAME: katelya77/katelyatv
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
IMAGE_NAME: ${{ github.repository }}
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
@@ -30,11 +33,13 @@ jobs:
|
||||
platform:
|
||||
- linux/amd64
|
||||
- linux/arm64
|
||||
- linux/arm/v7
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Set image name to lowercase
|
||||
run: echo "IMAGE_NAME=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
|
||||
id: image_name
|
||||
run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
with:
|
||||
@@ -51,7 +56,7 @@ jobs:
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
images: ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=ref,event=pr
|
||||
@@ -62,8 +67,6 @@ jobs:
|
||||
org.opencontainers.image.description=katelyatv - A modern streaming platform
|
||||
org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
|
||||
org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
|
||||
org.opencontainers.image.version=${{ steps.meta.outputs.version }}
|
||||
org.opencontainers.image.created=${{ steps.meta.outputs.created }}
|
||||
org.opencontainers.image.revision=${{ github.sha }}
|
||||
org.opencontainers.image.licenses=MIT
|
||||
- name: Build Docker image
|
||||
@@ -77,7 +80,7 @@ jobs:
|
||||
cache-from: type=gha,scope=${{ github.ref_name }}-${{ matrix.platform }}
|
||||
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-${{ matrix.platform }}
|
||||
outputs: |
|
||||
type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
|
||||
type=image,name=${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
|
||||
provenance: false
|
||||
sbom: false
|
||||
- name: Export digest
|
||||
@@ -104,9 +107,12 @@ jobs:
|
||||
needs:
|
||||
- build-and-push
|
||||
if: github.event_name != 'pull_request'
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
steps:
|
||||
- name: Set image name to lowercase
|
||||
run: echo "IMAGE_NAME=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
|
||||
id: image_name
|
||||
run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
|
||||
- name: Download digests
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
@@ -125,7 +131,7 @@ jobs:
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
images: ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=sha,prefix={{branch}}-
|
||||
@@ -134,28 +140,28 @@ jobs:
|
||||
working-directory: /tmp/digests
|
||||
run: |
|
||||
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
||||
$(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
|
||||
$(printf '${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}@sha256:%s ' *)
|
||||
- name: Get multi-arch digest
|
||||
id: get_digest
|
||||
run: |
|
||||
# 直接从 docker pull 获取 digest,这是最可靠的方法
|
||||
digest=$(docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} 2>&1 | grep "Digest:" | cut -d' ' -f2 || echo "")
|
||||
digest=$(docker pull ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}:${{ steps.meta.outputs.version }} 2>&1 | grep "Digest:" | cut -d' ' -f2 || echo "")
|
||||
if [ -z "$digest" ]; then
|
||||
# 备选方案:使用 crane 风格的检查(如果支持的话)
|
||||
digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} | grep "Digest:" | head -1 | cut -d' ' -f2 || echo "")
|
||||
digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}:${{ steps.meta.outputs.version }} | grep "Digest:" | head -1 | cut -d' ' -f2 || echo "")
|
||||
fi
|
||||
if [ -z "$digest" ]; then
|
||||
# 最后备选:从 raw manifest 计算
|
||||
digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} --raw | sha256sum | awk '{print "sha256:"$1}')
|
||||
digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}:${{ steps.meta.outputs.version }} --raw | sha256sum | awk '{print "sha256:"$1}')
|
||||
fi
|
||||
echo "digest=$digest" >> $GITHUB_OUTPUT
|
||||
- name: Inspect image
|
||||
run: |
|
||||
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
|
||||
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name }}:${{ steps.meta.outputs.version }}
|
||||
- name: Generate artifact attestation
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: actions/attest-build-provenance@v1
|
||||
with:
|
||||
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
|
||||
subject-name: ${{ env.REGISTRY }}/${{ steps.image_name.outputs.name}}
|
||||
subject-digest: ${{ steps.get_digest.outputs.digest }}
|
||||
push-to-registry: true
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -0,0 +1,91 @@
|
||||
# 成人内容过滤功能验证指南
|
||||
|
||||
## 🔒 过滤功能说明
|
||||
|
||||
### 工作原理
|
||||
|
||||
1. **默认行为**:所有用户默认开启成人内容过滤
|
||||
2. **源级别标记**:每个视频源都有 `is_adult` 标记
|
||||
3. **用户设置**:用户可通过设置页面控制过滤开关
|
||||
4. **API 级别分离**:搜索 API 将结果分为 `regular_results` 和 `adult_results`
|
||||
|
||||
### 过滤逻辑
|
||||
|
||||
```typescript
|
||||
// 1. 获取用户设置
|
||||
shouldFilterAdult = userSettings?.filter_adult_content !== false; // 默认true
|
||||
|
||||
// 2. 源分离
|
||||
getAvailableApiSites() // 返回 is_adult: false 的源
|
||||
getAdultApiSites() // 返回 is_adult: true 的源
|
||||
|
||||
// 3. 搜索分离
|
||||
regular_results: [...] // 来自常规源
|
||||
adult_results: [...] // 来自成人源(仅在用户关闭过滤且明确请求时)
|
||||
```
|
||||
|
||||
## 🧪 测试步骤
|
||||
|
||||
### 1. 添加测试源
|
||||
|
||||
在管理后台添加以下测试源:
|
||||
|
||||
**常规源:**
|
||||
|
||||
```
|
||||
源标识:test_regular
|
||||
源名称:测试常规源
|
||||
API地址:https://okzy.tv/api.php/provide/vod
|
||||
详情地址:https://okzy.tv/api.php/provide/vod/?ac=detail&ids={ids}
|
||||
是否成人内容:❌ 否
|
||||
```
|
||||
|
||||
**成人内容源:**
|
||||
|
||||
```
|
||||
源标识:test_adult
|
||||
源名称:测试成人源
|
||||
API地址:https://adult-test.com/api.php/provide/vod
|
||||
详情地址:https://adult-test.com/api.php/provide/vod/?ac=detail&ids={ids}
|
||||
是否成人内容:✅ 是
|
||||
```
|
||||
|
||||
### 2. 验证过滤开启状态
|
||||
|
||||
- 访问用户设置页面,确认"成人内容过滤"开关为**开启**
|
||||
- 搜索任意关键词,应该只返回常规源的结果
|
||||
- API 响应中 `adult_results` 应为空数组
|
||||
|
||||
### 3. 验证过滤关闭状态
|
||||
|
||||
- 关闭"成人内容过滤"开关
|
||||
- 搜索相同关键词
|
||||
- 应该看到结果分为两组:常规内容 + 成人内容
|
||||
|
||||
### 4. API 级别验证
|
||||
|
||||
```bash
|
||||
# 开启过滤(默认)
|
||||
curl "http://localhost:3001/api/search?q=test"
|
||||
# 预期:adult_results = []
|
||||
|
||||
# 关闭过滤且明确请求成人内容
|
||||
curl "http://localhost:3001/api/search?q=test&include_adult=true" -H "Authorization: Bearer username"
|
||||
# 预期:adult_results 包含成人源结果
|
||||
```
|
||||
|
||||
## ✅ 验证要点
|
||||
|
||||
1. **默认保护**:新用户默认开启过滤
|
||||
2. **源级别隔离**:is_adult 标记正确分离源
|
||||
3. **用户可控**:设置页面可以切换过滤状态
|
||||
4. **API 响应分离**:结果明确分组
|
||||
5. **明确请求**:关闭过滤后需明确请求成人内容才返回
|
||||
|
||||
## 🚨 安全检查
|
||||
|
||||
- [ ] 默认开启过滤
|
||||
- [ ] 设置页面有明确的年龄警告
|
||||
- [ ] API 不会意外返回成人内容
|
||||
- [ ] 源标记 `is_adult: true` 的源被正确隔离
|
||||
- [ ] 前端正确处理分组结果
|
||||
@@ -8,8 +8,21 @@
|
||||
- 🖱️ **用户界面优化**
|
||||
- 在用户菜单中新增"TVBox配置"按钮,提供便捷的配置入口
|
||||
- 新增电视图标(Tv)标识,界面更加直观
|
||||
|
||||
- 🎬 **跳过控制器增强**
|
||||
- 新增片尾倒计时模式选择:支持剩余时间模式和绝对时间模式
|
||||
- 剩余时间模式:基于视频剩余时间进行倒计时(推荐)
|
||||
- 绝对时间模式:基于视频播放时间进行检测(兼容旧版本)
|
||||
- 优化用户界面,提供更清晰的配置说明和帮助文本
|
||||
- 优化用户体验,一键访问TVBox配置页面
|
||||
|
||||
### 🐛 Bug修复
|
||||
- 🎯 **选集点击精确性修复**
|
||||
- 修复选集界面点击偏移问题,确保点击哪个集数就选择哪个集数
|
||||
- 问题根因:SkipController的固定定位面板(bottom-4 right-4)覆盖了选集面板右下角
|
||||
- 解决方案:将跳过配置面板移动到左下角(bottom-4 left-4),避免与选集面板冲突
|
||||
- 保持所有跳过功能正常工作,仅调整UI布局避免重叠
|
||||
|
||||
### 🔧 重要改进
|
||||
- 🔓 **TVBox API 认证优化**
|
||||
- **重要变更**:TVBox API (`/api/tvbox`) 现已开放无需认证访问
|
||||
|
||||
@@ -0,0 +1,266 @@
|
||||
# Cloudflare Pages 成人内容过滤配置指南
|
||||
|
||||
本文档详细说明如何在 Cloudflare Pages 部署中配置成人内容过滤功能。
|
||||
|
||||
## ⚠️ 重要说明
|
||||
|
||||
成人内容过滤功能需要**数据库存储支持**,不能使用默认的 `localstorage` 存储类型。在 Cloudflare Pages 环境下,必须配置 D1 数据库。
|
||||
|
||||
## 🚀 快速配置步骤
|
||||
|
||||
### 1. 创建 D1 数据库
|
||||
|
||||
```bash
|
||||
# 安装并登录 Wrangler CLI
|
||||
npm install -g wrangler
|
||||
wrangler auth login
|
||||
|
||||
# 创建 D1 数据库
|
||||
wrangler d1 create katelyatv-db
|
||||
```
|
||||
|
||||
记录输出的数据库 ID,类似:
|
||||
|
||||
```
|
||||
✅ Successfully created DB 'katelyatv-db' in region APAC
|
||||
Created your database using D1's new storage backend.
|
||||
database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
||||
```
|
||||
|
||||
### 2. 初始化数据库表
|
||||
|
||||
```bash
|
||||
# 克隆项目(如果还没有)
|
||||
git clone https://github.com/your-username/KatelyaTV.git
|
||||
cd KatelyaTV
|
||||
|
||||
# 初始化数据库表(包含 user_settings 表)
|
||||
wrangler d1 execute katelyatv-db --file=./scripts/d1-init.sql
|
||||
```
|
||||
|
||||
### 3. 配置 wrangler.toml
|
||||
|
||||
在项目根目录创建或更新 `wrangler.toml` 文件:
|
||||
|
||||
```toml
|
||||
name = "katelyatv"
|
||||
compatibility_date = "2023-12-01"
|
||||
compatibility_flags = ["nodejs_compat"]
|
||||
|
||||
[[d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "katelyatv-db"
|
||||
database_id = "your-database-id-here" # 替换为步骤1中获得的ID
|
||||
|
||||
[build]
|
||||
command = "pnpm install --frozen-lockfile && pnpm run pages:build"
|
||||
|
||||
[[build.environment_variables]]
|
||||
NEXT_PUBLIC_STORAGE_TYPE = "d1"
|
||||
|
||||
[vars]
|
||||
USERNAME = "admin"
|
||||
PASSWORD = "your_password_here"
|
||||
NEXT_PUBLIC_ENABLE_REGISTER = "true"
|
||||
```
|
||||
|
||||
### 4. 部署到 Cloudflare Pages
|
||||
|
||||
#### 方法一:通过 Cloudflare Dashboard
|
||||
|
||||
1. 登录 [Cloudflare Dashboard](https://dash.cloudflare.com/)
|
||||
2. 进入 **Pages** 服务
|
||||
3. 点击 **Create a project**
|
||||
4. 连接 GitHub 仓库并选择 KatelyaTV 项目
|
||||
5. 配置构建设置:
|
||||
- **Build command**: `pnpm install --frozen-lockfile && pnpm run pages:build`
|
||||
- **Build output directory**: `.vercel/output/static`
|
||||
- **Root directory**: 留空
|
||||
6. 在 **Environment variables** 中添加:
|
||||
```
|
||||
NEXT_PUBLIC_STORAGE_TYPE = d1
|
||||
USERNAME = admin
|
||||
PASSWORD = your_password_here
|
||||
NEXT_PUBLIC_ENABLE_REGISTER = true
|
||||
```
|
||||
7. 在 **Functions** 标签页中:
|
||||
- 启用 **Compatibility flags**: `nodejs_compat`
|
||||
- 配置 **D1 database bindings**:
|
||||
- Variable name: `DB`
|
||||
- D1 database: 选择刚创建的数据库
|
||||
|
||||
#### 方法二:通过命令行部署
|
||||
|
||||
```bash
|
||||
# 构建项目
|
||||
pnpm install --frozen-lockfile
|
||||
pnpm run pages:build
|
||||
|
||||
# 部署到 Pages
|
||||
wrangler pages deploy .vercel/output/static --project-name katelyatv
|
||||
```
|
||||
|
||||
## 🔍 验证配置
|
||||
|
||||
部署完成后,访问你的网站:
|
||||
|
||||
1. **登录系统**:使用配置的用户名密码登录
|
||||
2. **访问设置页面**:点击用户菜单中的「内容过滤」
|
||||
3. **检查功能**:应该能够看到成人内容过滤开关,而不是"获取用户设置失败"错误
|
||||
|
||||
## 🐛 故障排除
|
||||
|
||||
### 错误:"获取用户设置失败"
|
||||
|
||||
**可能原因**:
|
||||
|
||||
- 未配置 D1 数据库
|
||||
- `NEXT_PUBLIC_STORAGE_TYPE` 未设置为 `d1`
|
||||
- 数据库中缺少 `user_settings` 表
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 检查环境变量配置
|
||||
2. 验证 D1 数据库绑定
|
||||
3. 执行数据库迁移:
|
||||
```bash
|
||||
wrangler d1 execute katelyatv-db --file=./scripts/d1-init.sql
|
||||
```
|
||||
|
||||
### 错误:D1 数据库连接失败
|
||||
|
||||
**可能原因**:
|
||||
|
||||
- wrangler.toml 中的数据库配置错误
|
||||
- Cloudflare Pages 中的 D1 绑定未正确配置
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 验证 `wrangler.toml` 中的 database_id 是否正确
|
||||
2. 在 Cloudflare Pages Dashboard 中检查 Functions → D1 database bindings
|
||||
3. 确保绑定的变量名为 `DB`
|
||||
|
||||
### 🚨 错误:功能正常但开关无法操作(重要修复)
|
||||
|
||||
**问题描述**:
|
||||
|
||||
- 页面不再显示"获取用户设置失败"错误
|
||||
- 但成人内容过滤开关无法切换,点击无响应
|
||||
|
||||
**根本原因**:
|
||||
数据库表结构与代码期望的格式不匹配
|
||||
|
||||
**完整解决方案**:
|
||||
|
||||
#### 第一步:重建兼容表结构
|
||||
|
||||
在 Cloudflare D1 Console 中执行以下 SQL:
|
||||
|
||||
```sql
|
||||
-- 删除现有的不兼容表
|
||||
DROP TABLE IF EXISTS user_settings;
|
||||
|
||||
-- 创建与代码完全兼容的表结构
|
||||
CREATE TABLE user_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL UNIQUE,
|
||||
settings TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL
|
||||
);
|
||||
|
||||
-- 添加必要索引
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_username ON user_settings(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_updated_time ON user_settings(updated_time DESC);
|
||||
```
|
||||
|
||||
#### 第二步:插入用户设置数据
|
||||
|
||||
```sql
|
||||
-- 插入设置数据(请替换 'your_username' 为实际用户名)
|
||||
INSERT INTO user_settings (username, settings, updated_time) VALUES (
|
||||
'your_username',
|
||||
'{"filter_adult_content":true,"theme":"auto","language":"zh-CN","auto_play":true,"video_quality":"auto"}',
|
||||
strftime('%s', 'now')
|
||||
);
|
||||
```
|
||||
|
||||
#### 第三步:验证数据正确性
|
||||
|
||||
```sql
|
||||
-- 验证数据插入成功
|
||||
SELECT * FROM user_settings WHERE username = 'your_username';
|
||||
```
|
||||
|
||||
#### 第四步:重新部署并测试
|
||||
|
||||
1. 在 Cloudflare Pages 中触发重新部署
|
||||
2. 清除浏览器缓存并重新登录
|
||||
3. 测试成人内容过滤开关功能
|
||||
|
||||
**重要说明**:
|
||||
|
||||
- `settings` 字段必须是有效的 JSON 字符串
|
||||
- `filter_adult_content` 为 `true` 表示开启过滤
|
||||
- `updated_time` 使用 Unix 时间戳格式
|
||||
|
||||
### 错误:构建失败
|
||||
|
||||
**可能原因**:
|
||||
|
||||
- Node.js 兼容性问题
|
||||
- 依赖安装失败
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 确保启用了 `nodejs_compat` 兼容性标志
|
||||
2. 检查构建命令是否正确
|
||||
3. 查看构建日志中的具体错误信息
|
||||
|
||||
## 📊 数据库监控
|
||||
|
||||
在 Cloudflare Dashboard 中可以监控 D1 数据库的使用情况:
|
||||
|
||||
1. 进入 **D1** 服务
|
||||
2. 选择数据库实例
|
||||
3. 查看 **Metrics** 标签页
|
||||
4. 监控查询次数、存储使用量等指标
|
||||
|
||||
## 🔒 安全建议
|
||||
|
||||
1. **密码安全**:使用强密码,避免使用默认密码
|
||||
2. **环境变量**:敏感信息通过环境变量配置,不要硬编码
|
||||
3. **用户注册**:根据需要开启或关闭用户注册功能
|
||||
4. **访问控制**:考虑使用 Cloudflare Access 进一步控制访问
|
||||
|
||||
## 🆕 更新和迁移
|
||||
|
||||
当项目更新包含数据库结构变更时:
|
||||
|
||||
1. **备份数据**:
|
||||
|
||||
```bash
|
||||
wrangler d1 export katelyatv-db --output backup.sql
|
||||
```
|
||||
|
||||
2. **执行迁移**:
|
||||
|
||||
```bash
|
||||
wrangler d1 execute katelyatv-db --file=D1_MIGRATION.md的SQL脚本
|
||||
```
|
||||
|
||||
3. **验证功能**:确保所有功能正常工作
|
||||
|
||||
## 📚 相关文档
|
||||
|
||||
- [D1 数据库迁移文档](./D1_MIGRATION.md)
|
||||
- [Cloudflare Pages 官方文档](https://developers.cloudflare.com/pages/)
|
||||
- [D1 数据库文档](https://developers.cloudflare.com/d1/)
|
||||
- [Wrangler CLI 文档](https://developers.cloudflare.com/workers/wrangler/)
|
||||
|
||||
## 💬 需要帮助?
|
||||
|
||||
如果在配置过程中遇到问题:
|
||||
|
||||
1. 检查本文档的故障排除部分
|
||||
2. 查看项目的 GitHub Issues
|
||||
3. 提交新的 Issue 并提供详细的错误信息和配置详情
|
||||
@@ -0,0 +1,284 @@
|
||||
# Cloudflare Pages 部署指南
|
||||
|
||||
## 🚨 500 Internal Server Error 解决方案
|
||||
|
||||
### 问题:部署成功但运行时500错误
|
||||
|
||||
**原因分析:**
|
||||
|
||||
部署日志显示构建成功,但访问网站时出现500错误,通常是由于环境变量配置问题导致的运行时错误。
|
||||
|
||||
**主要原因:**
|
||||
|
||||
1. **USERNAME 环境变量缺失** - 这是最常见的原因
|
||||
2. D1 数据库绑定问题
|
||||
3. 其他关键环境变量未设置
|
||||
|
||||
### 🎯 解决步骤
|
||||
|
||||
#### 第一步:设置必需的环境变量
|
||||
|
||||
在 Cloudflare Pages 控制台中:
|
||||
|
||||
1. 进入您的项目设置
|
||||
2. 点击 "Settings" → "Environment variables"
|
||||
3. 添加以下**必需**环境变量:
|
||||
|
||||
**USERNAME 变量:**
|
||||
- **Variable name**: `USERNAME`
|
||||
- **Value**: `katelya` (您的站长用户名)
|
||||
- **Type**: Plain text
|
||||
- **Environment**: Production 和 Preview 都要添加
|
||||
|
||||
**PASSWORD 变量:** ⭐ **关键变量**
|
||||
- **Variable name**: `PASSWORD`
|
||||
- **Value**: `您设置的访问密码`
|
||||
- **Type**: Plain text (**重要:不要选择密码类型**)
|
||||
- **Environment**: Production 和 Preview 都要添加
|
||||
|
||||
4. 点击 "Save"
|
||||
5. 重新部署项目
|
||||
|
||||
#### 第二步:验证其他环境变量
|
||||
|
||||
确保以下环境变量已正确设置:
|
||||
|
||||
```bash
|
||||
# ⭐ 关键必需变量(缺一不可)
|
||||
USERNAME=katelya # 站长用户名
|
||||
PASSWORD=your-secure-password # 访问密码
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1 # 存储类型
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV # 站点名称
|
||||
NODE_ENV=production # 运行环境
|
||||
|
||||
# 推荐设置
|
||||
NEXTAUTH_URL=https://your-domain.pages.dev
|
||||
IMAGE_PROXY_ENABLED=true
|
||||
```
|
||||
|
||||
**⚠️ 重要提醒:**
|
||||
|
||||
- `PASSWORD` 必须设置为 "Plain text" 类型,不要选择 "Secret" 或 "Password" 类型
|
||||
- `PASSWORD` 的值应该与您之前在本地或其他环境中使用的密码一致
|
||||
|
||||
#### 第三步:检查 D1 数据库绑定
|
||||
|
||||
1. 确保在 Cloudflare Pages 中绑定了 D1 数据库
|
||||
2. 绑定名称应为 `DB`
|
||||
3. 数据库应已初始化(运行过初始化脚本)
|
||||
|
||||
## 部署问题修复
|
||||
|
||||
### 问题1:Edge Runtime 配置错误
|
||||
|
||||
**错误信息:**
|
||||
|
||||
```text
|
||||
The following routes were not configured to run with the Edge Runtime:
|
||||
- /api/test/simple
|
||||
|
||||
Please make sure that all your non-static routes export the following edge runtime route segment config:
|
||||
export const runtime = 'edge';
|
||||
```
|
||||
|
||||
**解决方案:**
|
||||
|
||||
✅ 已修复:删除了空的 `/api/test/simple/route.ts` 文件和相关目录。
|
||||
|
||||
**验证:**
|
||||
|
||||
所有API路由现在都正确配置了 `export const runtime = 'edge';`
|
||||
|
||||
### 问题2:Windows环境下的bash依赖问题
|
||||
|
||||
**错误信息:**
|
||||
|
||||
```text
|
||||
Error: spawn bash ENOENT
|
||||
```
|
||||
|
||||
**原因:**
|
||||
|
||||
`@cloudflare/next-on-pages` 在Windows环境下需要bash来执行构建过程。
|
||||
|
||||
**解决方案选项:**
|
||||
|
||||
#### 选项1:使用 WSL (推荐)
|
||||
|
||||
1. 安装 Windows Subsystem for Linux (WSL)
|
||||
2. 在WSL环境中运行构建命令
|
||||
|
||||
#### 选项2:使用 Git Bash
|
||||
|
||||
1. 确保已安装 Git for Windows
|
||||
2. 在Git Bash中运行构建命令:
|
||||
|
||||
```bash
|
||||
pnpm run pages:build
|
||||
```
|
||||
|
||||
#### 选项3:云端构建
|
||||
|
||||
直接在Cloudflare Pages的CI/CD环境中构建,因为云环境通常是Linux系统。
|
||||
|
||||
## 正确的部署步骤
|
||||
|
||||
### 1. 本地验证构建
|
||||
|
||||
```bash
|
||||
# 生成运行时配置
|
||||
pnpm run gen:runtime
|
||||
|
||||
# 生成manifest
|
||||
pnpm run gen:manifest
|
||||
|
||||
# Next.js 构建
|
||||
npx next build
|
||||
|
||||
# Cloudflare Pages 适配 (在Linux/WSL环境中)
|
||||
npx @cloudflare/next-on-pages
|
||||
```
|
||||
|
||||
### 2. Cloudflare Pages 配置
|
||||
|
||||
在Cloudflare Pages控制台中设置:
|
||||
|
||||
**构建配置:**
|
||||
|
||||
- 构建命令: `pnpm install --frozen-lockfile && pnpm run pages:build`
|
||||
- 构建输出目录: `.vercel/output/static`
|
||||
- Node.js 版本: `20.x`
|
||||
|
||||
**环境变量:** (已在 `wrangler.toml` 中配置)
|
||||
|
||||
- `NEXT_PUBLIC_STORAGE_TYPE=d1`
|
||||
- `NEXT_PUBLIC_SITE_NAME=KatelyaTV`
|
||||
- 其他变量见 `wrangler.toml`
|
||||
|
||||
### 3. 验证部署
|
||||
|
||||
部署成功后,检查:
|
||||
|
||||
1. 所有API路由是否正常工作
|
||||
2. 静态页面是否正确生成
|
||||
3. Edge Runtime是否正常运行
|
||||
|
||||
## 常见问题排查
|
||||
|
||||
### API路由问题
|
||||
|
||||
确保所有API文件都包含:
|
||||
|
||||
```typescript
|
||||
export const runtime = 'edge';
|
||||
```
|
||||
|
||||
### 构建失败
|
||||
|
||||
1. 检查所有依赖是否安装完整
|
||||
2. 确认TypeScript编译无错误
|
||||
3. 验证环境变量配置
|
||||
|
||||
### 性能优化
|
||||
|
||||
- 已启用默认代码分割
|
||||
- PWA缓存策略已配置
|
||||
- 静态资源优化已开启
|
||||
|
||||
## 部署状态验证
|
||||
|
||||
部署完成后,访问以下端点验证:
|
||||
|
||||
- `/api/server-config` - 服务器配置
|
||||
- `/api/debug/env` - 环境变量 (开发时)
|
||||
- 主页 `/` - 前端页面
|
||||
|
||||
## 🔧 完整故障排除指南
|
||||
|
||||
### 500错误诊断清单
|
||||
|
||||
#### 1. 环境变量检查
|
||||
|
||||
```bash
|
||||
# 在 Cloudflare Pages 控制台检查这些变量
|
||||
USERNAME=katelya # ❌ 经常缺失
|
||||
PASSWORD=your-password # ❌ 最关键,经常缺失或类型错误
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1 # ✅ 通常已设置
|
||||
NEXT_PUBLIC_SITE_NAME=KatelyaTV # ✅ 通常已设置
|
||||
NODE_ENV=production # ✅ 通常已设置
|
||||
```
|
||||
|
||||
**特别注意 PASSWORD 变量:**
|
||||
|
||||
- ✅ 正确:类型选择 "Plain text"
|
||||
- ❌ 错误:类型选择 "Secret" 或 "Password"
|
||||
- ❌ 错误:值为空或包含特殊字符
|
||||
|
||||
#### 2. D1 数据库检查
|
||||
|
||||
- [ ] D1 数据库是否已创建
|
||||
- [ ] 数据库是否正确绑定到 Pages 项目
|
||||
- [ ] 绑定名称是否为 `DB`
|
||||
- [ ] 数据库是否已初始化
|
||||
|
||||
#### 3. 常见错误模式
|
||||
|
||||
| 错误现象 | 原因 | 解决方案 |
|
||||
|---------|------|----------|
|
||||
| 500 错误 | PASSWORD 未设置或类型错误 | 设置 PASSWORD 为 Plain text 类型 |
|
||||
| 500 + 管理页面无法访问 | USERNAME 未设置 | 添加 USERNAME 环境变量 |
|
||||
| 重定向到 /warning 页面 | PASSWORD 环境变量缺失 | 检查 PASSWORD 变量设置 |
|
||||
| 500 + 数据库相关错误 | D1 绑定问题 | 检查数据库绑定配置 |
|
||||
| 构建成功但运行失败 | 关键环境变量缺失 | 检查 USERNAME 和 PASSWORD |
|
||||
|
||||
### 验证部署成功
|
||||
|
||||
部署完成后访问以下端点验证:
|
||||
|
||||
```bash
|
||||
# 1. 基本页面
|
||||
https://your-domain.pages.dev/ # 主页
|
||||
https://your-domain.pages.dev/login # 登录页
|
||||
|
||||
# 2. API 端点
|
||||
https://your-domain.pages.dev/api/server-config # 服务器配置
|
||||
https://your-domain.pages.dev/api/debug/env # 环境变量(开发时)
|
||||
|
||||
# 3. 管理功能
|
||||
https://your-domain.pages.dev/admin # 管理后台(需要正确的 USERNAME)
|
||||
```
|
||||
|
||||
### 紧急恢复方案
|
||||
|
||||
如果新部署出现问题:
|
||||
|
||||
1. **立即回滚**
|
||||
|
||||
```bash
|
||||
# 在 Cloudflare Pages 控制台
|
||||
Deployments → 选择之前的工作版本 → Rollback
|
||||
```
|
||||
|
||||
2. **保留环境变量**
|
||||
|
||||
```bash
|
||||
# 记录当前所有环境变量配置
|
||||
# 在新部署前先备份设置
|
||||
```
|
||||
|
||||
3. **分步部署**
|
||||
|
||||
```bash
|
||||
# 1. 先部署代码(不修改环境变量)
|
||||
# 2. 验证基本功能
|
||||
# 3. 逐步添加/修改环境变量
|
||||
```
|
||||
|
||||
## 后续维护
|
||||
|
||||
1. 定期更新依赖
|
||||
2. 监控部署日志
|
||||
3. 备份数据库配置
|
||||
4. 关注Cloudflare Pages更新
|
||||
5. 定期检查环境变量配置
|
||||
6. 监控网站运行状态
|
||||
@@ -0,0 +1,75 @@
|
||||
# Cloudflare Pages 部署修复指南
|
||||
|
||||
## 问题描述
|
||||
|
||||
Cloudflare Pages 部署遇到两个主要问题:
|
||||
|
||||
1. **绑定名称冲突**:
|
||||
```
|
||||
Error: Failed to publish your Function. Got error: Binding name 'PASSWORD' already in use.
|
||||
```
|
||||
|
||||
2. **wrangler.toml 文件损坏**:
|
||||
```
|
||||
ParseError: Unterminated string
|
||||
lineText: 'name = "katelyat[env.preview.vars]'
|
||||
```
|
||||
|
||||
## 解决方案
|
||||
|
||||
✅ **第一步**:将环境变量名从 `PASSWORD` 更改为 `AUTH_PASSWORD` 以避免Cloudflare的保留绑定名称冲突。
|
||||
|
||||
✅ **第二步**:修复损坏的 `wrangler.toml` 文件,文件结构被损坏导致语法错误。
|
||||
|
||||
## 需要的操作
|
||||
|
||||
### 1. 更新 wrangler.toml 配置
|
||||
✅ 已完成 - `PASSWORD` 已更改为 `AUTH_PASSWORD`
|
||||
|
||||
### 2. 更新代码中的引用
|
||||
✅ 已完成 - 所有 `process.env.PASSWORD` 已更改为 `process.env.AUTH_PASSWORD`
|
||||
|
||||
### 3. 在 Cloudflare Pages 控制台中设置环境变量
|
||||
|
||||
由于您提到无法在控制台中直接修改环境变量(因为通过 wrangler.toml 管理),我们需要:
|
||||
|
||||
1. **重新部署项目** - 新的 wrangler.toml 配置会自动设置 `AUTH_PASSWORD` 变量
|
||||
2. **验证环境变量** - 确保 `AUTH_PASSWORD` 正确设置
|
||||
|
||||
### 4. 立即执行步骤
|
||||
|
||||
现在执行以下命令重新部署:
|
||||
|
||||
```powershell
|
||||
git add -A
|
||||
git commit -m "fix: 修复绑定名称冲突 - 将PASSWORD改为AUTH_PASSWORD"
|
||||
git push origin main
|
||||
```
|
||||
|
||||
## 更新说明
|
||||
|
||||
### 变更的文件:
|
||||
- `wrangler.toml` - 更新环境变量名称
|
||||
- `src/middleware.ts` - 更新认证逻辑
|
||||
- `src/app/api/login/route.ts` - 更新登录验证
|
||||
- `src/app/api/register/route.ts` - 更新注册逻辑
|
||||
|
||||
### 环境变量变更:
|
||||
- `PASSWORD` → `AUTH_PASSWORD`
|
||||
- 功能保持完全一致,只是变量名称改变
|
||||
|
||||
## 预期结果
|
||||
|
||||
部署成功后:
|
||||
1. 不再出现绑定名称冲突错误
|
||||
2. `AUTH_PASSWORD` 环境变量将自动通过 wrangler.toml 设置
|
||||
3. 网站应该正常运行,认证功能正常
|
||||
|
||||
## 验证步骤
|
||||
|
||||
部署完成后:
|
||||
1. 访问您的 Cloudflare Pages 网站
|
||||
2. 尝试登录(用户名: katelya,密码: your-secure-password-here)
|
||||
3. 如果能正常登录,说明修复成功
|
||||
|
||||
如果仍有问题,请检查 Cloudflare Pages 的部署日志。
|
||||
+221
-28
@@ -1,10 +1,138 @@
|
||||
# D1 数据库迁移 - 添加跳过配置功能
|
||||
# D1 数据库迁移 - 添加成人内容过滤和跳过配置功能
|
||||
|
||||
如果您已经有一个运行中的 D1 数据库,需要执行以下 SQL 语句来添加跳过配置支持。
|
||||
如果您已经有一个运行中的 D1 数据库,需要执行以下 SQL 语句来添加成人内容过滤和跳过配置支持。
|
||||
|
||||
## 🗄️ 新增表结构
|
||||
|
||||
### skip_configs 表
|
||||
### user_settings 表(成人内容过滤功能 - 必需)
|
||||
|
||||
这个表用于存储用户## 🔧 故障排除
|
||||
|
||||
### 1. "获取用户设置失败" 错误
|
||||
|
||||
**原因**:缺少 `user_settings` 表
|
||||
**解决**:执行上述迁移 SQL,确保 user_settings 表已创建
|
||||
|
||||
### 2. "表已存在" 错误
|
||||
|
||||
**原因**:表已经创建过了
|
||||
**解决**:这是正常的,`CREATE TABLE IF NOT EXISTS` 语句是安全的
|
||||
|
||||
### 3. 外键约束错误
|
||||
|
||||
**原因**:users 表不存在或结构不匹配
|
||||
**解决**:确保先运行完整的 `./scripts/d1-init.sql` 初始化脚本
|
||||
|
||||
### 4. 🚨 表结构不兼容问题(重要修复)
|
||||
|
||||
**问题描述**:即使表创建成功,仍然显示"获取用户设置失败",开关无法操作
|
||||
|
||||
**原因**:代码期望的表结构与创建的表结构不匹配
|
||||
|
||||
**完整解决方案**:
|
||||
|
||||
#### 第一步:重建兼容的表结构
|
||||
|
||||
在 Cloudflare D1 Console 中执行:
|
||||
|
||||
```sql
|
||||
-- 删除现有表,重新创建完全兼容的结构
|
||||
DROP TABLE IF EXISTS user_settings;
|
||||
|
||||
-- 创建与代码完全匹配的表结构
|
||||
CREATE TABLE user_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL UNIQUE,
|
||||
settings TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL
|
||||
);
|
||||
|
||||
-- 创建索引
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_username ON user_settings(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_updated_time ON user_settings(updated_time DESC);
|
||||
|
||||
-- 插入用户设置(JSON格式,替换为您的用户名)
|
||||
INSERT INTO user_settings (username, settings, updated_time) VALUES (
|
||||
'your_username_here',
|
||||
'{"filter_adult_content":true,"theme":"auto","language":"zh-CN","auto_play":true,"video_quality":"auto"}',
|
||||
strftime('%s', 'now')
|
||||
);
|
||||
```
|
||||
|
||||
#### 第二步:验证数据插入
|
||||
|
||||
```sql
|
||||
-- 验证设置是否正确插入
|
||||
SELECT * FROM user_settings WHERE username = 'your_username_here';
|
||||
```
|
||||
|
||||
#### 第三步:确认环境变量
|
||||
|
||||
在 Cloudflare Pages → Settings → Environment variables 中确认:
|
||||
|
||||
```
|
||||
NEXT_PUBLIC_STORAGE_TYPE = d1
|
||||
USERNAME = your_username_here
|
||||
PASSWORD = your_password_here
|
||||
```
|
||||
|
||||
#### 第四步:确认 D1 绑定
|
||||
|
||||
在 Cloudflare Pages → Settings → Functions → D1 database bindings:
|
||||
|
||||
- **Variable name**: `DB`
|
||||
- **D1 database**: 选择您的数据库
|
||||
|
||||
#### 第五步:重新部署并清除缓存
|
||||
|
||||
1. 在 Cloudflare Pages → Deployments 中点击 "Retry deployment"
|
||||
2. 清除浏览器缓存(Ctrl+Shift+Delete)
|
||||
3. 重新登录并测试功能
|
||||
|
||||
**表结构说明**:
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
| -------------- | ------- | ------------------------------------- |
|
||||
| `id` | INTEGER | 主键,自动递增 |
|
||||
| `username` | TEXT | 用户名,必须与 users 表中的用户名匹配 |
|
||||
| `settings` | TEXT | 用户设置的 JSON 字符串 |
|
||||
| `updated_time` | INTEGER | 更新时间戳(Unix 时间戳) |
|
||||
|
||||
**settings JSON 格式**:
|
||||
|
||||
````json
|
||||
{
|
||||
"filter_adult_content": true, // 成人内容过滤开关
|
||||
"theme": "auto", // 主题设置
|
||||
"language": "zh-CN", // 语言设置
|
||||
"auto_play": true, // 自动播放
|
||||
"video_quality": "auto" // 视频质量
|
||||
}
|
||||
```:
|
||||
|
||||
```sql
|
||||
-- 创建用户设置表(成人内容过滤功能)
|
||||
CREATE TABLE IF NOT EXISTS user_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
username TEXT NOT NULL,
|
||||
filter_adult_content BOOLEAN DEFAULT 1,
|
||||
theme TEXT DEFAULT 'auto',
|
||||
language TEXT DEFAULT 'zh-CN',
|
||||
auto_play BOOLEAN DEFAULT 1,
|
||||
video_quality TEXT DEFAULT 'auto',
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, username)
|
||||
);
|
||||
|
||||
-- 为用户设置添加索引以优化查询性能
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_user_id ON user_settings(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_username ON user_settings(username);
|
||||
````
|
||||
|
||||
### skip_configs 表(跳过功能 - 可选)
|
||||
|
||||
这个表用于存储用户的跳过片头片尾配置:
|
||||
|
||||
@@ -12,24 +140,26 @@
|
||||
-- 创建跳过配置表
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
source TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
segments TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL,
|
||||
UNIQUE(username, key)
|
||||
user_id INTEGER NOT NULL,
|
||||
config_key TEXT NOT NULL,
|
||||
start_time INTEGER DEFAULT 0,
|
||||
end_time INTEGER DEFAULT 0,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, config_key)
|
||||
);
|
||||
|
||||
-- 为跳过配置添加索引以优化查询性能
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username ON skip_configs(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_key ON skip_configs(username, key);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_updated_time ON skip_configs(username, updated_time DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_user_id ON skip_configs(user_id);
|
||||
```
|
||||
|
||||
## 🚀 执行迁移的方法
|
||||
|
||||
### ⚠️ 重要提示
|
||||
|
||||
如果您在 Cloudflare Pages 使用成人内容过滤功能时遇到"获取用户设置失败"错误,这是因为缺少 `user_settings` 表。**必须执行此迁移**才能使功能正常工作。
|
||||
|
||||
### 方法一:使用 Cloudflare Dashboard(推荐)
|
||||
|
||||
1. 登录 [Cloudflare Dashboard](https://dash.cloudflare.com/)
|
||||
@@ -47,33 +177,96 @@ CREATE INDEX IF NOT EXISTS idx_skip_configs_username_updated_time ON skip_config
|
||||
# 首先登录 Cloudflare
|
||||
wrangler auth login
|
||||
|
||||
# 创建迁移文件
|
||||
echo "-- 上面的SQL代码" > user_settings_migration.sql
|
||||
|
||||
# 执行数据库迁移
|
||||
wrangler d1 execute your-database-name --file=migration.sql
|
||||
wrangler d1 execute your-database-name --file=user_settings_migration.sql
|
||||
```
|
||||
|
||||
其中 `migration.sql` 包含上面的 SQL 代码。
|
||||
### 方法三:使用项目内置迁移脚本
|
||||
|
||||
### 方法三:通过 Pages 函数执行(高级)
|
||||
```bash
|
||||
# 克隆或更新项目代码
|
||||
git pull origin main
|
||||
|
||||
也可以创建一个临时的迁移函数,部署后访问来执行迁移。
|
||||
# 执行完整的D1初始化(包含新表)
|
||||
wrangler d1 execute your-database-name --file=./scripts/d1-init.sql
|
||||
```
|
||||
|
||||
## 📋 字段说明
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
| -------------- | ------- | ------------------------------- |
|
||||
| `id` | INTEGER | 主键,自动递增 |
|
||||
| `username` | TEXT | 用户名,关联到用户 |
|
||||
| `key` | TEXT | 配置键,格式:`source+video_id` |
|
||||
| `source` | TEXT | 视频源标识 |
|
||||
| `video_id` | TEXT | 视频 ID |
|
||||
| `title` | TEXT | 视频标题 |
|
||||
| `segments` | TEXT | 跳过片段数据(JSON 格式) |
|
||||
| `updated_time` | INTEGER | 更新时间戳 |
|
||||
### user_settings 表字段
|
||||
|
||||
| 字段名 | 类型 | 默认值 | 说明 |
|
||||
| ---------------------- | -------- | -------- | ---------------------- |
|
||||
| `id` | INTEGER | 自增 | 主键 |
|
||||
| `user_id` | INTEGER | 无 | 用户 ID,关联 users 表 |
|
||||
| `username` | TEXT | 无 | 用户名 |
|
||||
| `filter_adult_content` | BOOLEAN | 1(true) | 成人内容过滤开关 |
|
||||
| `theme` | TEXT | 'auto' | 界面主题设置 |
|
||||
| `language` | TEXT | 'zh-CN' | 语言设置 |
|
||||
| `auto_play` | BOOLEAN | 1(true) | 自动播放开关 |
|
||||
| `video_quality` | TEXT | 'auto' | 视频质量偏好 |
|
||||
| `created_at` | DATETIME | 当前时间 | 创建时间 |
|
||||
| `updated_at` | DATETIME | 当前时间 | 更新时间 |
|
||||
|
||||
### skip_configs 表字段
|
||||
|
||||
| 字段名 | 类型 | 默认值 | 说明 |
|
||||
| ------------ | -------- | -------- | ------------------------------- |
|
||||
| `id` | INTEGER | 自增 | 主键 |
|
||||
| `user_id` | INTEGER | 无 | 用户 ID,关联 users 表 |
|
||||
| `config_key` | TEXT | 无 | 配置键,格式:`source+video_id` |
|
||||
| `start_time` | INTEGER | 0 | 跳过开始时间(秒) |
|
||||
| `end_time` | INTEGER | 0 | 跳过结束时间(秒) |
|
||||
| `created_at` | DATETIME | 当前时间 | 创建时间 |
|
||||
| `updated_at` | DATETIME | 当前时间 | 更新时间 |
|
||||
|
||||
## ✅ 迁移验证
|
||||
|
||||
执行迁移后,可以通过以下 SQL 验证表是否创建成功:
|
||||
|
||||
```sql
|
||||
-- 检查 user_settings 表是否存在
|
||||
SELECT name FROM sqlite_master WHERE type='table' AND name='user_settings';
|
||||
|
||||
-- 检查 skip_configs 表是否存在
|
||||
SELECT name FROM sqlite_master WHERE type='table' AND name='skip_configs';
|
||||
|
||||
-- 查看 user_settings 表结构
|
||||
PRAGMA table_info(user_settings);
|
||||
|
||||
-- 查看 skip_configs 表结构
|
||||
PRAGMA table_info(skip_configs);
|
||||
```
|
||||
|
||||
## 🔧 故障排除
|
||||
|
||||
### 1. "获取用户设置失败" 错误
|
||||
|
||||
**原因**:缺少 `user_settings` 表
|
||||
**解决**:执行上述迁移 SQL,确保 user_settings 表已创建
|
||||
|
||||
### 2. "表已存在" 错误
|
||||
|
||||
**原因**:表已经创建过了
|
||||
**解决**:这是正常的,`CREATE TABLE IF NOT EXISTS` 语句是安全的
|
||||
|
||||
### 3. 外键约束错误
|
||||
|
||||
**原因**:users 表不存在或结构不匹配
|
||||
**解决**:确保先运行完整的 `./scripts/d1-init.sql` 初始化脚本
|
||||
|
||||
## 📞 需要帮助?
|
||||
|
||||
如果在迁移过程中遇到问题:
|
||||
|
||||
1. 检查 Cloudflare D1 Dashboard 中的数据库状态
|
||||
2. 确认环境变量 `NEXT_PUBLIC_STORAGE_TYPE=d1` 已设置
|
||||
3. 验证 `wrangler.toml` 中的数据库配置
|
||||
4. 查看项目 Issues 或提交新的问题报告
|
||||
|
||||
```sql
|
||||
-- 检查表是否存在
|
||||
SELECT name FROM sqlite_master WHERE type='table' AND name='skip_configs';
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
```sql
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
username TEXT PRIMARY KEY,
|
||||
password TEXT NOT NULL,
|
||||
created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS play_records (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
source_name TEXT NOT NULL,
|
||||
cover TEXT NOT NULL,
|
||||
year TEXT NOT NULL,
|
||||
index_episode INTEGER NOT NULL,
|
||||
total_episodes INTEGER NOT NULL,
|
||||
play_time INTEGER NOT NULL,
|
||||
total_time INTEGER NOT NULL,
|
||||
save_time INTEGER NOT NULL,
|
||||
search_title TEXT,
|
||||
UNIQUE(username, key)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS favorites (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
source_name TEXT NOT NULL,
|
||||
cover TEXT NOT NULL,
|
||||
year TEXT NOT NULL,
|
||||
total_episodes INTEGER NOT NULL,
|
||||
save_time INTEGER NOT NULL,
|
||||
UNIQUE(username, key)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS search_history (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
keyword TEXT NOT NULL,
|
||||
created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
|
||||
UNIQUE(username, keyword)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS admin_config (
|
||||
id INTEGER PRIMARY KEY DEFAULT 1,
|
||||
config TEXT NOT NULL,
|
||||
updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
key TEXT NOT NULL,
|
||||
source TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
segments TEXT NOT NULL,
|
||||
updated_time INTEGER NOT NULL,
|
||||
UNIQUE(username, key)
|
||||
);
|
||||
|
||||
-- 基本索引
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_username ON play_records(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_username ON favorites(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username ON search_history(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username ON skip_configs(username);
|
||||
|
||||
-- 复合索引优化查询性能
|
||||
-- 播放记录:用户名+键值的复合索引,用于快速查找特定记录
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_username_key ON play_records(username, key);
|
||||
-- 播放记录:用户名+保存时间的复合索引,用于按时间排序的查询
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_username_save_time ON play_records(username, save_time DESC);
|
||||
|
||||
-- 收藏:用户名+键值的复合索引,用于快速查找特定收藏
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_username_key ON favorites(username, key);
|
||||
-- 收藏:用户名+保存时间的复合索引,用于按时间排序的查询
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_username_save_time ON favorites(username, save_time DESC);
|
||||
|
||||
-- 搜索历史:用户名+关键词的复合索引,用于快速查找/删除特定搜索记录
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username_keyword ON search_history(username, keyword);
|
||||
-- 搜索历史:用户名+创建时间的复合索引,用于按时间排序的查询
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username_created_at ON search_history(username, created_at DESC);
|
||||
|
||||
-- 搜索历史清理查询的优化索引
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username_id_created_at ON search_history(username, id, created_at DESC);
|
||||
|
||||
-- 跳过配置索引
|
||||
-- 跳过配置:用户名+键值的复合索引,用于快速查找特定配置
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_key ON skip_configs(username, key);
|
||||
-- 跳过配置:用户名+更新时间的复合索引,用于按时间排序的查询
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username_updated_time ON skip_configs(username, updated_time DESC);
|
||||
```
|
||||
@@ -1,226 +0,0 @@
|
||||
# 🚀 部署兼容性说明
|
||||
|
||||
## 跳过片头片尾功能部署兼容性
|
||||
|
||||
我们的跳过片头片尾功能已经完全兼容各种部署方式,具体如下:
|
||||
|
||||
## 📋 功能概述
|
||||
|
||||
- ✅ **自动跳过片头片尾** - 智能检测并跳过重复内容
|
||||
- ✅ **手动配置跳过段** - 用户可自定义跳过时间段
|
||||
- ✅ **多剧集支持** - 每个剧集独立配置
|
||||
- ✅ **多存储后端** - 支持 LocalStorage、Redis、D1、Upstash
|
||||
|
||||
## 🌐 部署方式兼容性
|
||||
|
||||
### 1. Cloudflare Pages ✅
|
||||
|
||||
**Runtime**: Edge Runtime
|
||||
**配置要求**: 所有 API 路由必须使用 `export const runtime = 'edge';`
|
||||
|
||||
```typescript
|
||||
// ✅ 已正确配置
|
||||
export const runtime = 'edge';
|
||||
```
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API (`/api/skip-configs`)
|
||||
- ✅ 所有存储后端(D1、Redis、Upstash)
|
||||
- ✅ 自动缓存优化
|
||||
|
||||
### 2. Docker 部署 ✅
|
||||
|
||||
**Runtime**: Node.js Runtime (自动转换)
|
||||
**自动转换**: Dockerfile 会自动将 Edge Runtime 转换为 Node.js Runtime
|
||||
|
||||
```dockerfile
|
||||
# Dockerfile 中的自动转换逻辑
|
||||
RUN find ./src -type f -name "route.ts" -print0 \
|
||||
| xargs -0 sed -i "s/export const runtime = 'edge';/export const runtime = 'nodejs';/g"
|
||||
```
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API
|
||||
- ✅ 所有存储后端
|
||||
- ✅ 环境变量配置
|
||||
- ✅ 健康检查
|
||||
|
||||
### 3. Vercel 部署 ✅
|
||||
|
||||
**Runtime**: Edge Runtime / Node.js Runtime (自动检测)
|
||||
**配置**: 无需特殊配置,自动适配
|
||||
|
||||
**特性支持**:
|
||||
|
||||
- ✅ 跳过配置 API
|
||||
- ✅ 所有存储后端
|
||||
- ✅ Serverless 函数优化
|
||||
|
||||
### 4. 其他部署方式 ✅
|
||||
|
||||
**Runtime**: Node.js Runtime
|
||||
**要求**: Node.js 18+ 环境
|
||||
|
||||
**支持的部署方式**:
|
||||
|
||||
- ✅ 传统服务器部署
|
||||
- ✅ PM2 进程管理
|
||||
- ✅ Nginx 反向代理
|
||||
- ✅ Kubernetes
|
||||
- ✅ Railway、Render 等云平台
|
||||
|
||||
## 🗄️ 存储后端支持
|
||||
|
||||
### LocalStorage (默认)
|
||||
|
||||
```bash
|
||||
# 无需额外配置,适用于单机部署
|
||||
NEXT_PUBLIC_STORAGE_TYPE=localstorage
|
||||
```
|
||||
|
||||
### Redis
|
||||
|
||||
```bash
|
||||
# 高性能缓存存储
|
||||
NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
REDIS_URL=redis://localhost:6379
|
||||
```
|
||||
|
||||
### Cloudflare D1
|
||||
|
||||
```bash
|
||||
# Cloudflare 原生数据库
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1
|
||||
```
|
||||
|
||||
### Upstash Redis
|
||||
|
||||
```bash
|
||||
# 无服务器 Redis
|
||||
NEXT_PUBLIC_STORAGE_TYPE=upstash
|
||||
UPSTASH_REDIS_REST_URL=https://xxx.upstash.io
|
||||
UPSTASH_REDIS_REST_TOKEN=xxx
|
||||
```
|
||||
|
||||
## 🔧 环境变量配置
|
||||
|
||||
### 核心配置
|
||||
|
||||
```bash
|
||||
# 存储类型 (必需)
|
||||
NEXT_PUBLIC_STORAGE_TYPE=localstorage|redis|d1|upstash
|
||||
|
||||
# Docker 环境标识 (Docker 部署时自动设置)
|
||||
DOCKER_ENV=true
|
||||
```
|
||||
|
||||
### 存储特定配置
|
||||
|
||||
```bash
|
||||
# Redis
|
||||
REDIS_URL=redis://localhost:6379
|
||||
REDIS_PASSWORD=optional
|
||||
|
||||
# Upstash
|
||||
UPSTASH_REDIS_REST_URL=https://xxx.upstash.io
|
||||
UPSTASH_REDIS_REST_TOKEN=xxx
|
||||
|
||||
# D1 (Cloudflare 自动注入)
|
||||
# 无需手动配置
|
||||
```
|
||||
|
||||
## 🚀 快速部署指南
|
||||
|
||||
### Cloudflare Pages
|
||||
|
||||
1. 连接 GitHub 仓库
|
||||
2. 设置构建命令: `npm run build`
|
||||
3. 设置输出目录: `.next`
|
||||
4. 配置环境变量 (可选)
|
||||
|
||||
### Docker
|
||||
|
||||
```bash
|
||||
# 构建镜像
|
||||
docker build -t katelyatv .
|
||||
|
||||
# 运行容器
|
||||
docker run -p 3000:3000 \
|
||||
-e NEXT_PUBLIC_STORAGE_TYPE=localstorage \
|
||||
katelyatv
|
||||
```
|
||||
|
||||
### Vercel
|
||||
|
||||
```bash
|
||||
# 一键部署
|
||||
npx vercel
|
||||
|
||||
# 或使用 Vercel CLI
|
||||
vercel --prod
|
||||
```
|
||||
|
||||
## 🧪 兼容性测试
|
||||
|
||||
运行兼容性测试脚本:
|
||||
|
||||
```bash
|
||||
# 测试所有部署方式的兼容性
|
||||
node scripts/test-docker-compatibility.js
|
||||
```
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
1. **Edge Runtime 限制**: 在 Cloudflare Pages 上,所有 API 路由必须使用 Edge Runtime
|
||||
2. **存储选择**: 根据部署环境选择合适的存储后端
|
||||
3. **环境变量**: 确保在生产环境中正确配置存储相关环境变量
|
||||
4. **缓存策略**: LocalStorage 仅适用于单机部署,集群部署请使用 Redis
|
||||
|
||||
## 📊 性能建议
|
||||
|
||||
### 小型部署 (< 1000 用户)
|
||||
|
||||
- **推荐**: LocalStorage
|
||||
- **优点**: 零配置,性能良好
|
||||
- **缺点**: 仅支持单机
|
||||
|
||||
### 中型部署 (1000-10000 用户)
|
||||
|
||||
- **推荐**: Redis
|
||||
- **优点**: 高性能,支持集群
|
||||
- **缺点**: 需要 Redis 服务器
|
||||
|
||||
### 大型部署 (> 10000 用户)
|
||||
|
||||
- **推荐**: Cloudflare D1 + Redis 缓存
|
||||
- **优点**: 高可用,全球分布
|
||||
- **缺点**: 依赖 Cloudflare
|
||||
|
||||
## 🆘 故障排除
|
||||
|
||||
### 常见问题
|
||||
|
||||
1. **API 路由 404**
|
||||
|
||||
- 检查 Edge Runtime 配置
|
||||
- 确认部署环境支持
|
||||
|
||||
2. **跳过配置保存失败**
|
||||
|
||||
- 检查存储后端配置
|
||||
- 验证环境变量设置
|
||||
|
||||
3. **Docker 构建失败**
|
||||
|
||||
- 确认 Node.js 版本 ≥ 18
|
||||
- 检查 pnpm 安装
|
||||
|
||||
4. **Cloudflare Pages 部署失败**
|
||||
- 确认所有 API 路由有 Edge Runtime 配置
|
||||
- 检查构建命令和输出目录
|
||||
|
||||
---
|
||||
|
||||
🎉 **恭喜!** 您的跳过片头片尾功能已完全兼容所有主流部署方式!
|
||||
@@ -9,6 +9,9 @@ WORKDIR /app
|
||||
# 仅复制依赖清单,提高构建缓存利用率
|
||||
COPY package.json pnpm-lock.yaml ./
|
||||
|
||||
# 针对ARM架构优化:设置更大的内存限制和超时时间
|
||||
ENV NODE_OPTIONS="--max-old-space-size=4096"
|
||||
|
||||
# 安装所有依赖(含 devDependencies,后续会裁剪)
|
||||
RUN pnpm install --frozen-lockfile
|
||||
|
||||
@@ -17,6 +20,9 @@ FROM --platform=$BUILDPLATFORM node:20-alpine AS builder
|
||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
||||
WORKDIR /app
|
||||
|
||||
# 针对ARM架构优化:设置更大的内存限制
|
||||
ENV NODE_OPTIONS="--max-old-space-size=4096"
|
||||
|
||||
# 复制依赖
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
# 复制全部源代码
|
||||
|
||||
@@ -1,212 +0,0 @@
|
||||
# 📊 KatelyaTV 项目状态报告
|
||||
|
||||
## 🎯 项目概述
|
||||
|
||||
**KatelyaTV** 是一个功能完整的影视聚合播放器,基于现代 Web 技术栈构建,支持多平台部署和多种存储后端。该项目为在原始项目「MoonTV」基础上的二创与继承版本,延续其优秀架构并在此之上进行持续优化与维护。
|
||||
|
||||
**当前版本**: v0.1.0-katelya
|
||||
**最后更新**: 2025-01-XX
|
||||
**项目状态**: 🟢 生产就绪
|
||||
|
||||
## ✨ 功能完成度
|
||||
|
||||
### 🎬 核心功能
|
||||
|
||||
| 功能模块 | 状态 | 完成度 | 说明 |
|
||||
|---------|------|--------|------|
|
||||
| 多源聚合搜索 | ✅ 完成 | 100% | 集成20+个资源站点,支持智能去重 |
|
||||
| 视频播放器 | ✅ 完成 | 100% | ArtPlayer + HLS.js,支持多种格式 |
|
||||
| 观看历史记录 | ✅ 完成 | 100% | 智能进度记录,断点续播,多设备同步 |
|
||||
| 收藏系统 | ✅ 完成 | 100% | 个性化片单,多端同步 |
|
||||
| 用户管理 | ✅ 完成 | 100% | 注册、登录、权限管理 |
|
||||
| PWA 支持 | ✅ 完成 | 100% | 离线缓存,桌面安装 |
|
||||
| 响应式设计 | ✅ 完成 | 100% | 完美适配桌面和移动端 |
|
||||
|
||||
### 🎨 用户体验
|
||||
|
||||
| 特性 | 状态 | 完成度 | 说明 |
|
||||
|------|------|--------|------|
|
||||
| 深色模式 | ✅ 完成 | 100% | 自动跟随系统主题 |
|
||||
| 移动端优化 | ✅ 完成 | 100% | 触摸友好,底部导航 |
|
||||
| 动画效果 | ✅ 完成 | 100% | Framer Motion 流畅动画 |
|
||||
| 加载状态 | ✅ 完成 | 100% | 骨架屏,进度条 |
|
||||
| 错误处理 | ✅ 完成 | 100% | 友好提示,重试机制 |
|
||||
|
||||
### 🚀 技术特性
|
||||
|
||||
| 技术栈 | 状态 | 完成度 | 说明 |
|
||||
|--------|------|--------|------|
|
||||
| Next.js 14 | ✅ 完成 | 100% | App Router,最新特性 |
|
||||
| TypeScript | ✅ 完成 | 100% | 类型安全,开发体验 |
|
||||
| Tailwind CSS | ✅ 完成 | 100% | 原子化 CSS,主题系统 |
|
||||
| 状态管理 | ✅ 完成 | 100% | React Hooks,Context API |
|
||||
| 数据库支持 | ✅ 完成 | 100% | localStorage, Redis, D1, Upstash |
|
||||
| 测试框架 | ✅ 完成 | 100% | Jest, Testing Library |
|
||||
|
||||
## 🏗️ 架构状态
|
||||
|
||||
### 前端架构
|
||||
- ✅ **组件化设计**: 模块化组件,可复用性强
|
||||
- ✅ **状态管理**: 合理的状态分层和更新机制
|
||||
- ✅ **路由系统**: Next.js App Router,支持动态路由
|
||||
- ✅ **样式系统**: Tailwind CSS + CSS 变量,主题切换
|
||||
- ✅ **类型安全**: TypeScript 全覆盖,接口定义完整
|
||||
|
||||
### 后端架构
|
||||
- ✅ **API 设计**: RESTful API,统一响应格式
|
||||
- ✅ **数据存储**: 多存储后端支持,数据隔离
|
||||
- ✅ **认证系统**: Cookie 认证,会话管理
|
||||
- ✅ **缓存策略**: 智能缓存,减少重复请求
|
||||
- ✅ **错误处理**: 统一错误处理,友好提示
|
||||
|
||||
### 部署架构
|
||||
- ✅ **容器化**: Docker 支持,多架构镜像
|
||||
- ✅ **云平台**: Vercel, Cloudflare Pages 支持
|
||||
- ✅ **CI/CD**: GitHub Actions 自动化流程
|
||||
- ✅ **监控**: 性能监控,错误追踪
|
||||
- ✅ **安全**: 密码保护,访问控制
|
||||
|
||||
## 📱 平台兼容性
|
||||
|
||||
### 浏览器支持
|
||||
- ✅ **Chrome**: 90+ (完全支持)
|
||||
- ✅ **Firefox**: 88+ (完全支持)
|
||||
- ✅ **Safari**: 14+ (完全支持)
|
||||
- ✅ **Edge**: 90+ (完全支持)
|
||||
|
||||
### 设备支持
|
||||
- ✅ **桌面端**: Windows, macOS, Linux (完全支持)
|
||||
- ✅ **移动端**: iOS 14+, Android 8+ (完全支持)
|
||||
- ✅ **平板**: iPad, Android 平板 (完全支持)
|
||||
- ✅ **智能电视**: Android TV (部分支持)
|
||||
|
||||
### 存储后端
|
||||
- ✅ **localStorage**: 单用户,浏览器存储
|
||||
- ✅ **Redis**: 多用户,数据持久化
|
||||
- ✅ **Cloudflare D1**: 多用户,边缘数据库
|
||||
- ✅ **Upstash**: 多用户,托管 Redis
|
||||
|
||||
## 🔧 开发工具链
|
||||
|
||||
### 代码质量
|
||||
- ✅ **ESLint**: 代码规范检查
|
||||
- ✅ **Prettier**: 代码格式化
|
||||
- ✅ **TypeScript**: 类型检查
|
||||
- ✅ **Husky**: Git hooks
|
||||
- ✅ **Lint-staged**: 提交前检查
|
||||
|
||||
### 测试覆盖
|
||||
- ✅ **Jest**: 单元测试框架
|
||||
- ✅ **Testing Library**: 组件测试
|
||||
- ✅ **Mock**: API 模拟
|
||||
- ✅ **Coverage**: 测试覆盖率
|
||||
|
||||
### 构建工具
|
||||
- ✅ **Next.js**: 构建和优化
|
||||
- ✅ **Tailwind**: CSS 构建
|
||||
- ✅ **TypeScript**: 类型编译
|
||||
- ✅ **SWC**: 快速编译
|
||||
|
||||
## 📊 性能指标
|
||||
|
||||
### 加载性能
|
||||
- ✅ **首屏加载**: < 2s (优化后)
|
||||
- ✅ **交互响应**: < 100ms
|
||||
- ✅ **图片加载**: 懒加载 + 占位符
|
||||
- ✅ **代码分割**: 按需加载
|
||||
|
||||
### 运行时性能
|
||||
- ✅ **内存使用**: 优化内存泄漏
|
||||
- ✅ **CPU 使用**: 减少不必要的计算
|
||||
- ✅ **网络请求**: 智能缓存,减少重复
|
||||
- ✅ **渲染性能**: 虚拟滚动,组件优化
|
||||
|
||||
## 🚀 部署状态
|
||||
|
||||
### 生产环境
|
||||
- ✅ **Docker Hub**: 镜像可用
|
||||
- ✅ **GitHub Packages**: 镜像可用
|
||||
- ✅ **Vercel**: 部署就绪
|
||||
- ✅ **Cloudflare**: 部署就绪
|
||||
|
||||
### 自动化流程
|
||||
- ✅ **版本管理**: 自动化版本更新
|
||||
- ✅ **构建部署**: CI/CD 流水线
|
||||
- ✅ **测试验证**: 自动化测试
|
||||
- ✅ **发布管理**: 自动化发布
|
||||
|
||||
## 📈 项目健康度
|
||||
|
||||
### 代码质量
|
||||
- **代码覆盖率**: 85%+
|
||||
- **类型覆盖率**: 100%
|
||||
- **Lint 通过率**: 100%
|
||||
- **测试通过率**: 100%
|
||||
|
||||
### 维护状态
|
||||
- **依赖更新**: 定期更新
|
||||
- **安全扫描**: 自动扫描
|
||||
- **性能监控**: 持续监控
|
||||
- **用户反馈**: 及时响应
|
||||
|
||||
### 社区活跃度
|
||||
- **Issue 响应**: 24小时内
|
||||
- **PR 审查**: 48小时内
|
||||
- **文档更新**: 持续更新
|
||||
- **版本发布**: 定期发布
|
||||
|
||||
## 🎯 下一步计划
|
||||
|
||||
### 短期目标 (1-2个月)
|
||||
- [ ] 弹幕系统支持
|
||||
- [ ] 字幕文件支持
|
||||
- [ ] 下载功能
|
||||
- [ ] 社交分享功能
|
||||
|
||||
### 中期目标 (3-6个月)
|
||||
- [ ] 用户评分系统
|
||||
- [ ] 推荐算法优化
|
||||
- [ ] 多语言支持
|
||||
- [ ] 高级搜索过滤
|
||||
|
||||
### 长期目标 (6-12个月)
|
||||
- [ ] AI 内容推荐
|
||||
- [ ] 社区功能
|
||||
- [ ] 移动端原生应用
|
||||
- [ ] 企业级功能
|
||||
|
||||
## 🏆 项目亮点
|
||||
|
||||
1. **技术先进性**: 使用最新的 Web 技术栈
|
||||
2. **功能完整性**: 覆盖影视播放的完整流程
|
||||
3. **部署灵活性**: 支持多种部署方式
|
||||
4. **用户体验**: 现代化 UI 设计,流畅交互
|
||||
5. **扩展性**: 模块化架构,易于扩展
|
||||
6. **社区友好**: 完善的文档和贡献指南
|
||||
|
||||
## 📞 支持状态
|
||||
|
||||
- **问题反馈**: 24小时内响应
|
||||
- **功能建议**: 48小时内评估
|
||||
- **代码贡献**: 72小时内审查
|
||||
- **紧急修复**: 12小时内处理
|
||||
|
||||
## 🎉 总结
|
||||
|
||||
KatelyaTV 项目目前处于**生产就绪**状态,核心功能完整,技术架构成熟,用户体验优秀。项目具备以下特点:
|
||||
|
||||
- ✅ **功能完整**: 所有核心功能均已实现
|
||||
- ✅ **技术先进**: 使用最新的 Web 技术
|
||||
- ✅ **部署灵活**: 支持多种部署方式
|
||||
- ✅ **维护活跃**: 持续更新和维护
|
||||
- ✅ **社区友好**: 完善的文档和指南
|
||||
|
||||
项目可以安全地用于生产环境,适合个人用户和中小型团队使用。
|
||||
|
||||
> 注:KatelyaTV 基于 MoonTV 二创与继承开发,保留并致谢原作者与社区贡献;如有授权或版权问题,请联系以尽快处理。
|
||||
|
||||
---
|
||||
|
||||
**最后更新**: 2025-01-XX
|
||||
**维护状态**: 🟢 活跃维护
|
||||
**推荐使用**: ✅ 生产就绪
|
||||
@@ -4,31 +4,34 @@
|
||||
<h1>KatelyaTV</h1>
|
||||
<p><strong>跨平台 · 聚合搜索 · 即开即用 · 自托管影视聚合播放器</strong></p>
|
||||
<p>基于 <code>Next.js 14</code> · <code>TypeScript</code> · <code>Tailwind CSS</code> · 多源聚合 / 播放记录 / 收藏同步 / 跳过片头片尾 / PWA</p>
|
||||
<p>MoonTV 二创延续版 · 持续维护与增强</p>
|
||||
|
||||
<p>
|
||||
<a href="#部署">🚀 部署</a> ·
|
||||
<a href="#功能特性">✨ 功能</a> ·
|
||||
<a href="#docker">🐳 Docker</a> ·
|
||||
<a href="#环境变量">⚙️ 配置</a>
|
||||
<a href="#-快速开始">🚀 快速开始</a> ·
|
||||
<a href="#-功能特性">✨ 功能特性</a> ·
|
||||
<a href="#-部署方案">📋 部署方案</a> ·
|
||||
<a href="#-配置说明">⚙️ 配置说明</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
## 📰 项目来源与声明
|
||||
---
|
||||
|
||||
本项目自「MoonTV」演进而来,为其二创/继承版本,持续维护与改进功能与体验。保留并致谢原作者与社区贡献者;如有授权或版权问题请联系以处理。目标:在原作基础上提供更易部署、更友好、更稳定的体验。
|
||||
## 📰 项目声明
|
||||
|
||||
> **🔔 重要变更通知**:应用户社区的宝贵建议,为确保项目的长期稳定运行和合规性,我们已将内置的视频源移除。现在用户需要自行配置资源站以使用本应用的完整功能。我们提供了经过测试的推荐配置文件,让您能够快速上手使用(具体配置文件见 README.md 内容底部)。
|
||||
本项目自「MoonTV」演进而来,为其二创/继承版本,持续维护与改进功能与体验。保留并致谢原作者与社区贡献者。
|
||||
|
||||
> **🔔 重要变更**:应用户社区建议,为确保项目长期稳定运行和合规性,内置视频源已移除。现需要用户自行配置资源站以使用完整功能。我们提供了经过测试的推荐配置文件,让您快速上手使用。
|
||||
|
||||
---
|
||||
|
||||
## ✨ 功能特性
|
||||
|
||||
### 🎬 核心播放功能
|
||||
### 🎬 核心功能
|
||||
|
||||
- **🔍 聚合搜索**:整合多个影视资源站,一键搜索全网内容
|
||||
- **📺 高清播放**:基于 ArtPlayer 的强大播放器,支持多种格式和画质
|
||||
- **📺 高清播放**:基于 ArtPlayer 的强大播放器,支持多种格式
|
||||
- **⏭️ 智能跳过**:自动检测并跳过片头片尾,手动设置跳过时间段
|
||||
- **🎯 断点续播**:自动记录播放进度,跨设备同步观看位置
|
||||
- **📱 响应式设计**:完美适配手机、平板、电脑各种屏幕尺寸
|
||||
- **📱 响应式设计**:完美适配手机、平板、电脑各种屏幕
|
||||
|
||||
### 💾 数据管理
|
||||
|
||||
@@ -36,1144 +39,560 @@
|
||||
- **📖 播放历史**:自动记录观看历史,快速找回看过的内容
|
||||
- **👥 多用户支持**:独立的用户系统,每个用户独享个人数据
|
||||
- **🔄 数据同步**:支持多种存储后端(LocalStorage、Redis、D1、Upstash)
|
||||
- **🔒 内容过滤**:智能成人内容过滤系统,默认开启安全保护
|
||||
|
||||
### 🚀 部署与扩展
|
||||
### 🚀 部署特性
|
||||
|
||||
- **🐳 Docker 一键部署**:提供完整的 Docker 镜像,开箱即用
|
||||
- **☁️ 多平台支持**:Vercel、Cloudflare Pages、传统服务器全兼容
|
||||
- **☁️ 多平台支持**:Vercel、Docker、Cloudflare Pages 全兼容
|
||||
- **🔧 灵活配置**:支持自定义资源站、代理设置、主题配置
|
||||
- **📱 PWA 支持**:可安装为桌面/手机应用,离线缓存
|
||||
- **📺 TVBox 兼容**:支持 TVBox 配置接口,可导入到各种电视盒子应用
|
||||
|
||||
### 🎨 用户体验
|
||||
|
||||
- **🌓 深色模式**:支持明暗主题切换,护眼舒适
|
||||
- **⚡ 性能优化**:智能缓存、懒加载、播放源优选算法
|
||||
- **🔐 隐私保护**:本地部署,数据完全掌控
|
||||
- **🌍 国际化**:多语言支持(规划中)
|
||||
|
||||
## 📋 技术栈
|
||||
|
||||
| 分类 | 主要依赖 |
|
||||
| --------- | ----------------------------------------------------------------------------------------------------- |
|
||||
| 前端框架 | [Next.js 14](https://nextjs.org/) · App Router |
|
||||
| UI & 样式 | [Tailwind CSS 3](https://tailwindcss.com/) · [Framer Motion](https://www.framer.com/motion/) |
|
||||
| 语言 | TypeScript 5 |
|
||||
| 播放器 | [ArtPlayer](https://github.com/zhw2590582/ArtPlayer) · [HLS.js](https://github.com/video-dev/hls.js/) |
|
||||
| 状态管理 | React Hooks · Context API |
|
||||
| 代码质量 | ESLint · Prettier · Jest · Husky |
|
||||
| 部署 | Docker · Vercel · CloudFlare pages |
|
||||
|
||||
## 📺 TVBox 兼容功能
|
||||
|
||||
KatelyaTV 新增了 TVBox 配置接口,可以将您的视频源导入到各种电视盒子应用中使用:
|
||||
|
||||
### ✨ 功能特点
|
||||
|
||||
- **🔄 自动同步**:自动同步 KatelyaTV 中配置的所有视频源
|
||||
- **📋 标准格式**:支持 TVBox 标准 JSON 配置格式
|
||||
- **🎬 内置解析**:集成多个视频解析接口,支持主流视频平台
|
||||
- **🌐 跨域支持**:自动处理 CORS 跨域问题
|
||||
- **📱 多格式**:支持 JSON 和 Base64 两种配置格式
|
||||
|
||||
### 🚀 快速使用
|
||||
|
||||
1. **访问配置页面**:在 KatelyaTV 中点击侧边栏的"TVBox 配置"或访问 `/config` 页面
|
||||
2. **选择格式类型**:在页面中选择 JSON 或 Base64 格式
|
||||
3. **复制配置链接**:点击复制按钮获取配置链接
|
||||
4. **导入到 TVBox**:在 TVBox 应用中导入配置链接
|
||||
|
||||
### 🔗 API 端点
|
||||
|
||||
- **JSON 配置**:`https://your-domain.com/api/tvbox?format=json`
|
||||
- **Base64 配置**:`https://your-domain.com/api/tvbox?format=base64`
|
||||
- **视频解析**:`https://your-domain.com/api/parse?url={视频地址}`
|
||||
|
||||
> 📖 详细使用说明请查看:[TVBox 配置指南](docs/TVBOX.md)
|
||||
|
||||
## 🚀 部署教程
|
||||
|
||||
> **💡 推荐方案**:
|
||||
>
|
||||
> - 🆕 **个人用户**:优先选择 **Docker 单容器**(最简单)
|
||||
> - 🏠 **家庭/团队**:选择 **Docker + Redis**(功能完整)
|
||||
> - 🏢 **生产环境**:强烈推荐 **Docker + Kvrocks**(极高可靠性,零数据丢失风险)
|
||||
|
||||
### 📋 部署方式对比
|
||||
|
||||
| 方式 | 难度 | 成本 | 多用户 | 数据可靠性 | 推荐场景 |
|
||||
| ----------------------- | ------ | -------- | ------ | ---------- | ------------------- |
|
||||
| 🐳 **Docker 单容器** | ⭐ | 需服务器 | ❌ | ⭐⭐ | 个人使用,最简单 |
|
||||
| 🐳 **Docker + Redis** | ⭐⭐ | 需服务器 | ✅ | ⭐⭐⭐ | 家庭/团队,功能完整 |
|
||||
| 🏪 **Docker + Kvrocks** | ⭐⭐ | 需服务器 | ✅ | ⭐⭐⭐⭐⭐ | 生产环境,高可靠性 |
|
||||
| ☁️ **Vercel** | ⭐ | 免费 | ❌ | ⭐ | 临时体验,无服务器 |
|
||||
| 🌐 **Cloudflare** | ⭐⭐⭐ | 免费 | ✅ | ⭐⭐⭐ | 技术爱好者 |
|
||||
- **📱 PWA 支持**:可安装为桌面/手机应用
|
||||
- **📺 TVBox 兼容**:支持 TVBox 配置接口
|
||||
|
||||
---
|
||||
|
||||
## 🎯 方案一:Docker 单容器(推荐新手)
|
||||
## 🚀 快速开始
|
||||
|
||||
> **适合场景**:个人使用,有服务器/NAS/电脑,想要最简单的部署方式
|
||||
### 💡 方案选择指南
|
||||
|
||||
### 🔧 前置要求
|
||||
| 使用场景 | 推荐方案 | 存储类型 | 成人内容过滤 | 多用户 | 部署难度 |
|
||||
| ------------ | ---------------- | ------------ | ------------ | ------ | -------- |
|
||||
| **个人使用** | Docker 单容器 | localstorage | ❌ | ❌ | ⭐ |
|
||||
| **家庭使用** | Docker + Redis | redis | ✅ | ✅ | ⭐⭐ |
|
||||
| **免费部署** | Vercel + Upstash | upstash | ✅ | ✅ | ⭐⭐⭐ |
|
||||
| **生产环境** | Docker + Kvrocks | kvrocks | ✅ | ✅ | ⭐⭐ |
|
||||
| **全球加速** | Cloudflare Pages | d1 | ✅ | ✅ | ⭐⭐⭐⭐ |
|
||||
|
||||
- 一台能联网的设备(服务器/NAS/Windows/Mac/Linux 都行)
|
||||
- 已安装 Docker([Docker 官网下载](https://www.docker.com/get-started/))
|
||||
> 💡 **重要提示**:成人内容过滤功能需要数据库存储支持,不支持 `localstorage` 方式
|
||||
|
||||
### 📝 详细步骤
|
||||
---
|
||||
|
||||
#### 第一步:拉取镜像
|
||||
## 📋 部署方案
|
||||
|
||||
### 方案一:Docker 单容器(最简单)
|
||||
|
||||
**特点**:5 分钟部署,个人使用,无多用户功能
|
||||
|
||||
```bash
|
||||
# 下载最新版本镜像(支持 ARM 和 x86 架构)
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
#### 第二步:启动容器
|
||||
|
||||
```bash
|
||||
# 一键启动(请把 your_password 改成你的密码)
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
-e PASSWORD=your_password \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
> **Windows 用户注意**:在 PowerShell 中运行上述命令
|
||||
|
||||
#### 第三步:访问应用
|
||||
|
||||
1. 打开浏览器,访问:`http://你的服务器IP:3000`
|
||||
2. 如果是本机安装,访问:`http://localhost:3000`
|
||||
3. 输入你在第二步设置的密码即可进入
|
||||
|
||||
#### 第四步:自定义资源站配置
|
||||
|
||||
> **📢 重要说明**:为确保项目的长期稳定运行和避免潜在的法律风险,应用户社区的建议,我们已将内置的视频源移除。现在需要用户自行配置视频源以正常使用本应用。
|
||||
|
||||
##### 🔗 获取推荐的资源站配置
|
||||
|
||||
为了方便用户快速上手,我们提供了一个经过测试的资源站配置文件:
|
||||
|
||||
**配置文件下载地址**: [https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
|
||||
##### 📋 配置步骤
|
||||
|
||||
1. **下载配置文件**:点击上方链接下载 `config.json` 文件
|
||||
2. **保存到本地**:将文件保存到服务器的合适位置(如 `/opt/katelyatv/config.json`)
|
||||
3. **挂载配置文件**:按以下命令重新启动容器
|
||||
**挂载自定义配置**(可选):
|
||||
|
||||
```bash
|
||||
# 先停止并删除旧容器
|
||||
docker stop katelyatv && docker rm katelyatv
|
||||
|
||||
# 重新运行并挂载配置文件
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
-v /path/to/your/config.json:/app/config.json:ro \
|
||||
-e PASSWORD=your_password \
|
||||
-v $(pwd)/config.json:/app/config.json:ro \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
> **路径说明**:把 `/path/to/your/config.json` 替换成你的配置文件完整路径
|
||||
> **Windows 示例**:`-v C:/Users/你的用户名/Desktop/config.json:/app/config.json:ro`
|
||||
### 方案二:Docker + Redis(推荐家庭使用)
|
||||
|
||||
##### 🛡️ 免责声明
|
||||
|
||||
- 提供的配置文件仅为方便用户测试和学习使用
|
||||
- 所有视频源均来源于公开的网络资源,请用户自行判断使用的合法性
|
||||
- 我们不对任何第三方视频源的内容、质量或合法性负责
|
||||
- 建议用户仅使用合法、正版的视频源
|
||||
|
||||
### 🛠️ 常用管理命令
|
||||
**特点**:完整功能,多用户支持,成人内容过滤
|
||||
|
||||
```bash
|
||||
# 查看运行状态
|
||||
docker ps
|
||||
# 1. 下载配置文件
|
||||
curl -O https://raw.githubusercontent.com/katelya77/KatelyaTV/main/docker-compose.redis.yml
|
||||
curl -O https://raw.githubusercontent.com/katelya77/KatelyaTV/main/.env.redis.example
|
||||
|
||||
# 查看日志
|
||||
docker logs katelyatv
|
||||
|
||||
# 重启应用
|
||||
docker restart katelyatv
|
||||
|
||||
# 停止应用
|
||||
docker stop katelyatv
|
||||
|
||||
# 删除容器
|
||||
docker rm katelyatv
|
||||
# 2. 配置环境变量
|
||||
cp .env.redis.example .env
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 方案二:Docker + Redis(推荐进阶)
|
||||
|
||||
> **适合场景**:多人使用,需要账号系统、观看记录同步、收藏功能
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- 已完成方案一,确认单容器版本能正常运行
|
||||
- 了解基本的 Docker Compose 概念
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步:创建配置文件
|
||||
|
||||
在你的服务器上创建一个文件夹,比如 `/opt/katelyatv`:
|
||||
**编辑 .env 文件**:
|
||||
|
||||
```bash
|
||||
# 创建目录
|
||||
mkdir -p /opt/katelyatv
|
||||
cd /opt/katelyatv
|
||||
# 管理员账号(必填)
|
||||
USERNAME=admin
|
||||
PASSWORD=your_secure_password
|
||||
|
||||
# 创建 docker-compose.yml 文件
|
||||
cat > docker-compose.yml << 'EOF'
|
||||
version: '3.8'
|
||||
# 存储配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
REDIS_URL=redis://katelyatv-redis:6379
|
||||
|
||||
services:
|
||||
# KatelyaTV 主应用
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
container_name: katelyatv
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
# 管理员账号(请修改)
|
||||
- USERNAME=admin
|
||||
- PASSWORD=your_strong_password
|
||||
# 启用 Redis 存储
|
||||
- NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
- REDIS_URL=redis://katelyatv-redis:6379
|
||||
# 允许用户注册(可选)
|
||||
- NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
depends_on:
|
||||
katelyatv-redis:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
# 可选:挂载自定义配置
|
||||
# volumes:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
|
||||
# Redis 数据库
|
||||
katelyatv-redis:
|
||||
image: redis:7-alpine
|
||||
container_name: katelyatv-redis
|
||||
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
||||
volumes:
|
||||
- katelyatv-redis-data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
katelyatv-redis-data:
|
||||
EOF
|
||||
# 功能开关
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
```
|
||||
|
||||
#### 第二步:修改配置
|
||||
|
||||
编辑 `docker-compose.yml` 文件,**必须修改**以下内容:
|
||||
|
||||
- `PASSWORD=your_strong_password` 改成你的强密码
|
||||
- `USERNAME=admin` 可以改成你喜欢的管理员用户名
|
||||
|
||||
#### 第三步:启动服务
|
||||
|
||||
```bash
|
||||
# 启动所有服务
|
||||
docker compose up -d
|
||||
|
||||
# 查看启动状态
|
||||
docker compose ps
|
||||
# 3. 启动服务
|
||||
docker compose -f docker-compose.redis.yml up -d
|
||||
```
|
||||
|
||||
#### 第四步:验证部署
|
||||
### 方案三:Docker + Kvrocks(生产环境)
|
||||
|
||||
1. 访问 `http://你的服务器IP:3000`
|
||||
2. 使用你设置的用户名和密码登录
|
||||
3. 登录后访问 `http://你的服务器IP:3000/admin` 进入管理后台
|
||||
4. 在管理后台可以配置资源站、管理用户等
|
||||
|
||||
#### 第五步:配置资源站
|
||||
|
||||
> **📢 重要提醒**:由于项目长期稳定运行的考虑,应用户建议已移除内置视频源,需要手动配置资源站。
|
||||
|
||||
##### 方法一:使用推荐配置文件(推荐)
|
||||
|
||||
1. **下载配置文件**:[点击下载 config.json](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
2. **修改 docker-compose.yml**:取消注释 volumes 部分
|
||||
```yaml
|
||||
# 将这两行的注释去掉
|
||||
volumes:
|
||||
- ./config.json:/app/config.json:ro
|
||||
```
|
||||
3. **重启服务**:
|
||||
```bash
|
||||
docker compose down
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
##### 方法二:管理后台配置
|
||||
|
||||
1. 登录管理后台:`http://你的服务器IP:3000/admin`
|
||||
2. 进入"站点配置"页面
|
||||
3. 手动添加视频源 API 接口
|
||||
|
||||
### 🛠️ 管理命令
|
||||
**特点**:极高可靠性,数据持久化到磁盘,节省内存
|
||||
|
||||
```bash
|
||||
# 查看所有服务状态
|
||||
docker compose ps
|
||||
|
||||
# 查看日志
|
||||
docker compose logs -f
|
||||
|
||||
# 重启所有服务
|
||||
docker compose restart
|
||||
|
||||
# 停止所有服务
|
||||
docker compose down
|
||||
|
||||
# 更新到最新版本
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### 💾 备份数据
|
||||
|
||||
```bash
|
||||
# 备份 Redis 数据
|
||||
docker run --rm -v katelyatv-redis-data:/data -v $(pwd):/backup alpine tar czf /backup/redis-backup-$(date +%Y%m%d).tar.gz /data
|
||||
|
||||
# 恢复数据(如果需要)
|
||||
docker run --rm -v katelyatv-redis-data:/data -v $(pwd):/backup alpine tar xzf /backup/redis-backup-20241201.tar.gz -C /
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## � 方案三:Docker + Kvrocks(高可靠性推荐)
|
||||
|
||||
> **适合场景**:生产环境,需要极高的数据可靠性,担心 Redis 数据丢失风险
|
||||
|
||||
### 🌟 Kvrocks 优势
|
||||
|
||||
- **🛡️ 极高可靠性**:基于 RocksDB,数据持久化到磁盘,几乎零丢失风险
|
||||
- **⚡ 性能优异**:完全兼容 Redis 协议,性能接近甚至超越 Redis
|
||||
- **💾 节省内存**:数据存储在磁盘,内存使用量大幅降低
|
||||
- **🔄 无需 AOF/RDB**:RocksDB 天然支持数据持久化,无需额外配置
|
||||
- **📈 更好扩展性**:支持更大的数据集,不受内存限制
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- 服务器/NAS/电脑(支持 Docker)
|
||||
- 已安装 Docker 和 Docker Compose
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步:下载配置文件
|
||||
|
||||
```bash
|
||||
# 创建项目目录
|
||||
mkdir katelyatv-kvrocks && cd katelyatv-kvrocks
|
||||
|
||||
# 下载 Kvrocks 部署配置
|
||||
# 1. 下载配置文件
|
||||
curl -O https://raw.githubusercontent.com/katelya77/KatelyaTV/main/docker-compose.kvrocks.yml
|
||||
curl -O https://raw.githubusercontent.com/katelya77/KatelyaTV/main/.env.kvrocks.example
|
||||
|
||||
# 复制环境变量模板
|
||||
# 2. 配置环境变量
|
||||
cp .env.kvrocks.example .env
|
||||
```
|
||||
|
||||
#### 第二步:配置环境变量
|
||||
**编辑 .env 文件**:
|
||||
|
||||
```bash
|
||||
# 编辑环境变量文件
|
||||
nano .env
|
||||
```
|
||||
# 管理员账号(必填,否则无法登录)
|
||||
USERNAME=admin
|
||||
PASSWORD=your_secure_password
|
||||
|
||||
**重要配置项**:
|
||||
|
||||
```bash
|
||||
# 存储类型:使用 Kvrocks
|
||||
# 存储配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=kvrocks
|
||||
|
||||
# Kvrocks 连接配置
|
||||
KVROCKS_URL=redis://kvrocks:6666
|
||||
KVROCKS_PASSWORD=your_secure_password_here # 改成你的密码
|
||||
KVROCKS_DATABASE=0
|
||||
|
||||
# NextAuth 配置
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here # 改成随机字符串
|
||||
NEXTAUTH_URL=http://localhost:3000 # 改成你的域名
|
||||
# 功能开关
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
```
|
||||
|
||||
#### 第三步:启动服务
|
||||
|
||||
```bash
|
||||
# 一键启动 KatelyaTV + Kvrocks
|
||||
docker compose -f docker-compose.kvrocks.yml up -d
|
||||
|
||||
# 查看启动状态
|
||||
docker compose -f docker-compose.kvrocks.yml ps
|
||||
```
|
||||
|
||||
#### 第四步:验证部署
|
||||
|
||||
```bash
|
||||
# 检查 Kvrocks 连接
|
||||
docker compose -f docker-compose.kvrocks.yml exec kvrocks redis-cli -h localhost -p 6666 ping
|
||||
|
||||
# 查看日志
|
||||
docker compose -f docker-compose.kvrocks.yml logs -f
|
||||
```
|
||||
|
||||
#### 第五步:访问应用
|
||||
|
||||
1. 浏览器访问:`http://你的服务器IP:3000`
|
||||
2. 注册账号开始使用
|
||||
|
||||
### 🛠️ 管理命令
|
||||
|
||||
```bash
|
||||
# 停止服务
|
||||
docker compose -f docker-compose.kvrocks.yml stop
|
||||
|
||||
# 重启服务
|
||||
docker compose -f docker-compose.kvrocks.yml restart
|
||||
|
||||
# 查看 Kvrocks 状态
|
||||
docker compose -f docker-compose.kvrocks.yml exec kvrocks redis-cli -h localhost -p 6666 info
|
||||
|
||||
# 备份数据
|
||||
docker compose -f docker-compose.kvrocks.yml exec kvrocks redis-cli -h localhost -p 6666 BGSAVE
|
||||
|
||||
# 数据量统计
|
||||
docker compose -f docker-compose.kvrocks.yml exec kvrocks redis-cli -h localhost -p 6666 dbsize
|
||||
```
|
||||
|
||||
### 🔒 数据备份与恢复
|
||||
|
||||
#### 备份数据
|
||||
|
||||
```bash
|
||||
# 自动备份(推荐)
|
||||
docker run --rm \
|
||||
-v katelyatv-kvrocks_kvrocks-data:/data \
|
||||
-v $(pwd):/backup \
|
||||
alpine tar czf /backup/kvrocks-backup-$(date +%Y%m%d).tar.gz /data
|
||||
|
||||
# 手动触发 RocksDB 备份
|
||||
docker compose -f docker-compose.kvrocks.yml exec kvrocks redis-cli -h localhost -p 6666 BGSAVE
|
||||
```
|
||||
|
||||
#### 恢复数据
|
||||
|
||||
```bash
|
||||
# 先停止服务
|
||||
docker compose -f docker-compose.kvrocks.yml down
|
||||
|
||||
# 恢复数据
|
||||
docker run --rm \
|
||||
-v katelyatv-kvrocks_kvrocks-data:/data \
|
||||
-v $(pwd):/backup \
|
||||
alpine tar xzf /backup/kvrocks-backup-20241201.tar.gz -C /
|
||||
|
||||
# 重新启动
|
||||
# 3. 启动服务
|
||||
docker compose -f docker-compose.kvrocks.yml up -d
|
||||
```
|
||||
|
||||
### 🚀 性能优化建议
|
||||
### 方案四:Vercel + Upstash(免费推荐)
|
||||
|
||||
1. **SSD 存储**:建议使用 SSD 存储以获得最佳性能
|
||||
2. **内存配置**:为 Kvrocks 分配 512MB-1GB 内存即可
|
||||
3. **磁盘空间**:预留足够磁盘空间,推荐至少 10GB
|
||||
4. **监控配置**:定期检查磁盘使用率和性能指标
|
||||
**特点**:完全免费,自动 HTTPS,全球 CDN
|
||||
|
||||
### ⚠️ 注意事项
|
||||
#### 基础部署
|
||||
|
||||
- Kvrocks 端口 6666 仅限内部网络访问,确保安全
|
||||
- 定期备份数据,虽然 Kvrocks 可靠性很高,但备份是好习惯
|
||||
- 监控磁盘空间使用,避免磁盘满导致的问题
|
||||
1. **Fork 项目** → [GitHub 仓库](https://github.com/katelya77/KatelyaTV)
|
||||
2. **部署到 Vercel**:
|
||||
- 登录 [Vercel](https://vercel.com/)
|
||||
- 导入刚 Fork 的仓库
|
||||
- 添加环境变量:`PASSWORD=your_password`
|
||||
- 点击 Deploy
|
||||
|
||||
#### 多用户配置
|
||||
|
||||
3. **创建 Upstash 数据库**:
|
||||
|
||||
- 访问 [Upstash](https://upstash.com/)
|
||||
- 创建免费 Redis 数据库
|
||||
- 获取 `UPSTASH_URL` 和 `UPSTASH_TOKEN`
|
||||
|
||||
4. **添加环境变量**:
|
||||
|
||||
```bash
|
||||
# 存储配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=upstash
|
||||
UPSTASH_URL=https://xxx.upstash.io
|
||||
UPSTASH_TOKEN=your_token
|
||||
|
||||
# 管理员账号
|
||||
USERNAME=admin
|
||||
PASSWORD=your_password
|
||||
|
||||
# 功能开关
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
```
|
||||
|
||||
5. **重新部署** → Vercel Dashboard → Redeploy
|
||||
|
||||
### 方案五:Cloudflare Pages + D1(全球加速)
|
||||
|
||||
**特点**:全球 CDN,无限带宽,免费 SSL
|
||||
|
||||
#### 快速部署
|
||||
|
||||
1. **Fork 项目** → [GitHub 仓库](https://github.com/katelya77/KatelyaTV)
|
||||
2. **创建 Pages 项目**:
|
||||
|
||||
- 登录 [Cloudflare Dashboard](https://dash.cloudflare.com/)
|
||||
- Pages → Connect to Git → 选择仓库
|
||||
- 构建设置:
|
||||
```
|
||||
Build command: pnpm install --frozen-lockfile && pnpm run pages:build
|
||||
Build output directory: .vercel/output/static
|
||||
```
|
||||
- 兼容性标志:`nodejs_compat`
|
||||
|
||||
3. **环境变量配置**:
|
||||
|
||||
```bash
|
||||
# 管理员账号
|
||||
USERNAME=admin
|
||||
PASSWORD=your_password
|
||||
|
||||
# 存储配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1
|
||||
|
||||
# 功能开关
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
```
|
||||
|
||||
4. **创建 D1 数据库**(多用户支持):
|
||||
|
||||
```bash
|
||||
# 安装Wrangler CLI
|
||||
npm install -g wrangler
|
||||
wrangler auth login
|
||||
|
||||
# 创建数据库
|
||||
wrangler d1 create katelyatv-db
|
||||
# ⚠️ 重要:确保在项目根目录下运行此命令
|
||||
# 如果遇到文件路径错误,请参考 D1_MIGRATION.md 排查指南
|
||||
wrangler d1 execute katelyatv-db --file=./scripts/d1-init.sql
|
||||
```
|
||||
|
||||
5. **配置数据库绑定** → 在 `wrangler.toml` 中添加数据库 ID
|
||||
|
||||
---
|
||||
|
||||
## �🎯 方案四:Vercel 部署(免服务器)
|
||||
## � 故障排除
|
||||
|
||||
> **适合场景**:没有服务器,想要快速体验,个人使用
|
||||
### 常见部署问题
|
||||
|
||||
### 🔧 前置要求
|
||||
#### Docker + Kvrocks 登录失败 ⚠️
|
||||
|
||||
- GitHub 账号
|
||||
- Vercel 账号(可用 GitHub 登录)
|
||||
**症状**:部署成功但无法登录,提示"账号或密码错误"
|
||||
|
||||
### 📝 详细步骤
|
||||
**解决方案**:
|
||||
|
||||
#### 第一步:Fork 仓库
|
||||
```bash
|
||||
# 确保 .env 包含完整配置
|
||||
USERNAME=admin
|
||||
PASSWORD=your_secure_password
|
||||
NEXT_PUBLIC_STORAGE_TYPE=kvrocks
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
|
||||
1. 打开 [KatelyaTV GitHub 页面](https://github.com/katelya77/KatelyaTV)
|
||||
2. 点击右上角 **Fork** 按钮
|
||||
3. 等待 Fork 完成
|
||||
# 重启服务应用配置
|
||||
docker compose -f docker-compose.kvrocks.yml down
|
||||
docker compose -f docker-compose.kvrocks.yml up -d
|
||||
```
|
||||
|
||||
#### 第二步:部署到 Vercel
|
||||
#### 构建失败
|
||||
|
||||
1. 访问 [Vercel](https://vercel.com/),用 GitHub 账号登录
|
||||
2. 点击 **Add New... → Project**
|
||||
3. 找到你刚才 Fork 的 `KatelyaTV` 仓库,点击 **Import**
|
||||
4. 在 **Environment Variables** 部分添加:
|
||||
- Key: `PASSWORD`
|
||||
- Value: `你的访问密码`(这是进入网站的密码)
|
||||
5. 点击 **Deploy** 开始部署
|
||||
```bash
|
||||
# 检查Node.js版本 (需要18+)
|
||||
node --version
|
||||
|
||||
#### 第三步:等待部署完成
|
||||
# 清理重装
|
||||
rm -rf node_modules pnpm-lock.yaml
|
||||
pnpm install
|
||||
```
|
||||
|
||||
- 通常需要 2-3 分钟
|
||||
- 部署成功后会显示域名,比如 `https://your-project.vercel.app`
|
||||
#### 数据库连接失败
|
||||
|
||||
#### 第四步:访问和使用
|
||||
```bash
|
||||
# Redis连接测试
|
||||
redis-cli -u $REDIS_URL ping
|
||||
|
||||
1. 点击 Vercel 提供的域名链接
|
||||
2. 输入你在第二步设置的密码
|
||||
3. 开始使用!
|
||||
# D1数据库检查
|
||||
wrangler d1 info your-database-name
|
||||
|
||||
### 🔧 自定义资源站
|
||||
# Upstash连接测试
|
||||
curl -H "Authorization: Bearer $UPSTASH_TOKEN" \
|
||||
$UPSTASH_URL/ping
|
||||
```
|
||||
|
||||
> **📢 重要说明**:由于项目长期稳定性考虑,应社区用户建议已移除内置视频源,需要配置资源站后才能正常使用。
|
||||
### 环境变量说明
|
||||
|
||||
#### 方法一:使用推荐配置(推荐)
|
||||
| 变量名 | 必填 | 说明 | 示例值 |
|
||||
| ----------------------------- | ------ | ------------ | ------------------------ |
|
||||
| `USERNAME` | 是\* | 管理员用户名 | `admin` |
|
||||
| `PASSWORD` | 是 | 访问密码 | `your_password` |
|
||||
| `NEXT_PUBLIC_STORAGE_TYPE` | 否 | 存储类型 | `redis/d1/upstash` |
|
||||
| `NEXT_PUBLIC_ENABLE_REGISTER` | 否 | 用户注册 | `true/false` |
|
||||
| `REDIS_URL` | 否\*\* | Redis 连接 | `redis://localhost:6379` |
|
||||
| `UPSTASH_URL` | 否\*\* | Upstash 地址 | `https://xxx.upstash.io` |
|
||||
| `UPSTASH_TOKEN` | 否\*\* | Upstash 令牌 | `AX_xxx` |
|
||||
|
||||
1. **下载配置文件**:[点击下载 config.json](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
2. **替换仓库配置**:
|
||||
- 在你 Fork 的仓库中找到 `config.json` 文件
|
||||
- 点击编辑按钮(铅笔图标)
|
||||
- 将下载的配置内容复制替换原有内容
|
||||
- 点击 **Commit changes**
|
||||
3. **等待重新部署**:Vercel 会自动重新部署(约 1-2 分钟)
|
||||
> \*多用户部署必填 \*\*对应存储类型必填
|
||||
|
||||
### 视频源配置
|
||||
|
||||
#### 推荐配置文件
|
||||
|
||||
- **基础版**(20+站点):[config_isadult.json](https://www.mediafire.com/file/upztrjc0g1ynbzy/config_isadult.json/file)
|
||||
- **增强版**(94 站点):[configplus_isadult.json](https://www.mediafire.com/file/ff60ynj6z21iqfb/configplus_isadult.json/file)
|
||||
|
||||
#### 配置方式
|
||||
|
||||
1. **Docker**:挂载到 `/app/config.json`
|
||||
2. **Vercel/Cloudflare**:提交到仓库根目录
|
||||
3. **管理员界面**:访问 `/admin` 上传配置
|
||||
|
||||
#### 配置格式
|
||||
|
||||
```json
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"site1": {
|
||||
"api": "https://api.example.com/provide/vod",
|
||||
"name": "资源站名称",
|
||||
"is_adult": false
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📱 高级功能使用指南
|
||||
|
||||
### 🔒 成人内容过滤
|
||||
|
||||
**功能介绍**:
|
||||
|
||||
- 智能识别和过滤成人内容资源站
|
||||
- 用户可自主选择开启或关闭过滤功能
|
||||
- 默认开启过滤,确保安全浏览体验
|
||||
- 支持资源分组显示,避免误触
|
||||
|
||||
**⚠️ 重要部署要求**:
|
||||
|
||||
成人内容过滤功能需要服务器端存储支持,**不能使用 `localstorage` 存储类型**。
|
||||
|
||||
| 部署平台 | 推荐存储类型 | 配置要求 |
|
||||
| ---------------- | ------------------- | ------------------------- |
|
||||
| Docker | `redis` / `kvrocks` | 配置 Redis/Kvrocks 服务器 |
|
||||
| Vercel | `upstash` | 配置 Upstash Redis |
|
||||
| Cloudflare Pages | `d1` | 配置 D1 数据库 |
|
||||
|
||||
**Cloudflare Pages 特殊配置**:
|
||||
|
||||
如果你使用 Cloudflare Pages 部署,**必须配置 D1 数据库**才能使用成人内容过滤功能:
|
||||
|
||||
1. **创建 D1 数据库**:
|
||||
|
||||
```bash
|
||||
wrangler d1 create katelyatv-db
|
||||
```
|
||||
|
||||
2. **初始化数据库表**:
|
||||
|
||||
```bash
|
||||
wrangler d1 execute katelyatv-db --file=./scripts/d1-init.sql
|
||||
```
|
||||
|
||||
3. **配置环境变量**:
|
||||
|
||||
```bash
|
||||
NEXT_PUBLIC_STORAGE_TYPE=d1
|
||||
```
|
||||
|
||||
4. **更新 wrangler.toml**:
|
||||
```toml
|
||||
[[d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "katelyatv-db"
|
||||
database_id = "your-d1-database-id"
|
||||
```
|
||||
|
||||
**故障排除**:
|
||||
|
||||
- ❌ **错误**:"获取用户设置失败"
|
||||
|
||||
- **原因**:使用了 `localstorage` 存储类型,服务器端 API 无法访问
|
||||
- **解决**:按上述要求配置数据库存储
|
||||
|
||||
- ❌ **错误**:过滤开关无法保存
|
||||
- **原因**:存储后端未正确配置或连接失败
|
||||
- **解决**:检查数据库连接和环境变量配置
|
||||
|
||||
**使用方法**:
|
||||
|
||||
1. **访问用户设置**:
|
||||
|
||||
- 登录后访问 `/settings` 页面
|
||||
- 或在用户菜单中点击「内容过滤」
|
||||
|
||||
2. **配置过滤选项**:
|
||||
|
||||
- 在「内容过滤」部分找到「成人内容过滤」开关
|
||||
- **开启**:完全隐藏成人内容资源站和搜索结果
|
||||
- **关闭**:成人内容在搜索结果中单独分组显示
|
||||
|
||||
3. **搜索结果展示**:
|
||||
- **过滤开启时**:只显示常规内容
|
||||
- **过滤关闭时**:显示两个标签页「常规结果」和「成人内容」
|
||||
|
||||
**配置文件格式**:
|
||||
|
||||
```json
|
||||
// config.json 中的资源站配置
|
||||
{
|
||||
"api_site": {
|
||||
"regular_site": {
|
||||
"api": "https://example.com/api.php/provide/vod",
|
||||
"name": "常规影视站",
|
||||
"is_adult": false // 或省略此字段,默认为 false
|
||||
},
|
||||
"adult_site": {
|
||||
"api": "https://adult.example.com/api.php/provide/vod",
|
||||
"name": "成人内容站",
|
||||
"is_adult": true // 标记为成人内容
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**安全提示**:
|
||||
|
||||
- 默认情况下,所有新用户和未登录用户的成人内容过滤均为开启状态
|
||||
- 关闭过滤功能需要用户主动操作,确保使用意图明确
|
||||
- 建议管理员在配置资源站时准确标记 `is_adult` 字段
|
||||
|
||||
**详细配置指南**:
|
||||
|
||||
- 📖 [Cloudflare Pages 成人内容过滤配置指南](./CLOUDFLARE_PAGES_ADULT_FILTER.md)
|
||||
- 🗄️ [D1 数据库迁移说明](./D1_MIGRATION.md)
|
||||
|
||||
### 🎯 跳过片头片尾
|
||||
|
||||
**功能介绍**:
|
||||
|
||||
- 自动识别并跳过片头片尾
|
||||
- 支持手动设置跳过时间点
|
||||
- 多设备同步跳过记录(需配置数据库)
|
||||
|
||||
**使用方法**:
|
||||
|
||||
1. 播放视频时点击「设置」按钮
|
||||
2. 选择「跳过片段设置」
|
||||
3. 设置片头结束时间和片尾开始时间
|
||||
4. 下次播放自动跳过
|
||||
|
||||
**批量设置**:
|
||||
|
||||
```json
|
||||
// 在管理员界面批量导入跳过配置
|
||||
{
|
||||
"skip_settings": {
|
||||
"电视剧名称": {
|
||||
"intro_end": 90, // 片头结束时间(秒)
|
||||
"outro_start": 2700 // 片尾开始时间(秒)
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 📺 TVBox 兼容模式
|
||||
|
||||
**配置地址生成**:
|
||||
|
||||
- JSON 格式:`https://你的域名/api/tvbox?format=json`
|
||||
- TXT 格式:`https://你的域名/api/tvbox?format=txt`
|
||||
- XML 格式:`https://你的域名/api/tvbox?format=xml`
|
||||
|
||||
**支持的 TVBox 应用**:
|
||||
|
||||
- TVBox(开源版)
|
||||
- CatVodTVOfficial
|
||||
- EasyBox
|
||||
- FongMi TV
|
||||
- 其他兼容应用
|
||||
|
||||
**配置导入步骤**:
|
||||
|
||||
1. 打开 TVBox 应用
|
||||
2. 进入「配置」或「设置」页面
|
||||
3. 选择「导入配置」或「添加配置」
|
||||
4. 输入上述配置地址
|
||||
5. 等待导入完成
|
||||
|
||||
### 🔄 多设备数据同步
|
||||
|
||||
**支持的数据**:
|
||||
|
||||
- 观看历史记录
|
||||
- 收藏夹内容
|
||||
- 跳过片段设置
|
||||
- 用户偏好配置
|
||||
|
||||
**同步方式对比**:
|
||||
|
||||
| 存储方式 | 同步范围 | 配置难度 | 免费程度 |
|
||||
| ------------ | -------- | ---------- | ---------- |
|
||||
| LocalStorage | 单设备 | 无需配置 | 完全免费 |
|
||||
| Redis | 全同步 | 需要服务器 | 自建免费 |
|
||||
| Upstash | 全同步 | 简单配置 | 有免费额度 |
|
||||
| D1 | 全同步 | 中等难度 | 完全免费 |
|
||||
| Kvrocks | 全同步 | 需要部署 | 自建免费 |
|
||||
|
||||
### 🎨 界面自定义
|
||||
|
||||
**主题切换**:
|
||||
|
||||
- 支持深色/浅色主题自动切换
|
||||
- 跟随系统主题设置
|
||||
- 手动切换并记忆偏好
|
||||
|
||||
**界面布局**:
|
||||
|
||||
- 响应式设计,适配手机/平板/桌面
|
||||
- 可调节视频播放器大小
|
||||
- 隐藏/显示侧边栏
|
||||
- 自定义首页展示内容
|
||||
|
||||
**个性化设置**:
|
||||
|
||||
```json
|
||||
// 在用户设置中自定义
|
||||
{
|
||||
"ui_preferences": {
|
||||
"theme": "dark", // 主题:dark/light/auto
|
||||
"layout": "grid", // 布局:grid/list
|
||||
"items_per_page": 24, // 每页显示数量
|
||||
"auto_play": true, // 自动播放下一集
|
||||
"video_quality": "auto", // 默认清晰度
|
||||
"subtitle_language": "zh-cn" // 字幕语言偏好
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 📊 数据统计分析
|
||||
|
||||
**管理员面板功能**:
|
||||
|
||||
- 访问量统计图表
|
||||
- 热门内容排行榜
|
||||
- 用户活跃度分析
|
||||
- 系统性能监控
|
||||
|
||||
**访问数据**:
|
||||
|
||||
```bash
|
||||
# 通过管理员界面查看或API获取
|
||||
GET /api/admin/analytics
|
||||
{
|
||||
"daily_visits": 1250,
|
||||
"total_users": 89,
|
||||
"popular_content": [
|
||||
{"title": "热门电影", "views": 456},
|
||||
{"title": "热播剧集", "views": 321}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
- 下载:[configplus_isadult.json](https://www.mediafire.com/file/ff60ynj6z21iqfb/configplus_isadult.json/file)
|
||||
- 重命名为 config.json 使用
|
||||
|
||||
1. 下载配置文件:
|
||||
|
||||
- [基础版 config_isadult.json](https://www.mediafire.com/file/upztrjc0g1ynbzy/config_isadult.json/file)
|
||||
- [Plus 版(94 个片源)](https://www.mediafire.com/file/ff60ynj6z21iqfb/configplus_isadult.json/file)
|
||||
|
||||
2. 配置方式:
|
||||
- **Docker**:挂载配置文件 `-v ./config.json:/app/config.json:ro`
|
||||
- **Vercel**:替换仓库中的 `config.json` 文件内容
|
||||
- **管理员界面**:登录后台 `/admin` 导入配置
|
||||
|
||||
#### 方法二:手动配置
|
||||
|
||||
如果你想添加自己的资源站:
|
||||
|
||||
1. 在你 Fork 的仓库中找到 `config.json` 文件
|
||||
2. 点击编辑按钮(铅笔图标)
|
||||
3. 修改配置内容
|
||||
4. 点击 **Commit changes**
|
||||
5. Vercel 会自动重新部署
|
||||
|
||||
### ⚠️ 注意事项
|
||||
|
||||
- Vercel 版本不支持用户注册和账号系统
|
||||
- 观看记录保存在浏览器本地,换设备会丢失
|
||||
- 如果需要多用户功能,请考虑 Docker + Redis 方案
|
||||
|
||||
---
|
||||
|
||||
## 🎯 方案五:Cloudflare Pages(进阶用户)
|
||||
|
||||
> **适合场景**:技术爱好者,想要全球 CDN 加速,免费但配置复杂
|
||||
|
||||
### 🔧 前置要求
|
||||
|
||||
- GitHub 账号
|
||||
- Cloudflare 账号
|
||||
- 对前端构建有基本了解
|
||||
|
||||
### 📝 详细步骤
|
||||
|
||||
#### 第一步:Fork 仓库并连接
|
||||
|
||||
1. Fork [KatelyaTV 仓库](https://github.com/katelya77/KatelyaTV)
|
||||
2. 登录 [Cloudflare](https://cloudflare.com)
|
||||
3. 进入 **Workers 和 Pages** → 点击 **创建应用程序**
|
||||
4. 选择 **Pages** → **连接到 Git**
|
||||
5. 选择你 Fork 的仓库
|
||||
|
||||
#### 第二步:配置构建设置
|
||||
|
||||
在构建设置页面填写:
|
||||
|
||||
- **构建命令**: `pnpm install && pnpm pages:build`
|
||||
- **构建输出目录**: `.vercel/output/static`
|
||||
- **Root directory**: `./`(默认)
|
||||
- **Node.js 版本**: `18`(推荐)
|
||||
|
||||
#### 第三步:设置兼容性
|
||||
|
||||
1. 点击 **保存并部署**
|
||||
2. 等待首次构建完成(可能会失败,没关系)
|
||||
3. 进入项目 **设置** → **兼容性标志**
|
||||
4. 添加标志: `nodejs_compat`
|
||||
|
||||
#### 第四步:添加环境变量
|
||||
|
||||
在 **设置** → **环境变量** 中添加:
|
||||
|
||||
- `PASSWORD`: 你的访问密码
|
||||
|
||||
#### 第五步:重新部署
|
||||
|
||||
1. 进入 **部署** 页面
|
||||
2. 点击最新部署旁的 **...** → **重试部署**
|
||||
3. 等待部署成功
|
||||
|
||||
#### 第六步:配置资源站
|
||||
|
||||
> **📢 重要提醒**:为保障项目长期稳定运行,应用户建议已移除内置视频源,需要配置资源站。
|
||||
|
||||
##### 推荐配置方法:
|
||||
|
||||
1. **下载配置文件**:[点击下载 config.json](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
2. **更新仓库配置**:
|
||||
- 回到你的 GitHub 仓库
|
||||
- 找到 `config.json` 文件,点击编辑
|
||||
- 用下载的内容替换原有配置
|
||||
- 提交更改
|
||||
3. **等待自动部署**:Cloudflare Pages 会自动重新构建部署
|
||||
|
||||
🎉 **完成!现在可以正常使用影视聚合功能了**
|
||||
|
||||
### 🗄️ 启用 D1 数据库(可选,支持多用户)
|
||||
|
||||
如果你想要用户系统和数据同步:
|
||||
|
||||
> ⚠️ **升级提醒**:如果你已有 D1 数据库,需要手动添加新功能表。请查看 [D1_MIGRATION.md](./D1_MIGRATION.md) 文件。
|
||||
|
||||
#### 第一步:创建 D1 数据库
|
||||
|
||||
1. 在 Cloudflare Dashboard 进入 **存储和数据库** → **D1 SQL 数据库**
|
||||
2. 点击 **创建数据库**,名称随意(比如 `katelyatv-db`)
|
||||
|
||||
#### 第二步:初始化数据库
|
||||
|
||||
1. 进入刚创建的数据库
|
||||
2. 点击 **Explore Data**
|
||||
3. 打开项目中的 [D1 初始化.md](https://github.com/katelya77/KatelyaTV/blob/main/D1%E5%88%9D%E5%A7%8B%E5%8C%96.md) 文件,复制所有 SQL 语句
|
||||
4. 粘贴到查询窗口,点击 **Run All**
|
||||
|
||||
#### 第三步:绑定数据库
|
||||
|
||||
1. 回到 Pages 项目设置
|
||||
2. 进入 **绑定** → **添加绑定**
|
||||
3. 选择 **D1 数据库**
|
||||
4. 变量名: `DB`
|
||||
5. 选择你刚创建的数据库
|
||||
|
||||
#### 第四步:添加环境变量
|
||||
|
||||
在环境变量中追加:
|
||||
|
||||
- `NEXT_PUBLIC_STORAGE_TYPE`: `d1`
|
||||
- `USERNAME`: 管理员用户名
|
||||
- `PASSWORD`: 管理员密码
|
||||
|
||||
#### 第五步:重新部署
|
||||
|
||||
重新部署后,你就可以:
|
||||
|
||||
- 使用管理员账号登录
|
||||
- 访问 `/admin` 管理后台
|
||||
- 支持用户注册和数据同步
|
||||
|
||||
---
|
||||
|
||||
## 🆙 升级和维护
|
||||
|
||||
### Docker 升级
|
||||
|
||||
```bash
|
||||
# 单容器版本
|
||||
docker stop katelyatv
|
||||
docker rm katelyatv
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
# 然后重新运行启动命令
|
||||
|
||||
# Compose 版本
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
### Vercel 升级
|
||||
|
||||
- 自动升级:当原仓库更新时,你的 Fork 仓库会收到更新提示
|
||||
- 手动升级:在你的 Fork 仓库点击 **Sync fork** 按钮
|
||||
|
||||
### Cloudflare 升级
|
||||
|
||||
- 同 Vercel,通过 Git 同步自动触发重新构建
|
||||
|
||||
### 🚨 常见问题排查
|
||||
|
||||
| 问题 | 现象 | 解决方法 |
|
||||
| --------------- | -------------------------- | ---------------------------------- |
|
||||
| 无法访问 | 浏览器显示无法连接 | 检查端口 3000 是否开放,防火墙设置 |
|
||||
| 403 Forbidden | 显示访问被拒绝 | 检查 PASSWORD 环境变量是否设置正确 |
|
||||
| Docker 启动失败 | 容器无法启动 | 查看日志 `docker logs katelyatv` |
|
||||
| Redis 连接失败 | 无法登录或保存数据 | 检查 Redis 容器是否正常运行 |
|
||||
| 构建失败 | Vercel/Cloudflare 部署失败 | 查看构建日志,检查环境变量设置 |
|
||||
|
||||
需要帮助?可以在 [GitHub Issues](https://github.com/katelya77/KatelyaTV/issues) 提问。
|
||||
|
||||
## 🐳 Docker
|
||||
|
||||
推荐方式。镜像多架构 (`linux/amd64`,`linux/arm64`),基于 Alpine,体积小启动快。
|
||||
|
||||
### 🚀 快速开始
|
||||
|
||||
#### 1. 基础部署(LocalStorage,最快验证)
|
||||
|
||||
```bash
|
||||
# 拉取最新镜像(支持 amd64/arm64 多架构)
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
|
||||
# 快速启动(LocalStorage 存储)
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_secure_password \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
访问 `http://服务器IP:3000` 即可使用。(需要在服务器控制台开放 3000 端口)
|
||||
|
||||
> Windows 本地构建如遇 Node Standalone `EPERM symlink`:优先使用 **Docker 镜像** 或在 **WSL2** 环境构建;无需修改源码。
|
||||
|
||||
#### 2. 自定义配置(挂载 config.json)
|
||||
|
||||
```bash
|
||||
# 创建配置文件目录
|
||||
mkdir -p ./katelyatv-config
|
||||
|
||||
# 将你的 config.json 放入该目录,然后运行:
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_secure_password \
|
||||
-v ./katelyatv-config/config.json:/app/config.json:ro \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
#### 3. 常用运维命令
|
||||
|
||||
```bash
|
||||
# 查看容器状态
|
||||
docker ps
|
||||
|
||||
# 查看日志
|
||||
docker logs katelyatv
|
||||
|
||||
# 查看实时日志
|
||||
docker logs -f katelyatv
|
||||
```
|
||||
|
||||
#### 4. 升级镜像
|
||||
|
||||
```bash
|
||||
# 停止并删除旧容器
|
||||
docker stop katelyatv && docker rm katelyatv
|
||||
|
||||
# 拉取最新镜像
|
||||
docker pull ghcr.io/katelya77/katelyatv:latest
|
||||
|
||||
# 重新创建容器(使用相同的配置)
|
||||
docker run -d \
|
||||
--name katelyatv \
|
||||
-p 3000:3000 \
|
||||
--env PASSWORD=your_secure_password \
|
||||
--restart unless-stopped \
|
||||
ghcr.io/katelya77/katelyatv:latest
|
||||
```
|
||||
|
||||
### 📦 镜像特性
|
||||
|
||||
- **🏗️ 多架构支持**:同时支持 `linux/amd64` 和 `linux/arm64` 架构
|
||||
- **⚡ 优化构建**:基于 Alpine Linux,镜像体积小,启动速度快
|
||||
- **🔒 安全可靠**:定期更新底层依赖,修复安全漏洞
|
||||
- **🚀 开箱即用**:内置所有必要依赖,无需额外配置
|
||||
|
||||
### 🔧 常用操作
|
||||
|
||||
```bash
|
||||
# 进入容器终端(调试用)
|
||||
docker exec -it katelyatv /bin/sh
|
||||
|
||||
# 重启容器
|
||||
docker restart katelyatv
|
||||
|
||||
# 停止容器
|
||||
docker stop katelyatv
|
||||
|
||||
# 查看容器资源使用情况
|
||||
docker stats katelyatv
|
||||
|
||||
# 备份容器(如果有挂载卷)
|
||||
docker run --rm -v katelyatv_data:/data -v $(pwd):/backup alpine tar czf /backup/katelyatv-backup.tar.gz /data
|
||||
```
|
||||
|
||||
## 🐙 Docker Compose 最佳实践
|
||||
|
||||
Docker Compose 是管理多容器应用的最佳方式,特别适合需要数据库支持的部署场景。
|
||||
|
||||
## 📚 功能使用教程
|
||||
|
||||
### ⏭️ 跳过片头片尾功能
|
||||
|
||||
KatelyaTV 提供了智能的跳过片头片尾功能,帮助您快速进入正片内容。
|
||||
|
||||
#### 🎯 如何使用
|
||||
|
||||
1. **自动检测**:系统会自动检测已设置的跳过片段,在观看时显示跳过按钮
|
||||
2. **手动设置**:在播放页面标题右侧点击"跳过设置"按钮
|
||||
3. **添加片段**:选择片头或片尾类型,设置开始和结束时间
|
||||
4. **保存配置**:配置会自动保存并应用到当前剧集
|
||||
|
||||
#### ⚙️ 功能特点
|
||||
|
||||
- **智能检测**:自动识别播放时间是否在跳过区间内
|
||||
- **手动配置**:支持精确设置跳过时间段(精确到秒)
|
||||
- **多类型支持**:支持片头、片尾等不同类型的跳过片段
|
||||
- **跨设备同步**:配置数据支持多设备同步(需使用 Redis/D1/Upstash 存储)
|
||||
- **个性化**:每个用户可独立设置不同的跳过偏好
|
||||
|
||||
#### 💾 存储支持
|
||||
|
||||
| 存储类型 | 支持状态 | 同步能力 | 推荐场景 |
|
||||
| ------------- | -------- | --------- | --------------- |
|
||||
| LocalStorage | ✅ | ❌ 单设备 | 个人本地使用 |
|
||||
| Redis | ✅ | ✅ 多设备 | 家庭/团队使用 |
|
||||
| Cloudflare D1 | ✅ | ✅ 多设备 | Cloudflare 部署 |
|
||||
| Upstash | ✅ | ✅ 多设备 | 无服务器部署 |
|
||||
|
||||
> ⚠️ **D1 用户注意**:如果你之前已经部署了项目并使用 D1 数据库,需要手动更新数据库表结构才能使用跳过功能。请参考 [D1_MIGRATION.md](./D1_MIGRATION.md) 进行升级。
|
||||
|
||||
#### 🛠️ 使用技巧
|
||||
|
||||
- **最佳时机**:建议在剧集开始播放后设置,可以实时看到当前播放时间
|
||||
- **时间精度**:支持小数点精度,如 `90.5` 秒
|
||||
- **批量设置**:一次设置后,所有相同剧集都会应用相同规则
|
||||
- **删除管理**:可以随时删除不需要的跳过片段
|
||||
|
||||
## 📁 配置说明
|
||||
|
||||
### 📝 LocalStorage(基础单机)
|
||||
|
||||
适合个人使用,数据存储在浏览器本地:
|
||||
|
||||
```yaml
|
||||
# docker-compose.yml
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
container_name: katelyatv
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- '3000:3000'
|
||||
environment:
|
||||
- PASSWORD=your_secure_password
|
||||
- SITE_NAME=我的影视站
|
||||
- ANNOUNCEMENT=欢迎使用 KatelyaTV!请遵守相关法律法规。
|
||||
# 可选:挂载自定义配置
|
||||
# volumes:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
'CMD',
|
||||
'wget',
|
||||
'--quiet',
|
||||
'--tries=1',
|
||||
'--spider',
|
||||
'http://localhost:3000',
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
```
|
||||
|
||||
**启动命令:**
|
||||
|
||||
```bash
|
||||
# 创建并启动服务
|
||||
docker compose up -d
|
||||
|
||||
# 查看服务状态
|
||||
docker compose ps
|
||||
|
||||
# 查看日志
|
||||
docker compose logs -f katelyatv
|
||||
```
|
||||
|
||||
### 🔐 Redis 版本(推荐:多用户 + 同步)
|
||||
|
||||
支持多用户、跨设备数据同步、完整的用户权限管理:
|
||||
|
||||
```yaml
|
||||
# docker-compose.yml
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
container_name: katelyatv
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- '3000:3000'
|
||||
environment:
|
||||
# 基础配置
|
||||
- SITE_NAME=KatelyaTV 影视站
|
||||
- ANNOUNCEMENT=支持多用户注册,请合理使用!
|
||||
|
||||
# 管理员账号(重要!)
|
||||
- USERNAME=admin
|
||||
- PASSWORD=admin_super_secure_password
|
||||
|
||||
# Redis 存储配置
|
||||
- NEXT_PUBLIC_STORAGE_TYPE=redis
|
||||
- REDIS_URL=redis://katelyatv-redis:6379
|
||||
|
||||
# 用户功能
|
||||
- NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
|
||||
# 可选:搜索配置
|
||||
- NEXT_PUBLIC_SEARCH_MAX_PAGE=8
|
||||
networks:
|
||||
- katelyatv-network
|
||||
depends_on:
|
||||
katelyatv-redis:
|
||||
condition: service_healthy
|
||||
# 可选:挂载自定义配置和持久化数据
|
||||
# volumes:
|
||||
# - ./config.json:/app/config.json:ro
|
||||
# - ./logs:/app/logs
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
'CMD',
|
||||
'wget',
|
||||
'--quiet',
|
||||
'--tries=1',
|
||||
'--spider',
|
||||
'http://localhost:3000',
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
|
||||
katelyatv-redis:
|
||||
image: redis:7-alpine
|
||||
container_name: katelyatv-redis
|
||||
restart: unless-stopped
|
||||
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
||||
networks:
|
||||
- katelyatv-network
|
||||
volumes:
|
||||
# Redis 数据持久化
|
||||
- katelyatv-redis-data:/data
|
||||
healthcheck:
|
||||
test: ['CMD', 'redis-cli', 'ping']
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
# 可选:端口映射(用于外部访问 Redis)
|
||||
# ports:
|
||||
# - '6379:6379'
|
||||
|
||||
networks:
|
||||
katelyatv-network:
|
||||
driver: bridge
|
||||
name: katelyatv-network
|
||||
|
||||
volumes:
|
||||
katelyatv-redis-data:
|
||||
driver: local
|
||||
name: katelyatv-redis-data
|
||||
```
|
||||
|
||||
**完整部署流程:**
|
||||
|
||||
```bash
|
||||
# 1. 创建项目目录
|
||||
mkdir katelyatv && cd katelyatv
|
||||
|
||||
# 2. 创建 docker-compose.yml 文件(复制上面的内容)
|
||||
nano docker-compose.yml
|
||||
|
||||
# 3. 检查配置文件语法
|
||||
docker compose config
|
||||
|
||||
# 4. 启动所有服务
|
||||
docker compose up -d
|
||||
|
||||
# 5. 查看服务状态
|
||||
docker compose ps
|
||||
|
||||
# 6. 查看启动日志
|
||||
docker compose logs -f
|
||||
|
||||
# 7. 等待服务完全启动(通常需要 30-60 秒)
|
||||
# 检查健康状态
|
||||
docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
|
||||
|
||||
# 8. 首次访问 http://your-server:3000
|
||||
# 使用管理员账号 admin / admin_super_secure_password 登录
|
||||
# 然后访问 /admin 进行管理员配置
|
||||
```
|
||||
|
||||
**🔍 部署验证步骤:**
|
||||
|
||||
```bash
|
||||
# 验证 Redis 连接
|
||||
docker compose exec katelyatv-redis redis-cli ping
|
||||
# 应该返回 "PONG"
|
||||
|
||||
# 验证 KatelyaTV 服务
|
||||
curl -I http://localhost:3000
|
||||
# 应该返回 HTTP 200 状态码
|
||||
|
||||
# 查看服务启动顺序
|
||||
docker compose logs --timestamps | grep "Ready in"
|
||||
```
|
||||
|
||||
### 🔄 管理与维护
|
||||
|
||||
```bash
|
||||
# 更新到最新版本
|
||||
docker compose pull && docker compose up -d
|
||||
|
||||
# 备份 Redis 数据
|
||||
docker compose exec katelyatv-redis redis-cli BGSAVE
|
||||
docker run --rm -v katelyatv-redis-data:/data -v $(pwd):/backup alpine tar czf /backup/redis-backup-$(date +%Y%m%d).tar.gz /data
|
||||
|
||||
# 查看资源使用情况
|
||||
docker compose stats
|
||||
|
||||
# 重启特定服务
|
||||
docker compose restart katelyatv
|
||||
|
||||
# 查看特定服务日志
|
||||
docker compose logs -f katelyatv-redis
|
||||
|
||||
# 进入容器调试
|
||||
docker compose exec katelyatv /bin/sh
|
||||
|
||||
# 完全清理(注意:会删除所有数据!)
|
||||
docker compose down -v --remove-orphans
|
||||
```
|
||||
|
||||
### 🚨 重要注意事项
|
||||
|
||||
1. **修改默认密码**:部署后请立即修改 `admin` 账号的默认密码
|
||||
2. **数据备份**:定期备份 Redis 数据卷,避免数据丢失
|
||||
3. **端口安全**:确保服务器防火墙正确配置,只开放必要端口
|
||||
4. **资源监控**:定期检查容器资源使用情况,必要时调整配置
|
||||
5. **日志管理**:配置日志轮转,避免日志文件过大
|
||||
|
||||
### 🛠️ 常见部署问题排查
|
||||
|
||||
**问题 1:容器启动失败**
|
||||
|
||||
```bash
|
||||
# 检查容器状态
|
||||
docker compose ps
|
||||
|
||||
# 查看详细错误日志
|
||||
docker compose logs katelyatv
|
||||
|
||||
# 常见原因:端口被占用、环境变量配置错误、镜像拉取失败
|
||||
```
|
||||
|
||||
**问题 2:Redis 连接失败**
|
||||
|
||||
```bash
|
||||
# 检查 Redis 容器状态
|
||||
docker compose exec katelyatv-redis redis-cli ping
|
||||
|
||||
# 检查网络连通性
|
||||
docker compose exec katelyatv ping katelyatv-redis
|
||||
|
||||
# 验证环境变量
|
||||
docker compose exec katelyatv env | grep REDIS
|
||||
```
|
||||
|
||||
**问题 3:Upstash Redis 连接问题**
|
||||
|
||||
```bash
|
||||
# 验证 Upstash 配置
|
||||
curl -H "Authorization: Bearer YOUR_TOKEN" YOUR_UPSTASH_URL/ping
|
||||
|
||||
# 检查环境变量格式
|
||||
echo $UPSTASH_URL # 应该是 https://xxx.upstash.io
|
||||
echo $UPSTASH_TOKEN # 应该是长字符串令牌
|
||||
```
|
||||
|
||||
**问题 4:Cloudflare D1 初始化失败**
|
||||
|
||||
- 确保在 D1 控制台中正确执行了所有 SQL 语句
|
||||
- 检查数据库绑定名称是否为 `DB`
|
||||
- 验证环境变量 `NEXT_PUBLIC_STORAGE_TYPE=d1`
|
||||
|
||||
**问题 5:Vercel 部署问题**
|
||||
|
||||
- 检查环境变量是否正确设置
|
||||
- 确保 `config.json` 文件格式正确
|
||||
- 查看 Vercel 部署日志中的错误信息
|
||||
|
||||
## 🔄 自动同步最近更改
|
||||
|
||||
建议在 fork 的仓库中启用本仓库自带的 GitHub Actions 自动同步功能(见 `.github/workflows/sync.yml`)。
|
||||
|
||||
如需手动同步主仓库更新,也可以使用 GitHub 官方的 [Sync fork](https://docs.github.com/cn/github/collaborating-with-issues-and-pull-requests/syncing-a-fork) 功能。
|
||||
|
||||
## ⚙️ 环境变量
|
||||
|
||||
### 📋 变量说明表
|
||||
|
||||
| 变量 | 说明 | 可选值 | 默认值 |
|
||||
| --------------------------- | ----------------------------------------------------------- | -------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
|
||||
| USERNAME | redis 部署时的管理员账号 | 任意字符串 | (空) |
|
||||
| PASSWORD | 默认部署时为唯一访问密码,redis 部署时为管理员密码 | 任意字符串 | (空) |
|
||||
| SITE_NAME | 站点名称 | 任意字符串 | KatelyaTV |
|
||||
| ANNOUNCEMENT | 站点公告 | 任意字符串 | 本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 播放记录/收藏的存储方式 | localstorage、redis、d1、upstash | localstorage |
|
||||
| REDIS_URL | redis 连接 url,若 NEXT_PUBLIC_STORAGE_TYPE 为 redis 则必填 | 连接 url | 空 |
|
||||
| UPSTASH_URL | upstash redis 连接 url | 连接 url | 空 |
|
||||
| UPSTASH_TOKEN | upstash redis 连接 token | 连接 token | 空 |
|
||||
| NEXT_PUBLIC_ENABLE_REGISTER | 是否开放注册,仅在非 localstorage 部署时生效 | true / false | false |
|
||||
| NEXT_PUBLIC_SEARCH_MAX_PAGE | 搜索接口可拉取的最大页数 | 1-50 | 5 |
|
||||
| NEXT_PUBLIC_IMAGE_PROXY | 默认的浏览器端图片代理 | url prefix | (空) |
|
||||
| NEXT_PUBLIC_DOUBAN_PROXY | 默认的浏览器端豆瓣数据代理 | url prefix | (空) |
|
||||
|
||||
### 🔧 配置验证
|
||||
|
||||
**部署后可通过以下方式验证环境变量是否生效:**
|
||||
|
||||
1. **访问服务状态页**:`http://your-domain/api/server-config`
|
||||
2. **检查管理员面板**:使用管理员账号登录后访问 `/admin`
|
||||
3. **查看容器日志**:
|
||||
|
||||
```bash
|
||||
# Docker 单容器
|
||||
docker logs katelyatv
|
||||
|
||||
# Docker Compose
|
||||
docker compose logs katelyatv
|
||||
```
|
||||
|
||||
## � 配置说明
|
||||
|
||||
所有可自定义项集中在根目录的 `config.json` 中:
|
||||
编辑 `config.json` 文件:
|
||||
|
||||
```json
|
||||
{
|
||||
@@ -1184,214 +603,547 @@ echo $UPSTASH_TOKEN # 应该是长字符串令牌
|
||||
"name": "示例资源站",
|
||||
"detail": "https://example.com"
|
||||
}
|
||||
// ...更多站点
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- `cache_time`:接口缓存时间(秒)。
|
||||
- `api_site`:你可以增删或替换任何资源站,字段说明:
|
||||
- `key`:唯一标识,保持小写字母/数字。
|
||||
- `api`:资源站提供的 `vod` JSON API 根地址。
|
||||
- `name`:在人机界面中展示的名称。
|
||||
- `detail`:(可选)部分无法通过 API 获取剧集详情的站点,需要提供网页详情根 URL,用于爬取。
|
||||
|
||||
KatelyaTV 支持标准的苹果 CMS V10 API 格式。
|
||||
|
||||
修改后 **无需重新构建**,服务会在启动时读取一次。
|
||||
|
||||
## 👨💼 管理员配置
|
||||
|
||||
**该特性目前仅支持通过非 localstorage 存储的部署方式使用**
|
||||
|
||||
支持在运行时动态变更服务配置
|
||||
|
||||
设置环境变量 USERNAME 和 PASSWORD 即为站长用户,站长可设置用户为管理员
|
||||
|
||||
站长或管理员访问 `/admin` 即可进行管理员配置
|
||||
|
||||
### 🔧 视频源配置管理
|
||||
|
||||
管理员界面提供了完整的视频源配置管理功能:
|
||||
|
||||
#### 📤 导出配置
|
||||
|
||||
- **一键导出**:点击"📤 导出配置"按钮,系统会自动生成符合标准格式的 `config.json` 文件
|
||||
- **自动格式化**:导出的配置文件包含所有已启用的视频源,格式完全符合项目要求
|
||||
- **本地保存**:配置文件会自动下载到浏览器的下载文件夹,文件名包含日期标记
|
||||
|
||||
#### 📂 导入配置
|
||||
|
||||
- **文件选择**:点击"📂 导入配置"按钮,选择本地的 `.json` 配置文件
|
||||
- **格式验证**:系统会自动验证配置文件格式,确保数据正确性
|
||||
- **批量导入**:支持一次性导入多个视频源,显示详细的导入结果
|
||||
- **错误提示**:如果导入过程中出现错误,会显示具体的错误信息
|
||||
|
||||
#### 📋 支持的配置格式
|
||||
|
||||
```json
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"source_key": {
|
||||
"api": "https://example.com/api.php/provide/vod",
|
||||
"name": "视频源名称",
|
||||
"detail": "https://example.com" // 可选
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### ✨ 其他管理功能
|
||||
|
||||
- **拖拽排序**:支持通过拖拽调整视频源的优先级顺序
|
||||
- **启用/禁用**:可以临时禁用某个视频源而不删除配置
|
||||
- **实时生效**:所有配置修改都会立即生效,无需重启服务
|
||||
|
||||
> **💡 提示**:导入的配置会永久保存在数据库中,不会因为浏览器刷新而丢失。这比直接修改 `config.json` 文件更加可靠和方便。
|
||||
|
||||
## 📱 AndroidTV 使用
|
||||
|
||||
目前该项目可以配合 [OrionTV](https://github.com/zimplexing/OrionTV) 在 Android TV 上使用,可以直接作为 OrionTV 后端
|
||||
|
||||
### 🆕 v0.5.0-katelya 修复说明
|
||||
|
||||
**修复了 OrionTV 客户端无法播放的问题**:
|
||||
|
||||
- **✅ 新增 CORS 支持**:为所有 API 路由添加了跨域请求头部,解决 OrionTV 客户端访问问题
|
||||
- **✅ 修复认证拦截**:调整了中间件配置,确保 OrionTV 必需的 API 路由不被认证系统拦截
|
||||
- **✅ 兼容性优化**:优化了搜索、详情、图片代理等关键 API 的响应头部
|
||||
|
||||
**如果你之前遇到"OrionTV 显示了资源但点击无法播放"的问题,现在应该已经解决了!**
|
||||
|
||||
### 📱 OrionTV 配置方法
|
||||
|
||||
1. **下载 OrionTV 客户端**:在 Android TV 上安装 OrionTV 应用
|
||||
2. **配置 API 地址**:在 OrionTV 中填入你的 KatelyaTV 部署地址
|
||||
3. **输入密码**:填写你设置的 PASSWORD 环境变量
|
||||
4. **测试播放**:尝试搜索和播放视频
|
||||
|
||||
### 🔍 故障排除
|
||||
|
||||
如果还有播放问题,请检查:
|
||||
|
||||
- 确保你的 KatelyaTV 版本是 v0.5.0-katelya 或更新版本
|
||||
- 确认已正确配置视频源(参考本文档的配置文件说明)
|
||||
- 检查网络连接和防火墙设置
|
||||
- 确保密码配置正确
|
||||
|
||||
暂时收藏夹与播放记录和网页端隔离,后续会支持同步用户数据
|
||||
|
||||
## 🗓️ Roadmap
|
||||
|
||||
- [x] 深色模式
|
||||
- [x] 持久化存储
|
||||
- [x] 多账户
|
||||
- [x] 观看历史记录
|
||||
- [x] PWA 支持
|
||||
- [x] 豆瓣集成
|
||||
- [ ] 弹幕系统
|
||||
- [ ] 字幕支持
|
||||
- [ ] 下载功能
|
||||
- [ ] 社交分享
|
||||
|
||||
## ⚠️ 安全与隐私提醒
|
||||
|
||||
### 强烈建议设置密码保护
|
||||
|
||||
为了您的安全和避免潜在的法律风险,我们**强烈建议**在部署时设置密码保护:
|
||||
|
||||
- **避免公开访问**:不设置密码的实例任何人都可以访问,可能被恶意利用
|
||||
- **防范版权风险**:公开的视频搜索服务可能面临版权方的投诉举报
|
||||
- **保护个人隐私**:设置密码可以限制访问范围,保护您的使用记录
|
||||
|
||||
### 部署建议
|
||||
|
||||
1. **设置环境变量 `PASSWORD`**:为您的实例设置一个强密码
|
||||
2. **仅供个人使用**:请勿将您的实例链接公开分享或传播
|
||||
3. **遵守当地法律**:请确保您的使用行为符合当地法律法规
|
||||
|
||||
### 重要声明
|
||||
|
||||
- 本项目仅供学习和个人使用
|
||||
- 请勿将部署的实例用于商业用途或公开服务
|
||||
- 如因公开分享导致的任何法律问题,用户需自行承担责任
|
||||
- 项目开发者不对用户的使用行为承担任何法律责任
|
||||
|
||||
## 📄 License
|
||||
|
||||
[MIT](LICENSE) © 2025 KatelyaTV & Contributors
|
||||
|
||||
## ⭐ Star History
|
||||
|
||||
<div align="center">
|
||||
|
||||
[](https://star-history.com/#katelya77/KatelyaTV&Date)
|
||||
|
||||
</div>
|
||||
|
||||
## 💖 支持项目
|
||||
|
||||
如果这个项目对您有帮助,欢迎给个 ⭐️ Star 支持一下!
|
||||
|
||||
您也可以通过以下方式支持项目的持续开发:
|
||||
|
||||
<div align="center">
|
||||
|
||||
### 请开发者喝杯咖啡 ☕
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<img src="public/wechat.jpg" alt="微信支付" width="200">
|
||||
<br>
|
||||
<strong>微信支付</strong>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
> 💝 感谢您的支持!您的捐赠将用于项目的持续维护和功能改进。
|
||||
|
||||
</div>
|
||||
|
||||
## � 推荐配置文件说明
|
||||
|
||||
### 🎯 为什么需要配置文件?
|
||||
|
||||
为了项目的长期稳定运行和合规性,我们根据用户社区的建议,将内置的视频源移除。这样做的好处包括:
|
||||
|
||||
- **🛡️ 降低法律风险**:避免项目因内置资源问题而受到影响
|
||||
- **⚡ 提升加载速度**:减少应用本体大小,提高启动速度
|
||||
- **🔧 更灵活配置**:用户可以根据需要选择最适合的资源站
|
||||
- **📈 长期维护性**:确保项目能够持续健康发展
|
||||
|
||||
### 📥 获取推荐配置
|
||||
|
||||
我们为用户精心准备了一个经过测试和优化的配置文件:
|
||||
|
||||
**📂 配置文件下载链接**: [https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file](https://www.mediafire.com/file/xl3yo7la2ci378w/config.json/file)
|
||||
|
||||
### ✨ 配置文件特点
|
||||
|
||||
- ✅ **经过充分测试**:所有资源站均经过可用性验证
|
||||
- ⚡ **响应速度优化**:优选响应快速的资源接口
|
||||
- 🎬 **内容丰富**:覆盖电影、电视剧、综艺、动漫等多种类型
|
||||
- 🔄 **定期更新**:我们会根据可用性定期更新推荐配置
|
||||
|
||||
### 🛡️ 使用声明
|
||||
|
||||
- 提供的配置文件仅供学习交流和技术测试使用
|
||||
- 所有资源均来源于公开的网络接口,请用户自行判断使用的合法性
|
||||
- 我们不对任何第三方资源的内容质量或合法性承担责任
|
||||
- 强烈建议用户仅使用合法、正版的影视内容
|
||||
|
||||
---
|
||||
|
||||
## �🙏 致谢
|
||||
## 📱 高级功能
|
||||
|
||||
- [ts-nextjs-tailwind-starter](https://github.com/theodorusclarence/ts-nextjs-tailwind-starter) — 项目最初基于该脚手架。
|
||||
- [LibreTV](https://github.com/LibreSpark/LibreTV) — 由此启发,站在巨人的肩膀上。
|
||||
- [LunaTV-原 MoonTV](https://github.com/MoonTechLab/LunaTV) — 原始项目与作者社区,感谢原作奠定坚实基础。
|
||||
- [ArtPlayer](https://github.com/zhw2590582/ArtPlayer) — 提供强大的网页视频播放器。
|
||||
- [HLS.js](https://github.com/video-dev/hls.js) — 实现 HLS 流媒体在浏览器中的播放支持。
|
||||
- 感谢所有提供免费影视接口的站点。
|
||||
### TVBox 兼容
|
||||
|
||||
支持 TVBox 配置接口,可以将视频源导入到各种电视盒子应用:
|
||||
|
||||
- **配置地址**:`https://your-domain.com/api/tvbox?format=json`
|
||||
- **详细说明**:查看 [TVBox 配置指南](docs/TVBOX.md)
|
||||
|
||||
### 跳过片头片尾
|
||||
|
||||
智能跳过片头片尾功能:
|
||||
|
||||
- 🎯 自动检测已设置的跳过片段
|
||||
- ⚙️ 手动设置跳过时间段(精确到秒)
|
||||
- 🔄 支持多设备同步(需配置 Redis/D1/Upstash)
|
||||
|
||||
### AndroidTV 支持
|
||||
|
||||
配合 [OrionTV](https://github.com/zimplexing/OrionTV) 在 Android TV 上使用:
|
||||
|
||||
1. 在 OrionTV 中填入 KatelyaTV 部署地址
|
||||
2. 输入设置的 PASSWORD
|
||||
3. 即可在电视上观看
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ 管理与维护
|
||||
|
||||
### 升级更新
|
||||
|
||||
### 🔄 升级更新
|
||||
|
||||
**自动更新检测**:
|
||||
|
||||
- 网站会自动检测新版本
|
||||
- 在管理员界面查看更新状态
|
||||
- 支持一键更新提醒
|
||||
|
||||
**手动更新步骤**:
|
||||
|
||||
**Docker 更新**:
|
||||
|
||||
```bash
|
||||
# 停止并更新服务
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
|
||||
# 查看运行状态
|
||||
docker compose ps
|
||||
|
||||
# 查看更新日志
|
||||
docker compose logs -f katelyatv
|
||||
```
|
||||
|
||||
**Git 部署更新**:
|
||||
|
||||
```bash
|
||||
# 备份当前配置
|
||||
cp config.json config.json.backup
|
||||
|
||||
# 拉取最新代码
|
||||
git pull origin main
|
||||
|
||||
# 安装新依赖
|
||||
pnpm install
|
||||
|
||||
# 重新构建
|
||||
pnpm run build
|
||||
|
||||
# 恢复配置文件
|
||||
cp config.json.backup config.json
|
||||
|
||||
# 重启服务
|
||||
pm2 restart katelyatv
|
||||
```
|
||||
|
||||
**Vercel/Cloudflare 更新**:
|
||||
|
||||
- Fork 的仓库会自动接收上游更新提醒
|
||||
- 在 GitHub 中点击 `Sync fork` 同步更新
|
||||
- 平台会自动重新部署
|
||||
|
||||
### 💾 数据备份与恢复
|
||||
|
||||
**备份脚本示例**:
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# backup.sh - 完整备份脚本
|
||||
DATE=$(date +%Y%m%d_%H%M%S)
|
||||
BACKUP_DIR="backups/$DATE"
|
||||
mkdir -p $BACKUP_DIR
|
||||
|
||||
echo "开始备份 KatelyaTV 数据..."
|
||||
|
||||
# 备份配置文件
|
||||
cp config.json $BACKUP_DIR/config.json
|
||||
echo "✓ 配置文件备份完成"
|
||||
|
||||
# 根据存储类型备份数据
|
||||
if [ -f .env ] && grep -q "REDIS_URL" .env; then
|
||||
# Redis 数据备份
|
||||
docker compose exec redis redis-cli --rdb $BACKUP_DIR/dump.rdb
|
||||
echo "✓ Redis 数据备份完成"
|
||||
elif [ -f .env ] && grep -q "UPSTASH" .env; then
|
||||
# Upstash 数据导出
|
||||
echo "Upstash 数据需手动在控制台导出"
|
||||
fi
|
||||
|
||||
# Kvrocks 数据备份
|
||||
if docker compose ps | grep -q kvrocks; then
|
||||
docker run --rm \
|
||||
-v katelyatv_kvrocks-data:/data:ro \
|
||||
-v $(pwd)/$BACKUP_DIR:/backup \
|
||||
alpine tar czf /backup/kvrocks-data.tar.gz /data
|
||||
echo "✓ Kvrocks 数据备份完成"
|
||||
fi
|
||||
|
||||
# 压缩备份文件
|
||||
tar -czf "katelyatv-backup-$DATE.tar.gz" -C backups $DATE
|
||||
rm -rf $BACKUP_DIR
|
||||
|
||||
echo "✓ 备份完成: katelyatv-backup-$DATE.tar.gz"
|
||||
```
|
||||
|
||||
**恢复数据**:
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# restore.sh - 数据恢复脚本
|
||||
BACKUP_FILE="$1"
|
||||
|
||||
if [ -z "$BACKUP_FILE" ]; then
|
||||
echo "用法: $0 <backup-file.tar.gz>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "恢复数据从: $BACKUP_FILE"
|
||||
tar -xzf $BACKUP_FILE
|
||||
|
||||
# 恢复配置文件
|
||||
BACKUP_DIR=$(tar -tzf $BACKUP_FILE | head -1 | cut -f1 -d"/")
|
||||
cp $BACKUP_DIR/config.json ./config.json
|
||||
|
||||
# 恢复数据库
|
||||
if [ -f "$BACKUP_DIR/dump.rdb" ]; then
|
||||
docker compose exec redis redis-cli FLUSHALL
|
||||
docker cp $BACKUP_DIR/dump.rdb redis:/data/dump.rdb
|
||||
docker compose restart redis
|
||||
fi
|
||||
|
||||
echo "✓ 数据恢复完成"
|
||||
```
|
||||
|
||||
### 🔍 故障诊断指南
|
||||
|
||||
**常见问题快速排查**:
|
||||
|
||||
| 问题症状 | 可能原因 | 解决方案 |
|
||||
| -------------- | ----------------------- | ------------------------------- |
|
||||
| 无法访问网站 | 端口未开放/服务未启动 | 检查防火墙和服务状态 |
|
||||
| 视频无法播放 | 配置文件错误/源失效 | 验证 config.json 格式和源可用性 |
|
||||
| 登录失败 | 密码错误/环境变量未设置 | 检查 PASSWORD 环境变量 |
|
||||
| 数据库连接失败 | 连接信息错误/服务未启动 | 验证连接字符串和服务状态 |
|
||||
| 页面加载缓慢 | 内存不足/缓存失效 | 重启服务或清理缓存 |
|
||||
|
||||
**诊断命令**:
|
||||
|
||||
```bash
|
||||
# 系统状态检查
|
||||
docker compose ps
|
||||
docker compose logs --tail=50
|
||||
|
||||
# 网络连通性测试
|
||||
curl -I http://localhost:3000
|
||||
wget --spider http://localhost:3000
|
||||
|
||||
# 数据库连接测试
|
||||
# Redis
|
||||
redis-cli -u $REDIS_URL ping
|
||||
# 或者
|
||||
docker compose exec redis redis-cli ping
|
||||
|
||||
# 配置文件验证
|
||||
cat config.json | jq '.'
|
||||
# 如果没有 jq,可以用 python
|
||||
python -m json.tool config.json
|
||||
|
||||
# 端口占用检查
|
||||
netstat -tlnp | grep 3000
|
||||
ss -tlnp | grep 3000
|
||||
```
|
||||
|
||||
### 📊 性能监控与优化
|
||||
|
||||
**监控指标**:
|
||||
|
||||
```bash
|
||||
# 实时系统监控脚本
|
||||
#!/bin/bash
|
||||
# monitor.sh
|
||||
while true; do
|
||||
echo "=== $(date) ==="
|
||||
|
||||
# Docker 容器状态
|
||||
echo "容器资源使用:"
|
||||
docker stats --no-stream --format "table {{.Name}}\t{{.CPUPerc}}\t{{.MemUsage}}"
|
||||
|
||||
# 系统负载
|
||||
echo -e "\n系统负载:"
|
||||
uptime
|
||||
|
||||
# 磁盘使用
|
||||
echo -e "\n磁盘使用:"
|
||||
df -h / | tail -1
|
||||
|
||||
# 内存使用
|
||||
echo -e "\n内存使用:"
|
||||
free -h | head -2
|
||||
|
||||
echo "================================"
|
||||
sleep 30
|
||||
done
|
||||
```
|
||||
|
||||
**性能优化建议**:
|
||||
|
||||
1. **内存优化**:
|
||||
|
||||
```bash
|
||||
# Node.js 内存限制
|
||||
export NODE_OPTIONS="--max-old-space-size=1024"
|
||||
|
||||
# Docker 内存限制
|
||||
docker run --memory=1g --memory-swap=1.5g ...
|
||||
```
|
||||
|
||||
2. **缓存优化**:
|
||||
|
||||
```json
|
||||
// config.json 中增加缓存时间
|
||||
{
|
||||
"cache_time": 21600, // 6小时缓存
|
||||
"api_cache_time": 3600 // API缓存1小时
|
||||
}
|
||||
```
|
||||
|
||||
3. **网络优化**:
|
||||
- 使用 CDN 加速静态资源
|
||||
- 启用 Gzip/Brotli 压缩
|
||||
- 配置适当的缓存头
|
||||
|
||||
### 🚨 安全加固
|
||||
|
||||
**生产环境安全检查清单**:
|
||||
|
||||
- [ ] 设置强密码策略(至少 12 位包含特殊字符)
|
||||
- [ ] 启用 HTTPS(使用 Let's Encrypt 或 Cloudflare)
|
||||
- [ ] 配置防火墙规则(仅开放必要端口)
|
||||
- [ ] 定期更新系统和依赖包
|
||||
- [ ] 设置访问日志监控
|
||||
- [ ] 配置自动备份策略
|
||||
- [ ] 限制管理员界面访问(IP 白名单)
|
||||
- [ ] 启用 fail2ban 防止暴力破解
|
||||
|
||||
**安全配置示例**:
|
||||
|
||||
```bash
|
||||
# nginx 配置增强安全性
|
||||
# /etc/nginx/sites-available/katelyatv
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
server_name your-domain.com;
|
||||
|
||||
# SSL 配置
|
||||
ssl_certificate /path/to/cert.pem;
|
||||
ssl_certificate_key /path/to/key.pem;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
|
||||
# 安全头
|
||||
add_header X-Frame-Options DENY;
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
|
||||
|
||||
# 限制请求大小
|
||||
client_max_body_size 10M;
|
||||
|
||||
# 速率限制
|
||||
limit_req_zone $binary_remote_addr zone=api:10m rate=10r/m;
|
||||
|
||||
location /api/ {
|
||||
limit_req zone=api burst=5 nodelay;
|
||||
proxy_pass http://localhost:3000;
|
||||
}
|
||||
|
||||
location /admin {
|
||||
# 仅允许特定IP访问管理界面
|
||||
allow 192.168.1.0/24;
|
||||
deny all;
|
||||
proxy_pass http://localhost:3000;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📚 扩展文档
|
||||
|
||||
### 📖 详细指南
|
||||
|
||||
**功能配置**:
|
||||
|
||||
- [📺 TVBox 兼容配置指南](docs/TVBOX.md)
|
||||
- [💾 Kvrocks 高性能部署](docs/KVROCKS.md)
|
||||
- [🗄️ D1 数据库迁移指南](D1_MIGRATION.md)
|
||||
|
||||
**故障排除**:
|
||||
|
||||
- [🔧 Docker 故障排除手册](DOCKER_TROUBLESHOOTING.md)
|
||||
- [⚠️ 兼容性问题解决](DEPLOYMENT_COMPATIBILITY.md)
|
||||
|
||||
### 🎯 最佳实践
|
||||
|
||||
**新手快速上手路径**:
|
||||
|
||||
1. 选择 Vercel + 基础配置(最简单)
|
||||
2. 升级到 Vercel + Upstash(支持多用户)
|
||||
3. 进阶到 Docker 自建(完全控制)
|
||||
4. 终极配置:Kvrocks 集群(高可用)
|
||||
|
||||
**生产环境推荐方案**:
|
||||
|
||||
- **小型个人站**:Vercel + Upstash
|
||||
- **中型团队使用**:Docker + Redis Cluster
|
||||
- **大型服务**:Kubernetes + Kvrocks 集群
|
||||
- **全球服务**:Cloudflare Pages + D1
|
||||
|
||||
### 🔗 相关资源
|
||||
|
||||
**官方资源**:
|
||||
|
||||
- [📦 GitHub 仓库](https://github.com/katelya77/KatelyaTV)
|
||||
- [🐳 Docker Hub](https://hub.docker.com/r/katelya77/katelyatv)
|
||||
- [📊 GitHub Container Registry](https://github.com/katelya77/KatelyaTV/pkgs/container/katelyatv)
|
||||
- [📋 版本发布页](https://github.com/katelya77/KatelyaTV/releases)
|
||||
|
||||
**社区支持**:
|
||||
|
||||
- [💬 Discussions 讨论区](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- [🐛 Issues 问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [📖 Wiki 知识库](https://github.com/katelya77/KatelyaTV/wiki)
|
||||
- [💡 Feature Requests](https://github.com/katelya77/KatelyaTV/issues?q=label%3Aenhancement)
|
||||
|
||||
**在线演示**:
|
||||
|
||||
- [🎬 官方演示站点](https://katelyatv-demo.pages.dev/) (密码: `demo123`)
|
||||
- [📱 PWA 功能演示](https://katelyatv-pwa.vercel.app/)
|
||||
- [🎨 主题预览站点](https://katelyatv-themes.pages.dev/)
|
||||
|
||||
### 🤝 参与贡献
|
||||
|
||||
**贡献方式**:
|
||||
|
||||
- ⭐ 给项目点 Star
|
||||
- 🐛 报告 Bug 和问题
|
||||
- 💡 提出新功能建议
|
||||
- 📝 完善文档和翻译
|
||||
- 💻 贡献代码和修复
|
||||
|
||||
**开发者指南**:
|
||||
|
||||
```bash
|
||||
# 本地开发环境搭建
|
||||
git clone https://github.com/katelya77/KatelyaTV.git
|
||||
cd KatelyaTV
|
||||
|
||||
# 安装依赖
|
||||
pnpm install
|
||||
|
||||
# 启动开发服务器
|
||||
pnpm dev
|
||||
|
||||
# 运行测试
|
||||
pnpm test
|
||||
|
||||
# 构建生产版本
|
||||
pnpm build
|
||||
|
||||
# 代码格式化
|
||||
pnpm lint --fix
|
||||
pnpm format
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔒 安全与合规
|
||||
|
||||
### 🚨 重要提醒
|
||||
|
||||
**强烈建议**:
|
||||
|
||||
- ✅ **设置强密码**:避免公开访问,保护个人隐私
|
||||
- ✅ **个人使用**:请勿公开分享实例链接或商业使用
|
||||
- ✅ **遵守法律**:确保使用行为符合当地法律法规
|
||||
- ✅ **版权意识**:尊重内容版权,支持正版
|
||||
|
||||
**安全配置**:
|
||||
|
||||
- 启用 HTTPS 加密传输
|
||||
- 设置访问密码和用户认证
|
||||
- 配置 IP 访问限制
|
||||
- 定期更新和安全检查
|
||||
|
||||
### ⚖️ 免责声明
|
||||
|
||||
- 本项目仅供个人学习、研究和合法使用
|
||||
- 用户需对自己的使用行为承担完全法律责任
|
||||
- 开发者不对用户的任何违法行为承担责任
|
||||
- 请确保遵守所在地区的法律法规
|
||||
|
||||
---
|
||||
|
||||
## 🌟 致谢与支持
|
||||
|
||||
### 🙏 特别感谢
|
||||
|
||||
感谢以下优秀的开源项目和技术社区:
|
||||
|
||||
**核心依赖**:
|
||||
|
||||
- [Next.js](https://nextjs.org/) — 强大的 React 全栈框架
|
||||
- [ArtPlayer](https://github.com/zhw2590582/ArtPlayer) — 功能丰富的 HTML5 视频播放器
|
||||
- [Tailwind CSS](https://tailwindcss.com/) — 实用优先的 CSS 框架
|
||||
- [TypeScript](https://www.typescriptlang.org/) — JavaScript 的超集
|
||||
|
||||
**基础设施**:
|
||||
|
||||
- [Cloudflare](https://cloudflare.com/) — 全球 CDN 和边缘计算
|
||||
- [Vercel](https://vercel.com/) — 现代化的部署平台
|
||||
- [Docker](https://docker.com/) — 容器化部署方案
|
||||
- [Redis](https://redis.io/) — 高性能内存数据库
|
||||
|
||||
**项目启发**:
|
||||
|
||||
- [LibreTV](https://github.com/LibreSpark/LibreTV) — 提供设计理念
|
||||
- [LunaTV](https://github.com/MoonTechLab/LunaTV) — 项目基础架构
|
||||
|
||||
### 💝 支持项目发展
|
||||
|
||||
如果 KatelyaTV 对您有帮助,欢迎通过以下方式支持项目:
|
||||
|
||||
**免费支持**:
|
||||
|
||||
- ⭐ [GitHub 点 Star](https://github.com/katelya77/KatelyaTV/stargazers)
|
||||
- 🍴 [Fork 项目](https://github.com/katelya77/KatelyaTV/fork)
|
||||
- 💬 [参与讨论](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- 📖 [完善文档](https://github.com/katelya77/KatelyaTV/tree/main/docs)
|
||||
- 🔗 [推荐朋友](https://github.com/katelya77/KatelyaTV)
|
||||
|
||||
**赞助支持**:
|
||||
|
||||
<div align="center">
|
||||
<img src="public/wechat.jpg" alt="微信赞赏码" width="200">
|
||||
<br>
|
||||
<strong>请开发者喝杯咖啡 ☕</strong>
|
||||
<p><em>您的支持是项目持续发展的动力</em></p>
|
||||
</div>
|
||||
|
||||
**企业赞助**:
|
||||
如果您的企业希望赞助 KatelyaTV 项目,请通过 [GitHub Sponsors](https://github.com/sponsors/katelya77) 或发邮件联系我们。
|
||||
|
||||
### � 项目统计
|
||||
|
||||
[](https://github.com/katelya77/KatelyaTV/stargazers)
|
||||
[](https://github.com/katelya77/KatelyaTV/network/members)
|
||||
[](https://github.com/katelya77/KatelyaTV/watchers)
|
||||
|
||||
[](https://github.com/katelya77/KatelyaTV/releases)
|
||||
[](https://hub.docker.com/r/katelya77/katelyatv)
|
||||
[](https://github.com/katelya77/KatelyaTV/issues)
|
||||
[](https://github.com/katelya77/KatelyaTV/blob/main/LICENSE)
|
||||
|
||||
**Star History**:
|
||||
[](https://star-history.com/#katelya77/KatelyaTV&Date)
|
||||
|
||||
---
|
||||
|
||||
## 📄 开源协议
|
||||
|
||||
本项目基于 **MIT License** 开源协议发布。
|
||||
|
||||
```
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2025 KatelyaTV & Contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
<div align="center">
|
||||
<h2>🎉 感谢您选择 KatelyaTV!</h2>
|
||||
<p>
|
||||
<strong>如果项目对您有帮助,请给个 ⭐ Star 支持一下!</strong>
|
||||
</p>
|
||||
<p>
|
||||
<a href="https://github.com/katelya77/KatelyaTV">🏠 项目首页</a>
|
||||
•
|
||||
<a href="https://github.com/katelya77/KatelyaTV/issues">🐛 问题反馈</a>
|
||||
•
|
||||
<a href="https://github.com/katelya77/KatelyaTV/discussions">💬 讨论交流</a>
|
||||
•
|
||||
<a href="https://github.com/katelya77/KatelyaTV/wiki">📚 使用文档</a>
|
||||
</p>
|
||||
<br>
|
||||
<p>
|
||||
<em>❤️ Made with love by KatelyaTV Community ❤️</em>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
## 🎉 KatelyaTV v0.6.0-katelya
|
||||
|
||||
### ✨ 主要更新
|
||||
|
||||
#### 📺 TVBox 集成优化
|
||||
|
||||
- **新增用户菜单中的"TVBox 配置"按钮** - 提供便捷的配置入口
|
||||
- **TVBox API 无需认证** - 解决客户端无法登录的问题,现在可直接使用配置链接
|
||||
- **优化用户体验** - 支持一键复制配置 URL,直接在 TVBox 应用中使用
|
||||
|
||||
#### ☁️ Cloudflare Pages 完全支持
|
||||
|
||||
- **修复 Edge Runtime 兼容性** - 解决部署失败问题
|
||||
- **重构 API 架构** - 使用 Edge Runtime 兼容的配置读取方式
|
||||
- **生产环境稳定性提升** - 确保 Cloudflare Pages 部署成功
|
||||
|
||||
#### 🔧 技术改进
|
||||
|
||||
- 修复代码风格问题(ESLint 导入排序)
|
||||
- 优化中间件配置,确保安全性
|
||||
- 提升构建过程稳定性
|
||||
|
||||
### 📱 使用方式
|
||||
|
||||
**TVBox 配置 URL**(无需登录):
|
||||
|
||||
- JSON 格式:`https://your-domain.com/api/tvbox?format=json`
|
||||
- Base64 格式:`https://your-domain.com/api/tvbox?format=base64`
|
||||
|
||||
**访问配置页面**:
|
||||
|
||||
1. 登录后点击右上角用户头像
|
||||
2. 选择"TVBox 配置"
|
||||
3. 复制配置链接到 TVBox 应用
|
||||
|
||||
### 🌐 部署兼容性
|
||||
|
||||
- ✅ Cloudflare Pages(推荐)
|
||||
- ✅ Vercel
|
||||
- ✅ Docker
|
||||
- ✅ 传统服务器
|
||||
|
||||
### 🔄 升级说明
|
||||
|
||||
- **向后兼容**:现有配置和数据完全兼容
|
||||
- **推荐操作**:重新部署以获取 Cloudflare Pages 优化
|
||||
- **新功能**:TVBox 配置功能可选使用
|
||||
|
||||
---
|
||||
|
||||
**重要提示**:本版本主要解决了 TVBox 客户端集成和 Cloudflare Pages 部署的关键问题,建议所有用户升级。
|
||||
@@ -1,149 +0,0 @@
|
||||
# 🎉 KatelyaTV v0.5.0-katelya
|
||||
|
||||
> **重大更新**:智能跳过片头片尾功能 + 多平台兼容性增强
|
||||
|
||||
## ✨ 主要新增功能
|
||||
|
||||
### 🎬 智能跳过片头片尾系统
|
||||
|
||||
- **批量设置**:支持同时配置片头片尾跳过时间
|
||||
- **智能检测**:自动识别片头片尾时间点
|
||||
- **时间格式**:直观的"分:秒"格式输入(如 1:30)
|
||||
- **自动跳转**:支持自动跳到下一集功能
|
||||
- **浮动界面**:美观的跳过提示,不遮挡视频内容
|
||||
- **倒计时显示**:5秒跳过倒计时提醒
|
||||
- **全存储支持**:LocalStorage、Redis、D1、Upstash 全兼容
|
||||
|
||||
### 🔧 技术架构优化
|
||||
|
||||
- **统一构建工具**:全面切换到 pnpm,提升构建速度 50%+
|
||||
- **多平台兼容**:完美支持 Cloudflare Pages、Docker、Vercel
|
||||
- **Edge Runtime**:Cloudflare Pages 使用 Edge Runtime 优化
|
||||
- **自动转换**:Docker 部署时自动转换为 Node.js Runtime
|
||||
|
||||
### 🗄️ 数据库增强
|
||||
|
||||
- **新增表结构**:`skip_configs` 表用于存储跳过配置
|
||||
- **索引优化**:完整的数据库索引提升查询性能
|
||||
- **迁移文档**:提供现有数据库的迁移指南
|
||||
|
||||
## 🔄 改进与修复
|
||||
|
||||
### 📦 构建系统
|
||||
|
||||
- 统一使用 pnpm 包管理器
|
||||
- 优化 Cloudflare Pages 构建配置
|
||||
- 修复 GitHub Actions 工作流语法错误
|
||||
- 更新所有仓库引用到新的 katelya77/KatelyaTV
|
||||
|
||||
### 🎨 用户界面
|
||||
|
||||
- 跳过配置界面重新设计
|
||||
- 支持批量设置片头片尾
|
||||
- 修复界面重叠问题
|
||||
- 优化时间输入体验
|
||||
|
||||
### 🛠️ 开发体验
|
||||
|
||||
- 修复 ESLint 错误
|
||||
- 清理无用配置文件
|
||||
- 优化版本检查机制
|
||||
- 完善 Docker 兼容性测试
|
||||
|
||||
## 🚀 部署指南
|
||||
|
||||
### Cloudflare Pages(推荐)
|
||||
|
||||
```bash
|
||||
# 构建命令
|
||||
pnpm pages:build
|
||||
|
||||
# 输出目录
|
||||
.vercel/output/static
|
||||
```
|
||||
|
||||
### Docker 部署
|
||||
|
||||
```bash
|
||||
docker pull ghcr.io/katelya77/katelyatv:v0.5.0-katelya
|
||||
docker run -d --name katelyatv -p 3000:3000 \
|
||||
--env PASSWORD=your_password \
|
||||
ghcr.io/katelya77/katelyatv:v0.5.0-katelya
|
||||
```
|
||||
|
||||
### Vercel 部署
|
||||
|
||||
```bash
|
||||
# 构建命令
|
||||
pnpm run build
|
||||
```
|
||||
|
||||
## 📋 环境变量
|
||||
|
||||
| 变量 | 说明 | 默认值 |
|
||||
| ------------------------ | ---------- | ------------ |
|
||||
| PASSWORD | 访问密码 | 必填 |
|
||||
| NEXT_PUBLIC_STORAGE_TYPE | 存储类型 | localstorage |
|
||||
| USERNAME | 管理员账号 | 空 |
|
||||
|
||||
## 🆕 新功能使用说明
|
||||
|
||||
### 跳过片头片尾设置
|
||||
|
||||
1. 在播放页面点击"跳过设置"按钮
|
||||
2. 选择"批量设置"模式
|
||||
3. 输入片头时间(如:1:30)
|
||||
4. 输入片尾时间(如:1:30)
|
||||
5. 开启"自动跳过"和"自动下一集"
|
||||
6. 保存设置
|
||||
|
||||
### 智能检测功能
|
||||
|
||||
- 系统会根据播放行为自动学习片头片尾时间
|
||||
- 支持自动识别常见的片头片尾模式
|
||||
- 提供5秒倒计时,可手动取消跳过
|
||||
|
||||
## 🔧 技术升级
|
||||
|
||||
### 构建工具统一
|
||||
|
||||
- 所有平台统一使用 pnpm
|
||||
- 构建速度提升 2-3 倍
|
||||
- 磁盘空间节省 50%+
|
||||
|
||||
### 多平台兼容
|
||||
|
||||
- **Cloudflare Pages**: 使用 Edge Runtime,全球CDN加速
|
||||
- **Docker**: 自动转换 Runtime,支持多架构
|
||||
- **Vercel**: 优化构建配置,快速部署
|
||||
|
||||
## 🔗 相关资源
|
||||
|
||||
- [项目文档](https://github.com/katelya77/KatelyaTV#readme)
|
||||
- [问题反馈](https://github.com/katelya77/KatelyaTV/issues)
|
||||
- [功能讨论](https://github.com/katelya77/KatelyaTV/discussions)
|
||||
- [贡献指南](https://github.com/katelya77/KatelyaTV/blob/main/CONTRIBUTING.md)
|
||||
|
||||
## 🙏 致谢
|
||||
|
||||
感谢所有用户的反馈和建议,特别是跳过片头片尾功能的需求。本版本致力于提供更智能、更便捷的观影体验。
|
||||
|
||||
## 📈 版本对比
|
||||
|
||||
| 功能 | v0.4.0 | v0.5.0 |
|
||||
| ------------ | ------ | ------ |
|
||||
| 跳过片头片尾 | ❌ | ✅ |
|
||||
| 批量设置 | ❌ | ✅ |
|
||||
| 智能检测 | ❌ | ✅ |
|
||||
| 自动下一集 | ❌ | ✅ |
|
||||
| pnpm 构建 | ❌ | ✅ |
|
||||
| Edge Runtime | ❌ | ✅ |
|
||||
| 多存储支持 | ✅ | ✅ |
|
||||
| Docker 部署 | ✅ | ✅ |
|
||||
|
||||
---
|
||||
|
||||
**注意**: 本项目仅供学习和个人使用,请遵守当地法律法规。
|
||||
|
||||
**发布日期**: 2025年9月2日
|
||||
**版本标签**: v0.5.0-katelya
|
||||
@@ -1,101 +0,0 @@
|
||||
# KatelyaTV v0.6.0-katelya 发布记录
|
||||
|
||||
## 🎉 重大更新
|
||||
|
||||
### 📺 TVBox 集成优化
|
||||
|
||||
- **用户界面改进**
|
||||
|
||||
- 在用户菜单中新增"TVBox 配置"按钮,提供便捷的配置入口
|
||||
- 优化配置页面用户体验,支持一键复制配置链接
|
||||
- 新增电视图标标识,界面更加直观
|
||||
|
||||
- **认证机制优化**
|
||||
- **重要变更**:TVBox API (`/api/tvbox`) 现已开放无需认证访问
|
||||
- 解决 TVBox 客户端无法登录的根本问题
|
||||
- 支持直接在 TVBox 应用中使用配置链接,无需预先登录
|
||||
- 确保其他管理 API 仍受认证保护,维护系统安全
|
||||
|
||||
### 🔧 技术优化
|
||||
|
||||
#### Cloudflare Pages 部署支持
|
||||
|
||||
- **Edge Runtime 全面兼容**
|
||||
- 修复所有 API 路由的 Edge Runtime 配置问题
|
||||
- 解决 Cloudflare Pages 部署失败的核心问题
|
||||
- 重构文件系统访问逻辑,使用 `getConfig()` 替代 `fs.readFileSync`
|
||||
- 确保生产环境部署稳定性
|
||||
|
||||
#### 代码质量提升
|
||||
|
||||
- **ESLint 规则优化**
|
||||
- 修复导入排序问题,确保代码风格一致性
|
||||
- 解决所有编译时警告和错误
|
||||
- 提升代码可维护性和团队协作效率
|
||||
|
||||
### 🌐 部署兼容性
|
||||
|
||||
- ✅ **Cloudflare Pages** - 完全支持,Edge Runtime 兼容
|
||||
- ✅ **Vercel** - 自动适配,零配置部署
|
||||
- ✅ **Docker** - 容器化部署,跨平台兼容
|
||||
- ✅ **传统服务器** - Node.js 运行时,稳定运行
|
||||
|
||||
### 📱 TVBox 使用指南
|
||||
|
||||
#### 配置方式
|
||||
|
||||
1. **通过用户菜单**:
|
||||
|
||||
- 登录 KatelyaTV 网站
|
||||
- 点击右上角用户头像
|
||||
- 选择"TVBox 配置"
|
||||
- 复制配置链接到 TVBox 应用
|
||||
|
||||
2. **直接访问**:
|
||||
|
||||
- JSON 格式:`https://your-domain.com/api/tvbox?format=json`
|
||||
|
||||
- Base64 格式:`https://your-domain.com/api/tvbox?format=base64`
|
||||
|
||||
#### 支持的客户端
|
||||
|
||||
- TVBox 官方版本
|
||||
- TVBox 开源版本
|
||||
- 影视仓
|
||||
- 其他兼容 TVBox 标准的应用
|
||||
|
||||
### 🔄 迁移指南
|
||||
|
||||
从 v0.5.x 升级到 v0.6.0:
|
||||
|
||||
1. **无需数据迁移**:配置数据完全兼容
|
||||
2. **新功能可选**:现有功能保持不变
|
||||
3. **推荐操作**:重新部署以获取 Cloudflare Pages 优化
|
||||
|
||||
### 🐛 修复的问题
|
||||
|
||||
- 修复 Cloudflare Pages 部署时的 Edge Runtime 配置错误
|
||||
- 解决 TVBox API 认证导致的访问失败问题
|
||||
- 修复代码导入排序导致的 ESLint 警告
|
||||
- 优化构建过程,减少 Windows 开发环境的权限警告
|
||||
|
||||
### ⚠️ 重要说明
|
||||
|
||||
- **安全考虑**:TVBox API 开放访问不会泄露敏感信息,配置数据主要包含公开的视频源地址
|
||||
- **向后兼容**:现有用户的所有功能和数据保持不变
|
||||
- **推荐升级**:建议所有用户升级以获得更好的 TVBox 集成体验
|
||||
|
||||
---
|
||||
|
||||
## 🚀 下一版本预告
|
||||
|
||||
- 更多视频源集成
|
||||
- 播放性能优化
|
||||
- 移动端体验改进
|
||||
- 更多第三方客户端支持
|
||||
|
||||
---
|
||||
|
||||
**发布日期**:2025 年 9 月 3 日
|
||||
**版本标签**:v0.6.0-katelya
|
||||
**兼容性**:向下兼容 v0.5.x 所有功能
|
||||
@@ -1,123 +0,0 @@
|
||||
# 🎬 智能跳过功能使用指南
|
||||
|
||||
## ✨ 功能特色
|
||||
|
||||
### 🚀 全新智能跳过体验
|
||||
|
||||
- **🎯 分:秒格式输入** - 更符合观影习惯,如 `2:10` 表示 2 分 10 秒
|
||||
- **⚡ 自动跳过** - 无需手动点击,到达设定时间自动跳转
|
||||
- **🎭 智能片尾** - 可设置从指定时间直接跳转下一集
|
||||
- **🎨 优化布局** - 悬浮式配置显示,不与内容重叠
|
||||
|
||||
## 📱 使用方法
|
||||
|
||||
### 1. 开启跳过设置
|
||||
|
||||
在播放页面,点击标题右侧的 **"跳过设置"** 按钮
|
||||
|
||||
### 2. 智能配置模式(推荐)
|
||||
|
||||
#### 全局开关
|
||||
|
||||
- ✅ **启用自动跳过** - 到达时间自动跳转,无需手动点击
|
||||
- ✅ **片尾自动播放下一集** - 片尾时显示倒计时,自动播放下一集
|
||||
|
||||
#### 片头设置
|
||||
|
||||
- **开始时间**: `0:00` (通常从视频开始)
|
||||
- **结束时间**: `2:10` (跳过 2 分 10 秒的片头)
|
||||
|
||||
#### 片尾设置
|
||||
|
||||
- **开始时间**: `19:20` (从 19 分 20 秒开始检测片尾)
|
||||
- **结束时间**: 留空 (直接跳转下一集) 或 `20:50` (跳过片尾到此时间)
|
||||
|
||||
### 3. 支持的时间格式
|
||||
|
||||
- **分:秒格式**: `2:10`, `19:20`, `1:30.5`
|
||||
- **秒数格式**: `130`, `1160`, `90.5`
|
||||
- **自动识别**: 系统会自动识别并转换格式
|
||||
|
||||
## 🎯 使用场景示例
|
||||
|
||||
### 场景一:跳过片头
|
||||
|
||||
```
|
||||
片头设置:
|
||||
开始时间: 0:00
|
||||
结束时间: 2:10
|
||||
|
||||
效果: 视频开始播放时,自动从0秒跳转到2分10秒
|
||||
```
|
||||
|
||||
### 场景二:片尾直接下一集
|
||||
|
||||
```
|
||||
片尾设置:
|
||||
开始时间: 19:20
|
||||
结束时间: 留空
|
||||
|
||||
效果: 播放到19分20秒时,显示倒计时,自动播放下一集
|
||||
```
|
||||
|
||||
### 场景三:跳过片头+片尾
|
||||
|
||||
```
|
||||
片头: 0:00 → 2:10 (跳过片头)
|
||||
片尾: 19:20 → 留空 (直接下一集)
|
||||
|
||||
效果: 完全自动化的观影体验
|
||||
```
|
||||
|
||||
## 🎨 界面说明
|
||||
|
||||
### 播放时显示
|
||||
|
||||
- **倒计时器**: 片尾时屏幕中央显示"X 秒后自动播放下一集"
|
||||
- **跳过提示**: 自动跳过时显示"自动跳过片头/片尾"
|
||||
- **取消按钮**: 可随时取消自动操作
|
||||
|
||||
### 配置显示
|
||||
|
||||
- **悬浮卡片**: 右下角显示当前跳过配置
|
||||
- **状态标识**: 显示自动跳过状态
|
||||
- **快速修改**: 点击卡片可快速修改配置
|
||||
|
||||
## ⚙️ 高级功能
|
||||
|
||||
### 精确设置
|
||||
|
||||
- 支持小数点精度: `90.5` 秒
|
||||
- 支持多段跳过: 可设置多个片头/片尾段落
|
||||
- 智能检测: 自动识别当前播放时间是否在跳过区间
|
||||
|
||||
### 数据同步
|
||||
|
||||
- **LocalStorage**: 单设备本地存储
|
||||
- **云端同步**: 支持 Redis、D1、Upstash 跨设备同步
|
||||
- **实时更新**: 配置修改后立即生效
|
||||
|
||||
## 🔧 故障排除
|
||||
|
||||
### 常见问题
|
||||
|
||||
1. **时间格式错误**: 确保使用 `分:秒` 格式,如 `2:10`
|
||||
2. **配置不生效**: 检查是否开启了"启用自动跳过"开关
|
||||
3. **重叠显示**: 新版本已修复,配置卡片不会与内容重叠
|
||||
|
||||
### 兼容性
|
||||
|
||||
- ✅ 支持所有部署方式 (Docker, Vercel, Cloudflare Pages)
|
||||
- ✅ 支持所有存储后端 (LocalStorage, Redis, D1, Upstash)
|
||||
- ✅ 支持桌面和移动设备
|
||||
|
||||
## 💡 使用技巧
|
||||
|
||||
1. **首次设置**: 建议先观看一遍内容,记录片头片尾时间
|
||||
2. **批量配置**: 使用智能配置模式一次性设置片头和片尾
|
||||
3. **个性化**: 不同类型的内容可以设置不同的跳过规则
|
||||
4. **测试验证**: 设置后可以快进到设定时间测试效果
|
||||
|
||||
---
|
||||
|
||||
🎉 **享受更流畅的观影体验!**
|
||||
+1
-1
@@ -1 +1 @@
|
||||
20250903203337
|
||||
20250904200125
|
||||
@@ -0,0 +1,44 @@
|
||||
# 视频源配置说明
|
||||
|
||||
## 配置方式
|
||||
|
||||
您有两种方式配置视频源:
|
||||
|
||||
### 方式 1:通过管理后台配置(推荐)
|
||||
|
||||
1. 访问 `/admin` 管理后台
|
||||
2. 在"源管理"部分添加视频源
|
||||
3. 支持实时启用/禁用
|
||||
4. 数据保存在数据库中,重启不丢失
|
||||
|
||||
### 方式 2:通过 config.json 配置
|
||||
|
||||
参考 `config.example.json` 文件的格式:
|
||||
|
||||
```json
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"source_key": {
|
||||
"api": "https://your-api.com/api.php/provide/vod",
|
||||
"name": "源名称",
|
||||
"detail": "https://your-api.com/api.php/provide/vod/?ac=detail&ids={ids}",
|
||||
"is_adult": false
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## 字段说明
|
||||
|
||||
- `source_key`: 源的唯一标识符
|
||||
- `api`: 视频 API 的搜索接口地址
|
||||
- `name`: 源的显示名称
|
||||
- `detail`: 视频详情接口地址({ids} 会被替换为视频 ID)
|
||||
- `is_adult`: 是否为成人内容源(true/false)
|
||||
|
||||
## 推荐设置
|
||||
|
||||
- 建议保持 `config.json` 为空配置:`{"cache_time": 7200, "api_site": {}}`
|
||||
- 通过管理后台动态添加和管理视频源
|
||||
- 这样更灵活,支持实时启用/禁用,无需重启服务
|
||||
@@ -0,0 +1,142 @@
|
||||
-- ========================================
|
||||
-- KatelyaTV Cloudflare D1 数据库初始化脚本
|
||||
-- 版本: 2025-09-05 (适配当前代码结构)
|
||||
-- ========================================
|
||||
|
||||
-- 1. 用户表 (必需)
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT UNIQUE NOT NULL,
|
||||
password_hash TEXT NOT NULL,
|
||||
salt TEXT NOT NULL,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
last_login DATETIME,
|
||||
login_count INTEGER DEFAULT 0,
|
||||
is_active BOOLEAN DEFAULT 1,
|
||||
role TEXT DEFAULT 'user'
|
||||
);
|
||||
|
||||
-- 2. 用户设置表 (成人内容过滤必需)
|
||||
CREATE TABLE IF NOT EXISTS user_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT UNIQUE NOT NULL,
|
||||
filter_adult_content BOOLEAN DEFAULT 1,
|
||||
can_disable_filter BOOLEAN DEFAULT 1,
|
||||
managed_by_admin BOOLEAN DEFAULT 0,
|
||||
last_filter_change DATETIME,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- 3. 播放记录表 (观看历史)
|
||||
CREATE TABLE IF NOT EXISTS play_records (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
video_title TEXT,
|
||||
video_url TEXT,
|
||||
video_cover TEXT,
|
||||
current_time REAL DEFAULT 0,
|
||||
duration REAL DEFAULT 0,
|
||||
progress REAL DEFAULT 0,
|
||||
episode_index INTEGER DEFAULT 0,
|
||||
episode_url TEXT,
|
||||
last_watched DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
watch_count INTEGER DEFAULT 1,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE,
|
||||
UNIQUE(username, video_id)
|
||||
);
|
||||
|
||||
-- 4. 收藏表
|
||||
CREATE TABLE IF NOT EXISTS favorites (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
video_title TEXT,
|
||||
video_cover TEXT,
|
||||
video_url TEXT,
|
||||
rating REAL,
|
||||
year TEXT,
|
||||
area TEXT,
|
||||
category TEXT,
|
||||
actors TEXT,
|
||||
director TEXT,
|
||||
description TEXT,
|
||||
added_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
UNIQUE(username, video_id),
|
||||
FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- 5. 搜索历史表
|
||||
CREATE TABLE IF NOT EXISTS search_history (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
keyword TEXT NOT NULL,
|
||||
search_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- 6. 跳过配置表 (跳过片头片尾)
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL,
|
||||
video_id TEXT NOT NULL,
|
||||
skip_start INTEGER DEFAULT 0,
|
||||
skip_end INTEGER DEFAULT 0,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
UNIQUE(username, video_id),
|
||||
FOREIGN KEY (username) REFERENCES users(username) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- ========================================
|
||||
-- 索引优化
|
||||
-- ========================================
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_users_username ON users(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_username ON user_settings(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_username ON play_records(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_last_watched ON play_records(last_watched);
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_username ON favorites(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_username ON search_history(username);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_username ON skip_configs(username);
|
||||
|
||||
-- ========================================
|
||||
-- 触发器
|
||||
-- ========================================
|
||||
|
||||
-- 自动更新 user_settings 时间戳
|
||||
CREATE TRIGGER IF NOT EXISTS update_user_settings_timestamp
|
||||
AFTER UPDATE ON user_settings
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
UPDATE user_settings SET updated_at = CURRENT_TIMESTAMP WHERE username = NEW.username;
|
||||
END;
|
||||
|
||||
-- 新用户注册时创建默认设置
|
||||
CREATE TRIGGER IF NOT EXISTS create_default_user_settings
|
||||
AFTER INSERT ON users
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
INSERT OR IGNORE INTO user_settings (username, filter_adult_content, can_disable_filter, managed_by_admin)
|
||||
VALUES (NEW.username, 1, 1, 0);
|
||||
END;
|
||||
|
||||
-- 更新播放记录时间戳
|
||||
CREATE TRIGGER IF NOT EXISTS update_play_records_timestamp
|
||||
AFTER UPDATE ON play_records
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
UPDATE play_records SET updated_at = CURRENT_TIMESTAMP WHERE id = NEW.id;
|
||||
END;
|
||||
|
||||
-- 更新跳过配置时间戳
|
||||
CREATE TRIGGER IF NOT EXISTS update_skip_configs_timestamp
|
||||
AFTER UPDATE ON skip_configs
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
UPDATE skip_configs SET updated_at = CURRENT_TIMESTAMP WHERE id = NEW.id;
|
||||
END;
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"example_source": {
|
||||
"api": "https://your-video-api.com/api.php/provide/vod",
|
||||
"name": "示例视频源",
|
||||
"detail": "https://your-video-api.com/api.php/provide/vod/?ac=detail&ids={ids}",
|
||||
"is_adult": false
|
||||
},
|
||||
"another_example": {
|
||||
"api": "https://another-api.com/api.php/provide/vod",
|
||||
"name": "另一个示例源",
|
||||
"detail": "https://another-api.com/api.php/provide/vod/?ac=detail&ids={ids}",
|
||||
"is_adult": false
|
||||
},
|
||||
"adult_example": {
|
||||
"api": "https://adult-content-api.com/api.php/provide/vod",
|
||||
"name": "成人内容源示例",
|
||||
"detail": "https://adult-content-api.com/api.php/provide/vod/?ac=detail&ids={ids}",
|
||||
"is_adult": true
|
||||
},
|
||||
"test_adult_source": {
|
||||
"api": "https://test-adult-api.com/api.php/provide/vod",
|
||||
"name": "测试成人源(用于验证过滤)",
|
||||
"detail": "https://test-adult-api.com/api.php/provide/vod/?ac=detail&ids={ids}",
|
||||
"is_adult": true
|
||||
}
|
||||
}
|
||||
}
|
||||
+24
-4
@@ -1,10 +1,30 @@
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"example_test": {
|
||||
"api": "https://example.com/api.php/provide/vod",
|
||||
"name": "示例视频源",
|
||||
"detail": "https://example.com"
|
||||
"hnzy": {
|
||||
"api": "https://hnzyapi.com/api.php/provide/vod",
|
||||
"name": "火鸟资源",
|
||||
"is_adult": false
|
||||
},
|
||||
"lzzy": {
|
||||
"api": "https://api.liangzizy.com/inc/apijson_vod.php",
|
||||
"name": "量子资源",
|
||||
"is_adult": false
|
||||
},
|
||||
"ffzy": {
|
||||
"api": "https://ffzyapi.com/api.php/provide/vod",
|
||||
"name": "非凡资源",
|
||||
"is_adult": false
|
||||
},
|
||||
"ykzy": {
|
||||
"api": "https://api.yongjiuzy.cc/provide/vod",
|
||||
"name": "永久资源",
|
||||
"is_adult": false
|
||||
},
|
||||
"bdzy": {
|
||||
"api": "https://api.1080zyku.com/inc/apijson_vod.php",
|
||||
"name": "百度资源",
|
||||
"is_adult": false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"cache_time": 7200,
|
||||
"api_site": {
|
||||
"example_test": {
|
||||
"api": "https://example.com/api.php/provide/vod",
|
||||
"name": "示例视频源",
|
||||
"detail": "https://example.com",
|
||||
"is_adult": false
|
||||
},
|
||||
"adult_example": {
|
||||
"api": "https://adult-example.com/api.php/provide/vod",
|
||||
"name": "成人内容源(仅供示例)",
|
||||
"detail": "https://adult-example.com",
|
||||
"is_adult": true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# KatelyaTV 应用服务
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
# 数据库配置 - 使用 Kvrocks (带密码)
|
||||
NEXT_PUBLIC_STORAGE_TYPE: kvrocks
|
||||
KVROCKS_URL: redis://kvrocks:6666
|
||||
KVROCKS_PASSWORD: ${KVROCKS_PASSWORD}
|
||||
KVROCKS_DATABASE: 0
|
||||
|
||||
# 站点访问密码配置
|
||||
PASSWORD: ${PASSWORD:-}
|
||||
|
||||
# 其他必要的环境变量
|
||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||
NEXTAUTH_URL: ${NEXTAUTH_URL:-http://localhost:3000}
|
||||
depends_on:
|
||||
- kvrocks
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
|
||||
# Kvrocks 数据库服务 (带密码认证)
|
||||
kvrocks:
|
||||
image: apache/kvrocks:latest
|
||||
ports:
|
||||
- "6666:6666"
|
||||
environment:
|
||||
# Kvrocks 配置
|
||||
KVROCKS_BIND: 0.0.0.0
|
||||
KVROCKS_PORT: 6666
|
||||
KVROCKS_DIR: /var/lib/kvrocks/data
|
||||
KVROCKS_LOG_LEVEL: info
|
||||
# 设置密码
|
||||
KVROCKS_REQUIREPASS: ${KVROCKS_PASSWORD}
|
||||
volumes:
|
||||
# 持久化数据存储
|
||||
- kvrocks-data:/var/lib/kvrocks/data
|
||||
# 挂载配置文件
|
||||
- ./docker/kvrocks/kvrocks.auth.conf:/etc/kvrocks/kvrocks.conf:ro
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "-h", "localhost", "-p", "6666", "-a", "${KVROCKS_PASSWORD}", "ping"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
volumes:
|
||||
# Kvrocks 数据卷
|
||||
kvrocks-data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
katelyatv-network:
|
||||
driver: bridge
|
||||
@@ -0,0 +1,60 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# KatelyaTV 应用服务(本地构建版本)
|
||||
katelyatv:
|
||||
build: .
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
# 数据库配置 - 使用 Kvrocks
|
||||
NEXT_PUBLIC_STORAGE_TYPE: kvrocks
|
||||
KVROCKS_URL: redis://kvrocks:6666
|
||||
KVROCKS_PASSWORD: ${KVROCKS_PASSWORD:-}
|
||||
KVROCKS_DATABASE: 0
|
||||
|
||||
# 其他必要的环境变量
|
||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||
NEXTAUTH_URL: ${NEXTAUTH_URL:-http://localhost:3000}
|
||||
depends_on:
|
||||
- kvrocks
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
|
||||
# Kvrocks 数据库服务
|
||||
kvrocks:
|
||||
image: apache/kvrocks:latest
|
||||
ports:
|
||||
- "6666:6666"
|
||||
environment:
|
||||
# Kvrocks 配置
|
||||
KVROCKS_BIND: 0.0.0.0
|
||||
KVROCKS_PORT: 6666
|
||||
KVROCKS_DIR: /var/lib/kvrocks/data
|
||||
KVROCKS_LOG_LEVEL: info
|
||||
# 可选:设置密码
|
||||
KVROCKS_REQUIREPASS: ${KVROCKS_PASSWORD:-}
|
||||
volumes:
|
||||
# 持久化数据存储
|
||||
- kvrocks-data:/var/lib/kvrocks/data
|
||||
# 可选:挂载配置文件
|
||||
- ./docker/kvrocks/kvrocks.conf:/etc/kvrocks/kvrocks.conf:ro
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "-h", "localhost", "-p", "6666", "ping"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
volumes:
|
||||
# Kvrocks 数据卷
|
||||
kvrocks-data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
katelyatv-network:
|
||||
driver: bridge
|
||||
@@ -3,7 +3,7 @@ version: '3.8'
|
||||
services:
|
||||
# KatelyaTV 应用服务
|
||||
katelyatv:
|
||||
build: .
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
@@ -13,6 +13,13 @@ services:
|
||||
KVROCKS_PASSWORD: ${KVROCKS_PASSWORD:-}
|
||||
KVROCKS_DATABASE: 0
|
||||
|
||||
# 管理员账号配置(必填)
|
||||
USERNAME: ${USERNAME:-admin}
|
||||
PASSWORD: ${PASSWORD}
|
||||
|
||||
# 站点配置
|
||||
NEXT_PUBLIC_ENABLE_REGISTER: ${NEXT_PUBLIC_ENABLE_REGISTER:-true}
|
||||
|
||||
# 其他必要的环境变量
|
||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||
NEXTAUTH_URL: ${NEXTAUTH_URL:-http://localhost:3000}
|
||||
@@ -33,12 +40,10 @@ services:
|
||||
KVROCKS_PORT: 6666
|
||||
KVROCKS_DIR: /var/lib/kvrocks/data
|
||||
KVROCKS_LOG_LEVEL: info
|
||||
# 可选:设置密码
|
||||
KVROCKS_REQUIREPASS: ${KVROCKS_PASSWORD:-}
|
||||
volumes:
|
||||
# 持久化数据存储
|
||||
- kvrocks-data:/var/lib/kvrocks/data
|
||||
# 可选:挂载配置文件
|
||||
# 挂载配置文件
|
||||
- ./docker/kvrocks/kvrocks.conf:/etc/kvrocks/kvrocks.conf:ro
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# KatelyaTV 应用服务
|
||||
katelyatv:
|
||||
image: ghcr.io/katelya77/katelyatv:latest
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
# 数据库配置 - 使用 Redis
|
||||
NEXT_PUBLIC_STORAGE_TYPE: redis
|
||||
REDIS_URL: redis://katelyatv-redis:6379
|
||||
REDIS_PASSWORD: ${REDIS_PASSWORD:-}
|
||||
REDIS_DATABASE: 0
|
||||
|
||||
# 站点访问密码配置
|
||||
PASSWORD: ${PASSWORD:-}
|
||||
|
||||
# 其他必要的环境变量
|
||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||
NEXTAUTH_URL: ${NEXTAUTH_URL:-http://localhost:3000}
|
||||
depends_on:
|
||||
- katelyatv-redis
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
|
||||
# Redis 数据库服务
|
||||
katelyatv-redis:
|
||||
image: redis:7-alpine
|
||||
container_name: katelyatv-redis
|
||||
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
||||
volumes:
|
||||
# 持久化数据存储
|
||||
- katelyatv-redis-data:/data
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- katelyatv-network
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
|
||||
volumes:
|
||||
# Redis 数据卷
|
||||
katelyatv-redis-data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
katelyatv-network:
|
||||
driver: bridge
|
||||
@@ -0,0 +1,50 @@
|
||||
# Kvrocks 配置文件 (带密码认证)
|
||||
# 基于 RocksDB 的 Redis 协议兼容存储引擎
|
||||
|
||||
# 网络配置
|
||||
bind 0.0.0.0
|
||||
port 6666
|
||||
|
||||
# 数据存储配置
|
||||
dir /var/lib/kvrocks/data
|
||||
|
||||
# 日志配置
|
||||
log-level info
|
||||
log-dir /var/lib/kvrocks/logs
|
||||
|
||||
# 性能优化配置
|
||||
# RocksDB 配置
|
||||
rocksdb.max_open_files 4096
|
||||
rocksdb.max_background_jobs 4
|
||||
rocksdb.max_write_buffer_number 4
|
||||
rocksdb.write_buffer_size 64MB
|
||||
|
||||
# 压缩配置
|
||||
rocksdb.compression snappy
|
||||
|
||||
# 内存配置
|
||||
max-memory 512MB
|
||||
|
||||
# 安全配置 - 启用密码认证
|
||||
# 密码将通过环境变量 KVROCKS_REQUIREPASS 设置
|
||||
requirepass ${KVROCKS_REQUIREPASS}
|
||||
|
||||
# 持久化配置
|
||||
# Kvrocks 基于 RocksDB,天然支持持久化,无需额外配置
|
||||
|
||||
# 网络超时配置
|
||||
timeout 300
|
||||
|
||||
# 客户端连接配置
|
||||
tcp-keepalive 300
|
||||
tcp-backlog 511
|
||||
|
||||
# 慢查询日志
|
||||
slowlog-log-slower-than 10000
|
||||
slowlog-max-len 128
|
||||
|
||||
# 数据库数量
|
||||
databases 16
|
||||
|
||||
# 备份配置
|
||||
save ""
|
||||
@@ -26,6 +26,8 @@ rocksdb.compression snappy
|
||||
max-memory 512MB
|
||||
|
||||
# 安全配置
|
||||
# 默认不设置密码(适合开发环境)
|
||||
# 如需启用密码,请取消注释下行并设置密码
|
||||
# requirepass your_password_here
|
||||
|
||||
# 持久化配置
|
||||
|
||||
@@ -48,6 +48,33 @@ Kvrocks 是一个分布式键值数据库,兼容 Redis 协议,基于 RocksDB
|
||||
### 3. 运维简单
|
||||
|
||||
- **免维护**:无需定期备份,数据自动持久化
|
||||
|
||||
## 🔧 快速部署
|
||||
|
||||
### 无密码部署(开发环境)
|
||||
|
||||
```bash
|
||||
# 1. 设置环境变量
|
||||
cp .env.kvrocks.example .env
|
||||
# 编辑 .env,不设置 KVROCKS_PASSWORD
|
||||
|
||||
# 2. 启动服务
|
||||
docker-compose -f docker-compose.kvrocks.yml up -d
|
||||
```
|
||||
|
||||
### 密码认证部署(生产环境)
|
||||
|
||||
```bash
|
||||
# 1. 设置环境变量
|
||||
cp .env.kvrocks.example .env
|
||||
# 编辑 .env,设置 KVROCKS_PASSWORD=your_secure_password
|
||||
|
||||
# 2. 启动服务
|
||||
docker-compose -f docker-compose.kvrocks.auth.yml up -d
|
||||
```
|
||||
|
||||
📖 **详细部署指南**:请参考 [KVROCKS_DEPLOYMENT.md](./KVROCKS_DEPLOYMENT.md)
|
||||
|
||||
- **监控简单**:提供标准 Redis 监控接口
|
||||
- **迁移容易**:完全兼容 Redis 客户端和工具
|
||||
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
# Kvrocks 部署指南
|
||||
|
||||
本文档介绍如何使用 Docker + Kvrocks 部署 KatelyaTV。
|
||||
|
||||
> **⚠️ 重要提醒**:Kvrocks 部署需要配置管理员账号(`USERNAME` 和 `PASSWORD`),否则会出现"页面显示账号密码登录但无法登录"的问题!
|
||||
|
||||
## 🚀 快速开始
|
||||
|
||||
### 方案一:无密码部署(推荐用于开发环境)
|
||||
|
||||
1. **准备环境变量文件**
|
||||
|
||||
```bash
|
||||
# 复制环境变量示例文件
|
||||
cp .env.kvrocks.example .env
|
||||
|
||||
# 编辑环境变量
|
||||
nano .env
|
||||
```
|
||||
|
||||
2. **环境变量配置**
|
||||
|
||||
```bash
|
||||
# 数据库配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=kvrocks
|
||||
KVROCKS_URL=redis://kvrocks:6666
|
||||
# 不设置 Kvrocks 密码
|
||||
# KVROCKS_PASSWORD=
|
||||
KVROCKS_DATABASE=0
|
||||
|
||||
# 管理员账号配置(必填!)
|
||||
USERNAME=admin
|
||||
PASSWORD=your_admin_password
|
||||
|
||||
# 用户注册配置
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
|
||||
# 应用配置
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here
|
||||
NEXTAUTH_URL=http://localhost:3000
|
||||
```
|
||||
|
||||
3. **启动服务**
|
||||
|
||||
```bash
|
||||
docker-compose -f docker-compose.kvrocks.yml up -d
|
||||
```
|
||||
|
||||
### 方案二:密码认证部署(推荐用于生产环境)
|
||||
|
||||
1. **准备环境变量文件**
|
||||
|
||||
```bash
|
||||
# 复制环境变量示例文件
|
||||
cp .env.kvrocks.example .env
|
||||
|
||||
# 编辑环境变量
|
||||
nano .env
|
||||
```
|
||||
|
||||
2. **环境变量配置**
|
||||
|
||||
```bash
|
||||
# 数据库配置
|
||||
NEXT_PUBLIC_STORAGE_TYPE=kvrocks
|
||||
KVROCKS_URL=redis://kvrocks:6666
|
||||
# 设置强密码
|
||||
KVROCKS_PASSWORD=your_secure_password_here
|
||||
KVROCKS_DATABASE=0
|
||||
|
||||
# 应用配置
|
||||
NEXTAUTH_SECRET=your_nextauth_secret_here
|
||||
NEXTAUTH_URL=http://localhost:3000
|
||||
```
|
||||
|
||||
3. **启动服务**
|
||||
|
||||
```bash
|
||||
docker-compose -f docker-compose.kvrocks.auth.yml up -d
|
||||
```
|
||||
|
||||
## 🔧 故障排除
|
||||
|
||||
### 问题 1:页面显示账号密码登录但无法登录
|
||||
|
||||
**现象:**
|
||||
|
||||
- 部署后页面显示用户名+密码登录界面
|
||||
- 但是只配置了 `PASSWORD` 环境变量
|
||||
- 无法登录或提示"用户名或密码错误"
|
||||
|
||||
**原因:**
|
||||
|
||||
- Kvrocks 部署属于多用户模式,需要配置管理员账号
|
||||
- 缺少 `USERNAME` 环境变量导致系统无法识别管理员
|
||||
|
||||
**解决方案:**
|
||||
|
||||
```bash
|
||||
# 在 .env 文件中添加管理员账号配置
|
||||
USERNAME=admin
|
||||
PASSWORD=your_admin_password
|
||||
NEXT_PUBLIC_ENABLE_REGISTER=true
|
||||
```
|
||||
|
||||
### 问题 2:密码认证错误
|
||||
|
||||
```
|
||||
❌ Kvrocks Client Error: [Error]: ERR Client sent AUTH, but no password is set
|
||||
```
|
||||
|
||||
**解决方案:**
|
||||
|
||||
- 确保使用正确的 docker-compose 文件
|
||||
- 检查环境变量 `KVROCKS_PASSWORD` 的设置
|
||||
- 无密码部署使用:`docker-compose.kvrocks.yml`
|
||||
- 密码认证部署使用:`docker-compose.kvrocks.auth.yml`
|
||||
|
||||
### 问题 3:连接超时
|
||||
|
||||
```
|
||||
❌ Failed to connect to Kvrocks: connect ECONNREFUSED
|
||||
```
|
||||
|
||||
**解决方案:**
|
||||
|
||||
1. 检查 Kvrocks 服务是否正常启动
|
||||
|
||||
```bash
|
||||
docker-compose logs kvrocks
|
||||
```
|
||||
|
||||
2. 检查网络连接
|
||||
|
||||
```bash
|
||||
docker-compose exec katelyatv ping kvrocks
|
||||
```
|
||||
|
||||
3. 检查端口映射
|
||||
|
||||
```bash
|
||||
docker-compose ps
|
||||
```
|
||||
|
||||
### 问题 3:数据持久化问题
|
||||
|
||||
**解决方案:**
|
||||
|
||||
1. 确保数据卷正确挂载
|
||||
|
||||
```bash
|
||||
docker volume ls | grep kvrocks
|
||||
```
|
||||
|
||||
2. 检查数据目录权限
|
||||
|
||||
```bash
|
||||
docker-compose exec kvrocks ls -la /var/lib/kvrocks/data
|
||||
```
|
||||
|
||||
## 📊 健康检查
|
||||
|
||||
### 检查服务状态
|
||||
|
||||
```bash
|
||||
# 查看所有服务状态
|
||||
docker-compose ps
|
||||
|
||||
# 查看日志
|
||||
docker-compose logs -f
|
||||
|
||||
# 检查 Kvrocks 连接
|
||||
docker-compose exec kvrocks redis-cli -p 6666 ping
|
||||
```
|
||||
|
||||
### 性能监控
|
||||
|
||||
```bash
|
||||
# 查看 Kvrocks 信息
|
||||
docker-compose exec kvrocks redis-cli -p 6666 info
|
||||
|
||||
# 查看内存使用
|
||||
docker-compose exec kvrocks redis-cli -p 6666 info memory
|
||||
|
||||
# 查看连接数
|
||||
docker-compose exec kvrocks redis-cli -p 6666 info clients
|
||||
```
|
||||
|
||||
## 🔒 安全建议
|
||||
|
||||
1. **生产环境必须设置密码**
|
||||
2. **定期备份数据**
|
||||
3. **限制网络访问**
|
||||
4. **监控日志异常**
|
||||
|
||||
## 📁 文件结构
|
||||
|
||||
```
|
||||
project/
|
||||
├── docker-compose.kvrocks.yml # 无密码部署配置
|
||||
├── docker-compose.kvrocks.auth.yml # 密码认证部署配置
|
||||
├── .env.kvrocks.example # 环境变量示例
|
||||
├── docker/
|
||||
│ └── kvrocks/
|
||||
│ ├── kvrocks.conf # 无密码配置文件
|
||||
│ └── kvrocks.auth.conf # 密码认证配置文件
|
||||
└── .env # 实际环境变量(需要创建)
|
||||
```
|
||||
|
||||
## 🆘 获取帮助
|
||||
|
||||
如果遇到问题,请:
|
||||
|
||||
1. 检查日志:`docker-compose logs -f`
|
||||
2. 验证环境变量:`docker-compose config`
|
||||
3. 重启服务:`docker-compose restart`
|
||||
4. 重新构建:`docker-compose up -d --force-recreate`
|
||||
@@ -0,0 +1,49 @@
|
||||
# TVBox 配置生成问题修复
|
||||
|
||||
## 问题描述
|
||||
|
||||
用户反馈 TVBox 配置生成失败,错误信息:
|
||||
```
|
||||
{"error":"TVBox配置生成失败","details":"D1_ERROR: no such table: admin_config: SQLITE_ERROR"}
|
||||
```
|
||||
|
||||
## 问题原因
|
||||
|
||||
这是一个数据库表名不一致的问题:
|
||||
|
||||
1. **SQL初始化脚本** (`scripts/d1-init.sql`):创建的表名是 `admin_configs`(复数)
|
||||
2. **应用代码** (`src/lib/d1.db.ts`):查询的表名是 `admin_config`(单数)
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 1. 代码修复
|
||||
已修改 `src/lib/d1.db.ts` 中的 `getAdminConfig()` 和 `setAdminConfig()` 方法,使其使用正确的表名 `admin_configs`。
|
||||
|
||||
### 2. 数据迁移
|
||||
创建了迁移脚本 `scripts/d1-migrate-admin-config.sql` 来处理现有数据。
|
||||
|
||||
## 部署步骤
|
||||
|
||||
### 对于新部署用户
|
||||
直接使用最新版本部署即可,无需额外操作。
|
||||
|
||||
### 对于现有用户
|
||||
需要运行数据迁移脚本:
|
||||
|
||||
```bash
|
||||
# 运行迁移脚本
|
||||
wrangler d1 execute your-database-name --file=./scripts/d1-migrate-admin-config.sql
|
||||
```
|
||||
|
||||
## 验证修复
|
||||
修复后,TVBox 配置生成应该能正常工作:
|
||||
|
||||
```bash
|
||||
# 测试 TVBox 配置 API
|
||||
curl "https://your-domain.pages.dev/api/tvbox?format=json"
|
||||
```
|
||||
|
||||
## 影响范围
|
||||
- 仅影响使用 Cloudflare Pages + D1 部署的用户
|
||||
- 其他部署方式(Docker + Redis、Vercel + Upstash 等)不受影响
|
||||
- 不影响其他功能(用户认证、播放记录、收藏等)
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "katelyatv",
|
||||
"version": "0.6.0-katelya",
|
||||
"version": "0.7.0-katelya",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "npm run gen:runtime && npm run gen:manifest && next dev -H 0.0.0.0",
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
if(!self.define){let e,s={};const n=(n,a)=>(n=new URL(n+".js",a).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(a,c)=>{const i=e||("document"in self?document.currentScript.src:"")||location.href;if(s[i])return;let t={};const r=e=>n(e,i),o={module:{uri:i},exports:t,require:r};s[i]=Promise.all(a.map(e=>o[e]||r(e))).then(e=>(c(...e),t))}}define(["./workbox-e9849328"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"ed4223c3f11fa5b30e75397a730aadec"},{url:"/_next/static/YxNDbDLH8EDPR3w9YWGxN/_buildManifest.js",revision:"046380ae5bc74b46b6d5eac3eed65355"},{url:"/_next/static/YxNDbDLH8EDPR3w9YWGxN/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/chunks/110-4d8fbe2ce6008c90.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/154-de4a84fd5b2e0100.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/29-0844689411ca7d55.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/459-6bec40a8423cc309.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/51b697cb-f464f3017ac1ea30.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/682-d1dca8d17a3a8e6f.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/900-fb094d8873768e88.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/967-217cdcb80ae3beeb.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/998-568996670b543597.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/_not-found/page-ac328df06cf68f14.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/admin/page-d05d4621a6953d54.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/config/page-11f6321397ad65b1.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/douban/page-2d0023184aa37aff.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/layout-bd0bfbfdb401e15f.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/login/page-6d62f8fe1814a4fb.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/page-6a58e37ab3250691.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/play/page-cbcfbf4a92cde119.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/search/page-63fe30b91e0539a7.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/tvbox/page-3a990d4dba7ad091.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/app/warning/page-11cba4cf9332a238.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/c72274ce-06682d6fc8197e6d.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/da9543df-bf6da1a431d8604f.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/framework-6e06c675866dc992.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/main-app-dbd320e104e1a5dc.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/main-ef3a79fcb73d32d2.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/pages/_app-792b631a362c29e1.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/pages/_error-9fde6601392a2a99.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-17170f1d90853b2d.js",revision:"YxNDbDLH8EDPR3w9YWGxN"},{url:"/_next/static/css/23100062f5d4aac0.css",revision:"23100062f5d4aac0"},{url:"/_next/static/css/27265468060ffa3a.css",revision:"27265468060ffa3a"},{url:"/_next/static/css/275ed64cc4367444.css",revision:"275ed64cc4367444"},{url:"/_next/static/media/26a46d62cd723877-s.woff2",revision:"befd9c0fdfa3d8a645d5f95717ed6420"},{url:"/_next/static/media/55c55f0601d81cf3-s.woff2",revision:"43828e14271c77b87e3ed582dbff9f74"},{url:"/_next/static/media/581909926a08bbc8-s.woff2",revision:"f0b86e7c24f455280b8df606b89af891"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/97e0cb1ae144a2a9-s.woff2",revision:"e360c61c5bd8d90639fd4503c829c2dc"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/favicon.ico",revision:"c5de6e56c5664adda146825f75ea6ecf"},{url:"/icons/icon-192x192.png",revision:"4a56c090828a1ad254c903c7aec0389d"},{url:"/icons/icon-256x256.png",revision:"f6409eb1a001f754121e3a8281c0319c"},{url:"/icons/icon-384x384.png",revision:"f6efc3e357b9ffdf4e0d8c14b2ed0ac1"},{url:"/icons/icon-512x512.png",revision:"9c008cbbeb6a576fe07bb1284a83f4d2"},{url:"/logo.png",revision:"40de611b143c47c6291c7bdad2c959ca"},{url:"/manifest.json",revision:"7bd3dabc1cfbfe40f09577efca223d31"},{url:"/robots.txt",revision:"e2b2cd8514443456bc6fb9d77b3b1f3e"},{url:"/screenshot1.png",revision:"10572bfcea54dc93ac4c5f7c9057fc98"},{url:"/screenshot2.png",revision:"f815a8990973a221899976867365c239"},{url:"/screenshot3.png",revision:"49709e96345dfeeab1d8083821d4b44e"},{url:"/screenshot4.png",revision:"a76c751e41e37556048a487e4f8b8b1c"},{url:"/wechat.jpg",revision:"d0f601311802667cd6ca5a37dc69bfa7"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:n,state:a})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")});
|
||||
if(!self.define){let e,s={};const a=(a,n)=>(a=new URL(a+".js",n).href,s[a]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=a,e.onload=s,document.head.appendChild(e)}else e=a,importScripts(a),s()}).then(()=>{let e=s[a];if(!e)throw new Error(`Module ${a} didn’t register its module`);return e}));self.define=(n,t)=>{const c=e||("document"in self?document.currentScript.src:"")||location.href;if(s[c])return;let i={};const r=e=>a(e,c),o={module:{uri:c},exports:i,require:r};s[c]=Promise.all(n.map(e=>o[e]||r(e))).then(e=>(t(...e),i))}}define(["./workbox-e9849328"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/app-build-manifest.json",revision:"05b02c433504d113bbbf7464726a4330"},{url:"/_next/static/UkQ9tJsupBw6-055mAaeW/_buildManifest.js",revision:"046380ae5bc74b46b6d5eac3eed65355"},{url:"/_next/static/UkQ9tJsupBw6-055mAaeW/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/chunks/110-89e2e67f2e3bcaaa.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/154-211e189482cc0258.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/29-2acace5e289d422b.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/459-b5005e79594397e4.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/51b697cb-24a59f0c53e2e105.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/682-d1dca8d17a3a8e6f.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/711-9ae080cb4f6a9355.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/900-c7c9e505cc903ead.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/998-f22ebd15e7bac0f0.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/_not-found/page-4dc7d52fd5d943cc.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/admin/page-7f30b4abb7bde63b.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/config/page-578e0487b53650a4.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/douban/page-6b5d567834ba726e.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/layout-d530e785c3fe67fb.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/login/page-530049e8ddbbd780.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/page-a401624afa29aef0.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/play/page-6297f80eaa080bf5.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/search/page-cafa7a89158278cb.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/settings/page-d73b9df16c781bd2.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/tvbox/page-443d4dd8e3c842b3.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/app/warning/page-11cba4cf9332a238.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/c72274ce-06682d6fc8197e6d.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/da9543df-bf6da1a431d8604f.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/framework-6e06c675866dc992.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/main-app-dbd320e104e1a5dc.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/main-c5fb3cb103d3b800.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/pages/_app-792b631a362c29e1.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/pages/_error-9fde6601392a2a99.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-17170f1d90853b2d.js",revision:"UkQ9tJsupBw6-055mAaeW"},{url:"/_next/static/css/23100062f5d4aac0.css",revision:"23100062f5d4aac0"},{url:"/_next/static/css/7cca8e2c5137bd71.css",revision:"7cca8e2c5137bd71"},{url:"/_next/static/css/cfee8a0b55b735f1.css",revision:"cfee8a0b55b735f1"},{url:"/_next/static/media/19cfc7226ec3afaa-s.woff2",revision:"9dda5cfc9a46f256d0e131bb535e46f8"},{url:"/_next/static/media/21350d82a1f187e9-s.woff2",revision:"4e2553027f1d60eff32898367dd4d541"},{url:"/_next/static/media/8e9860b6e62d6359-s.woff2",revision:"01ba6c2a184b8cba08b0d57167664d75"},{url:"/_next/static/media/ba9851c3c22cd980-s.woff2",revision:"9e494903d6b0ffec1a1e14d34427d44d"},{url:"/_next/static/media/c5fe6dc8356a8c31-s.woff2",revision:"027a89e9ab733a145db70f09b8a18b42"},{url:"/_next/static/media/df0a9ae256c0569c-s.woff2",revision:"d54db44de5ccb18886ece2fda72bdfe0"},{url:"/_next/static/media/e4af272ccee01ff0-s.p.woff2",revision:"65850a373e258f1c897a2b3d75eb74de"},{url:"/favicon.ico",revision:"c5de6e56c5664adda146825f75ea6ecf"},{url:"/icons/icon-192x192.png",revision:"4a56c090828a1ad254c903c7aec0389d"},{url:"/icons/icon-256x256.png",revision:"f6409eb1a001f754121e3a8281c0319c"},{url:"/icons/icon-384x384.png",revision:"f6efc3e357b9ffdf4e0d8c14b2ed0ac1"},{url:"/icons/icon-512x512.png",revision:"9c008cbbeb6a576fe07bb1284a83f4d2"},{url:"/logo.png",revision:"40de611b143c47c6291c7bdad2c959ca"},{url:"/manifest.json",revision:"7bd3dabc1cfbfe40f09577efca223d31"},{url:"/robots.txt",revision:"e2b2cd8514443456bc6fb9d77b3b1f3e"},{url:"/screenshot1.png",revision:"10572bfcea54dc93ac4c5f7c9057fc98"},{url:"/screenshot2.png",revision:"f815a8990973a221899976867365c239"},{url:"/screenshot3.png",revision:"49709e96345dfeeab1d8083821d4b44e"},{url:"/screenshot4.png",revision:"a76c751e41e37556048a487e4f8b8b1c"},{url:"/wechat.jpg",revision:"d0f601311802667cd6ca5a37dc69bfa7"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:a,state:n})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")});
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
module.exports = {
|
||||
env: {
|
||||
node: true,
|
||||
es6: true,
|
||||
},
|
||||
extends: ['eslint:recommended'],
|
||||
parserOptions: {
|
||||
ecmaVersion: 2020,
|
||||
sourceType: 'module',
|
||||
},
|
||||
rules: {
|
||||
'no-console': 'off', // 允许在脚本中使用 console
|
||||
'no-unused-vars': 'off', // 暂时忽略未使用变量
|
||||
'@typescript-eslint/no-var-requires': 'off', // 允许 require
|
||||
'import/no-import-module-exports': 'off',
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,301 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* KatelyaTV 全方案部署状态检查脚本
|
||||
* 检查所有部署方案的配置文件和环境是否完整
|
||||
*/
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
console.log('🔍 KatelyaTV 部署配置检查开始...\n');
|
||||
|
||||
// 检查结果统计
|
||||
let checkResults = {
|
||||
total: 0,
|
||||
passed: 0,
|
||||
failed: 0,
|
||||
warnings: 0,
|
||||
errors: []
|
||||
};
|
||||
|
||||
// 辅助函数
|
||||
function logCheck(name, status, message = '') {
|
||||
checkResults.total++;
|
||||
if (status === 'PASS') {
|
||||
checkResults.passed++;
|
||||
console.log(`✅ ${name}: PASS ${message}`);
|
||||
} else if (status === 'WARN') {
|
||||
checkResults.warnings++;
|
||||
console.log(`⚠️ ${name}: WARN ${message}`);
|
||||
} else {
|
||||
checkResults.failed++;
|
||||
console.log(`❌ ${name}: FAIL ${message}`);
|
||||
checkResults.errors.push(`${name}: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
function fileExists(filePath) {
|
||||
try {
|
||||
return fs.existsSync(filePath);
|
||||
} catch (error) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function readJsonFile(filePath) {
|
||||
try {
|
||||
const content = fs.readFileSync(filePath, 'utf8');
|
||||
return JSON.parse(content);
|
||||
} catch (error) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// 检查1:Docker 部署配置
|
||||
function checkDockerConfigs() {
|
||||
console.log('🐳 检查 Docker 部署配置...');
|
||||
|
||||
const dockerConfigs = [
|
||||
{
|
||||
name: 'Docker + Redis 配置',
|
||||
files: ['docker-compose.redis.yml', '.env.redis.example']
|
||||
},
|
||||
{
|
||||
name: 'Docker + Kvrocks 配置(无密码)',
|
||||
files: ['docker-compose.kvrocks.yml', '.env.kvrocks.example']
|
||||
},
|
||||
{
|
||||
name: 'Docker + Kvrocks 配置(密码认证)',
|
||||
files: ['docker-compose.kvrocks.auth.yml']
|
||||
},
|
||||
{
|
||||
name: 'Docker + Kvrocks 本地构建配置',
|
||||
files: ['docker-compose.kvrocks.local.yml']
|
||||
}
|
||||
];
|
||||
|
||||
for (const config of dockerConfigs) {
|
||||
let allFilesExist = true;
|
||||
let missingFiles = [];
|
||||
|
||||
for (const file of config.files) {
|
||||
if (!fileExists(file)) {
|
||||
allFilesExist = false;
|
||||
missingFiles.push(file);
|
||||
}
|
||||
}
|
||||
|
||||
if (allFilesExist) {
|
||||
logCheck(config.name, 'PASS', '所有配置文件存在');
|
||||
} else {
|
||||
logCheck(config.name, 'FAIL', `缺失文件: ${missingFiles.join(', ')}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 检查2:Cloudflare 部署配置
|
||||
function checkCloudflareConfigs() {
|
||||
console.log('\n☁️ 检查 Cloudflare 部署配置...');
|
||||
|
||||
const cloudflareFiles = [
|
||||
'wrangler.toml',
|
||||
'.env.cloudflare.example',
|
||||
'scripts/d1-init.sql'
|
||||
];
|
||||
|
||||
for (const file of cloudflareFiles) {
|
||||
if (fileExists(file)) {
|
||||
logCheck(`Cloudflare 配置文件 ${file}`, 'PASS', '文件存在');
|
||||
} else {
|
||||
logCheck(`Cloudflare 配置文件 ${file}`, 'FAIL', '文件不存在');
|
||||
}
|
||||
}
|
||||
|
||||
// 检查 wrangler.toml 内容
|
||||
if (fileExists('wrangler.toml')) {
|
||||
const content = fs.readFileSync('wrangler.toml', 'utf8');
|
||||
if (content.includes('d1_databases') && content.includes('pages:build')) {
|
||||
logCheck('wrangler.toml 内容', 'PASS', '包含必要配置');
|
||||
} else {
|
||||
logCheck('wrangler.toml 内容', 'WARN', '可能缺少部分配置');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 检查3:Vercel 部署配置
|
||||
function checkVercelConfigs() {
|
||||
console.log('\n▲ 检查 Vercel 部署配置...');
|
||||
|
||||
const vercelFile = 'vercel.json';
|
||||
if (fileExists(vercelFile)) {
|
||||
logCheck('Vercel 配置文件', 'PASS', 'vercel.json 存在');
|
||||
|
||||
const vercelConfig = readJsonFile(vercelFile);
|
||||
if (vercelConfig) {
|
||||
if (vercelConfig.build && vercelConfig.build.env) {
|
||||
logCheck('Vercel 构建配置', 'PASS', '包含环境变量配置');
|
||||
} else {
|
||||
logCheck('Vercel 构建配置', 'WARN', '可能缺少构建环境配置');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
logCheck('Vercel 配置文件', 'FAIL', 'vercel.json 不存在');
|
||||
}
|
||||
}
|
||||
|
||||
// 检查4:环境变量示例文件
|
||||
function checkEnvExamples() {
|
||||
console.log('\n⚙️ 检查环境变量示例文件...');
|
||||
|
||||
const envFiles = [
|
||||
'.env.example',
|
||||
'.env.redis.example',
|
||||
'.env.kvrocks.example',
|
||||
'.env.cloudflare.example'
|
||||
];
|
||||
|
||||
for (const envFile of envFiles) {
|
||||
if (fileExists(envFile)) {
|
||||
const content = fs.readFileSync(envFile, 'utf8');
|
||||
const hasStorageType = content.includes('NEXT_PUBLIC_STORAGE_TYPE');
|
||||
const hasAuthConfig = content.includes('NEXTAUTH_SECRET');
|
||||
|
||||
if (hasStorageType && hasAuthConfig) {
|
||||
logCheck(`环境变量文件 ${envFile}`, 'PASS', '包含必要配置');
|
||||
} else {
|
||||
logCheck(`环境变量文件 ${envFile}`, 'WARN', '可能缺少部分配置');
|
||||
}
|
||||
} else {
|
||||
logCheck(`环境变量文件 ${envFile}`, 'FAIL', '文件不存在');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 检查5:package.json 脚本
|
||||
function checkPackageScripts() {
|
||||
console.log('\n📦 检查 package.json 构建脚本...');
|
||||
|
||||
const packageJson = readJsonFile('package.json');
|
||||
if (packageJson && packageJson.scripts) {
|
||||
const requiredScripts = [
|
||||
'dev',
|
||||
'build',
|
||||
'start',
|
||||
'pages:build', // Cloudflare Pages
|
||||
'lint'
|
||||
];
|
||||
|
||||
for (const script of requiredScripts) {
|
||||
if (packageJson.scripts[script]) {
|
||||
logCheck(`package.json 脚本 ${script}`, 'PASS', '脚本存在');
|
||||
} else {
|
||||
logCheck(`package.json 脚本 ${script}`, 'WARN', '脚本不存在或未配置');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
logCheck('package.json', 'FAIL', '文件不存在或格式错误');
|
||||
}
|
||||
}
|
||||
|
||||
// 检查6:Kvrocks 配置文件
|
||||
function checkKvrocksConfigs() {
|
||||
console.log('\n🏪 检查 Kvrocks 配置文件...');
|
||||
|
||||
const kvrocksConfigs = [
|
||||
'docker/kvrocks/kvrocks.conf',
|
||||
'docker/kvrocks/kvrocks.auth.conf'
|
||||
];
|
||||
|
||||
for (const configFile of kvrocksConfigs) {
|
||||
if (fileExists(configFile)) {
|
||||
const content = fs.readFileSync(configFile, 'utf8');
|
||||
const hasBasicConfig = content.includes('bind') && content.includes('port');
|
||||
|
||||
if (hasBasicConfig) {
|
||||
logCheck(`Kvrocks 配置 ${path.basename(configFile)}`, 'PASS', '包含基本配置');
|
||||
} else {
|
||||
logCheck(`Kvrocks 配置 ${path.basename(configFile)}`, 'WARN', '可能缺少基本配置');
|
||||
}
|
||||
} else {
|
||||
logCheck(`Kvrocks 配置 ${path.basename(configFile)}`, 'FAIL', '文件不存在');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 检查7:文档文件
|
||||
function checkDocumentation() {
|
||||
console.log('\n📚 检查文档文件...');
|
||||
|
||||
const docFiles = [
|
||||
'README.md',
|
||||
'docs/KVROCKS.md',
|
||||
'docs/KVROCKS_DEPLOYMENT.md',
|
||||
'docs/TVBOX.md',
|
||||
'KVROCKS_FIX_REPORT.md'
|
||||
];
|
||||
|
||||
for (const docFile of docFiles) {
|
||||
if (fileExists(docFile)) {
|
||||
logCheck(`文档文件 ${docFile}`, 'PASS', '文件存在');
|
||||
} else {
|
||||
logCheck(`文档文件 ${docFile}`, 'WARN', '文件不存在');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 主检查函数
|
||||
async function runChecks() {
|
||||
try {
|
||||
await checkDockerConfigs();
|
||||
await checkCloudflareConfigs();
|
||||
await checkVercelConfigs();
|
||||
await checkEnvExamples();
|
||||
await checkPackageScripts();
|
||||
await checkKvrocksConfigs();
|
||||
await checkDocumentation();
|
||||
|
||||
} catch (error) {
|
||||
console.error('检查执行出错:', error);
|
||||
checkResults.failed++;
|
||||
checkResults.errors.push(`检查执行出错: ${error.message}`);
|
||||
}
|
||||
|
||||
// 输出检查结果
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('📊 部署配置检查结果汇总:');
|
||||
console.log(` 总计: ${checkResults.total} 项检查`);
|
||||
console.log(` 通过: ${checkResults.passed} 项 ✅`);
|
||||
console.log(` 警告: ${checkResults.warnings} 项 ⚠️`);
|
||||
console.log(` 失败: ${checkResults.failed} 项 ❌`);
|
||||
|
||||
if (checkResults.failed > 0) {
|
||||
console.log('\n🚨 失败的检查项:');
|
||||
checkResults.errors.forEach((error, index) => {
|
||||
console.log(` ${index + 1}. ${error}`);
|
||||
});
|
||||
}
|
||||
|
||||
if (checkResults.warnings > 0) {
|
||||
console.log('\n⚠️ 警告说明:');
|
||||
console.log(' - 警告项目不影响基本功能,但建议完善');
|
||||
console.log(' - 可能影响特定部署方案或高级功能');
|
||||
}
|
||||
|
||||
if (checkResults.failed === 0) {
|
||||
console.log('\n🎉 所有必要配置文件检查通过!');
|
||||
console.log(' 您可以选择以下任意部署方案:');
|
||||
console.log(' 1. 🐳 Docker + Redis (docker-compose.redis.yml)');
|
||||
console.log(' 2. 🏪 Docker + Kvrocks (docker-compose.kvrocks.yml)');
|
||||
console.log(' 3. ☁️ Cloudflare Pages + D1 (wrangler.toml)');
|
||||
console.log(' 4. ▲ Vercel + Upstash (vercel.json)');
|
||||
}
|
||||
|
||||
console.log('='.repeat(60));
|
||||
|
||||
// 退出代码
|
||||
process.exit(checkResults.failed > 0 ? 1 : 0);
|
||||
}
|
||||
|
||||
// 运行检查
|
||||
runChecks().catch(console.error);
|
||||
@@ -0,0 +1,127 @@
|
||||
-- D1 数据库初始化脚本
|
||||
-- 用于创建 KatelyaTV 所需的数据表
|
||||
|
||||
-- 用户表
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT UNIQUE NOT NULL,
|
||||
password TEXT NOT NULL,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 播放记录表
|
||||
CREATE TABLE IF NOT EXISTS play_records (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
record_key TEXT NOT NULL,
|
||||
video_url TEXT,
|
||||
current_time REAL DEFAULT 0,
|
||||
duration REAL DEFAULT 0,
|
||||
episode_index INTEGER DEFAULT 0,
|
||||
episode_url TEXT,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, record_key)
|
||||
);
|
||||
|
||||
-- 收藏表
|
||||
CREATE TABLE IF NOT EXISTS favorites (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
favorite_key TEXT NOT NULL,
|
||||
title TEXT,
|
||||
cover_url TEXT,
|
||||
rating REAL,
|
||||
year TEXT,
|
||||
area TEXT,
|
||||
category TEXT,
|
||||
actors TEXT,
|
||||
director TEXT,
|
||||
description TEXT,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, favorite_key)
|
||||
);
|
||||
|
||||
-- 搜索历史表
|
||||
CREATE TABLE IF NOT EXISTS search_history (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
keyword TEXT NOT NULL,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- 跳过配置表
|
||||
CREATE TABLE IF NOT EXISTS skip_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
config_key TEXT NOT NULL,
|
||||
start_time INTEGER DEFAULT 0,
|
||||
end_time INTEGER DEFAULT 0,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, config_key)
|
||||
);
|
||||
|
||||
-- 用户设置表
|
||||
CREATE TABLE IF NOT EXISTS user_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
username TEXT NOT NULL,
|
||||
filter_adult_content BOOLEAN DEFAULT 1,
|
||||
theme TEXT DEFAULT 'auto',
|
||||
language TEXT DEFAULT 'zh-CN',
|
||||
auto_play BOOLEAN DEFAULT 1,
|
||||
video_quality TEXT DEFAULT 'auto',
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
|
||||
UNIQUE (user_id, username)
|
||||
);
|
||||
|
||||
-- 管理员配置表
|
||||
CREATE TABLE IF NOT EXISTS admin_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
config_key TEXT UNIQUE NOT NULL,
|
||||
config_value TEXT,
|
||||
description TEXT,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 插入默认管理员配置
|
||||
INSERT OR IGNORE INTO admin_configs (config_key, config_value, description) VALUES
|
||||
('site_name', 'KatelyaTV', '站点名称'),
|
||||
('site_description', '高性能影视播放平台', '站点描述'),
|
||||
('enable_register', 'true', '是否允许用户注册'),
|
||||
('max_users', '100', '最大用户数量'),
|
||||
('cache_ttl', '3600', '缓存时间(秒)');
|
||||
|
||||
-- 创建索引以提高查询性能
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_user_id ON play_records(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_play_records_record_key ON play_records(record_key);
|
||||
CREATE INDEX IF NOT EXISTS idx_favorites_user_id ON favorites(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_search_history_user_id ON search_history(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_skip_configs_user_id ON skip_configs(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_user_id ON user_settings(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_settings_username ON user_settings(username);
|
||||
|
||||
-- 创建视图以简化查询
|
||||
CREATE VIEW IF NOT EXISTS user_stats AS
|
||||
SELECT
|
||||
u.id,
|
||||
u.username,
|
||||
COUNT(DISTINCT pr.id) as play_count,
|
||||
COUNT(DISTINCT f.id) as favorite_count,
|
||||
COUNT(DISTINCT sh.id) as search_count,
|
||||
u.created_at
|
||||
FROM users u
|
||||
LEFT JOIN play_records pr ON u.id = pr.user_id
|
||||
LEFT JOIN favorites f ON u.id = f.user_id
|
||||
LEFT JOIN search_history sh ON u.id = sh.user_id
|
||||
GROUP BY u.id, u.username, u.created_at;
|
||||
@@ -0,0 +1,33 @@
|
||||
-- D1 数据库迁移脚本:修复 admin_config 表名问题
|
||||
-- 将旧的 admin_config 表数据迁移到新的 admin_configs 表结构
|
||||
|
||||
-- 首先确保新的 admin_configs 表存在
|
||||
CREATE TABLE IF NOT EXISTS admin_configs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
config_key TEXT UNIQUE NOT NULL,
|
||||
config_value TEXT,
|
||||
description TEXT,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 检查是否存在旧的 admin_config 表
|
||||
-- 如果存在,迁移数据到新表
|
||||
INSERT OR IGNORE INTO admin_configs (config_key, config_value, description)
|
||||
SELECT
|
||||
'main_config' as config_key,
|
||||
config as config_value,
|
||||
'从旧表迁移的主要管理员配置' as description
|
||||
FROM admin_config
|
||||
WHERE id = 1;
|
||||
|
||||
-- 插入默认管理员配置(如果不存在)
|
||||
INSERT OR IGNORE INTO admin_configs (config_key, config_value, description) VALUES
|
||||
('site_name', 'KatelyaTV', '站点名称'),
|
||||
('site_description', '高性能影视播放平台', '站点描述'),
|
||||
('enable_register', 'true', '是否允许用户注册'),
|
||||
('max_users', '100', '最大用户数量'),
|
||||
('cache_ttl', '3600', '缓存时间(秒)');
|
||||
|
||||
-- 可选:删除旧表(请谨慎使用,建议先备份数据)
|
||||
-- DROP TABLE IF EXISTS admin_config;
|
||||
@@ -0,0 +1,260 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Kvrocks 部署测试脚本
|
||||
* 用于验证 Docker + Kvrocks 部署是否正常工作
|
||||
*/
|
||||
|
||||
const { createClient } = require('redis');
|
||||
const { spawn } = require('child_process');
|
||||
const fs = require('fs');
|
||||
|
||||
// 配置
|
||||
const TEST_CONFIG = {
|
||||
KVROCKS_URL: process.env.KVROCKS_URL || 'redis://localhost:6666',
|
||||
KVROCKS_PASSWORD: process.env.KVROCKS_PASSWORD,
|
||||
KVROCKS_DATABASE: parseInt(process.env.KVROCKS_DATABASE || '0'),
|
||||
TEST_TIMEOUT: 30000, // 30秒超时
|
||||
};
|
||||
|
||||
console.log('🧪 Kvrocks 部署测试开始...\n');
|
||||
|
||||
// 测试结果统计
|
||||
let testResults = {
|
||||
total: 0,
|
||||
passed: 0,
|
||||
failed: 0,
|
||||
errors: []
|
||||
};
|
||||
|
||||
// 辅助函数
|
||||
function logTest(name, status, message = '') {
|
||||
testResults.total++;
|
||||
if (status === 'PASS') {
|
||||
testResults.passed++;
|
||||
console.log(`✅ ${name}: PASS ${message}`);
|
||||
} else {
|
||||
testResults.failed++;
|
||||
console.log(`❌ ${name}: FAIL ${message}`);
|
||||
testResults.errors.push(`${name}: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 测试1:检查 Docker Compose 文件
|
||||
async function testDockerComposeFiles() {
|
||||
console.log('📁 测试 Docker Compose 配置文件...');
|
||||
|
||||
const files = [
|
||||
'docker-compose.kvrocks.yml',
|
||||
'docker-compose.kvrocks.auth.yml'
|
||||
];
|
||||
|
||||
for (const file of files) {
|
||||
try {
|
||||
if (fs.existsSync(file)) {
|
||||
const content = fs.readFileSync(file, 'utf8');
|
||||
if (content.includes('kvrocks:') && content.includes('katelyatv:')) {
|
||||
logTest(`Docker Compose 文件 ${file}`, 'PASS', '配置正确');
|
||||
} else {
|
||||
logTest(`Docker Compose 文件 ${file}`, 'FAIL', '配置缺失');
|
||||
}
|
||||
} else {
|
||||
logTest(`Docker Compose 文件 ${file}`, 'FAIL', '文件不存在');
|
||||
}
|
||||
} catch (error) {
|
||||
logTest(`Docker Compose 文件 ${file}`, 'FAIL', error.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 测试2:检查环境变量配置
|
||||
async function testEnvironmentConfig() {
|
||||
console.log('\n🔧 测试环境变量配置...');
|
||||
|
||||
// 检查必需的环境变量
|
||||
const requiredVars = ['NEXT_PUBLIC_STORAGE_TYPE'];
|
||||
const optionalVars = ['KVROCKS_PASSWORD', 'NEXTAUTH_SECRET'];
|
||||
|
||||
for (const varName of requiredVars) {
|
||||
if (process.env[varName]) {
|
||||
logTest(`环境变量 ${varName}`, 'PASS', `值: ${process.env[varName]}`);
|
||||
} else {
|
||||
logTest(`环境变量 ${varName}`, 'FAIL', '未设置');
|
||||
}
|
||||
}
|
||||
|
||||
for (const varName of optionalVars) {
|
||||
if (process.env[varName]) {
|
||||
logTest(`环境变量 ${varName}`, 'PASS', '已设置');
|
||||
} else {
|
||||
logTest(`环境变量 ${varName}`, 'PASS', '未设置(可选)');
|
||||
}
|
||||
}
|
||||
|
||||
// 检查存储类型
|
||||
if (process.env.NEXT_PUBLIC_STORAGE_TYPE === 'kvrocks') {
|
||||
logTest('存储类型配置', 'PASS', 'kvrocks');
|
||||
} else {
|
||||
logTest('存储类型配置', 'FAIL', `期望 kvrocks,实际 ${process.env.NEXT_PUBLIC_STORAGE_TYPE}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 测试3:Kvrocks 连接测试
|
||||
async function testKvrocksConnection() {
|
||||
console.log('\n🔌 测试 Kvrocks 连接...');
|
||||
|
||||
let client;
|
||||
try {
|
||||
// 构建客户端配置
|
||||
const clientConfig = {
|
||||
url: TEST_CONFIG.KVROCKS_URL,
|
||||
database: TEST_CONFIG.KVROCKS_DATABASE,
|
||||
socket: {
|
||||
connectTimeout: 5000,
|
||||
},
|
||||
};
|
||||
|
||||
// 只有当密码存在且不为空时才添加密码配置
|
||||
if (TEST_CONFIG.KVROCKS_PASSWORD && TEST_CONFIG.KVROCKS_PASSWORD.trim() !== '') {
|
||||
clientConfig.password = TEST_CONFIG.KVROCKS_PASSWORD;
|
||||
console.log('🔐 使用密码认证连接');
|
||||
} else {
|
||||
console.log('🔓 无密码认证连接');
|
||||
}
|
||||
|
||||
client = createClient(clientConfig);
|
||||
|
||||
// 连接
|
||||
await client.connect();
|
||||
logTest('Kvrocks 连接', 'PASS', '连接成功');
|
||||
|
||||
// 测试 PING
|
||||
const pong = await client.ping();
|
||||
if (pong === 'PONG') {
|
||||
logTest('Kvrocks PING', 'PASS', 'PONG');
|
||||
} else {
|
||||
logTest('Kvrocks PING', 'FAIL', `响应: ${pong}`);
|
||||
}
|
||||
|
||||
// 测试基本操作
|
||||
const testKey = 'test:' + Date.now();
|
||||
const testValue = 'test-value-' + Math.random();
|
||||
|
||||
await client.set(testKey, testValue);
|
||||
const getValue = await client.get(testKey);
|
||||
|
||||
if (getValue === testValue) {
|
||||
logTest('Kvrocks 读写操作', 'PASS', '数据一致');
|
||||
} else {
|
||||
logTest('Kvrocks 读写操作', 'FAIL', `期望 ${testValue},实际 ${getValue}`);
|
||||
}
|
||||
|
||||
// 清理测试数据
|
||||
await client.del(testKey);
|
||||
|
||||
// 测试数据库信息
|
||||
const info = await client.info();
|
||||
if (info.includes('kvrocks_version')) {
|
||||
const version = info.match(/kvrocks_version:([^\r\n]+)/)?.[1];
|
||||
logTest('Kvrocks 版本信息', 'PASS', `版本: ${version}`);
|
||||
} else {
|
||||
logTest('Kvrocks 版本信息', 'FAIL', '无法获取版本信息');
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
logTest('Kvrocks 连接', 'FAIL', error.message);
|
||||
} finally {
|
||||
if (client && client.isOpen) {
|
||||
await client.quit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 测试4:Docker 服务状态检查
|
||||
async function testDockerServices() {
|
||||
console.log('\n🐳 测试 Docker 服务状态...');
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const docker = spawn('docker-compose', ['ps'], { stdio: 'pipe' });
|
||||
let output = '';
|
||||
|
||||
docker.stdout.on('data', (data) => {
|
||||
output += data.toString();
|
||||
});
|
||||
|
||||
docker.on('close', (code) => {
|
||||
if (code === 0) {
|
||||
if (output.includes('kvrocks') && output.includes('Up')) {
|
||||
logTest('Docker Kvrocks 服务', 'PASS', '服务运行中');
|
||||
} else {
|
||||
logTest('Docker Kvrocks 服务', 'FAIL', '服务未运行');
|
||||
}
|
||||
|
||||
if (output.includes('katelyatv') && output.includes('Up')) {
|
||||
logTest('Docker KatelyaTV 服务', 'PASS', '服务运行中');
|
||||
} else {
|
||||
logTest('Docker KatelyaTV 服务', 'FAIL', '服务未运行或未启动');
|
||||
}
|
||||
} else {
|
||||
logTest('Docker 服务检查', 'FAIL', 'docker-compose 命令执行失败');
|
||||
}
|
||||
resolve();
|
||||
});
|
||||
|
||||
docker.on('error', (error) => {
|
||||
logTest('Docker 服务检查', 'FAIL', `Docker 未安装或不可用: ${error.message}`);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 主测试函数
|
||||
async function runTests() {
|
||||
console.log(`🏗️ 测试配置:`);
|
||||
console.log(` Kvrocks URL: ${TEST_CONFIG.KVROCKS_URL}`);
|
||||
console.log(` 密码认证: ${TEST_CONFIG.KVROCKS_PASSWORD ? '是' : '否'}`);
|
||||
console.log(` 数据库: ${TEST_CONFIG.KVROCKS_DATABASE}`);
|
||||
console.log('');
|
||||
|
||||
try {
|
||||
await testDockerComposeFiles();
|
||||
await testEnvironmentConfig();
|
||||
await testDockerServices();
|
||||
await testKvrocksConnection();
|
||||
|
||||
} catch (error) {
|
||||
console.error('测试执行出错:', error);
|
||||
testResults.failed++;
|
||||
testResults.errors.push(`测试执行出错: ${error.message}`);
|
||||
}
|
||||
|
||||
// 输出测试结果
|
||||
console.log('\n' + '='.repeat(50));
|
||||
console.log('📊 测试结果汇总:');
|
||||
console.log(` 总计: ${testResults.total} 项测试`);
|
||||
console.log(` 通过: ${testResults.passed} 项 ✅`);
|
||||
console.log(` 失败: ${testResults.failed} 项 ❌`);
|
||||
|
||||
if (testResults.failed > 0) {
|
||||
console.log('\n🚨 失败的测试项:');
|
||||
testResults.errors.forEach((error, index) => {
|
||||
console.log(` ${index + 1}. ${error}`);
|
||||
});
|
||||
|
||||
console.log('\n💡 解决建议:');
|
||||
console.log(' 1. 检查 Docker 服务是否正常启动');
|
||||
console.log(' 2. 验证环境变量配置是否正确');
|
||||
console.log(' 3. 确认网络连接是否正常');
|
||||
console.log(' 4. 查看详细部署指南: docs/KVROCKS_DEPLOYMENT.md');
|
||||
} else {
|
||||
console.log('\n🎉 所有测试通过!Kvrocks 部署正常工作。');
|
||||
}
|
||||
|
||||
console.log('='.repeat(50));
|
||||
|
||||
// 退出代码
|
||||
process.exit(testResults.failed > 0 ? 1 : 0);
|
||||
}
|
||||
|
||||
// 运行测试
|
||||
runTests().catch(console.error);
|
||||
@@ -0,0 +1,122 @@
|
||||
/* eslint-disable no-console, @typescript-eslint/no-explicit-any */
|
||||
|
||||
/**
|
||||
* 验证 Kvrocks 密码处理修复
|
||||
* 模拟用户反馈的错误场景
|
||||
*/
|
||||
|
||||
// 模拟用户的环境变量设置
|
||||
process.env.NEXT_PUBLIC_STORAGE_TYPE = 'kvrocks';
|
||||
process.env.KVROCKS_URL = 'redis://kvrocks:6666';
|
||||
process.env.KVROCKS_PASSWORD = ''; // 用户设置了空密码,这是问题所在
|
||||
process.env.KVROCKS_DATABASE = '0';
|
||||
|
||||
// 模拟 Redis 客户端创建函数
|
||||
function createClient(config) {
|
||||
console.log('🔧 创建 Redis 客户端配置:', JSON.stringify(config, null, 2));
|
||||
|
||||
if (config.password === '') {
|
||||
console.log('❌ 检测到空密码,这会导致认证错误!');
|
||||
return {
|
||||
connect: () => Promise.reject(new Error('ERR Client sent AUTH, but no password is set')),
|
||||
isOpen: false
|
||||
};
|
||||
} else if (config.password === undefined) {
|
||||
console.log('✅ 无密码配置,正常连接');
|
||||
return {
|
||||
connect: () => Promise.resolve(),
|
||||
isOpen: true
|
||||
};
|
||||
} else {
|
||||
console.log('✅ 有效密码配置,正常连接');
|
||||
return {
|
||||
connect: () => Promise.resolve(),
|
||||
isOpen: true
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// 使用修复后的客户端创建逻辑
|
||||
function getKvrocksClient() {
|
||||
const kvrocksUrl = process.env.KVROCKS_URL || 'redis://localhost:6666';
|
||||
const kvrocksPassword = process.env.KVROCKS_PASSWORD;
|
||||
const kvrocksDatabase = parseInt(process.env.KVROCKS_DATABASE || '0');
|
||||
|
||||
console.log('🏪 Initializing Kvrocks client...');
|
||||
console.log('🔗 Kvrocks URL:', kvrocksUrl);
|
||||
console.log('🔑 Password configured:', kvrocksPassword ? 'Yes' : 'No');
|
||||
console.log('🔑 Password value:', JSON.stringify(kvrocksPassword));
|
||||
|
||||
// 构建客户端配置
|
||||
const clientConfig = {
|
||||
url: kvrocksUrl,
|
||||
database: kvrocksDatabase,
|
||||
socket: {
|
||||
connectTimeout: 10000,
|
||||
},
|
||||
};
|
||||
|
||||
// 只有当密码存在且不为空时才添加密码配置
|
||||
if (kvrocksPassword && kvrocksPassword.trim() !== '') {
|
||||
clientConfig.password = kvrocksPassword;
|
||||
console.log('🔐 Using password authentication');
|
||||
} else {
|
||||
console.log('🔓 No password authentication (connecting without password)');
|
||||
}
|
||||
|
||||
return createClient(clientConfig);
|
||||
}
|
||||
|
||||
async function testScenarios() {
|
||||
console.log('🧪 测试不同密码配置场景\n');
|
||||
|
||||
// 场景1:用户的问题场景 - 空字符串密码
|
||||
console.log('📝 场景1:用户问题场景(空字符串密码)');
|
||||
console.log('环境变量: KVROCKS_PASSWORD=""');
|
||||
process.env.KVROCKS_PASSWORD = '';
|
||||
try {
|
||||
const client = getKvrocksClient();
|
||||
await client.connect();
|
||||
console.log('✅ 场景1通过:无认证错误\n');
|
||||
} catch (error) {
|
||||
console.log('❌ 场景1失败:', error.message, '\n');
|
||||
}
|
||||
|
||||
// 场景2:未设置密码
|
||||
console.log('📝 场景2:未设置密码');
|
||||
console.log('环境变量: KVROCKS_PASSWORD=undefined');
|
||||
delete process.env.KVROCKS_PASSWORD;
|
||||
try {
|
||||
const client = getKvrocksClient();
|
||||
await client.connect();
|
||||
console.log('✅ 场景2通过:无认证错误\n');
|
||||
} catch (error) {
|
||||
console.log('❌ 场景2失败:', error.message, '\n');
|
||||
}
|
||||
|
||||
// 场景3:有效密码
|
||||
console.log('📝 场景3:有效密码');
|
||||
console.log('环境变量: KVROCKS_PASSWORD="validpassword"');
|
||||
process.env.KVROCKS_PASSWORD = 'validpassword';
|
||||
try {
|
||||
const client = getKvrocksClient();
|
||||
await client.connect();
|
||||
console.log('✅ 场景3通过:正常密码认证\n');
|
||||
} catch (error) {
|
||||
console.log('❌ 场景3失败:', error.message, '\n');
|
||||
}
|
||||
|
||||
// 场景4:只有空格的密码
|
||||
console.log('📝 场景4:只有空格的密码');
|
||||
console.log('环境变量: KVROCKS_PASSWORD=" "');
|
||||
process.env.KVROCKS_PASSWORD = ' ';
|
||||
try {
|
||||
const client = getKvrocksClient();
|
||||
await client.connect();
|
||||
console.log('✅ 场景4通过:空格密码被正确处理\n');
|
||||
} catch (error) {
|
||||
console.log('❌ 场景4失败:', error.message, '\n');
|
||||
}
|
||||
}
|
||||
|
||||
testScenarios().catch(console.error);
|
||||
+45
-4
@@ -21,8 +21,16 @@ import {
|
||||
verticalListSortingStrategy,
|
||||
} from '@dnd-kit/sortable';
|
||||
import { CSS } from '@dnd-kit/utilities';
|
||||
import { ChevronDown, ChevronUp, Settings, Users, Video } from 'lucide-react';
|
||||
import {
|
||||
ChevronDown,
|
||||
ChevronUp,
|
||||
Settings,
|
||||
Tv,
|
||||
Users,
|
||||
Video,
|
||||
} from 'lucide-react';
|
||||
import { GripVertical } from 'lucide-react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { Suspense, useCallback, useEffect, useState } from 'react';
|
||||
import Swal from 'sweetalert2';
|
||||
|
||||
@@ -62,6 +70,7 @@ interface DataSource {
|
||||
detail?: string;
|
||||
disabled?: boolean;
|
||||
from: 'config' | 'custom';
|
||||
is_adult?: boolean; // 添加成人内容标记字段
|
||||
}
|
||||
|
||||
// 可折叠标签组件
|
||||
@@ -635,6 +644,7 @@ const VideoSourceConfig = ({
|
||||
detail: '',
|
||||
disabled: false,
|
||||
from: 'config',
|
||||
is_adult: false, // 默认不是成人内容
|
||||
});
|
||||
|
||||
// dnd-kit 传感器
|
||||
@@ -713,6 +723,7 @@ const VideoSourceConfig = ({
|
||||
name: newSource.name,
|
||||
api: newSource.api,
|
||||
detail: newSource.detail,
|
||||
is_adult: newSource.is_adult, // 传递成人内容标记
|
||||
})
|
||||
.then(() => {
|
||||
setNewSource({
|
||||
@@ -722,6 +733,7 @@ const VideoSourceConfig = ({
|
||||
detail: '',
|
||||
disabled: false,
|
||||
from: 'custom',
|
||||
is_adult: false, // 重置为默认值
|
||||
});
|
||||
setShowAddForm(false);
|
||||
})
|
||||
@@ -858,7 +870,8 @@ const VideoSourceConfig = ({
|
||||
exportConfig.api_site[source.key] = {
|
||||
api: source.api,
|
||||
name: source.name,
|
||||
...(source.detail && { detail: source.detail })
|
||||
...(source.detail && { detail: source.detail }),
|
||||
...(source.is_adult !== undefined && { is_adult: source.is_adult }) // 确保导出 is_adult 字段
|
||||
};
|
||||
}
|
||||
});
|
||||
@@ -931,7 +944,7 @@ const VideoSourceConfig = ({
|
||||
throw new Error(`${key}: 无效的配置对象`);
|
||||
}
|
||||
|
||||
const sourceObj = source as { api?: string; name?: string; detail?: string };
|
||||
const sourceObj = source as { api?: string; name?: string; detail?: string; is_adult?: boolean };
|
||||
|
||||
if (!sourceObj.api || !sourceObj.name) {
|
||||
throw new Error(`${key}: 缺少必要字段 api 或 name`);
|
||||
@@ -942,7 +955,8 @@ const VideoSourceConfig = ({
|
||||
key: key,
|
||||
name: sourceObj.name,
|
||||
api: sourceObj.api,
|
||||
detail: sourceObj.detail || ''
|
||||
detail: sourceObj.detail || '',
|
||||
is_adult: sourceObj.is_adult || false // 确保处理 is_adult 字段
|
||||
});
|
||||
successCount++;
|
||||
} catch (error) {
|
||||
@@ -1238,6 +1252,25 @@ const VideoSourceConfig = ({
|
||||
}
|
||||
className='px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-gray-100'
|
||||
/>
|
||||
|
||||
{/* 成人内容标记复选框 */}
|
||||
<div className='flex items-center space-x-2'>
|
||||
<input
|
||||
type='checkbox'
|
||||
id='is_adult'
|
||||
checked={newSource.is_adult || false}
|
||||
onChange={(e) =>
|
||||
setNewSource((prev) => ({ ...prev, is_adult: e.target.checked }))
|
||||
}
|
||||
className='w-4 h-4 text-red-600 bg-gray-100 border-gray-300 rounded focus:ring-red-500 dark:bg-gray-700 dark:border-gray-600'
|
||||
/>
|
||||
<label
|
||||
htmlFor='is_adult'
|
||||
className='text-sm font-medium text-gray-900 dark:text-gray-300'
|
||||
>
|
||||
🔞 成人内容资源站
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div className='flex justify-end'>
|
||||
<button
|
||||
@@ -1609,6 +1642,7 @@ const SiteConfigComponent = ({ config }: { config: AdminConfig | null }) => {
|
||||
};
|
||||
|
||||
function AdminPageClient() {
|
||||
const router = useRouter();
|
||||
const [config, setConfig] = useState<AdminConfig | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -1728,6 +1762,13 @@ function AdminPageClient() {
|
||||
重置配置
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
onClick={() => router.push('/config')}
|
||||
className='px-3 py-1 bg-blue-600 hover:bg-blue-700 text-white text-xs rounded-md transition-colors flex items-center gap-1'
|
||||
>
|
||||
<Tv size={14} />
|
||||
<span>TVBox 配置</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 站点配置标签 */}
|
||||
|
||||
@@ -59,11 +59,12 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
switch (action) {
|
||||
case 'add': {
|
||||
const { key, name, api, detail } = body as {
|
||||
const { key, name, api, detail, is_adult } = body as {
|
||||
key?: string;
|
||||
name?: string;
|
||||
api?: string;
|
||||
detail?: string;
|
||||
is_adult?: boolean;
|
||||
};
|
||||
if (!key || !name || !api) {
|
||||
return NextResponse.json({ error: '缺少必要参数' }, { status: 400 });
|
||||
@@ -78,6 +79,7 @@ export async function POST(request: NextRequest) {
|
||||
detail,
|
||||
from: 'custom',
|
||||
disabled: false,
|
||||
is_adult: is_adult || false, // 确保处理 is_adult 字段
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
/* eslint-disable no-console, @typescript-eslint/no-explicit-any */
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
|
||||
import { getStorage } from '@/lib/db';
|
||||
import { User } from '@/lib/types';
|
||||
|
||||
export const runtime = 'edge';
|
||||
|
||||
// 检查是否为站长账户
|
||||
function isOwnerAccount(username: string): boolean {
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
return username === ownerUsername;
|
||||
}
|
||||
|
||||
export async function GET(request: NextRequest) {
|
||||
try {
|
||||
// 从Authorization头获取当前用户
|
||||
const auth = request.headers.get('Authorization')?.replace('Bearer ', '');
|
||||
if (!auth) {
|
||||
return NextResponse.json({ error: '需要认证' }, { status: 401 });
|
||||
}
|
||||
|
||||
const currentUsername = decodeURIComponent(auth);
|
||||
|
||||
// 检查是否为站长账户
|
||||
if (!isOwnerAccount(currentUsername)) {
|
||||
return NextResponse.json({ error: '权限不足' }, { status: 403 });
|
||||
}
|
||||
|
||||
// 获取所有用户及其设置
|
||||
const storage = getStorage();
|
||||
const users: User[] = await storage.getAllUsers();
|
||||
const usersWithSettings = await Promise.all(
|
||||
users.map(async (user) => {
|
||||
const settings = await storage.getUserSettings(user.username);
|
||||
return {
|
||||
username: user.username,
|
||||
role: user.role || 'user',
|
||||
created_at: user.created_at,
|
||||
filter_adult_content: settings?.filter_adult_content ?? true,
|
||||
can_disable_filter: settings?.can_disable_filter ?? true,
|
||||
managed_by_admin: settings?.managed_by_admin ?? false,
|
||||
last_filter_change: settings?.last_filter_change
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return NextResponse.json({
|
||||
users: usersWithSettings,
|
||||
total: usersWithSettings.length
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('获取用户列表失败:', error);
|
||||
return NextResponse.json({ error: '获取用户列表失败' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
// 从Authorization头获取当前用户
|
||||
const auth = request.headers.get('Authorization')?.replace('Bearer ', '');
|
||||
if (!auth) {
|
||||
return NextResponse.json({ error: '需要认证' }, { status: 401 });
|
||||
}
|
||||
|
||||
const currentUsername = decodeURIComponent(auth);
|
||||
|
||||
// 检查是否为站长账户
|
||||
if (!isOwnerAccount(currentUsername)) {
|
||||
return NextResponse.json({ error: '权限不足' }, { status: 403 });
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
const { action, username, settings } = await request.json();
|
||||
|
||||
switch (action) {
|
||||
case 'update_settings': {
|
||||
// 更新用户设置
|
||||
const currentSettings = await storage.getUserSettings(username);
|
||||
const newSettings = {
|
||||
...currentSettings,
|
||||
...settings,
|
||||
last_filter_change: new Date().toISOString()
|
||||
};
|
||||
|
||||
await storage.setUserSettings(username, newSettings);
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
message: `已更新用户 ${username} 的设置`
|
||||
});
|
||||
}
|
||||
|
||||
case 'force_filter': {
|
||||
// 强制开启某用户的成人内容过滤
|
||||
const currentSettings = await storage.getUserSettings(username) || {
|
||||
filter_adult_content: true,
|
||||
theme: 'auto' as const,
|
||||
language: 'zh-CN',
|
||||
auto_play: false,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
|
||||
await storage.setUserSettings(username, {
|
||||
...currentSettings,
|
||||
filter_adult_content: true,
|
||||
can_disable_filter: false,
|
||||
managed_by_admin: true,
|
||||
last_filter_change: new Date().toISOString()
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
message: `已强制开启用户 ${username} 的成人内容过滤`
|
||||
});
|
||||
}
|
||||
|
||||
case 'allow_disable': {
|
||||
// 允许用户自己管理过滤设置
|
||||
const existingSettings = await storage.getUserSettings(username) || {
|
||||
filter_adult_content: true,
|
||||
theme: 'auto' as const,
|
||||
language: 'zh-CN',
|
||||
auto_play: false,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
|
||||
await storage.setUserSettings(username, {
|
||||
...existingSettings,
|
||||
filter_adult_content: existingSettings.filter_adult_content ?? true,
|
||||
theme: existingSettings.theme || 'auto',
|
||||
language: existingSettings.language || 'zh-CN',
|
||||
auto_play: existingSettings.auto_play ?? false,
|
||||
video_quality: existingSettings.video_quality || 'auto',
|
||||
can_disable_filter: true,
|
||||
managed_by_admin: false,
|
||||
last_filter_change: new Date().toISOString()
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
message: `已允许用户 ${username} 自己管理过滤设置`
|
||||
});
|
||||
}
|
||||
|
||||
default:
|
||||
return NextResponse.json({ error: '未知操作' }, { status: 400 });
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('用户管理操作失败:', error);
|
||||
return NextResponse.json({ error: '操作失败' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
Vendored
+22
@@ -0,0 +1,22 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
export const runtime = 'edge';
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
return NextResponse.json({
|
||||
status: 'ok',
|
||||
timestamp: new Date().toISOString(),
|
||||
runtime: 'edge',
|
||||
storageType: process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage',
|
||||
hasDB: !!(globalThis as any).DB,
|
||||
nodeEnv: process.env.NODE_ENV
|
||||
});
|
||||
} catch (error) {
|
||||
return NextResponse.json({
|
||||
error: 'Debug failed',
|
||||
message: error instanceof Error ? error.message : 'Unknown error'
|
||||
}, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -56,10 +56,10 @@ async function generateAuthCookie(
|
||||
authData.password = password;
|
||||
}
|
||||
|
||||
if (username && process.env.PASSWORD) {
|
||||
if (username && process.env.AUTH_PASSWORD) {
|
||||
authData.username = username;
|
||||
// 使用密码作为密钥对用户名进行签名
|
||||
const signature = await generateSignature(username, process.env.PASSWORD);
|
||||
const signature = await generateSignature(username, process.env.AUTH_PASSWORD);
|
||||
authData.signature = signature;
|
||||
authData.timestamp = Date.now(); // 添加时间戳防重放攻击
|
||||
}
|
||||
@@ -71,9 +71,9 @@ export async function POST(req: NextRequest) {
|
||||
try {
|
||||
// 本地 / localStorage 模式——仅校验固定密码
|
||||
if (STORAGE_TYPE === 'localstorage') {
|
||||
const envPassword = process.env.PASSWORD;
|
||||
const envPassword = process.env.AUTH_PASSWORD;
|
||||
|
||||
// 未配置 PASSWORD 时直接放行
|
||||
// 未配置 AUTH_PASSWORD 时直接放行
|
||||
if (!envPassword) {
|
||||
const response = NextResponse.json({ ok: true });
|
||||
|
||||
@@ -136,7 +136,7 @@ export async function POST(req: NextRequest) {
|
||||
// 可能是站长,直接读环境变量
|
||||
if (
|
||||
username === process.env.USERNAME &&
|
||||
password === process.env.PASSWORD
|
||||
password === process.env.AUTH_PASSWORD
|
||||
) {
|
||||
// 验证成功,设置认证cookie
|
||||
const response = NextResponse.json({ ok: true });
|
||||
|
||||
@@ -50,8 +50,8 @@ async function generateAuthCookie(username: string): Promise<string> {
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
// 使用process.env.PASSWORD作为签名密钥,而不是用户密码
|
||||
const signingKey = process.env.PASSWORD || '';
|
||||
// 使用process.env.AUTH_PASSWORD作为签名密钥,而不是用户密码
|
||||
const signingKey = process.env.AUTH_PASSWORD || '';
|
||||
const signature = await generateSignature(username, signingKey);
|
||||
authData.signature = signature;
|
||||
|
||||
|
||||
+72
-10
@@ -1,7 +1,8 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
import { getAvailableApiSites, getCacheTime } from '@/lib/config';
|
||||
import { getAvailableApiSites,getCacheTime } from '@/lib/config';
|
||||
import { addCorsHeaders, handleOptionsRequest } from '@/lib/cors';
|
||||
import { getStorage } from '@/lib/db';
|
||||
import { searchFromApi } from '@/lib/downstream';
|
||||
|
||||
export const runtime = 'edge';
|
||||
@@ -14,11 +15,23 @@ export async function OPTIONS() {
|
||||
export async function GET(request: Request) {
|
||||
const { searchParams } = new URL(request.url);
|
||||
const query = searchParams.get('q');
|
||||
|
||||
// 从 Authorization header 或 query parameter 获取用户名
|
||||
let userName: string | undefined = searchParams.get('user') || undefined;
|
||||
if (!userName) {
|
||||
const authHeader = request.headers.get('Authorization');
|
||||
if (authHeader && authHeader.startsWith('Bearer ')) {
|
||||
userName = authHeader.substring(7);
|
||||
}
|
||||
}
|
||||
|
||||
if (!query) {
|
||||
const cacheTime = await getCacheTime();
|
||||
const response = NextResponse.json(
|
||||
{ results: [] },
|
||||
{
|
||||
regular_results: [],
|
||||
adult_results: []
|
||||
},
|
||||
{
|
||||
headers: {
|
||||
'Cache-Control': `public, max-age=${cacheTime}, s-maxage=${cacheTime}`,
|
||||
@@ -30,16 +43,58 @@ export async function GET(request: Request) {
|
||||
return addCorsHeaders(response);
|
||||
}
|
||||
|
||||
const apiSites = await getAvailableApiSites();
|
||||
const searchPromises = apiSites.map((site) => searchFromApi(site, query));
|
||||
|
||||
try {
|
||||
const results = await Promise.all(searchPromises);
|
||||
const flattenedResults = results.flat();
|
||||
const cacheTime = await getCacheTime();
|
||||
// 检查是否明确要求包含成人内容(用于关闭过滤时的明确请求)
|
||||
const includeAdult = searchParams.get('include_adult') === 'true';
|
||||
|
||||
// 获取用户的成人内容过滤设置
|
||||
let shouldFilterAdult = true; // 默认过滤
|
||||
if (userName) {
|
||||
try {
|
||||
const storage = getStorage();
|
||||
const userSettings = await storage.getUserSettings(userName);
|
||||
// 如果用户设置存在且明确设为false,则不过滤;否则默认过滤
|
||||
shouldFilterAdult = userSettings?.filter_adult_content !== false;
|
||||
} catch (error) {
|
||||
// 出错时默认过滤成人内容
|
||||
shouldFilterAdult = true;
|
||||
}
|
||||
}
|
||||
|
||||
// 根据用户设置和明确请求决定最终的过滤策略
|
||||
const finalShouldFilter = shouldFilterAdult || !includeAdult;
|
||||
|
||||
// 使用动态过滤方法,但不依赖缓存,实时获取设置
|
||||
const availableSites = finalShouldFilter
|
||||
? await getAvailableApiSites(true) // 过滤成人内容
|
||||
: await getAvailableApiSites(false); // 不过滤成人内容
|
||||
|
||||
if (!availableSites || availableSites.length === 0) {
|
||||
const cacheTime = await getCacheTime();
|
||||
const response = NextResponse.json({
|
||||
regular_results: [],
|
||||
adult_results: []
|
||||
}, {
|
||||
headers: {
|
||||
'Cache-Control': `public, max-age=${cacheTime}, s-maxage=${cacheTime}`,
|
||||
'CDN-Cache-Control': `public, s-maxage=${cacheTime}`,
|
||||
'Vercel-CDN-Cache-Control': `public, s-maxage=${cacheTime}`,
|
||||
},
|
||||
});
|
||||
return addCorsHeaders(response);
|
||||
}
|
||||
|
||||
// 搜索所有可用的资源站(已根据用户设置动态过滤)
|
||||
const searchPromises = availableSites.map((site) => searchFromApi(site, query));
|
||||
const searchResults = (await Promise.all(searchPromises)).flat();
|
||||
|
||||
// 所有结果都作为常规结果返回,因为成人内容源已经在源头被过滤掉了
|
||||
const cacheTime = await getCacheTime();
|
||||
const response = NextResponse.json(
|
||||
{ results: flattenedResults },
|
||||
{
|
||||
regular_results: searchResults,
|
||||
adult_results: [] // 始终为空,因为成人内容在源头就被过滤了
|
||||
},
|
||||
{
|
||||
headers: {
|
||||
'Cache-Control': `public, max-age=${cacheTime}, s-maxage=${cacheTime}`,
|
||||
@@ -50,7 +105,14 @@ export async function GET(request: Request) {
|
||||
);
|
||||
return addCorsHeaders(response);
|
||||
} catch (error) {
|
||||
const response = NextResponse.json({ error: '搜索失败' }, { status: 500 });
|
||||
const response = NextResponse.json(
|
||||
{
|
||||
regular_results: [],
|
||||
adult_results: [],
|
||||
error: '搜索失败'
|
||||
},
|
||||
{ status: 500 }
|
||||
);
|
||||
return addCorsHeaders(response);
|
||||
}
|
||||
}
|
||||
|
||||
+28
-14
@@ -69,20 +69,34 @@ export async function GET(request: NextRequest) {
|
||||
wallpaper: `${baseUrl}/screenshot1.png`, // 使用项目截图作为壁纸
|
||||
|
||||
// 影视源配置
|
||||
sites: sourceConfigs.map((source) => ({
|
||||
key: source.key || source.name,
|
||||
name: source.name,
|
||||
type: 0, // 影视源
|
||||
api: source.api,
|
||||
searchable: 1, // 可搜索
|
||||
quickSearch: 1, // 支持快速搜索
|
||||
filterable: 1, // 支持分类筛选
|
||||
ext: source.detail || '', // 详情页地址作为扩展参数
|
||||
timeout: 30, // 30秒超时
|
||||
categories: [
|
||||
"电影", "电视剧", "综艺", "动漫", "纪录片", "短剧"
|
||||
]
|
||||
})),
|
||||
sites: sourceConfigs.map((source) => {
|
||||
// 更智能的type判断逻辑:
|
||||
// 1. 如果api地址包含 "/provide/vod" 且不包含 "at/xml",则认为是JSON类型 (type=1)
|
||||
// 2. 如果api地址包含 "at/xml",则认为是XML类型 (type=0)
|
||||
// 3. 如果api地址以 ".json" 结尾,则认为是JSON类型 (type=1)
|
||||
// 4. 其他情况默认为JSON类型 (type=1),因为现在大部分都是JSON
|
||||
let type = 1; // 默认为JSON类型
|
||||
|
||||
const apiLower = source.api.toLowerCase();
|
||||
if (apiLower.includes('at/xml') || apiLower.endsWith('.xml')) {
|
||||
type = 0; // XML类型
|
||||
}
|
||||
|
||||
return {
|
||||
key: source.key || source.name,
|
||||
name: source.name,
|
||||
type: type, // 使用智能判断的type
|
||||
api: source.api,
|
||||
searchable: 1, // 可搜索
|
||||
quickSearch: 1, // 支持快速搜索
|
||||
filterable: 1, // 支持分类筛选
|
||||
ext: source.detail || '', // 详情页地址作为扩展参数
|
||||
timeout: 30, // 30秒超时
|
||||
categories: [
|
||||
"电影", "电视剧", "综艺", "动漫", "纪录片", "短剧"
|
||||
]
|
||||
};
|
||||
}),
|
||||
|
||||
// 解析源配置(添加一些常用的解析源)
|
||||
parses: [
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
import { headers } from 'next/headers';
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
|
||||
import { getStorage } from '@/lib/db';
|
||||
import { UserSettings } from '@/lib/types';
|
||||
|
||||
// 设置运行时为 Edge Runtime,确保部署兼容性
|
||||
export const runtime = 'edge';
|
||||
|
||||
// 获取用户设置
|
||||
export async function GET(_request: NextRequest) {
|
||||
try {
|
||||
const headersList = headers();
|
||||
const authorization = headersList.get('Authorization');
|
||||
|
||||
if (!authorization) {
|
||||
return NextResponse.json({ error: '未授权访问' }, { status: 401 });
|
||||
}
|
||||
|
||||
const userName = authorization.split(' ')[1]; // 假设格式为 "Bearer username"
|
||||
|
||||
if (!userName) {
|
||||
return NextResponse.json({ error: '用户名不能为空' }, { status: 400 });
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
const settings = await storage.getUserSettings(userName);
|
||||
|
||||
return NextResponse.json({
|
||||
settings: settings || {
|
||||
filter_adult_content: true, // 默认开启成人内容过滤
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: true,
|
||||
video_quality: 'auto'
|
||||
}
|
||||
}, {
|
||||
headers: {
|
||||
'Cache-Control': 'no-cache, no-store, must-revalidate',
|
||||
'Pragma': 'no-cache',
|
||||
'Expires': '0'
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('Error getting user settings:', error);
|
||||
return NextResponse.json({ error: '获取用户设置失败' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
// 更新用户设置
|
||||
export async function PATCH(request: NextRequest) {
|
||||
try {
|
||||
const headersList = headers();
|
||||
const authorization = headersList.get('Authorization');
|
||||
|
||||
if (!authorization) {
|
||||
return NextResponse.json({ error: '未授权访问' }, { status: 401 });
|
||||
}
|
||||
|
||||
const userName = authorization.split(' ')[1];
|
||||
|
||||
if (!userName) {
|
||||
return NextResponse.json({ error: '用户名不能为空' }, { status: 400 });
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
const { settings } = body as { settings: Partial<UserSettings> };
|
||||
|
||||
if (!settings) {
|
||||
return NextResponse.json({ error: '设置数据不能为空' }, { status: 400 });
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
|
||||
// 验证用户存在
|
||||
const userExists = await storage.checkUserExist(userName);
|
||||
if (!userExists) {
|
||||
return NextResponse.json({ error: '用户不存在' }, { status: 404 });
|
||||
}
|
||||
|
||||
await storage.updateUserSettings(userName, settings);
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
message: '设置更新成功'
|
||||
}, {
|
||||
headers: {
|
||||
'Cache-Control': 'no-cache, no-store, must-revalidate',
|
||||
'Pragma': 'no-cache',
|
||||
'Expires': '0'
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('Error updating user settings:', error);
|
||||
return NextResponse.json({ error: '更新用户设置失败' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
// 重置用户设置
|
||||
export async function PUT(request: NextRequest) {
|
||||
try {
|
||||
const headersList = headers();
|
||||
const authorization = headersList.get('Authorization');
|
||||
|
||||
if (!authorization) {
|
||||
return NextResponse.json({ error: '未授权访问' }, { status: 401 });
|
||||
}
|
||||
|
||||
const userName = authorization.split(' ')[1];
|
||||
|
||||
if (!userName) {
|
||||
return NextResponse.json({ error: '用户名不能为空' }, { status: 400 });
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
const { settings } = body as { settings: UserSettings };
|
||||
|
||||
if (!settings) {
|
||||
return NextResponse.json({ error: '设置数据不能为空' }, { status: 400 });
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
|
||||
// 验证用户存在
|
||||
const userExists = await storage.checkUserExist(userName);
|
||||
if (!userExists) {
|
||||
return NextResponse.json({ error: '用户不存在' }, { status: 404 });
|
||||
}
|
||||
|
||||
await storage.setUserSettings(userName, settings);
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
message: '设置已重置'
|
||||
});
|
||||
} catch (error) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('Error resetting user settings:', error);
|
||||
return NextResponse.json({ error: '重置用户设置失败' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
+13
-6
@@ -14,12 +14,19 @@ const inter = Inter({ subsets: ['latin'] });
|
||||
// 动态生成 metadata,支持配置更新后的标题变化
|
||||
export async function generateMetadata(): Promise<Metadata> {
|
||||
let siteName = process.env.SITE_NAME || 'KatelyaTV';
|
||||
if (
|
||||
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'd1' &&
|
||||
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'upstash'
|
||||
) {
|
||||
const config = await getConfig();
|
||||
siteName = config.SiteConfig.SiteName;
|
||||
|
||||
try {
|
||||
// 只有在非 d1 和 upstash 存储类型时才尝试获取配置
|
||||
if (
|
||||
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'd1' &&
|
||||
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'upstash'
|
||||
) {
|
||||
const config = await getConfig();
|
||||
siteName = config.SiteConfig.SiteName;
|
||||
}
|
||||
} catch (error) {
|
||||
// 如果配置获取失败,使用默认站点名称
|
||||
// siteName 已经有默认值,不需要额外处理
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
+137
-12
@@ -20,6 +20,7 @@ import { DoubanItem } from '@/lib/types';
|
||||
import CapsuleSwitch from '@/components/CapsuleSwitch';
|
||||
import ContinueWatching from '@/components/ContinueWatching';
|
||||
import PageLayout from '@/components/PageLayout';
|
||||
import PaginatedRow from '@/components/PaginatedRow';
|
||||
import { useSite } from '@/components/SiteProvider';
|
||||
import VideoCard from '@/components/VideoCard';
|
||||
|
||||
@@ -81,6 +82,21 @@ function HomeClient() {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const { announcement } = useSite();
|
||||
|
||||
// 分页状态管理
|
||||
const [moviePage, setMoviePage] = useState(0);
|
||||
const [tvShowPage, setTvShowPage] = useState(0);
|
||||
const [varietyShowPage, setVarietyShowPage] = useState(0);
|
||||
const [loadingMore, setLoadingMore] = useState({
|
||||
movies: false,
|
||||
tvShows: false,
|
||||
varietyShows: false,
|
||||
});
|
||||
const [hasMoreData, setHasMoreData] = useState({
|
||||
movies: true,
|
||||
tvShows: true,
|
||||
varietyShows: true,
|
||||
});
|
||||
|
||||
const [showAnnouncement, setShowAnnouncement] = useState(false);
|
||||
|
||||
// 检查公告弹窗状态
|
||||
@@ -147,6 +163,100 @@ function HomeClient() {
|
||||
fetchDoubanData();
|
||||
}, []);
|
||||
|
||||
// 加载更多电影
|
||||
const loadMoreMovies = async () => {
|
||||
if (loadingMore.movies || !hasMoreData.movies) return;
|
||||
|
||||
setLoadingMore(prev => ({ ...prev, movies: true }));
|
||||
try {
|
||||
const nextPage = moviePage + 1;
|
||||
const moviesData = await getDoubanCategories({
|
||||
kind: 'movie',
|
||||
category: '热门',
|
||||
type: '全部',
|
||||
pageStart: nextPage * 20,
|
||||
pageLimit: 20,
|
||||
});
|
||||
|
||||
if (moviesData.code === 200 && moviesData.list.length > 0) {
|
||||
setHotMovies(prev => [...prev, ...moviesData.list]);
|
||||
setMoviePage(nextPage);
|
||||
// 如果返回的数据少于请求的数量,说明没有更多数据了
|
||||
if (moviesData.list.length < 20) {
|
||||
setHasMoreData(prev => ({ ...prev, movies: false }));
|
||||
}
|
||||
} else {
|
||||
setHasMoreData(prev => ({ ...prev, movies: false }));
|
||||
}
|
||||
} catch (error) {
|
||||
// 静默处理错误
|
||||
} finally {
|
||||
setLoadingMore(prev => ({ ...prev, movies: false }));
|
||||
}
|
||||
};
|
||||
|
||||
// 加载更多剧集
|
||||
const loadMoreTvShows = async () => {
|
||||
if (loadingMore.tvShows || !hasMoreData.tvShows) return;
|
||||
|
||||
setLoadingMore(prev => ({ ...prev, tvShows: true }));
|
||||
try {
|
||||
const nextPage = tvShowPage + 1;
|
||||
const tvShowsData = await getDoubanCategories({
|
||||
kind: 'tv',
|
||||
category: 'tv',
|
||||
type: 'tv',
|
||||
pageStart: nextPage * 20,
|
||||
pageLimit: 20,
|
||||
});
|
||||
|
||||
if (tvShowsData.code === 200 && tvShowsData.list.length > 0) {
|
||||
setHotTvShows(prev => [...prev, ...tvShowsData.list]);
|
||||
setTvShowPage(nextPage);
|
||||
if (tvShowsData.list.length < 20) {
|
||||
setHasMoreData(prev => ({ ...prev, tvShows: false }));
|
||||
}
|
||||
} else {
|
||||
setHasMoreData(prev => ({ ...prev, tvShows: false }));
|
||||
}
|
||||
} catch (error) {
|
||||
// 静默处理错误
|
||||
} finally {
|
||||
setLoadingMore(prev => ({ ...prev, tvShows: false }));
|
||||
}
|
||||
};
|
||||
|
||||
// 加载更多综艺
|
||||
const loadMoreVarietyShows = async () => {
|
||||
if (loadingMore.varietyShows || !hasMoreData.varietyShows) return;
|
||||
|
||||
setLoadingMore(prev => ({ ...prev, varietyShows: true }));
|
||||
try {
|
||||
const nextPage = varietyShowPage + 1;
|
||||
const varietyShowsData = await getDoubanCategories({
|
||||
kind: 'tv',
|
||||
category: 'show',
|
||||
type: 'show',
|
||||
pageStart: nextPage * 20,
|
||||
pageLimit: 20,
|
||||
});
|
||||
|
||||
if (varietyShowsData.code === 200 && varietyShowsData.list.length > 0) {
|
||||
setHotVarietyShows(prev => [...prev, ...varietyShowsData.list]);
|
||||
setVarietyShowPage(nextPage);
|
||||
if (varietyShowsData.list.length < 20) {
|
||||
setHasMoreData(prev => ({ ...prev, varietyShows: false }));
|
||||
}
|
||||
} else {
|
||||
setHasMoreData(prev => ({ ...prev, varietyShows: false }));
|
||||
}
|
||||
} catch (error) {
|
||||
// 静默处理错误
|
||||
} finally {
|
||||
setLoadingMore(prev => ({ ...prev, varietyShows: false }));
|
||||
}
|
||||
};
|
||||
|
||||
// 处理收藏数据更新的函数
|
||||
const updateFavoriteItems = async (allFavorites: Record<string, Favorite>) => {
|
||||
const allPlayRecords = await getAllPlayRecords();
|
||||
@@ -291,7 +401,12 @@ function HomeClient() {
|
||||
<ChevronRight className='w-4 h-4 ml-1' />
|
||||
</Link>
|
||||
</div>
|
||||
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4'>
|
||||
<PaginatedRow
|
||||
itemsPerPage={10}
|
||||
onLoadMore={loadMoreMovies}
|
||||
hasMoreData={hasMoreData.movies}
|
||||
isLoading={loadingMore.movies}
|
||||
>
|
||||
{loading
|
||||
? // 加载状态显示灰色占位数据 (显示10个,2行x5列)
|
||||
Array.from({ length: 10 }).map((_, index) => (
|
||||
@@ -305,8 +420,8 @@ function HomeClient() {
|
||||
<div className='mt-2 h-4 bg-purple-200 rounded animate-pulse dark:bg-purple-800'></div>
|
||||
</div>
|
||||
))
|
||||
: // 显示真实数据,只显示前10个实现2行布局
|
||||
hotMovies.slice(0, 10).map((movie, index) => (
|
||||
: // 显示真实数据
|
||||
hotMovies.map((movie, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='w-full'
|
||||
@@ -322,7 +437,7 @@ function HomeClient() {
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</PaginatedRow>
|
||||
</section>
|
||||
|
||||
{/* 热门剧集 */}
|
||||
@@ -339,7 +454,12 @@ function HomeClient() {
|
||||
<ChevronRight className='w-4 h-4 ml-1' />
|
||||
</Link>
|
||||
</div>
|
||||
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4'>
|
||||
<PaginatedRow
|
||||
itemsPerPage={10}
|
||||
onLoadMore={loadMoreTvShows}
|
||||
hasMoreData={hasMoreData.tvShows}
|
||||
isLoading={loadingMore.tvShows}
|
||||
>
|
||||
{loading
|
||||
? // 加载状态显示灰色占位数据 (显示10个,2行x5列)
|
||||
Array.from({ length: 10 }).map((_, index) => (
|
||||
@@ -353,8 +473,8 @@ function HomeClient() {
|
||||
<div className='mt-2 h-4 bg-purple-200 rounded animate-pulse dark:bg-purple-800'></div>
|
||||
</div>
|
||||
))
|
||||
: // 显示真实数据,只显示前10个实现2行布局
|
||||
hotTvShows.slice(0, 10).map((show, index) => (
|
||||
: // 显示真实数据
|
||||
hotTvShows.map((show, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='w-full'
|
||||
@@ -369,7 +489,7 @@ function HomeClient() {
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</PaginatedRow>
|
||||
</section>
|
||||
|
||||
{/* 热门综艺 */}
|
||||
@@ -386,7 +506,12 @@ function HomeClient() {
|
||||
<ChevronRight className='w-4 h-4 ml-1' />
|
||||
</Link>
|
||||
</div>
|
||||
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4'>
|
||||
<PaginatedRow
|
||||
itemsPerPage={10}
|
||||
onLoadMore={loadMoreVarietyShows}
|
||||
hasMoreData={hasMoreData.varietyShows}
|
||||
isLoading={loadingMore.varietyShows}
|
||||
>
|
||||
{loading
|
||||
? // 加载状态显示灰色占位数据 (显示10个,2行x5列)
|
||||
Array.from({ length: 10 }).map((_, index) => (
|
||||
@@ -400,8 +525,8 @@ function HomeClient() {
|
||||
<div className='mt-2 h-4 bg-purple-200 rounded animate-pulse dark:bg-purple-800'></div>
|
||||
</div>
|
||||
))
|
||||
: // 显示真实数据,只显示前10个实现2行布局
|
||||
hotVarietyShows.slice(0, 10).map((show, index) => (
|
||||
: // 显示真实数据
|
||||
hotVarietyShows.map((show, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='w-full'
|
||||
@@ -416,7 +541,7 @@ function HomeClient() {
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</PaginatedRow>
|
||||
</section>
|
||||
|
||||
{/* 首页底部 Logo */}
|
||||
|
||||
+21
-4
@@ -505,8 +505,22 @@ function PlayPageClient() {
|
||||
}
|
||||
const data = await response.json();
|
||||
|
||||
// 处理新的搜索结果格式:合并 regular_results 和 adult_results
|
||||
let allResults: SearchResult[] = [];
|
||||
if (data.regular_results && Array.isArray(data.regular_results)) {
|
||||
allResults = allResults.concat(data.regular_results);
|
||||
}
|
||||
if (data.adult_results && Array.isArray(data.adult_results)) {
|
||||
allResults = allResults.concat(data.adult_results);
|
||||
}
|
||||
|
||||
// 兼容旧格式(如果有的话)
|
||||
if (data.results && Array.isArray(data.results)) {
|
||||
allResults = data.results;
|
||||
}
|
||||
|
||||
// 处理搜索结果,根据规则过滤
|
||||
const results = data.results.filter(
|
||||
const results = allResults.filter(
|
||||
(result: SearchResult) =>
|
||||
result.title.replaceAll(' ', '').toLowerCase() ===
|
||||
videoTitleRef.current.replaceAll(' ', '').toLowerCase() &&
|
||||
@@ -737,12 +751,14 @@ function PlayPageClient() {
|
||||
// ---------------------------------------------------------------------------
|
||||
// 处理集数切换
|
||||
const handleEpisodeChange = (episodeNumber: number) => {
|
||||
if (episodeNumber >= 0 && episodeNumber < totalEpisodes) {
|
||||
// episodeNumber是显示的集数(从1开始),需要转换为索引(从0开始)
|
||||
const episodeIndex = episodeNumber - 1;
|
||||
if (episodeIndex >= 0 && episodeIndex < totalEpisodes) {
|
||||
// 在更换集数前保存当前播放进度
|
||||
if (artPlayerRef.current && artPlayerRef.current.paused) {
|
||||
saveCurrentPlayProgress();
|
||||
}
|
||||
setCurrentEpisodeIndex(episodeNumber);
|
||||
setCurrentEpisodeIndex(episodeIndex);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1616,7 +1632,7 @@ function PlayPageClient() {
|
||||
|
||||
{/* 选集和换源 - 在移动端始终显示,在 lg 及以上可折叠 */}
|
||||
<div
|
||||
className={`h-[300px] lg:h-full md:overflow-hidden transition-all duration-300 ease-in-out ${
|
||||
className={`h-[600px] lg:h-full md:overflow-hidden transition-all duration-300 ease-in-out ${
|
||||
isEpisodeSelectorCollapsed
|
||||
? 'md:col-span-1 lg:hidden lg:opacity-0 lg:scale-95'
|
||||
: 'md:col-span-1 lg:opacity-100 lg:scale-100'
|
||||
@@ -1624,6 +1640,7 @@ function PlayPageClient() {
|
||||
>
|
||||
<EpisodeSelector
|
||||
totalEpisodes={totalEpisodes}
|
||||
episodesPerPage={50}
|
||||
value={currentEpisodeIndex + 1}
|
||||
onChange={handleEpisodeChange}
|
||||
onSourceChange={handleSourceChange}
|
||||
|
||||
+145
-72
@@ -3,8 +3,9 @@
|
||||
|
||||
import { ChevronUp, Search, X } from 'lucide-react';
|
||||
import { useRouter, useSearchParams } from 'next/navigation';
|
||||
import { Suspense, useEffect, useMemo, useState } from 'react';
|
||||
import { Suspense, useEffect, useState } from 'react';
|
||||
|
||||
import { getAuthInfoFromBrowserCookie } from '@/lib/auth';
|
||||
import {
|
||||
addSearchHistory,
|
||||
clearSearchHistory,
|
||||
@@ -29,6 +30,15 @@ function SearchPageClient() {
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [showResults, setShowResults] = useState(false);
|
||||
const [searchResults, setSearchResults] = useState<SearchResult[]>([]);
|
||||
|
||||
// 分组结果状态
|
||||
const [groupedResults, setGroupedResults] = useState<{
|
||||
regular: SearchResult[];
|
||||
adult: SearchResult[];
|
||||
} | null>(null);
|
||||
|
||||
// 分组标签页状态
|
||||
const [activeTab, setActiveTab] = useState<'regular' | 'adult'>('regular');
|
||||
|
||||
// 获取默认聚合设置:只读取用户本地设置,默认为 true
|
||||
const getDefaultAggregate = () => {
|
||||
@@ -45,11 +55,11 @@ function SearchPageClient() {
|
||||
return getDefaultAggregate() ? 'agg' : 'all';
|
||||
});
|
||||
|
||||
// 聚合后的结果(按标题和年份分组)
|
||||
const aggregatedResults = useMemo(() => {
|
||||
// 聚合函数
|
||||
const aggregateResults = (results: SearchResult[]) => {
|
||||
const map = new Map<string, SearchResult[]>();
|
||||
searchResults.forEach((item) => {
|
||||
// 使用 title + year + type 作为键,year 必然存在,但依然兜底 'unknown'
|
||||
results.forEach((item) => {
|
||||
// 使用 title + year + type 作为键
|
||||
const key = `${item.title.replaceAll(' ', '')}-${
|
||||
item.year || 'unknown'
|
||||
}-${item.episodes.length === 1 ? 'movie' : 'tv'}`;
|
||||
@@ -73,23 +83,21 @@ function SearchPageClient() {
|
||||
if (a[1][0].year === b[1][0].year) {
|
||||
return a[0].localeCompare(b[0]);
|
||||
} else {
|
||||
// 处理 unknown 的情况
|
||||
const aYear = a[1][0].year;
|
||||
const bYear = b[1][0].year;
|
||||
|
||||
if (aYear === 'unknown' && bYear === 'unknown') {
|
||||
return 0;
|
||||
} else if (aYear === 'unknown') {
|
||||
return 1; // a 排在后面
|
||||
return 1;
|
||||
} else if (bYear === 'unknown') {
|
||||
return -1; // b 排在后面
|
||||
return -1;
|
||||
} else {
|
||||
// 都是数字年份,按数字大小排序(大的在前面)
|
||||
return aYear > bYear ? -1 : 1;
|
||||
}
|
||||
}
|
||||
});
|
||||
}, [searchResults]);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// 无搜索参数时聚焦搜索框
|
||||
@@ -161,39 +169,54 @@ function SearchPageClient() {
|
||||
const fetchSearchResults = async (query: string) => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
|
||||
// 获取用户认证信息
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
|
||||
// 构建请求头
|
||||
const headers: HeadersInit = {};
|
||||
if (authInfo?.username) {
|
||||
headers['Authorization'] = `Bearer ${authInfo.username}`;
|
||||
}
|
||||
|
||||
// 简化的搜索请求 - 成人内容过滤现在在API层面自动处理
|
||||
// 添加时间戳参数避免缓存问题
|
||||
const timestamp = Date.now();
|
||||
const response = await fetch(
|
||||
`/api/search?q=${encodeURIComponent(query.trim())}`
|
||||
`/api/search?q=${encodeURIComponent(query.trim())}&t=${timestamp}`,
|
||||
{
|
||||
headers: {
|
||||
...headers,
|
||||
'Cache-Control': 'no-cache, no-store, must-revalidate'
|
||||
}
|
||||
}
|
||||
);
|
||||
const data = await response.json();
|
||||
setSearchResults(
|
||||
data.results.sort((a: SearchResult, b: SearchResult) => {
|
||||
// 优先排序:标题与搜索词完全一致的排在前面
|
||||
const aExactMatch = a.title === query.trim();
|
||||
const bExactMatch = b.title === query.trim();
|
||||
|
||||
if (aExactMatch && !bExactMatch) return -1;
|
||||
if (!aExactMatch && bExactMatch) return 1;
|
||||
|
||||
// 如果都匹配或都不匹配,则按原来的逻辑排序
|
||||
if (a.year === b.year) {
|
||||
return a.title.localeCompare(b.title);
|
||||
} else {
|
||||
// 处理 unknown 的情况
|
||||
if (a.year === 'unknown' && b.year === 'unknown') {
|
||||
return 0;
|
||||
} else if (a.year === 'unknown') {
|
||||
return 1; // a 排在后面
|
||||
} else if (b.year === 'unknown') {
|
||||
return -1; // b 排在后面
|
||||
} else {
|
||||
// 都是数字年份,按数字大小排序(大的在前面)
|
||||
return parseInt(a.year) > parseInt(b.year) ? -1 : 1;
|
||||
}
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
// 处理新的搜索结果格式
|
||||
if (data.regular_results || data.adult_results) {
|
||||
// 处理分组结果
|
||||
setGroupedResults({
|
||||
regular: data.regular_results || [],
|
||||
adult: data.adult_results || []
|
||||
});
|
||||
setSearchResults([...(data.regular_results || []), ...(data.adult_results || [])]);
|
||||
} else if (data.grouped) {
|
||||
// 兼容旧的分组格式
|
||||
setGroupedResults({
|
||||
regular: data.regular || [],
|
||||
adult: data.adult || []
|
||||
});
|
||||
setSearchResults([...(data.regular || []), ...(data.adult || [])]);
|
||||
} else {
|
||||
// 兼容旧的普通结果格式
|
||||
setGroupedResults(null);
|
||||
setSearchResults(data.results || []);
|
||||
}
|
||||
|
||||
setShowResults(true);
|
||||
} catch (error) {
|
||||
setGroupedResults(null);
|
||||
setSearchResults([]);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
@@ -284,50 +307,100 @@ function SearchPageClient() {
|
||||
</div>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
{/* 如果有分组结果且有成人内容,显示分组标签 */}
|
||||
{groupedResults && groupedResults.adult.length > 0 && (
|
||||
<div className="mb-6">
|
||||
<div className="flex items-center justify-center mb-4">
|
||||
<div className="inline-flex p-1 bg-gray-100 dark:bg-gray-800 rounded-lg">
|
||||
<button
|
||||
onClick={() => setActiveTab('regular')}
|
||||
className={`px-4 py-2 rounded-md text-sm font-medium transition-colors ${
|
||||
activeTab === 'regular'
|
||||
? 'bg-white dark:bg-gray-700 text-blue-600 dark:text-blue-400 shadow-sm'
|
||||
: 'text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200'
|
||||
}`}
|
||||
>
|
||||
常规结果 ({groupedResults.regular.length})
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setActiveTab('adult')}
|
||||
className={`px-4 py-2 rounded-md text-sm font-medium transition-colors ${
|
||||
activeTab === 'adult'
|
||||
? 'bg-white dark:bg-gray-700 text-red-600 dark:text-red-400 shadow-sm'
|
||||
: 'text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200'
|
||||
}`}
|
||||
>
|
||||
成人内容 ({groupedResults.adult.length})
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{activeTab === 'adult' && (
|
||||
<div className="mb-4 p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md">
|
||||
<p className="text-sm text-red-600 dark:text-red-400 text-center">
|
||||
⚠️ 以下内容可能包含成人资源,请确保您已年满18周岁
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
<div
|
||||
key={`search-results-${viewMode}`}
|
||||
key={`search-results-${viewMode}-${activeTab}`}
|
||||
className='justify-start grid grid-cols-3 gap-x-2 gap-y-14 sm:gap-y-20 px-0 sm:px-2 sm:grid-cols-[repeat(auto-fill,_minmax(11rem,_1fr))] sm:gap-x-8'
|
||||
>
|
||||
{viewMode === 'agg'
|
||||
? aggregatedResults.map(([mapKey, group]) => {
|
||||
return (
|
||||
<div key={`agg-${mapKey}`} className='w-full'>
|
||||
<VideoCard
|
||||
from='search'
|
||||
items={group}
|
||||
query={
|
||||
searchQuery.trim() !== group[0].title
|
||||
? searchQuery.trim()
|
||||
: ''
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
: searchResults.map((item) => (
|
||||
<div
|
||||
key={`all-${item.source}-${item.id}`}
|
||||
className='w-full'
|
||||
>
|
||||
{(() => {
|
||||
// 确定要显示的结果
|
||||
let displayResults = searchResults;
|
||||
if (groupedResults && groupedResults.adult.length > 0) {
|
||||
displayResults = activeTab === 'adult'
|
||||
? groupedResults.adult
|
||||
: groupedResults.regular;
|
||||
}
|
||||
|
||||
// 聚合显示模式
|
||||
if (viewMode === 'agg') {
|
||||
const aggregated = aggregateResults(displayResults);
|
||||
return aggregated.map(([mapKey, group]: [string, SearchResult[]]) => (
|
||||
<div key={`agg-${mapKey}`} className='w-full'>
|
||||
<VideoCard
|
||||
id={item.id}
|
||||
title={item.title}
|
||||
poster={item.poster}
|
||||
episodes={item.episodes.length}
|
||||
source={item.source}
|
||||
source_name={item.source_name}
|
||||
douban_id={item.douban_id?.toString()}
|
||||
from='search'
|
||||
items={group}
|
||||
query={
|
||||
searchQuery.trim() !== item.title
|
||||
searchQuery.trim() !== group[0].title
|
||||
? searchQuery.trim()
|
||||
: ''
|
||||
}
|
||||
year={item.year}
|
||||
from='search'
|
||||
type={item.episodes.length > 1 ? 'tv' : 'movie'}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
));
|
||||
}
|
||||
|
||||
// 列表显示模式
|
||||
return displayResults.map((item) => (
|
||||
<div
|
||||
key={`all-${item.source}-${item.id}`}
|
||||
className='w-full'
|
||||
>
|
||||
<VideoCard
|
||||
id={item.id}
|
||||
title={item.title}
|
||||
poster={item.poster}
|
||||
episodes={item.episodes.length}
|
||||
source={item.source}
|
||||
source_name={item.source_name}
|
||||
douban_id={item.douban_id?.toString()}
|
||||
query={
|
||||
searchQuery.trim() !== item.title
|
||||
? searchQuery.trim()
|
||||
: ''
|
||||
}
|
||||
year={item.year}
|
||||
from='search'
|
||||
type={item.episodes.length > 1 ? 'tv' : 'movie'}
|
||||
/>
|
||||
</div>
|
||||
));
|
||||
})()}
|
||||
{searchResults.length === 0 && (
|
||||
<div className='col-span-full text-center text-gray-500 py-8 dark:text-gray-400'>
|
||||
未找到相关结果
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
'use client';
|
||||
|
||||
import { ArrowLeft, Settings, User } from 'lucide-react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
import { getAuthInfoFromBrowserCookie } from '@/lib/auth';
|
||||
|
||||
import AdultContentFilter from '@/components/AdultContentFilter';
|
||||
|
||||
export default function UserSettingsPage() {
|
||||
const router = useRouter();
|
||||
const [authInfo, setAuthInfo] = useState<{ userName: string } | null>(null);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
const auth = getAuthInfoFromBrowserCookie();
|
||||
if (!auth || !auth.username) {
|
||||
// 如果用户未登录,重定向到登录页面
|
||||
router.push('/login');
|
||||
return;
|
||||
}
|
||||
setAuthInfo({ userName: auth.username });
|
||||
setIsLoading(false);
|
||||
}, [router]);
|
||||
|
||||
const handleFilterUpdate = (_enabled: boolean) => {
|
||||
// 可以在这里添加一些全局状态更新或通知逻辑
|
||||
// console.log('成人内容过滤状态已更新:', enabled);
|
||||
};
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-50 dark:bg-gray-900 flex items-center justify-center">
|
||||
<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!authInfo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-50 dark:bg-gray-900">
|
||||
<div className="max-w-4xl mx-auto p-6">
|
||||
{/* 页面头部 */}
|
||||
<div className="flex items-center justify-between mb-8">
|
||||
<div className="flex items-center space-x-4">
|
||||
<button
|
||||
onClick={() => router.back()}
|
||||
className="flex items-center justify-center w-10 h-10 rounded-full bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
|
||||
>
|
||||
<ArrowLeft className="w-5 h-5 text-gray-600 dark:text-gray-400" />
|
||||
</button>
|
||||
<div>
|
||||
<h1 className="text-3xl font-bold text-gray-900 dark:text-white flex items-center">
|
||||
<Settings className="w-8 h-8 mr-3 text-blue-600" />
|
||||
用户设置
|
||||
</h1>
|
||||
<p className="text-gray-600 dark:text-gray-400 mt-2">
|
||||
管理您的个人偏好设置和隐私选项
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center space-x-3 px-4 py-2 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700">
|
||||
<User className="w-5 h-5 text-gray-600 dark:text-gray-400" />
|
||||
<span className="text-sm font-medium text-gray-900 dark:text-white">
|
||||
{authInfo.userName}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 设置区域 */}
|
||||
<div className="space-y-6">
|
||||
{/* 内容过滤设置 */}
|
||||
<div>
|
||||
<h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">
|
||||
内容过滤
|
||||
</h2>
|
||||
<AdultContentFilter
|
||||
userName={authInfo.userName}
|
||||
onUpdate={handleFilterUpdate}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* 其他设置部分预留 */}
|
||||
<div>
|
||||
<h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">
|
||||
其他设置
|
||||
</h2>
|
||||
<div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-6">
|
||||
<p className="text-gray-500 dark:text-gray-400 text-center py-8">
|
||||
更多设置选项即将推出...
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 底部信息 */}
|
||||
<div className="mt-8 text-center text-sm text-gray-500 dark:text-gray-400">
|
||||
<p>设置会自动保存并在所有设备间同步</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
'use client';
|
||||
|
||||
import { Shield, ShieldOff } from 'lucide-react';
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
interface AdultContentFilterProps {
|
||||
userName: string;
|
||||
onUpdate?: (enabled: boolean) => void;
|
||||
}
|
||||
|
||||
const AdultContentFilter: React.FC<AdultContentFilterProps> = ({
|
||||
userName,
|
||||
onUpdate
|
||||
}) => {
|
||||
const [isEnabled, setIsEnabled] = useState(true); // 默认开启过滤
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// 获取用户设置
|
||||
useEffect(() => {
|
||||
const fetchUserSettings = async () => {
|
||||
if (!userName) return;
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/user/settings', {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${userName}`,
|
||||
},
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const data = await response.json();
|
||||
setIsEnabled(data.settings.filter_adult_content);
|
||||
} else {
|
||||
setError('获取用户设置失败');
|
||||
}
|
||||
} catch (err) {
|
||||
setError('网络连接失败');
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('Failed to fetch user settings:', err);
|
||||
}
|
||||
};
|
||||
|
||||
fetchUserSettings();
|
||||
}, [userName]);
|
||||
|
||||
// 更新用户设置
|
||||
const handleToggle = async () => {
|
||||
if (!userName || isLoading) return;
|
||||
|
||||
setIsLoading(true);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/user/settings', {
|
||||
method: 'PATCH',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${userName}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
settings: {
|
||||
filter_adult_content: !isEnabled,
|
||||
},
|
||||
}),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const newState = !isEnabled;
|
||||
setIsEnabled(newState);
|
||||
|
||||
// 强制刷新用户设置缓存 - 向搜索API发送一个空请求来刷新设置
|
||||
try {
|
||||
await fetch('/api/search?q=_cache_refresh_', {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${userName}`,
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
// 忽略刷新缓存的错误
|
||||
}
|
||||
|
||||
onUpdate?.(newState);
|
||||
} else {
|
||||
const errorData = await response.json();
|
||||
setError(errorData.error || '更新设置失败');
|
||||
}
|
||||
} catch (err) {
|
||||
setError('网络连接失败');
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('Failed to update user settings:', err);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-6">
|
||||
<div className="flex items-start justify-between">
|
||||
<div className="flex items-center space-x-3">
|
||||
<div className="flex items-center justify-center w-10 h-10 rounded-full bg-blue-100 dark:bg-blue-900">
|
||||
{isEnabled ? (
|
||||
<Shield className="w-5 h-5 text-blue-600 dark:text-blue-400" />
|
||||
) : (
|
||||
<ShieldOff className="w-5 h-5 text-gray-600 dark:text-gray-400" />
|
||||
)}
|
||||
</div>
|
||||
<div className="flex-1">
|
||||
<h3 className="text-lg font-medium text-gray-900 dark:text-white">
|
||||
成人内容过滤
|
||||
</h3>
|
||||
<p className="text-sm text-gray-500 dark:text-gray-400 mt-1">
|
||||
{isEnabled
|
||||
? '已开启过滤,将自动隐藏所有标记为"成人"的资源站及其内容'
|
||||
: '已关闭过滤,成人内容将在搜索结果中单独分组显示'
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center space-x-3">
|
||||
<button
|
||||
onClick={handleToggle}
|
||||
disabled={isLoading || !userName}
|
||||
className={`
|
||||
relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-white dark:focus:ring-offset-gray-800 disabled:opacity-50 disabled:cursor-not-allowed
|
||||
${isEnabled
|
||||
? 'bg-blue-600'
|
||||
: 'bg-gray-200 dark:bg-gray-700'
|
||||
}
|
||||
`}
|
||||
>
|
||||
<span
|
||||
className={`
|
||||
inline-block h-4 w-4 transform rounded-full bg-white transition-transform
|
||||
${isEnabled ? 'translate-x-6' : 'translate-x-1'}
|
||||
`}
|
||||
/>
|
||||
</button>
|
||||
|
||||
{isLoading && (
|
||||
<div className="w-5 h-5">
|
||||
<div className="animate-spin rounded-full h-5 w-5 border-b-2 border-blue-600"></div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mt-4 p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md">
|
||||
<p className="text-sm text-red-600 dark:text-red-400">{error}</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="mt-4 p-4 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-md">
|
||||
<div className="flex items-start">
|
||||
<div className="flex-shrink-0">
|
||||
<Shield className="w-5 h-5 text-amber-600 dark:text-amber-400" />
|
||||
</div>
|
||||
<div className="ml-3">
|
||||
<h4 className="text-sm font-medium text-amber-800 dark:text-amber-200">
|
||||
安全提示
|
||||
</h4>
|
||||
<p className="mt-1 text-sm text-amber-700 dark:text-amber-300">
|
||||
为了确保良好的使用体验和遵守相关法规,建议保持成人内容过滤开启。如需访问相关内容,请确保您已年满18周岁并承担相应法律责任。
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default AdultContentFilter;
|
||||
@@ -234,7 +234,7 @@ const EpisodeSelector: React.FC<EpisodeSelectorProps> = ({
|
||||
return (
|
||||
<div className='md:ml-2 px-4 py-0 h-full rounded-xl bg-black/10 dark:bg-white/5 flex flex-col border border-white/0 dark:border-white/30 overflow-hidden'>
|
||||
{/* 主要的 Tab 切换 - 无缝融入设计 */}
|
||||
<div className='flex mb-1 -mx-6 flex-shrink-0'>
|
||||
<div className='flex mb-0 -mx-6 flex-shrink-0'>
|
||||
{totalEpisodes > 1 && (
|
||||
<div
|
||||
onClick={() => setActiveTab('episodes')}
|
||||
@@ -267,7 +267,7 @@ const EpisodeSelector: React.FC<EpisodeSelectorProps> = ({
|
||||
{activeTab === 'episodes' && (
|
||||
<>
|
||||
{/* 分类标签 */}
|
||||
<div className='flex items-center gap-4 mb-4 border-b border-gray-300 dark:border-gray-700 -mx-6 px-6 flex-shrink-0'>
|
||||
<div className='flex items-center gap-4 mb-2 border-b border-gray-300 dark:border-gray-700 -mx-6 px-6 flex-shrink-0'>
|
||||
<div className='flex-1 overflow-x-auto' ref={categoryContainerRef}>
|
||||
<div className='flex gap-2 min-w-max'>
|
||||
{categories.map((label, idx) => {
|
||||
@@ -320,8 +320,8 @@ const EpisodeSelector: React.FC<EpisodeSelectorProps> = ({
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 集数网格 */}
|
||||
<div className='grid grid-cols-[repeat(auto-fill,minmax(40px,1fr))] auto-rows-[40px] gap-x-3 gap-y-3 overflow-y-auto h-full pb-4'>
|
||||
{/* 集数网格 - 优化为10行×5列布局 */}
|
||||
<div className='grid grid-cols-5 gap-3 pb-6 px-2'>
|
||||
{(() => {
|
||||
const len = currentEnd - currentStart + 1;
|
||||
const episodes = Array.from({ length: len }, (_, i) =>
|
||||
@@ -333,13 +333,18 @@ const EpisodeSelector: React.FC<EpisodeSelectorProps> = ({
|
||||
return (
|
||||
<button
|
||||
key={episodeNumber}
|
||||
onClick={() => handleEpisodeClick(episodeNumber)}
|
||||
className={`h-10 flex items-center justify-center text-sm font-medium rounded-md transition-all duration-200
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
handleEpisodeClick(episodeNumber);
|
||||
}}
|
||||
className={`w-full h-10 flex items-center justify-center text-sm font-medium rounded-lg transition-all duration-200 cursor-pointer
|
||||
${
|
||||
isActive
|
||||
? 'bg-green-500 text-white shadow-lg shadow-green-500/25 dark:bg-green-600'
|
||||
: 'bg-gray-200 text-gray-700 hover:bg-gray-300 hover:scale-105 dark:bg-white/10 dark:text-gray-300 dark:hover:bg-white/20'
|
||||
}`.trim()}
|
||||
type="button"
|
||||
>
|
||||
{episodeNumber}
|
||||
</button>
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
'use client';
|
||||
|
||||
import { ChevronLeft, ChevronRight } from 'lucide-react';
|
||||
import { useId, useMemo, useState } from 'react';
|
||||
|
||||
interface PaginatedRowProps {
|
||||
children: React.ReactNode[];
|
||||
itemsPerPage?: number;
|
||||
className?: string;
|
||||
onLoadMore?: () => Promise<void>; // 新增:加载更多数据的回调函数
|
||||
hasMoreData?: boolean; // 新增:是否还有更多数据可加载
|
||||
isLoading?: boolean; // 新增:是否正在加载中
|
||||
}
|
||||
|
||||
export default function PaginatedRow({
|
||||
children,
|
||||
itemsPerPage = 10,
|
||||
className = '',
|
||||
onLoadMore,
|
||||
hasMoreData = true,
|
||||
isLoading = false,
|
||||
}: PaginatedRowProps) {
|
||||
const [startIndex, setStartIndex] = useState(0);
|
||||
const [isHovered, setIsHovered] = useState(false);
|
||||
const uniqueId = useId(); // 为每个实例生成唯一ID
|
||||
|
||||
// 获取当前显示的项目 - 支持无限向前浏览
|
||||
const currentItems = useMemo(() => {
|
||||
const endIndex = startIndex + itemsPerPage;
|
||||
// 如果超出范围,循环显示
|
||||
if (endIndex <= children.length) {
|
||||
return children.slice(startIndex, endIndex);
|
||||
} else {
|
||||
// 当超出范围时,从头开始循环
|
||||
const firstPart = children.slice(startIndex);
|
||||
const secondPart = children.slice(0, endIndex - children.length);
|
||||
return [...firstPart, ...secondPart];
|
||||
}
|
||||
}, [children, startIndex, itemsPerPage]);
|
||||
|
||||
// 向前翻页 - 禁止超出第一页
|
||||
const handlePrevPage = () => {
|
||||
setStartIndex((prev) => {
|
||||
const newIndex = prev - itemsPerPage;
|
||||
return newIndex < 0 ? 0 : newIndex; // 不允许小于0
|
||||
});
|
||||
};
|
||||
|
||||
// 向后翻页 - 支持动态加载更多数据
|
||||
const handleNextPage = async () => {
|
||||
const newIndex = startIndex + itemsPerPage;
|
||||
|
||||
// 如果即将超出当前数据范围,且有更多数据可加载,且有加载回调函数
|
||||
if (newIndex >= children.length && hasMoreData && onLoadMore && !isLoading) {
|
||||
try {
|
||||
await onLoadMore(); // 加载更多数据
|
||||
// 加载完成后,直接设置到下一页
|
||||
setStartIndex(newIndex);
|
||||
} catch (error) {
|
||||
// 静默处理加载错误,保持用户体验
|
||||
}
|
||||
} else if (newIndex < children.length) {
|
||||
// 如果还在当前数据范围内,直接翻页
|
||||
setStartIndex(newIndex);
|
||||
} else {
|
||||
// 如果没有更多数据可加载,循环回到第一页
|
||||
setStartIndex(0);
|
||||
}
|
||||
};
|
||||
|
||||
// 检查是否可以向前翻页
|
||||
const canGoPrev = startIndex > 0;
|
||||
// 检查是否可以向后翻页:有更多数据或者当前不在最后一页
|
||||
const canGoNext = children.length > itemsPerPage && (startIndex + itemsPerPage < children.length || hasMoreData || startIndex + itemsPerPage >= children.length);
|
||||
|
||||
// 如果没有足够的内容需要分页,就不显示按钮
|
||||
const needsPagination = children.length > itemsPerPage;
|
||||
|
||||
return (
|
||||
<div
|
||||
className={`relative ${className}`}
|
||||
data-paginated-row={uniqueId}
|
||||
onMouseEnter={() => setIsHovered(true)}
|
||||
onMouseLeave={() => setIsHovered(false)}
|
||||
>
|
||||
{/* 内容区域 - 移除group类以避免悬停效果冲突 */}
|
||||
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4 relative'>
|
||||
{currentItems}
|
||||
|
||||
{/* 改进的导航按钮 - 仅在容器悬停时显示 */}
|
||||
{needsPagination && (
|
||||
<>
|
||||
{/* 左箭头按钮 - 只有不在第一页时才显示 */}
|
||||
{canGoPrev && (
|
||||
<button
|
||||
onClick={handlePrevPage}
|
||||
className={`absolute -left-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900 ${
|
||||
isHovered ? 'opacity-100' : 'opacity-0'
|
||||
}`}
|
||||
style={{
|
||||
// 确保按钮在两行中间
|
||||
top: 'calc(50% - 20px)',
|
||||
}}
|
||||
aria-label='上一页'
|
||||
>
|
||||
<ChevronLeft className='w-5 h-5 text-white' />
|
||||
</button>
|
||||
)}
|
||||
|
||||
{/* 右箭头按钮 - 总是显示,支持动态加载 */}
|
||||
{canGoNext && (
|
||||
<button
|
||||
onClick={handleNextPage}
|
||||
disabled={isLoading}
|
||||
className={`absolute -right-12 z-20 w-10 h-10 bg-gradient-to-r from-purple-500 to-purple-600 hover:from-purple-600 hover:to-purple-700 rounded-full shadow-lg hover:shadow-xl flex items-center justify-center transition-all duration-300 hover:scale-110 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-offset-2 dark:focus:ring-offset-gray-900 disabled:opacity-50 disabled:cursor-not-allowed ${
|
||||
isHovered ? 'opacity-100' : 'opacity-0'
|
||||
}`}
|
||||
style={{
|
||||
// 确保按钮在两行中间
|
||||
top: 'calc(50% - 20px)',
|
||||
}}
|
||||
aria-label={isLoading ? '加载中...' : '下一页'}
|
||||
>
|
||||
{isLoading ? (
|
||||
<div className='w-5 h-5 border-2 border-white border-t-transparent rounded-full animate-spin' />
|
||||
) : (
|
||||
<ChevronRight className='w-5 h-5 text-white' />
|
||||
)}
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 移除页码指示器 - 不再需要 */}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -43,7 +43,8 @@ export default function SkipController({
|
||||
const [batchSettings, setBatchSettings] = useState({
|
||||
openingStart: '0:00', // 片头开始时间(分:秒格式)
|
||||
openingEnd: '1:30', // 片头结束时间(分:秒格式,90秒=1分30秒)
|
||||
endingStart: '20:00', // 片尾开始时间(分:秒格式)
|
||||
endingMode: 'remaining', // 片尾模式:'remaining'(剩余时间) 或 'absolute'(绝对时间)
|
||||
endingStart: '2:00', // 片尾开始时间(剩余时间模式:还剩多少时间开始倒计时;绝对时间模式:从视频开始多长时间)
|
||||
endingEnd: '', // 片尾结束时间(可选,空表示直接跳转下一集)
|
||||
autoSkip: true, // 自动跳过开关
|
||||
autoNextEpisode: true, // 自动下一集开关
|
||||
@@ -300,30 +301,57 @@ export default function SkipController({
|
||||
if (batchSettings.endingStart) {
|
||||
const endingStartSeconds = timeToSeconds(batchSettings.endingStart);
|
||||
|
||||
// 根据模式计算实际的开始时间
|
||||
let actualStartSeconds: number;
|
||||
if (batchSettings.endingMode === 'remaining') {
|
||||
// 剩余时间模式:从视频总长度减去剩余时间
|
||||
actualStartSeconds = duration - endingStartSeconds;
|
||||
} else {
|
||||
// 绝对时间模式:使用输入的时间
|
||||
actualStartSeconds = endingStartSeconds;
|
||||
}
|
||||
|
||||
// 确保开始时间在有效范围内
|
||||
if (actualStartSeconds < 0) {
|
||||
actualStartSeconds = 0;
|
||||
} else if (actualStartSeconds >= duration) {
|
||||
alert(`片尾开始时间超出视频长度(总长:${secondsToTime(duration)})`);
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果没有设置结束时间,则直接跳转到下一集
|
||||
if (!batchSettings.endingEnd || batchSettings.endingEnd.trim() === '') {
|
||||
// 直接从指定时间跳转下一集
|
||||
segments.push({
|
||||
start: endingStartSeconds,
|
||||
start: actualStartSeconds,
|
||||
end: duration, // 设置为视频总长度
|
||||
type: 'ending',
|
||||
title: '片尾跳转下一集',
|
||||
title: batchSettings.endingMode === 'remaining'
|
||||
? `剩余${batchSettings.endingStart}时跳转下一集`
|
||||
: '片尾跳转下一集',
|
||||
autoSkip: batchSettings.autoSkip,
|
||||
autoNextEpisode: batchSettings.autoNextEpisode,
|
||||
});
|
||||
} else {
|
||||
let actualEndSeconds: number;
|
||||
const endingEndSeconds = timeToSeconds(batchSettings.endingEnd);
|
||||
|
||||
if (endingStartSeconds >= endingEndSeconds) {
|
||||
if (batchSettings.endingMode === 'remaining') {
|
||||
actualEndSeconds = duration - endingEndSeconds;
|
||||
} else {
|
||||
actualEndSeconds = endingEndSeconds;
|
||||
}
|
||||
|
||||
if (actualStartSeconds >= actualEndSeconds) {
|
||||
alert('片尾开始时间必须小于结束时间');
|
||||
return;
|
||||
}
|
||||
|
||||
segments.push({
|
||||
start: endingStartSeconds,
|
||||
end: endingEndSeconds,
|
||||
start: actualStartSeconds,
|
||||
end: actualEndSeconds,
|
||||
type: 'ending',
|
||||
title: '片尾',
|
||||
title: batchSettings.endingMode === 'remaining' ? '片尾(剩余时间模式)' : '片尾',
|
||||
autoSkip: batchSettings.autoSkip,
|
||||
autoNextEpisode: batchSettings.autoNextEpisode,
|
||||
});
|
||||
@@ -352,7 +380,8 @@ export default function SkipController({
|
||||
setBatchSettings({
|
||||
openingStart: '0:00',
|
||||
openingEnd: '1:30',
|
||||
endingStart: '20:00',
|
||||
endingMode: 'remaining',
|
||||
endingStart: '2:00',
|
||||
endingEnd: '',
|
||||
autoSkip: true,
|
||||
autoNextEpisode: true,
|
||||
@@ -363,7 +392,7 @@ export default function SkipController({
|
||||
console.error('保存跳过配置失败:', err);
|
||||
alert('保存失败,请重试');
|
||||
}
|
||||
}, [batchSettings, duration, source, id, title, onSettingModeChange, timeToSeconds]);
|
||||
}, [batchSettings, duration, source, id, title, onSettingModeChange, timeToSeconds, secondsToTime]);
|
||||
|
||||
// 删除跳过片段
|
||||
const handleDeleteSegment = useCallback(
|
||||
@@ -558,18 +587,60 @@ export default function SkipController({
|
||||
🎭 片尾设置
|
||||
</h4>
|
||||
|
||||
{/* 片尾模式选择 */}
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-2 text-gray-700 dark:text-gray-300">
|
||||
计时模式
|
||||
</label>
|
||||
<div className="flex gap-4">
|
||||
<label className="flex items-center">
|
||||
<input
|
||||
type="radio"
|
||||
name="endingMode"
|
||||
value="remaining"
|
||||
checked={batchSettings.endingMode === 'remaining'}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, endingMode: e.target.value})}
|
||||
className="mr-2"
|
||||
/>
|
||||
剩余时间(推荐)
|
||||
</label>
|
||||
<label className="flex items-center">
|
||||
<input
|
||||
type="radio"
|
||||
name="endingMode"
|
||||
value="absolute"
|
||||
checked={batchSettings.endingMode === 'absolute'}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, endingMode: e.target.value})}
|
||||
className="mr-2"
|
||||
/>
|
||||
绝对时间
|
||||
</label>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 mt-1">
|
||||
{batchSettings.endingMode === 'remaining'
|
||||
? '基于剩余时间倒计时(如:还剩2分钟时开始)'
|
||||
: '基于播放时间(如:播放到第20分钟时开始)'
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
|
||||
开始时间 (分:秒)
|
||||
{batchSettings.endingMode === 'remaining' ? '剩余时间 (分:秒)' : '开始时间 (分:秒)'}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={batchSettings.endingStart}
|
||||
onChange={(e) => setBatchSettings({...batchSettings, endingStart: e.target.value})}
|
||||
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
placeholder="20:00"
|
||||
placeholder={batchSettings.endingMode === 'remaining' ? '2:00' : '20:00'}
|
||||
/>
|
||||
<p className="text-xs text-gray-500 mt-1">从此时间开始检测片尾</p>
|
||||
<p className="text-xs text-gray-500 mt-1">
|
||||
{batchSettings.endingMode === 'remaining'
|
||||
? '当剩余时间达到此值时开始倒计时'
|
||||
: '从视频开始播放此时间后开始检测片尾'
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -615,7 +686,8 @@ export default function SkipController({
|
||||
setBatchSettings({
|
||||
openingStart: '0:00',
|
||||
openingEnd: '1:30',
|
||||
endingStart: '20:00',
|
||||
endingMode: 'remaining',
|
||||
endingStart: '2:00',
|
||||
endingEnd: '',
|
||||
autoSkip: true,
|
||||
autoNextEpisode: true,
|
||||
@@ -691,7 +763,7 @@ export default function SkipController({
|
||||
|
||||
{/* 管理已有片段 - 优化布局避免重叠 */}
|
||||
{skipConfig && skipConfig.segments && skipConfig.segments.length > 0 && !isSettingMode && (
|
||||
<div className="fixed bottom-4 right-4 z-[9998] max-w-sm bg-white/95 dark:bg-gray-800/95 backdrop-blur-sm rounded-lg shadow-lg border border-gray-200 dark:border-gray-600 animate-fade-in">
|
||||
<div className="fixed bottom-4 left-4 z-[9998] max-w-sm bg-white/95 dark:bg-gray-800/95 backdrop-blur-sm rounded-lg shadow-lg border border-gray-200 dark:border-gray-600 animate-fade-in">
|
||||
<div className="p-3">
|
||||
<h4 className="font-medium mb-2 text-gray-900 dark:text-gray-100 text-sm flex items-center">
|
||||
<svg className="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
|
||||
@@ -0,0 +1,288 @@
|
||||
/* eslint-disable no-console, @typescript-eslint/no-explicit-any */
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
// 临时内联认证函数,避免导入问题
|
||||
function getAuthInfoFromBrowserCookie(): {
|
||||
password?: string;
|
||||
username?: string;
|
||||
signature?: string;
|
||||
timestamp?: number;
|
||||
} | null {
|
||||
if (typeof window === 'undefined') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const cookies = document.cookie.split(';');
|
||||
const authCookie = cookies.find(cookie => cookie.trim().startsWith('auth='));
|
||||
|
||||
if (!authCookie) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
const cookieValue = authCookie.split('=')[1];
|
||||
const decoded = decodeURIComponent(cookieValue);
|
||||
const authData = JSON.parse(decoded);
|
||||
return authData;
|
||||
} catch (error) {
|
||||
console.error('Failed to parse auth cookie:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
interface UserInfo {
|
||||
username: string;
|
||||
role: string;
|
||||
created_at: string;
|
||||
filter_adult_content: boolean;
|
||||
can_disable_filter: boolean;
|
||||
managed_by_admin: boolean;
|
||||
last_filter_change?: string;
|
||||
}
|
||||
|
||||
export default function UserManagement() {
|
||||
const [users, setUsers] = useState<UserInfo[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [currentUser, setCurrentUser] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
// 获取当前用户信息
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (authInfo?.username) {
|
||||
setCurrentUser(authInfo.username);
|
||||
loadUsers();
|
||||
} else {
|
||||
setError('未登录或权限不足');
|
||||
setLoading(false);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const loadUsers = async () => {
|
||||
try {
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
throw new Error('未获取到用户认证信息');
|
||||
}
|
||||
|
||||
const response = await fetch('/api/admin/users', {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${encodeURIComponent(authInfo.username)}`,
|
||||
'Cache-Control': 'no-cache'
|
||||
}
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
throw new Error(errorData.error || '获取用户列表失败');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
setUsers(data.users || []);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '未知错误');
|
||||
console.error('加载用户列表失败:', err);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const updateUserSettings = async (username: string, action: string, settings?: any) => {
|
||||
try {
|
||||
const authInfo = getAuthInfoFromBrowserCookie();
|
||||
if (!authInfo?.username) {
|
||||
throw new Error('未获取到用户认证信息');
|
||||
}
|
||||
|
||||
const response = await fetch('/api/admin/users', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${encodeURIComponent(authInfo.username)}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
action,
|
||||
username,
|
||||
settings
|
||||
})
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
throw new Error(errorData.error || '操作失败');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
alert(data.message || '操作成功');
|
||||
|
||||
// 重新加载用户列表
|
||||
await loadUsers();
|
||||
} catch (err) {
|
||||
const errorMsg = err instanceof Error ? err.message : '未知错误';
|
||||
alert(`操作失败: ${errorMsg}`);
|
||||
console.error('用户管理操作失败:', err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleForceFilter = (username: string) => {
|
||||
if (confirm(`确定要强制开启用户 ${username} 的成人内容过滤功能吗?`)) {
|
||||
updateUserSettings(username, 'force_filter');
|
||||
}
|
||||
};
|
||||
|
||||
const handleAllowDisable = (username: string) => {
|
||||
if (confirm(`确定要允许用户 ${username} 自己管理过滤设置吗?`)) {
|
||||
updateUserSettings(username, 'allow_disable');
|
||||
}
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="flex items-center justify-center h-40">
|
||||
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-green-500"></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md p-4">
|
||||
<div className="text-red-600 dark:text-red-400">{error}</div>
|
||||
<button
|
||||
onClick={loadUsers}
|
||||
className="mt-2 text-sm text-red-600 dark:text-red-400 underline hover:no-underline"
|
||||
>
|
||||
重试
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div className="flex items-center justify-between">
|
||||
<h2 className="text-xl font-bold text-gray-800 dark:text-gray-200">
|
||||
用户管理
|
||||
</h2>
|
||||
<div className="text-sm text-gray-600 dark:text-gray-400">
|
||||
总计 {users.length} 个用户
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-white dark:bg-gray-800 rounded-lg shadow overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
|
||||
<thead className="bg-gray-50 dark:bg-gray-900">
|
||||
<tr>
|
||||
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
|
||||
用户名
|
||||
</th>
|
||||
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
|
||||
角色
|
||||
</th>
|
||||
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
|
||||
成人内容过滤
|
||||
</th>
|
||||
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
|
||||
管理状态
|
||||
</th>
|
||||
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
|
||||
操作
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700">
|
||||
{users.map((user) => (
|
||||
<tr key={user.username} className="hover:bg-gray-50 dark:hover:bg-gray-700">
|
||||
<td className="px-6 py-4 whitespace-nowrap">
|
||||
<div className="flex items-center">
|
||||
<div className="text-sm font-medium text-gray-900 dark:text-gray-100">
|
||||
{user.username}
|
||||
</div>
|
||||
{user.username === currentUser && (
|
||||
<span className="ml-2 px-2 py-1 text-xs bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200 rounded-full">
|
||||
当前用户
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</td>
|
||||
<td className="px-6 py-4 whitespace-nowrap">
|
||||
<span className={`inline-flex px-2 py-1 text-xs font-semibold rounded-full ${
|
||||
user.role === 'owner'
|
||||
? 'bg-purple-100 dark:bg-purple-900 text-purple-800 dark:text-purple-200'
|
||||
: 'bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-300'
|
||||
}`}>
|
||||
{user.role === 'owner' ? '站长' : '用户'}
|
||||
</span>
|
||||
</td>
|
||||
<td className="px-6 py-4 whitespace-nowrap">
|
||||
<div className="flex items-center">
|
||||
<span className={`inline-flex px-2 py-1 text-xs font-semibold rounded-full ${
|
||||
user.filter_adult_content
|
||||
? 'bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200'
|
||||
: 'bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-200'
|
||||
}`}>
|
||||
{user.filter_adult_content ? '已开启' : '已关闭'}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
|
||||
{user.managed_by_admin ? (
|
||||
<span className="text-orange-600 dark:text-orange-400">管理员控制</span>
|
||||
) : user.can_disable_filter ? (
|
||||
<span className="text-green-600 dark:text-green-400">用户自主</span>
|
||||
) : (
|
||||
<span className="text-gray-600 dark:text-gray-400">受限制</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="px-6 py-4 whitespace-nowrap text-sm font-medium">
|
||||
{user.role !== 'owner' && user.username !== currentUser && (
|
||||
<div className="flex space-x-2">
|
||||
{!user.filter_adult_content || !user.managed_by_admin ? (
|
||||
<button
|
||||
onClick={() => handleForceFilter(user.username)}
|
||||
className="text-red-600 hover:text-red-900 dark:text-red-400 dark:hover:text-red-300"
|
||||
>
|
||||
强制过滤
|
||||
</button>
|
||||
) : null}
|
||||
{user.managed_by_admin || !user.can_disable_filter ? (
|
||||
<button
|
||||
onClick={() => handleAllowDisable(user.username)}
|
||||
className="text-green-600 hover:text-green-900 dark:text-green-400 dark:hover:text-green-300"
|
||||
>
|
||||
允许自主
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{users.length === 0 && (
|
||||
<div className="text-center py-12 text-gray-500 dark:text-gray-400">
|
||||
暂无用户数据
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-md p-4">
|
||||
<h3 className="text-sm font-medium text-blue-800 dark:text-blue-200 mb-2">
|
||||
说明
|
||||
</h3>
|
||||
<ul className="text-sm text-blue-600 dark:text-blue-300 space-y-1">
|
||||
<li>• <strong>强制过滤</strong>:开启用户的成人内容过滤,用户无法自己关闭</li>
|
||||
<li>• <strong>允许自主</strong>:允许用户自己管理成人内容过滤设置</li>
|
||||
<li>• 站长账户默认具有所有权限,无法被其他用户管理</li>
|
||||
<li>• 管理员控制的用户无法在用户设置中关闭成人内容过滤</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+13
-12
@@ -2,7 +2,7 @@
|
||||
|
||||
'use client';
|
||||
|
||||
import { KeyRound, LogOut, Settings, Shield, Tv, User, X } from 'lucide-react';
|
||||
import { Filter, KeyRound, LogOut, Settings, Shield, User, X } from 'lucide-react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
@@ -149,11 +149,6 @@ export const UserMenu: React.FC = () => {
|
||||
router.push('/admin');
|
||||
};
|
||||
|
||||
const handleTVBoxConfig = () => {
|
||||
setIsOpen(false);
|
||||
router.push('/config');
|
||||
};
|
||||
|
||||
const handleChangePassword = () => {
|
||||
setIsOpen(false);
|
||||
setIsChangePasswordOpen(true);
|
||||
@@ -213,12 +208,18 @@ export const UserMenu: React.FC = () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 处理设置点击
|
||||
const handleSettings = () => {
|
||||
setIsOpen(false);
|
||||
setIsSettingsOpen(true);
|
||||
};
|
||||
|
||||
const handleCloseSettings = () => {
|
||||
// 处理内容过滤设置
|
||||
const handleContentFilter = () => {
|
||||
setIsOpen(false);
|
||||
// 跳转到内容过滤设置页面
|
||||
router.push('/settings');
|
||||
}; const handleCloseSettings = () => {
|
||||
setIsSettingsOpen(false);
|
||||
};
|
||||
|
||||
@@ -365,16 +366,16 @@ export const UserMenu: React.FC = () => {
|
||||
className='w-full px-3 py-2 text-left flex items-center gap-2.5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors text-sm'
|
||||
>
|
||||
<Settings className='w-4 h-4 text-gray-500 dark:text-gray-400' />
|
||||
<span className='font-medium'>设置</span>
|
||||
<span className='font-medium'>本地设置</span>
|
||||
</button>
|
||||
|
||||
{/* TVBox配置按钮 */}
|
||||
{/* 内容过滤按钮 */}
|
||||
<button
|
||||
onClick={handleTVBoxConfig}
|
||||
onClick={handleContentFilter}
|
||||
className='w-full px-3 py-2 text-left flex items-center gap-2.5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors text-sm'
|
||||
>
|
||||
<Tv className='w-4 h-4 text-gray-500 dark:text-gray-400' />
|
||||
<span className='font-medium'>TVBox配置</span>
|
||||
<Filter className='w-4 h-4 text-gray-500 dark:text-gray-400' />
|
||||
<span className='font-medium'>内容过滤</span>
|
||||
</button>
|
||||
|
||||
{/* 管理面板按钮 */}
|
||||
|
||||
@@ -228,7 +228,7 @@ export default function VideoCard({
|
||||
const configs = {
|
||||
playrecord: {
|
||||
showSourceName: true,
|
||||
showProgress: true,
|
||||
showProgress: false,
|
||||
showPlayButton: true,
|
||||
showHeart: true,
|
||||
showCheckCircle: true,
|
||||
|
||||
@@ -22,6 +22,7 @@ export interface AdminConfig {
|
||||
detail?: string;
|
||||
from: 'config' | 'custom';
|
||||
disabled?: boolean;
|
||||
is_adult?: boolean; // 新增:是否为成人内容资源站
|
||||
}[];
|
||||
}
|
||||
|
||||
|
||||
+124
-12
@@ -1,8 +1,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any, no-console, @typescript-eslint/no-non-null-assertion */
|
||||
|
||||
import { getStorage } from '@/lib/db';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { getStorage } from './db';
|
||||
import runtimeConfig from './runtime';
|
||||
|
||||
export interface ApiSite {
|
||||
@@ -101,6 +100,7 @@ async function initConfig() {
|
||||
detail: site.detail,
|
||||
from: 'config',
|
||||
disabled: false,
|
||||
is_adult: (site as any).is_adult || false, // 确保 is_adult 字段被正确处理
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -110,6 +110,12 @@ async function initConfig() {
|
||||
adminConfig.SourceConfig.forEach((source) => {
|
||||
if (!apiSiteKeys.has(source.key)) {
|
||||
source.from = 'custom';
|
||||
} else {
|
||||
// 更新现有源的 is_adult 字段
|
||||
const siteConfig = fileConfig.api_site[source.key];
|
||||
if (siteConfig) {
|
||||
source.is_adult = (siteConfig as any).is_adult || false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -172,6 +178,7 @@ async function initConfig() {
|
||||
detail: site.detail,
|
||||
from: 'config',
|
||||
disabled: false,
|
||||
is_adult: (site as any).is_adult || false, // 确保 is_adult 字段被正确处理
|
||||
})),
|
||||
};
|
||||
}
|
||||
@@ -218,19 +225,24 @@ async function initConfig() {
|
||||
|
||||
export async function getConfig(): Promise<AdminConfig> {
|
||||
const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
|
||||
|
||||
if (process.env.DOCKER_ENV === 'true' || storageType === 'localstorage') {
|
||||
await initConfig();
|
||||
return cachedConfig;
|
||||
}
|
||||
|
||||
// 非 docker 环境且 DB 存储,直接读 db 配置
|
||||
const storage = getStorage();
|
||||
let adminConfig: AdminConfig | null = null;
|
||||
if (storage && typeof (storage as any).getAdminConfig === 'function') {
|
||||
adminConfig = await (storage as any).getAdminConfig();
|
||||
}
|
||||
if (adminConfig) {
|
||||
// 合并一些环境变量配置
|
||||
adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || 'KatelyaTV';
|
||||
try {
|
||||
const storage = getStorage();
|
||||
let adminConfig: AdminConfig | null = null;
|
||||
|
||||
if (storage && typeof (storage as any).getAdminConfig === 'function') {
|
||||
adminConfig = await (storage as any).getAdminConfig();
|
||||
}
|
||||
|
||||
if (adminConfig) {
|
||||
// 合并一些环境变量配置
|
||||
adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || 'KatelyaTV';
|
||||
adminConfig.SiteConfig.Announcement =
|
||||
process.env.ANNOUNCEMENT ||
|
||||
'本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。';
|
||||
@@ -254,6 +266,7 @@ export async function getConfig(): Promise<AdminConfig> {
|
||||
detail: site.detail,
|
||||
from: 'config',
|
||||
disabled: false,
|
||||
is_adult: (site as any).is_adult || false, // 确保处理 is_adult 字段
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -263,6 +276,12 @@ export async function getConfig(): Promise<AdminConfig> {
|
||||
adminConfig.SourceConfig.forEach((source) => {
|
||||
if (!apiSiteKeys.has(source.key)) {
|
||||
source.from = 'custom';
|
||||
} else {
|
||||
// 更新现有源的 is_adult 字段
|
||||
const siteConfig = fileConfig.api_site[source.key];
|
||||
if (siteConfig) {
|
||||
source.is_adult = (siteConfig as any).is_adult || false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -292,6 +311,11 @@ export async function getConfig(): Promise<AdminConfig> {
|
||||
await initConfig();
|
||||
}
|
||||
return cachedConfig;
|
||||
} catch (error) {
|
||||
// 如果数据库访问失败,回退到默认配置
|
||||
await initConfig();
|
||||
return cachedConfig;
|
||||
}
|
||||
}
|
||||
|
||||
export async function resetConfig() {
|
||||
@@ -378,9 +402,97 @@ export async function getCacheTime(): Promise<number> {
|
||||
return config.SiteConfig.SiteInterfaceCacheTime || 7200;
|
||||
}
|
||||
|
||||
export async function getAvailableApiSites(): Promise<ApiSite[]> {
|
||||
export async function getAvailableApiSites(filterAdult = false): Promise<ApiSite[]> {
|
||||
const config = await getConfig();
|
||||
return config.SourceConfig.filter((s) => !s.disabled).map((s) => ({
|
||||
|
||||
// 防御性检查:确保 SourceConfig 存在且为数组
|
||||
if (!config.SourceConfig || !Array.isArray(config.SourceConfig)) {
|
||||
console.warn('SourceConfig is missing or not an array, returning empty array');
|
||||
return [];
|
||||
}
|
||||
|
||||
// 防御性处理:为每个源确保 is_adult 字段存在
|
||||
let sites = config.SourceConfig
|
||||
.filter((s) => !s.disabled)
|
||||
.map((s) => ({
|
||||
...s,
|
||||
is_adult: s.is_adult === true // 严格检查,只有明确为 true 的才是成人内容
|
||||
}));
|
||||
|
||||
// 如果需要过滤成人内容,则排除标记为成人内容的资源站
|
||||
if (filterAdult) {
|
||||
sites = sites.filter((s) => !s.is_adult);
|
||||
}
|
||||
|
||||
return sites.map((s) => ({
|
||||
key: s.key,
|
||||
name: s.name,
|
||||
api: s.api,
|
||||
detail: s.detail,
|
||||
}));
|
||||
}
|
||||
|
||||
// 根据用户设置动态获取可用资源站(你的想法实现)
|
||||
export async function getFilteredApiSites(userName?: string): Promise<ApiSite[]> {
|
||||
const config = await getConfig();
|
||||
|
||||
// 防御性检查:确保 SourceConfig 存在且为数组
|
||||
if (!config.SourceConfig || !Array.isArray(config.SourceConfig)) {
|
||||
console.warn('SourceConfig is missing or not an array, returning empty array');
|
||||
return [];
|
||||
}
|
||||
|
||||
// 默认过滤成人内容
|
||||
let shouldFilterAdult = true;
|
||||
|
||||
// 如果提供了用户名,获取用户设置
|
||||
if (userName) {
|
||||
try {
|
||||
const storage = getStorage();
|
||||
const userSettings = await storage.getUserSettings(userName);
|
||||
shouldFilterAdult = userSettings?.filter_adult_content !== false; // 默认为 true
|
||||
} catch (error) {
|
||||
// 获取用户设置失败时,默认过滤成人内容
|
||||
console.warn('Failed to get user settings, using default filter:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// 防御性处理:为每个源确保 is_adult 字段存在
|
||||
let sites = config.SourceConfig
|
||||
.filter((s) => !s.disabled)
|
||||
.map((s) => ({
|
||||
...s,
|
||||
is_adult: s.is_adult === true // 严格检查,只有明确为 true 的才是成人内容
|
||||
}));
|
||||
|
||||
// 根据用户设置动态过滤成人内容源
|
||||
if (shouldFilterAdult) {
|
||||
sites = sites.filter((s) => !s.is_adult);
|
||||
}
|
||||
|
||||
return sites.map((s) => ({
|
||||
key: s.key,
|
||||
name: s.name,
|
||||
api: s.api,
|
||||
detail: s.detail,
|
||||
}));
|
||||
}
|
||||
|
||||
// 获取成人内容资源站
|
||||
export async function getAdultApiSites(): Promise<ApiSite[]> {
|
||||
const config = await getConfig();
|
||||
|
||||
// 防御性检查:确保 SourceConfig 存在且为数组
|
||||
if (!config.SourceConfig || !Array.isArray(config.SourceConfig)) {
|
||||
console.warn('SourceConfig is missing or not an array, returning empty array');
|
||||
return [];
|
||||
}
|
||||
|
||||
// 防御性处理:严格检查成人内容标记
|
||||
const adultSites = config.SourceConfig
|
||||
.filter((s) => !s.disabled && s.is_adult === true); // 只有明确为 true 的才被认为是成人内容
|
||||
|
||||
return adultSites.map((s) => ({
|
||||
key: s.key,
|
||||
name: s.name,
|
||||
api: s.api,
|
||||
|
||||
+89
-9
@@ -1,7 +1,7 @@
|
||||
/* eslint-disable no-console, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord, User, UserSettings } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -39,7 +39,21 @@ interface D1ExecResult {
|
||||
|
||||
// 获取全局D1数据库实例
|
||||
function getD1Database(): D1Database {
|
||||
return (process.env as any).DB as D1Database;
|
||||
// 在 Cloudflare Pages 环境中,DB 通过全局绑定可用
|
||||
if (typeof globalThis !== 'undefined') {
|
||||
// 尝试直接访问全局 DB
|
||||
const globalDB = (globalThis as any).DB;
|
||||
if (globalDB) {
|
||||
return globalDB as D1Database;
|
||||
}
|
||||
}
|
||||
|
||||
// 回退到 process.env(用于本地开发)
|
||||
if (process.env.DB) {
|
||||
return (process.env as any).DB as D1Database;
|
||||
}
|
||||
|
||||
throw new Error('D1 database not available');
|
||||
}
|
||||
|
||||
export class D1Storage implements IStorage {
|
||||
@@ -428,14 +442,20 @@ export class D1Storage implements IStorage {
|
||||
}
|
||||
|
||||
// 用户列表
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
async getAllUsers(): Promise<User[]> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
const result = await db
|
||||
.prepare('SELECT username FROM users ORDER BY created_at ASC')
|
||||
.all<{ username: string }>();
|
||||
.prepare('SELECT username, created_at FROM users ORDER BY created_at ASC')
|
||||
.all<{ username: string; created_at: string }>();
|
||||
|
||||
return result.results.map((row) => row.username);
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
|
||||
return result.results.map((row) => ({
|
||||
username: row.username,
|
||||
role: row.username === ownerUsername ? 'owner' : 'user',
|
||||
created_at: row.created_at
|
||||
}));
|
||||
} catch (err) {
|
||||
console.error('Failed to get all users:', err);
|
||||
throw err;
|
||||
@@ -447,7 +467,8 @@ export class D1Storage implements IStorage {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
const result = await db
|
||||
.prepare('SELECT config FROM admin_config WHERE id = 1')
|
||||
.prepare('SELECT config_value as config FROM admin_configs WHERE config_key = ? LIMIT 1')
|
||||
.bind('main_config')
|
||||
.first<{ config: string }>();
|
||||
|
||||
if (!result) return null;
|
||||
@@ -464,9 +485,9 @@ export class D1Storage implements IStorage {
|
||||
const db = await this.getDatabase();
|
||||
await db
|
||||
.prepare(
|
||||
'INSERT OR REPLACE INTO admin_config (id, config) VALUES (1, ?)'
|
||||
'INSERT OR REPLACE INTO admin_configs (config_key, config_value, description) VALUES (?, ?, ?)'
|
||||
)
|
||||
.bind(JSON.stringify(config))
|
||||
.bind('main_config', JSON.stringify(config), '主要管理员配置')
|
||||
.run();
|
||||
} catch (err) {
|
||||
console.error('Failed to set admin config:', err);
|
||||
@@ -573,4 +594,63 @@ export class D1Storage implements IStorage {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 用户设置 ----------
|
||||
async getUserSettings(userName: string): Promise<UserSettings | null> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
const row = await db
|
||||
.prepare('SELECT settings FROM user_settings WHERE username = ?')
|
||||
.bind(userName)
|
||||
.first();
|
||||
|
||||
if (row && row.settings) {
|
||||
return JSON.parse(row.settings as string) as UserSettings;
|
||||
}
|
||||
return null;
|
||||
} catch (err) {
|
||||
console.error('Failed to get user settings:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async setUserSettings(
|
||||
userName: string,
|
||||
settings: UserSettings
|
||||
): Promise<void> {
|
||||
try {
|
||||
const db = await this.getDatabase();
|
||||
await db
|
||||
.prepare(`
|
||||
INSERT OR REPLACE INTO user_settings (username, settings, updated_time)
|
||||
VALUES (?, ?, ?)
|
||||
`)
|
||||
.bind(userName, JSON.stringify(settings), Date.now())
|
||||
.run();
|
||||
} catch (err) {
|
||||
console.error('Failed to set user settings:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async updateUserSettings(
|
||||
userName: string,
|
||||
settings: Partial<UserSettings>
|
||||
): Promise<void> {
|
||||
const current = await this.getUserSettings(userName);
|
||||
const defaultSettings: UserSettings = {
|
||||
filter_adult_content: true,
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: false,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
const updated: UserSettings = {
|
||||
...defaultSettings,
|
||||
...current,
|
||||
...settings,
|
||||
filter_adult_content: settings.filter_adult_content ?? current?.filter_adult_content ?? true
|
||||
};
|
||||
await this.setUserSettings(userName, updated);
|
||||
}
|
||||
}
|
||||
|
||||
+28
-13
@@ -20,19 +20,34 @@ const STORAGE_TYPE =
|
||||
|
||||
// 创建存储实例
|
||||
function createStorage(): IStorage {
|
||||
switch (STORAGE_TYPE) {
|
||||
case 'redis':
|
||||
return new RedisStorage();
|
||||
case 'kvrocks':
|
||||
return new KvrocksStorage();
|
||||
case 'upstash':
|
||||
return new UpstashRedisStorage();
|
||||
case 'd1':
|
||||
return new D1Storage();
|
||||
case 'localstorage':
|
||||
default:
|
||||
// 使用 LocalStorage 实现,适用于本地开发和简单部署
|
||||
return new LocalStorage();
|
||||
const storageType = STORAGE_TYPE;
|
||||
|
||||
try {
|
||||
switch (storageType) {
|
||||
case 'redis':
|
||||
return new RedisStorage();
|
||||
case 'kvrocks':
|
||||
return new KvrocksStorage();
|
||||
case 'upstash':
|
||||
return new UpstashRedisStorage();
|
||||
case 'd1':
|
||||
// 对于 d1,先检查是否可用
|
||||
if (typeof globalThis !== 'undefined' && (globalThis as any).DB) {
|
||||
return new D1Storage();
|
||||
} else if (process.env.DB) {
|
||||
return new D1Storage();
|
||||
} else {
|
||||
// D1 不可用,回退到 LocalStorage
|
||||
return new LocalStorage();
|
||||
}
|
||||
case 'localstorage':
|
||||
default:
|
||||
// 使用 LocalStorage 实现,适用于本地开发和简单部署
|
||||
return new LocalStorage();
|
||||
}
|
||||
} catch (error) {
|
||||
// 创建存储失败,回退到 LocalStorage
|
||||
return new LocalStorage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+82
-7
@@ -3,7 +3,7 @@
|
||||
import { createClient, RedisClientType } from 'redis';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord, User, UserSettings } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -266,9 +266,31 @@ export class KvrocksStorage implements IStorage {
|
||||
});
|
||||
}
|
||||
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
const users = await withRetry(() => this.client.sMembers(this.userListKey()));
|
||||
return ensureStringArray(users);
|
||||
async getAllUsers(): Promise<User[]> {
|
||||
const usernames = await withRetry(() => this.client.sMembers(this.userListKey()));
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
|
||||
const users = await Promise.all(
|
||||
usernames.map(async (username) => {
|
||||
let created_at = '';
|
||||
try {
|
||||
const userData = await this.getUser(username);
|
||||
if (userData?.created_at) {
|
||||
created_at = new Date(userData.created_at).toISOString();
|
||||
}
|
||||
} catch (err) {
|
||||
// 忽略错误,使用空字符串
|
||||
}
|
||||
|
||||
return {
|
||||
username,
|
||||
role: username === ownerUsername ? 'owner' : 'user',
|
||||
created_at
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return users;
|
||||
}
|
||||
|
||||
async registerUser(userName: string, password: string): Promise<void> {
|
||||
@@ -337,6 +359,48 @@ export class KvrocksStorage implements IStorage {
|
||||
this.client.set(this.adminConfigKey(), JSON.stringify(config))
|
||||
);
|
||||
}
|
||||
|
||||
// ---------- 用户设置 ----------
|
||||
private userSettingsKey(userName: string) {
|
||||
return `u:${userName}:settings`;
|
||||
}
|
||||
|
||||
async getUserSettings(userName: string): Promise<UserSettings | null> {
|
||||
const val = await withRetry(() =>
|
||||
this.client.get(this.userSettingsKey(userName))
|
||||
);
|
||||
return val ? (JSON.parse(val) as UserSettings) : null;
|
||||
}
|
||||
|
||||
async setUserSettings(
|
||||
userName: string,
|
||||
settings: UserSettings
|
||||
): Promise<void> {
|
||||
await withRetry(() =>
|
||||
this.client.set(this.userSettingsKey(userName), JSON.stringify(settings))
|
||||
);
|
||||
}
|
||||
|
||||
async updateUserSettings(
|
||||
userName: string,
|
||||
settings: Partial<UserSettings>
|
||||
): Promise<void> {
|
||||
const current = await this.getUserSettings(userName);
|
||||
const defaultSettings: UserSettings = {
|
||||
filter_adult_content: true,
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: false,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
const updated: UserSettings = {
|
||||
...defaultSettings,
|
||||
...current,
|
||||
...settings,
|
||||
filter_adult_content: settings.filter_adult_content ?? current?.filter_adult_content ?? true
|
||||
};
|
||||
await this.setUserSettings(userName, updated);
|
||||
}
|
||||
}
|
||||
|
||||
// Kvrocks客户端单例
|
||||
@@ -351,10 +415,11 @@ export function getKvrocksClient(): RedisClientType {
|
||||
|
||||
console.log('🏪 Initializing Kvrocks client...');
|
||||
console.log('🔗 Kvrocks URL:', kvrocksUrl.replace(/\/\/.*@/, '//***:***@'));
|
||||
console.log('🔑 Password configured:', kvrocksPassword ? 'Yes' : 'No');
|
||||
|
||||
kvrocksClient = createClient({
|
||||
// 构建客户端配置
|
||||
const clientConfig: any = {
|
||||
url: kvrocksUrl,
|
||||
password: kvrocksPassword,
|
||||
database: kvrocksDatabase,
|
||||
socket: {
|
||||
connectTimeout: 10000, // 10秒连接超时
|
||||
@@ -364,7 +429,17 @@ export function getKvrocksClient(): RedisClientType {
|
||||
return delay;
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
// 只有当密码存在且不为空时才添加密码配置
|
||||
if (kvrocksPassword && kvrocksPassword.trim() !== '') {
|
||||
clientConfig.password = kvrocksPassword;
|
||||
console.log('🔐 Using password authentication');
|
||||
} else {
|
||||
console.log('🔓 No password authentication (connecting without password)');
|
||||
}
|
||||
|
||||
kvrocksClient = createClient(clientConfig);
|
||||
|
||||
kvrocksClient.on('error', (err) => {
|
||||
console.error('❌ Kvrocks Client Error:', err);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* eslint-disable no-console */
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord, User, UserSettings } from './types';
|
||||
|
||||
/**
|
||||
* LocalStorage 存储实现
|
||||
@@ -290,19 +290,89 @@ export class LocalStorage implements IStorage {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 用户设置 ----------
|
||||
async getUserSettings(userName: string): Promise<UserSettings | null> {
|
||||
if (typeof window === 'undefined') return null;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('settings', userName);
|
||||
const data = localStorage.getItem(storageKey);
|
||||
if (data) {
|
||||
return JSON.parse(data);
|
||||
}
|
||||
|
||||
// 如果用户设置不存在,返回默认设置
|
||||
const defaultSettings: UserSettings = {
|
||||
filter_adult_content: true, // 默认开启成人内容过滤
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: true,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
|
||||
return defaultSettings;
|
||||
} catch (error) {
|
||||
console.error('Error getting user settings:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async setUserSettings(userName: string, settings: UserSettings): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const storageKey = this.getStorageKey('settings', userName);
|
||||
localStorage.setItem(storageKey, JSON.stringify(settings));
|
||||
} catch (error) {
|
||||
console.error('Error setting user settings:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async updateUserSettings(userName: string, settings: Partial<UserSettings>): Promise<void> {
|
||||
if (typeof window === 'undefined') return;
|
||||
|
||||
try {
|
||||
const currentSettings = await this.getUserSettings(userName);
|
||||
const updatedSettings = { ...currentSettings, ...settings };
|
||||
await this.setUserSettings(userName, updatedSettings as UserSettings);
|
||||
} catch (error) {
|
||||
console.error('Error updating user settings:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 管理员功能 ----------
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
async getAllUsers(): Promise<User[]> {
|
||||
if (typeof window === 'undefined') return [];
|
||||
|
||||
try {
|
||||
const users: string[] = [];
|
||||
const users: User[] = [];
|
||||
const prefix = 'katelyatv_user_';
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
|
||||
for (let i = 0; i < localStorage.length; i++) {
|
||||
const storageKey = localStorage.key(i);
|
||||
if (storageKey && storageKey.startsWith(prefix)) {
|
||||
const userName = storageKey.replace(prefix, '');
|
||||
users.push(userName);
|
||||
const username = storageKey.replace(prefix, '');
|
||||
|
||||
// 尝试获取用户创建时间
|
||||
let created_at = '';
|
||||
try {
|
||||
const userDataStr = localStorage.getItem(storageKey);
|
||||
if (userDataStr) {
|
||||
const userData = JSON.parse(userDataStr);
|
||||
if (userData.created_at) {
|
||||
created_at = new Date(userData.created_at).toISOString();
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
// 忽略解析错误
|
||||
}
|
||||
|
||||
users.push({
|
||||
username,
|
||||
role: username === ownerUsername ? 'owner' : 'user',
|
||||
created_at
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +435,7 @@ export class LocalStorage implements IStorage {
|
||||
localStorage.removeItem(userKey);
|
||||
|
||||
// 删除用户相关的所有数据
|
||||
const prefixes = ['playrecord', 'favorite', 'searchhistory', 'skipconfig'];
|
||||
const prefixes = ['playrecord', 'favorite', 'searchhistory', 'skipconfig', 'settings'];
|
||||
|
||||
for (const prefix of prefixes) {
|
||||
const dataPrefix = this.getStorageKey(prefix, userName);
|
||||
|
||||
+74
-3
@@ -3,7 +3,7 @@
|
||||
import { createClient, RedisClientType } from 'redis';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord, User, UserSettings } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -223,6 +223,50 @@ export class RedisStorage implements IStorage {
|
||||
if (favoriteKeys.length > 0) {
|
||||
await withRetry(() => this.client.del(favoriteKeys));
|
||||
}
|
||||
|
||||
// 删除用户设置
|
||||
await withRetry(() => this.client.del(this.userSettingsKey(userName)));
|
||||
}
|
||||
|
||||
// ---------- 用户设置 ----------
|
||||
private userSettingsKey(user: string) {
|
||||
return `u:${user}:settings`; // u:username:settings
|
||||
}
|
||||
|
||||
async getUserSettings(userName: string): Promise<UserSettings | null> {
|
||||
const data = await withRetry(() =>
|
||||
this.client.get(this.userSettingsKey(userName))
|
||||
);
|
||||
|
||||
if (data) {
|
||||
return JSON.parse(ensureString(data));
|
||||
}
|
||||
|
||||
// 如果用户设置不存在,返回默认设置
|
||||
const defaultSettings: UserSettings = {
|
||||
filter_adult_content: true, // 默认开启成人内容过滤
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: true,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
|
||||
return defaultSettings;
|
||||
}
|
||||
|
||||
async setUserSettings(userName: string, settings: UserSettings): Promise<void> {
|
||||
await withRetry(() =>
|
||||
this.client.set(
|
||||
this.userSettingsKey(userName),
|
||||
JSON.stringify(settings)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
async updateUserSettings(userName: string, settings: Partial<UserSettings>): Promise<void> {
|
||||
const currentSettings = await this.getUserSettings(userName);
|
||||
const updatedSettings = { ...currentSettings, ...settings };
|
||||
await this.setUserSettings(userName, updatedSettings as UserSettings);
|
||||
}
|
||||
|
||||
// ---------- 搜索历史 ----------
|
||||
@@ -258,14 +302,41 @@ export class RedisStorage implements IStorage {
|
||||
}
|
||||
|
||||
// ---------- 获取全部用户 ----------
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
async getAllUsers(): Promise<User[]> {
|
||||
const keys = await withRetry(() => this.client.keys('u:*:pwd'));
|
||||
return keys
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
|
||||
const usernames = keys
|
||||
.map((k) => {
|
||||
const match = k.match(/^u:(.+?):pwd$/);
|
||||
return match ? ensureString(match[1]) : undefined;
|
||||
})
|
||||
.filter((u): u is string => typeof u === 'string');
|
||||
|
||||
// 获取用户创建时间并构造 User 对象
|
||||
const users = await Promise.all(
|
||||
usernames.map(async (username) => {
|
||||
// 尝试获取用户创建时间,如果没有则使用空字符串
|
||||
const createdAtKey = `u:${username}:created_at`;
|
||||
let created_at = '';
|
||||
try {
|
||||
const timestamp = await withRetry(() => this.client.get(createdAtKey));
|
||||
if (timestamp) {
|
||||
created_at = new Date(parseInt(timestamp)).toISOString();
|
||||
}
|
||||
} catch (err) {
|
||||
// 忽略错误,使用空字符串
|
||||
}
|
||||
|
||||
return {
|
||||
username,
|
||||
role: username === ownerUsername ? 'owner' : 'user',
|
||||
created_at
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return users;
|
||||
}
|
||||
|
||||
// ---------- 管理员配置 ----------
|
||||
|
||||
+45
-1
@@ -42,6 +42,13 @@ export interface Favorite {
|
||||
search_title: string; // 搜索时使用的标题
|
||||
}
|
||||
|
||||
// 用户数据结构
|
||||
export interface User {
|
||||
username: string;
|
||||
role?: string;
|
||||
created_at?: string;
|
||||
}
|
||||
|
||||
// 存储接口
|
||||
export interface IStorage {
|
||||
// 播放记录相关
|
||||
@@ -70,6 +77,11 @@ export interface IStorage {
|
||||
// 删除用户(包括密码、搜索历史、播放记录、收藏夹)
|
||||
deleteUser(userName: string): Promise<void>;
|
||||
|
||||
// 用户设置相关
|
||||
getUserSettings(userName: string): Promise<UserSettings | null>;
|
||||
setUserSettings(userName: string, settings: UserSettings): Promise<void>;
|
||||
updateUserSettings(userName: string, settings: Partial<UserSettings>): Promise<void>;
|
||||
|
||||
// 搜索历史相关
|
||||
getSearchHistory(userName: string): Promise<string[]>;
|
||||
addSearchHistory(userName: string, keyword: string): Promise<void>;
|
||||
@@ -82,7 +94,7 @@ export interface IStorage {
|
||||
deleteSkipConfig(userName: string, key: string): Promise<void>;
|
||||
|
||||
// 用户列表
|
||||
getAllUsers(): Promise<string[]>;
|
||||
getAllUsers(): Promise<User[]>;
|
||||
|
||||
// 管理员配置相关
|
||||
getAdminConfig(): Promise<AdminConfig | null>;
|
||||
@@ -119,6 +131,38 @@ export interface DoubanResult {
|
||||
list: DoubanItem[];
|
||||
}
|
||||
|
||||
// 资源站配置
|
||||
export interface ApiSite {
|
||||
api: string;
|
||||
name: string;
|
||||
detail?: string;
|
||||
type?: number;
|
||||
playMode?: 'parse' | 'direct';
|
||||
is_adult?: boolean; // 新增:是否为成人内容资源站
|
||||
}
|
||||
|
||||
// 配置文件结构
|
||||
export interface Config {
|
||||
cache_time: number;
|
||||
api_site: { [key: string]: ApiSite };
|
||||
}
|
||||
|
||||
// 用户设置
|
||||
export interface UserSettings {
|
||||
filter_adult_content: boolean; // 是否过滤成人内容,默认为 true
|
||||
theme: 'light' | 'dark' | 'auto';
|
||||
language: string;
|
||||
auto_play: boolean;
|
||||
video_quality: string;
|
||||
[key: string]: string | boolean | number; // 允许其他设置
|
||||
}
|
||||
|
||||
// 搜索结果(支持成人内容分组)
|
||||
export interface GroupedSearchResults {
|
||||
regular_results: SearchResult[];
|
||||
adult_results?: SearchResult[];
|
||||
}
|
||||
|
||||
// Runtime配置类型
|
||||
export interface RuntimeConfig {
|
||||
STORAGE_TYPE?: string;
|
||||
|
||||
+72
-3
@@ -3,7 +3,7 @@
|
||||
import { Redis } from '@upstash/redis';
|
||||
|
||||
import { AdminConfig } from './admin.types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord } from './types';
|
||||
import { EpisodeSkipConfig, Favorite, IStorage, PlayRecord, User, UserSettings } from './types';
|
||||
|
||||
// 搜索历史最大条数
|
||||
const SEARCH_HISTORY_LIMIT = 20;
|
||||
@@ -244,14 +244,41 @@ export class UpstashRedisStorage implements IStorage {
|
||||
}
|
||||
|
||||
// ---------- 获取全部用户 ----------
|
||||
async getAllUsers(): Promise<string[]> {
|
||||
async getAllUsers(): Promise<User[]> {
|
||||
const keys = await withRetry(() => this.client.keys('u:*:pwd'));
|
||||
return keys
|
||||
const ownerUsername = process.env.USERNAME || 'admin';
|
||||
|
||||
const usernames = keys
|
||||
.map((k) => {
|
||||
const match = k.match(/^u:(.+?):pwd$/);
|
||||
return match ? ensureString(match[1]) : undefined;
|
||||
})
|
||||
.filter((u): u is string => typeof u === 'string');
|
||||
|
||||
// 获取用户创建时间并构造 User 对象
|
||||
const users = await Promise.all(
|
||||
usernames.map(async (username) => {
|
||||
// 尝试获取用户创建时间,如果没有则使用空字符串
|
||||
const createdAtKey = `u:${username}:created_at`;
|
||||
let created_at = '';
|
||||
try {
|
||||
const timestamp = await withRetry(() => this.client.get(createdAtKey));
|
||||
if (timestamp && typeof timestamp === 'number') {
|
||||
created_at = new Date(timestamp).toISOString();
|
||||
}
|
||||
} catch (err) {
|
||||
// 忽略错误,使用空字符串
|
||||
}
|
||||
|
||||
return {
|
||||
username,
|
||||
role: username === ownerUsername ? 'owner' : 'user',
|
||||
created_at
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return users;
|
||||
}
|
||||
|
||||
// ---------- 管理员配置 ----------
|
||||
@@ -329,6 +356,48 @@ export class UpstashRedisStorage implements IStorage {
|
||||
await this.client.srem(this.skipConfigsKey(userName), key);
|
||||
});
|
||||
}
|
||||
|
||||
// ---------- 用户设置 ----------
|
||||
private userSettingsKey(userName: string) {
|
||||
return `u:${userName}:settings`;
|
||||
}
|
||||
|
||||
async getUserSettings(userName: string): Promise<UserSettings | null> {
|
||||
const val = await withRetry(() =>
|
||||
this.client.get(this.userSettingsKey(userName))
|
||||
);
|
||||
return val ? (val as UserSettings) : null;
|
||||
}
|
||||
|
||||
async setUserSettings(
|
||||
userName: string,
|
||||
settings: UserSettings
|
||||
): Promise<void> {
|
||||
await withRetry(() =>
|
||||
this.client.set(this.userSettingsKey(userName), settings)
|
||||
);
|
||||
}
|
||||
|
||||
async updateUserSettings(
|
||||
userName: string,
|
||||
settings: Partial<UserSettings>
|
||||
): Promise<void> {
|
||||
const current = await this.getUserSettings(userName);
|
||||
const defaultSettings: UserSettings = {
|
||||
filter_adult_content: true,
|
||||
theme: 'auto',
|
||||
language: 'zh-CN',
|
||||
auto_play: false,
|
||||
video_quality: 'auto'
|
||||
};
|
||||
const updated: UserSettings = {
|
||||
...defaultSettings,
|
||||
...current,
|
||||
...settings,
|
||||
filter_adult_content: settings.filter_adult_content ?? current?.filter_adult_content ?? true
|
||||
};
|
||||
await this.setUserSettings(userName, updated);
|
||||
}
|
||||
}
|
||||
|
||||
// 单例 Upstash Redis 客户端
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
'use client';
|
||||
|
||||
const CURRENT_VERSION = '20250903203337';
|
||||
const CURRENT_VERSION = '20250904200125';
|
||||
|
||||
// 版本检查结果枚举
|
||||
export enum UpdateStatus {
|
||||
|
||||
+3
-3
@@ -14,7 +14,7 @@ export async function middleware(request: NextRequest) {
|
||||
|
||||
const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
|
||||
|
||||
if (!process.env.PASSWORD) {
|
||||
if (!process.env.AUTH_PASSWORD) {
|
||||
// 如果没有设置密码,重定向到警告页面
|
||||
const warningUrl = new URL('/warning', request.url);
|
||||
return NextResponse.redirect(warningUrl);
|
||||
@@ -29,7 +29,7 @@ export async function middleware(request: NextRequest) {
|
||||
|
||||
// localstorage模式:在middleware中完成验证
|
||||
if (storageType === 'localstorage') {
|
||||
if (!authInfo.password || authInfo.password !== process.env.PASSWORD) {
|
||||
if (!authInfo.password || authInfo.password !== process.env.AUTH_PASSWORD) {
|
||||
return handleAuthFailure(request, pathname);
|
||||
}
|
||||
return NextResponse.next();
|
||||
@@ -46,7 +46,7 @@ export async function middleware(request: NextRequest) {
|
||||
const isValidSignature = await verifySignature(
|
||||
authInfo.username,
|
||||
authInfo.signature,
|
||||
process.env.PASSWORD || ''
|
||||
process.env.AUTH_PASSWORD || ''
|
||||
);
|
||||
|
||||
// 签名验证通过即可
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
name = "katelyatv"
|
||||
compatibility_date = "2024-09-01"
|
||||
compatibility_flags = ["nodejs_compat"]
|
||||
pages_build_output_dir = ".vercel/output/static"
|
||||
|
||||
# 默认 D1 数据库配置(用于命令行操作)
|
||||
[[d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "katelyatv-db"
|
||||
database_id = "6d580637-1f87-4ddf-8b4d-3d97254b4c33"
|
||||
|
||||
# 生产环境配置
|
||||
[env.production]
|
||||
name = "katelyatv"
|
||||
|
||||
# 生产环境 D1 数据库配置
|
||||
[[env.production.d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "katelyatv-db"
|
||||
database_id = "6d580637-1f87-4ddf-8b4d-3d97254b4c33"
|
||||
|
||||
# 生产环境变量
|
||||
[env.production.vars]
|
||||
NEXT_PUBLIC_STORAGE_TYPE = "d1"
|
||||
NEXT_PUBLIC_SITE_NAME = "KatelyaTV"
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION = "高性能影视播放平台"
|
||||
NEXTAUTH_URL = "https://tv.katelya.eu.org"
|
||||
USERNAME = "katelya"
|
||||
AUTH_PASSWORD = "ab1433223cd@"
|
||||
IMAGE_PROXY_ENABLED = "true"
|
||||
CACHE_TTL = "3600"
|
||||
CORS_ORIGIN = "*"
|
||||
RATE_LIMIT_MAX = "100"
|
||||
RATE_LIMIT_WINDOW = "60000"
|
||||
HEALTH_CHECK_ENABLED = "true"
|
||||
HEALTH_CHECK_INTERVAL = "30"
|
||||
LOG_LEVEL = "info"
|
||||
LOG_FORMAT = "json"
|
||||
NODE_ENV = "production"
|
||||
|
||||
# 预览环境配置
|
||||
[env.preview]
|
||||
name = "katelyatv-preview"
|
||||
|
||||
# 预览环境 D1 数据库配置
|
||||
[[env.preview.d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "katelyatv-db"
|
||||
database_id = "6d580637-1f87-4ddf-8b4d-3d97254b4c33"
|
||||
|
||||
# 预览环境变量
|
||||
[env.preview.vars]
|
||||
NEXT_PUBLIC_STORAGE_TYPE = "d1"
|
||||
NEXT_PUBLIC_SITE_NAME = "KatelyaTV"
|
||||
NEXT_PUBLIC_SITE_DESCRIPTION = "高性能影视播放平台"
|
||||
NEXTAUTH_URL = "https://katelyatv.pages.dev"
|
||||
USERNAME = "katelya"
|
||||
AUTH_PASSWORD = "ab1433223cd@"
|
||||
IMAGE_PROXY_ENABLED = "true"
|
||||
CACHE_TTL = "3600"
|
||||
CORS_ORIGIN = "*"
|
||||
RATE_LIMIT_MAX = "100"
|
||||
RATE_LIMIT_WINDOW = "60000"
|
||||
HEALTH_CHECK_ENABLED = "true"
|
||||
HEALTH_CHECK_INTERVAL = "30"
|
||||
LOG_LEVEL = "info"
|
||||
LOG_FORMAT = "json"
|
||||
NODE_ENV = "production"
|
||||
Reference in New Issue
Block a user