hotfix: 补回system_configs表缺失的);

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.12

build.sh

@@ -4,7 +4,7 @@ cd "$(dirname "$0")/source_clean"
 
 VERSION=$(cat ../VERSION)
 echo "🔨 Building CloudSearch v${VERSION}..."
-
+cp ../VERSION ./VERSION
 docker build -t cloudsearch-app:v${VERSION} -t cloudsearch-app:latest .
 
 echo "✅ Built: cloudsearch-app:v${VERSION} + cloudsearch-app:latest"

docker-compose.yml

@@ -70,6 +70,7 @@ services:
       - CORS_ORIGIN=${CORS_ORIGIN}
 
       # ── 数据库 & 缓存 ──
+      - DATA_DIR=/data
       - DB_PATH=${DB_PATH:-/data/database.sqlite}
       - REDIS_URL=${REDIS_URL:-redis://redis:6379}
 

source_clean/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.12

source_clean/build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+cd "$(dirname "$0")/source_clean"
+
+VERSION=$(cat ../VERSION)
+echo "🔨 Building CloudSearch v${VERSION}..."
+
+docker build -t cloudsearch-app:v${VERSION} -t cloudsearch-app:latest .
+
+echo "✅ Built: cloudsearch-app:v${VERSION} + cloudsearch-app:latest"
+echo "   Run: docker-compose up -d app"

source_clean/deploy.sh

@@ -1,56 +1,128 @@
 #!/bin/bash
 set -e
 
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+# CloudSearch 一键部署
-cd "$SCRIPT_DIR"
+# curl -sS https://gitea.timxx.cn/admin/CloudSearch/raw/branch/master/source_clean/deploy.sh | bash
+#
+# 环境变量(可选):
+#   CORS_ORIGIN    - 域名 (默认自动检测公网IP)
+#   ADMIN_PASSWORD - 管理员密码 (留空自动生成)
+#   JWT_SECRET     - JWT密钥 (留空自动生成)
+#   DEPLOY_DIR     - 部署目录 (默认 /opt/cloudsearch)
 
-# 如果 docker-compose.yml 不存在，自动下载
+REPO_URL="https://gitea.timxx.cn/admin/CloudSearch.git"
-if [ ! -f docker-compose.yml ]; then
+DEPLOY_DIR="${DEPLOY_DIR:-/opt/cloudsearch}"
-    echo "📥 下载 docker-compose.yml..."
+
-    wget -q https://gitea.timxx.cn/admin/CloudSearch/raw/branch/master/source_clean/docker-compose.yml
+info()  { echo "[INFO] $*"; }
+warn()  { echo "[WARN] $*"; }
+err()   { echo "[ERROR] $*"; }
+
+command -v docker &>/dev/null || { err "Docker未安装"; exit 1; }
+
+# -- CORS_ORIGIN --
+if [ -z "$CORS_ORIGIN" ]; then
+    PUBLIC_IP=$(curl -s --connect-timeout 3 ifconfig.me 2>/dev/null || curl -s --connect-timeout 3 ip.sb 2>/dev/null || echo "")
+    if [ -n "$PUBLIC_IP" ]; then
+        CORS_ORIGIN="http://${PUBLIC_IP}:9527"
+    else
+        CORS_ORIGIN="http://localhost:9527"
+    fi
+    warn "CORS_ORIGIN=$CORS_ORIGIN (自动检测)"
 fi
 
-echo "🔍 检测 Redis..."
+# -- 拉取仓库 --
+info "拉取仓库..."
+if [ -d "$DEPLOY_DIR/.git" ]; then
+    cd "$DEPLOY_DIR" && git pull --ff-only origin master 2>/dev/null || true
+else
+    rm -rf "$DEPLOY_DIR"
+    git clone --depth 1 "$REPO_URL" "$DEPLOY_DIR"
+fi
+cd "$DEPLOY_DIR/source_clean"
 
-EXISTING_REDIS=$(docker ps --format '{{.Names}}' | grep -i redis | head -1)
+# -- 切换镜像模式 --
+if grep -q '^    build:' docker-compose.yml 2>/dev/null; then
+    info "切换镜像模式..."
+    sed -i 's/^    build:/    # build:/' docker-compose.yml
+    sed -i 's/^      context:/      # context:/' docker-compose.yml
+    sed -i 's/^      dockerfile:/      # dockerfile:/' docker-compose.yml
+    sed -i 's|^    # image: gitea.timxx.cn/admin/cloudsearch:latest|    image: gitea.timxx.cn/admin/cloudsearch:latest|' docker-compose.yml
+fi
 
+# -- 检测 Redis --
+info "检测Redis..."
+EXISTING_REDIS=$(docker ps --format '{{.Names}}' 2>/dev/null | grep -i redis | grep -v CloudSearch | head -1)
 if [ -n "$EXISTING_REDIS" ]; then
-    if docker network inspect cloudsearch-net --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null | grep -qw "$EXISTING_REDIS"; then
-        echo "✅ 已有 Redis: $EXISTING_REDIS (已加入 cloudsearch-net)，跳过创建"
-    else
-        echo "✅ 已有 Redis: $EXISTING_REDIS，正在加入网络..."
-        docker network connect cloudsearch-net "$EXISTING_REDIS" 2>/dev/null || true
-        echo "   ✅ 已加入 cloudsearch-net"
-    fi
-
-    # 检测 Redis 密码
-    REDIS_PASS=$(docker inspect "$EXISTING_REDIS" --format '{{range .Config.Cmd}}{{println .}}{{end}}' 2>/dev/null | grep -A1 'requirepass' | tail -1 || true)
-    if [ -n "$REDIS_PASS" ]; then
-        REDIS_URL="redis://:${REDIS_PASS}@${EXISTING_REDIS}:6379"
-        echo "   🔑 检测到 Redis 密码，已自动配置"
-    else
     REDIS_URL="redis://${EXISTING_REDIS}:6379"
-    fi
+    info "复用已有Redis: $EXISTING_REDIS"
-    PROFILE=""
 else
-    echo "📦 未检测到 Redis，将自动创建..."
+    REDIS_URL="redis://redis:6379"
-    REDIS_URL="redis://CloudSearch_Redis:6379"
+    info "使用Compose自带Redis"
-    PROFILE="--profile full"
 fi
 
-# 生成 .env
+# -- 生成密钥 --
-cat > .env <<EOF
+JWT_SECRET="${JWT_SECRET:-$(openssl rand -hex 32)}"
+ADMIN_PASSWORD="${ADMIN_PASSWORD:-$(openssl rand -base64 12 | tr -d '=+/' | head -c 16)}"
+
+# -- 生成 .env --
+cat > .env <<ENVEOF
+CORS_ORIGIN=${CORS_ORIGIN}
+JWT_SECRET=${JWT_SECRET}
+ADMIN_PASSWORD=${ADMIN_PASSWORD}
 REDIS_URL=${REDIS_URL}
-CORS_ORIGIN=https://zy.hk.timxx.cn
+LOG_LEVEL=${LOG_LEVEL:-info}
-JWT_SECRET=cloudsearch-jwt-secret-2024
+ENVEOF
-ADMIN_PASSWORD=0nL5kLhMIJ1121PYmQb25A
-LOG_LEVEL=info
-EOF
 
-echo ""
+info "管理员: admin / ${ADMIN_PASSWORD}"
-echo "🚀 启动服务..."
-docker compose $PROFILE up -d
 
+# -- 部署 --
+info "拉取镜像..."
+docker compose pull app 2>/dev/null || true
+
+info "停止旧服务..."
+docker compose down --remove-orphans 2>/dev/null || true
+
+info "启动服务..."
+docker compose up -d
+
+# -- 等待就绪 --
+info "等待服务就绪..."
+for i in $(seq 1 20); do
+    if curl -s -o /dev/null -w '%{http_code}' http://localhost:9527/health 2>/dev/null | grep -q '200'; then
+        break
+    fi
+    sleep 2
+done
+
+# -- 强制写入管理员密码 --
+info "同步管理员密码..."
+sleep 3
+docker exec CloudSearch_App node -e '
+var bcrypt = require("bcryptjs");
+var Database = require("better-sqlite3");
+var db = new Database("/data/database.sqlite");
+var hash = bcrypt.hashSync("'"${ADMIN_PASSWORD}"'", 10);
+var existing = db.prepare("SELECT id FROM admins WHERE username = ?").get("admin");
+if (existing) {
+    db.prepare("UPDATE admins SET password_hash = ? WHERE username = ?").run(hash, "admin");
+} else {
+    db.prepare("INSERT INTO admins (username, password_hash) VALUES (?, ?)").run("admin", hash);
+}
+db.close();
+' 2>/dev/null && info "密码已同步" || warn "密码同步失败，请稍后重试"
+
+# -- 验证 --
+if docker compose ps 2>/dev/null | grep -q 'Up'; then
     echo ""
-echo "✅ 部署完成"
+    echo "=============================================="
+    echo "  CloudSearch 部署完成"
+    echo "=============================================="
     docker compose ps
+    echo ""
+    echo "  管理后台: ${CORS_ORIGIN}/admin/login"
+    echo "  用户名:   admin"
+    echo "  密码:     ${ADMIN_PASSWORD}"
+else
+    err "启动失败: docker compose logs"
+    exit 1
+fi

source_clean/src/cloud/credential.service.ts

@@ -35,9 +35,9 @@ function decryptCookie(encrypted: string): string {
 
 function extractCookieUid(cookie: string): string {
   if (!cookie) return '';
-  let m = cookie.match(/__uid=([a-zA-Z0-9+/=_-]+)/);
+  let m = cookie.match(/__uid=([^;]+)/);
   if (m) return m[1];
-  m = cookie.match(/b-user-id=([a-zA-Z0-9-]+)/);
+  m = cookie.match(/b-user-id=([^;]+)/);
   if (m) return m[1];
   return '';
 }
@@ -222,7 +222,8 @@ export async function testCloudConnection(id: number): Promise<{
     return { success: false, message: 'Cookie not configured' };
   }
 
-  const cookie = decryptCookie(config.cookie);
+  // config.cookie is already decrypted by getCloudConfigById
+  const cookie = config.cookie;
 
   try {
     let valid = false;

source_clean/src/database/database.ts

@@ -40,6 +40,7 @@ function runMigrations(db: Database.Database): void {
       cloud_type TEXT NOT NULL,
       cookie TEXT,
       cloud_type_uid TEXT DEFAULT NULL,
+      cookie_uid TEXT DEFAULT NULL,
       nickname TEXT,
       is_active INTEGER NOT NULL DEFAULT 1,
       storage_used TEXT,
@@ -109,6 +110,13 @@ function runMigrations(db: Database.Database): void {
       description TEXT,
       updated_at TEXT NOT NULL DEFAULT (datetime('now', 'localtime'))
     );
+    CREATE TABLE IF NOT EXISTS push_users (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      account TEXT NOT NULL UNIQUE,
+      notify_config TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now','localtime')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now','localtime'))
+    );
 
     CREATE TABLE IF NOT EXISTS content_cache (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -149,6 +157,8 @@ function migrateSaveRecords(db: Database.Database): void {
     { col: 'request_url', def: 'TEXT' },
     { col: 'ip_location', def: 'TEXT' },
     { col: 'original_folder_name', def: 'TEXT' },
+    { col: 'config_id', def: 'INTEGER' },
+    { col: 'promotion_account', def: 'TEXT' },
   ];
   for (const { col, def } of newCols) {
     try {
@@ -207,6 +217,7 @@ function migrateCloudConfigs(db: Database.Database): void {
         cookie TEXT,
         cloud_type_uid TEXT DEFAULT NULL,
         nickname TEXT,
+        cookie_uid TEXT DEFAULT NULL,
         is_active INTEGER NOT NULL DEFAULT 1,
         storage_used TEXT,
         storage_total TEXT,
@@ -289,18 +300,19 @@ function seedSystemConfigs(db: Database.Database): void {
     { key: 'search_proxy_url', value: '', description: '搜索代理地址 (如 http://127.0.0.1:7890)' },
     { key: 'search_strategy', value: 'wait_all', description: '搜索结果展示方式: wait_all=等待全部后展示, stream_channel=频道逐步展示' },
     { key: 'link_validation_enabled', value: 'true', description: '资源链接有效性检测开关（true/false）' },
-    { key: 'cloud_enabled_quark', value: 'true', description: '夸克网盘' },
+    { key: 'link_invalid_keywords', value: '', description: '链接失效关键词（一行一条，命中的链接判定为失效）' },
-    { key: 'cloud_enabled_baidu', value: 'true', description: '百度网盘' },
+    { key: 'cloud_type_quark_enabled', value: 'true', description: '夸克网盘' },
-    { key: 'cloud_enabled_aliyun', value: 'true', description: '阿里云盘' },
+    { key: 'cloud_type_baidu_enabled', value: 'true', description: '百度网盘' },
-    { key: 'cloud_enabled_115', value: 'true', description: '115 网盘' },
+    { key: 'cloud_type_aliyun_enabled', value: 'true', description: '阿里云盘' },
-    { key: 'cloud_enabled_tianyi', value: 'true', description: '天翼云盘' },
+    { key: 'cloud_type_115_enabled', value: 'true', description: '115 网盘' },
-    { key: 'cloud_enabled_123pan', value: 'true', description: '123 云盘' },
+    { key: 'cloud_type_tianyi_enabled', value: 'true', description: '天翼云盘' },
-    { key: 'cloud_enabled_uc', value: 'true', description: 'UC 网盘' },
+    { key: 'cloud_type_123pan_enabled', value: 'true', description: '123 云盘' },
-    { key: 'cloud_enabled_xunlei', value: 'true', description: '迅雷网盘' },
+    { key: 'cloud_type_uc_enabled', value: 'true', description: 'UC 网盘' },
-    { key: 'cloud_enabled_pikpak', value: 'true', description: 'PikPak 网盘' },
+    { key: 'cloud_type_xunlei_enabled', value: 'true', description: '迅雷网盘' },
-    { key: 'cloud_enabled_magnet', value: 'true', description: '磁力链接' },
+    { key: 'cloud_type_pikpak_enabled', value: 'true', description: 'PikPak 网盘' },
-    { key: 'cloud_enabled_ed2k', value: 'true', description: '电驴链接' },
+    { key: 'cloud_type_magnet_enabled', value: 'true', description: '磁力链接' },
-    { key: 'cloud_enabled_others', value: 'false', description: '其他类型（默认关闭）' },
+    { key: 'cloud_type_ed2k_enabled', value: 'true', description: '电驴链接' },
+    { key: 'cloud_type_others_enabled', value: 'false', description: '其他类型（默认关闭）' },
     { key: 'search_result_limit', value: '10', description: '每类网盘最多展示的有效结果数' },
     { key: 'search_fallback_image', value: '', description: '无图资源的兜底封面图 URL（留空使用渐变色）' },
     { key: 'site_logo', value: '', description: '网站 LOGO 图片 URL（留空使用默认图标/文字）' },
@@ -309,6 +321,7 @@ function seedSystemConfigs(db: Database.Database): void {
     { key: 'site_marquee', value: '📢 欢迎使用CloudSearch，所有资源仅供学习交流，请于下载后24小时内删除', description: '搜索栏下方滚动通知文字（从右往左滚动显示）' },
     { key: 'tmdb_api_token', value: '', description: 'TMDB API 读取令牌（用于增强豆瓣内容信息）' },
     { key: 'ip_geo_api_url', value: '', description: 'IP 归属地查询接口（{ip} 会被替换为实际IP，留空则禁用）' },
+    { key: 'ip_geo_api_id', value: '', description: 'IP 归属地 API ID（apihz.cn 接口）' },
     { key: 'ip_geo_api_key', value: '', description: 'IP 归属地备用 API Key（留空使用默认）' },
     { key: 'title_filter_rules', value: '', description: '搜索结果标题过滤规则（一行一条：纯文本直接移除 / 正则用/包围/）' },
     { key: 'timezone', value: 'Asia/Shanghai', description: '系统时区（如 Asia/Shanghai、America/New_York、UTC）' },
@@ -328,6 +341,16 @@ function seedSystemConfigs(db: Database.Database): void {
     { key: 'search_all_channels', value: 'false', description: '使用所有频道参与搜索（包含未启用频道）' },
     { key: 'ip_geo_provider', value: 'apihz', description: 'IP 归属地查询接口提供商' },
     { key: 'auto_update_enabled', value: 'false', description: '自动更新镜像（预留，暂未实现）' },
+    { key: 'cleanup_auto_refresh_storage', value: 'false', description: '自动刷新网盘空间信息（每天检查一次）' },
+    { key: 'cleanup_verify_enabled', value: 'false', description: '启用转存后自动验证链接有效性' },
+    { key: 'cleanup_verify_interval', value: '3600', description: '自动验证间隔（秒）' },
+    { key: 'cleanup_whitelist_dirs', value: '', description: '清理文件白名单目录（逗号分隔，保留不删）' },
+    { key: 'proxy_url', value: '', description: 'HTTP 代理地址（用于搜索请求代理）' },
+    { key: 'quark_ad_keywords', value: '', description: '夸克广告文件关键词（逗号分隔）' },
+    { key: 'quark_sus_extensions', value: '', description: '夸克可疑文件后缀（逗号分隔）' },
+    { key: 'quark_warning_folder_names', value: '', description: '夸克警示文件夹名称（逗号分隔）' },
+    { key: 'storage_refresh_interval', value: '86400', description: '空间信息刷新间隔（秒，默认24小时）' },
+
   ];
   const insert = db.prepare(
     'INSERT OR IGNORE INTO system_configs (key, value, description) VALUES (?, ?, ?)'

source_clean/src/routes/admin.routes.ts

@@ -154,7 +154,7 @@ router.get('/admin/cloud-configs', (_req: Request, res: Response) => {
 });
 
 /** POST /api/admin/cloud-configs — create or smart-replace a cloud config */
-router.post('/admin/cloud-configs', (req: Request, res: Response) => {
+router.post('/admin/cloud-configs', async (req: Request, res: Response) => {
   try {
     const data = req.body;
     if (!data.cloud_type) {
@@ -164,6 +164,24 @@ router.post('/admin/cloud-configs', (req: Request, res: Response) => {
     // Normalize is_active: frontend sends boolean, SQLite needs 0/1
     if (typeof data.is_active === 'boolean') data.is_active = data.is_active ? 1 : 0;
     const saved = saveCloudConfig(data);
+
+    // Auto-validate if cookie was provided (best-effort, non-blocking)
+    if (data.cookie && saved.id) {
+      try {
+        const result = await testCloudConnectionWithCookie(data.cloud_type, data.cookie);
+        if (result.success) {
+          const updateData: any = { id: saved.id, cloud_type: data.cloud_type };
+          if (result.nickname) updateData.nickname = result.nickname;
+          if (result.storage_used) updateData.storage_used = result.storage_used;
+          if (result.storage_total) updateData.storage_total = result.storage_total;
+          saveCloudConfig(updateData);
+          Object.assign(saved, { nickname: result.nickname, storage_used: result.storage_used, storage_total: result.storage_total });
+        }
+      } catch (_) {
+        // Auto-validation is best-effort, don't fail the save
+      }
+    }
+
     res.json(saved);
   } catch (err: any) {
     res.status(500).json({ error: err.message || 'Failed to save cloud config' });
@@ -508,7 +526,7 @@ router.post('/admin/test-external-service', async (req: Request, res: Response)
         break;
       }
       case 'tmdb': {
-        const tmdbToken = token || getSystemConfig('tmdb_api_key') || '';
+        const tmdbToken = token || getSystemConfig('tmdb_api_token') || '';
         if (!tmdbToken) {
           res.json({ ok: false, info: 'TMDB API Key not configured' });
           return;