Merge branch 'ling-drag0n:main' into main

Author: Ai686Leo

.gitignore

@@ -106,4 +106,5 @@ out
 .tern-port
 
 # Stores VSCode versions used for testing VSCode extensions
-.vscode-test
+.vscode-test
+.spec-workflow

backend/docker-server.js

@@ -523,6 +523,7 @@ server.use(async (req, res, next) => {
     req.env = {
       DB: sqliteAdapter,
       ENCRYPTION_SECRET: process.env.ENCRYPTION_SECRET || "default-encryption-key",
+      ADMIN_TOKEN_EXPIRY_DAYS: process.env.ADMIN_TOKEN_EXPIRY_DAYS || "7",
     };
 
     next();
@@ -779,7 +780,6 @@ function startMemoryMonitoring(interval = 1200000) {
   // 简单读取容器内存使用情况
   const getContainerMemory = () => {
     try {
-      const fs = require("fs");
       // 尝试读取cgroup内存使用（优先v2，回退v1）
       let usage = null,
         limit = null;

backend/src/routes/adminRoutes.js

@@ -13,7 +13,7 @@ adminRoutes.post("/api/admin/login", async (c) => {
   const { username, password } = await c.req.json();
 
   try {
-    const loginResult = await login(db, username, password);
+    const loginResult = await login(db, username, password, c.env);
 
     return c.json({
       code: ApiStatus.SUCCESS,

backend/src/services/adminService.js

@@ -38,9 +38,10 @@ export async function validateAdminToken(db, token) {
  * @param {D1Database} db - D1数据库实例
  * @param {string} username - 用户名
  * @param {string} password - 密码
+ * @param {Object} env - 环境变量对象
  * @returns {Promise<Object>} 登录结果，包含token和过期时间
  */
-export async function login(db, username, password) {
+export async function login(db, username, password, env = {}) {
   // 参数验证
   if (!username || !password) {
     throw new HTTPException(ApiStatus.BAD_REQUEST, { message: "用户名和密码不能为空" });
@@ -88,7 +89,10 @@ export async function login(db, username, password) {
   // 生成并存储令牌
   const token = generateRandomString(32);
   const expiresAt = new Date();
-  expiresAt.setDate(expiresAt.getDate() + 1); // 1天过期
+
+  // 从环境变量读取token过期天数，默认7天
+  const expiryDays = parseInt(env.ADMIN_TOKEN_EXPIRY_DAYS || "7", 10);
+  expiresAt.setDate(expiresAt.getDate() + expiryDays);
 
   // 使用 AdminRepository 创建令牌
   await adminRepository.createToken(admin.id, token, expiresAt);

backend/src/storage/drivers/s3/S3StorageDriver.js

@@ -8,7 +8,7 @@ import { CAPABILITIES } from "../../interfaces/capabilities/index.js";
 import { HTTPException } from "hono/http-exception";
 import { ApiStatus } from "../../../constants/index.js";
 import { createS3Client } from "../../../utils/s3Utils.js";
-import { normalizeS3SubPath } from "./utils/S3PathUtils.js";
+import { normalizeS3SubPath, isCompleteFilePath } from "./utils/S3PathUtils.js";
 import { updateMountLastUsed, findMountPointByPath } from "../../fs/utils/MountResolver.js";
 import { buildFullProxyUrl, buildSignedProxyUrl } from "../../../constants/proxy.js";
 import { ProxySignatureService } from "../../../services/ProxySignatureService.js";
@@ -673,7 +673,6 @@ export class S3StorageDriver extends BaseDriver {
     const fileName = customFilename || path.split("/").filter(Boolean).pop() || "unnamed_file";
 
     // 智能检查s3SubPath是否已经包含完整的文件路径
-    const { isCompleteFilePath } = require("./utils/S3PathUtils.js");
     if (s3SubPath && isCompleteFilePath(s3SubPath, fileName)) {
       // 添加root_prefix（如果有）
       const rootPrefix = this.config.root_prefix ? (this.config.root_prefix.endsWith("/") ? this.config.root_prefix : this.config.root_prefix + "/") : "";

backend/src/storage/drivers/s3/utils/S3PathUtils.js

@@ -3,6 +3,8 @@
  * 提供S3存储驱动专用的路径规范化功能
  */
 
+import path from "path";
+
 /**
  * 规范化S3子路径
  * @param {string} subPath - 子路径
@@ -42,7 +44,6 @@ export function isCompleteFilePath(s3SubPath, originalFileName) {
   if (!s3SubPath || !originalFileName) return false;
 
   // Node.js path 模块解析路径
-  const path = require("path");
   const pathInfo = path.parse(s3SubPath);
   const originalInfo = path.parse(originalFileName);
 

backend/wrangler.toml

@@ -7,6 +7,8 @@ compatibility_flags = ["nodejs_compat"]
 [vars]
 # 用于加密敏感配置的密钥
 # ENCRYPTION_SECRET = "lzl123456789987654321"
+# 管理员Token过期天数，默认7天
+# ADMIN_TOKEN_EXPIRY_DAYS = "7"
 
 # 绑定D1数据库
 # 需要替换为实际的数据库ID
@@ -20,6 +22,7 @@ database_id = "xxxxxxxxxxxxxxxxx"
 # 开发环境变量
 [env.dev.vars]
 ENCRYPTION_SECRET = "dev-encryption-secret-key"
+ADMIN_TOKEN_EXPIRY_DAYS = "7"
 
 [[env.dev.d1_databases]]
 binding = "DB"

docker-compose.yml

@@ -29,6 +29,8 @@ services:
       - LOG_LEVEL=2 # 日志级别
       # 重要: 请修改为您自己的安全密钥，用于加密数据
       - ENCRYPTION_SECRET=xxxxxxx
+      # 管理员Token过期天数，默认7天
+      - ADMIN_TOKEN_EXPIRY_DAYS=7
     volumes:
       - ./sql_data:/data # 将当前目录下的sql_data映射到容器的/data目录
     ports: