feat: 优化发布清单和安装结构自动识别

app/api/routes/admin_config.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from fastapi import APIRouter, Depends, HTTPException, Request
 
 from app.core.config import ENV_FILE_PATH
-from app.core.security import admin_auth, persist_env_value, set_admin_token, token_digest
+from app.core.security import persist_env_value, require_permission, set_admin_token, token_digest
 from app.repositories import app_channel_repository, license_repository
 from app.schemas.admin_config import ChangeAdminTokenRequest, ClientConfigGenerateRequest
 from app.services.admin_config_service import (
@@ -53,29 +53,33 @@ def client_config_license_warning(license_key: str, app_id: str, channel: str) -
     return ""
 
 
-@router.get("/admin/auth/check")
-def admin_auth_check(auth=Depends(admin_auth)):
-    return {"code": 0, "msg": "管理员令牌有效"}
+def normalize_install_root(value: str, fallback: str = "..") -> str:
+    normalized = str(value or fallback).strip().replace("\\", "/")
+    if normalized in ("", "."):
+        return "."
+    if normalized == "..":
+        return ".."
+    raise HTTPException(status_code=400, detail="install_root 目前仅支持 . 或 ..")
 
 
 @router.post("/admin/token/change")
-def admin_change_token(body: ChangeAdminTokenRequest, auth=Depends(admin_auth)):
+def admin_change_token(body: ChangeAdminTokenRequest, auth=Depends(require_permission("admin:manage"))):
     new_token = body.new_token.strip()
     if len(new_token) < 8:
-        raise HTTPException(status_code=400, detail="新令牌至少需要 8 个字符")
+        raise HTTPException(status_code=400, detail="新兼容令牌至少需要 8 个字符")
     if len(new_token) > 128:
-        raise HTTPException(status_code=400, detail="新令牌不能超过 128 个字符")
+        raise HTTPException(status_code=400, detail="新兼容令牌不能超过 128 个字符")
     try:
         persist_env_value(ENV_FILE_PATH, "ADMIN_TOKEN", new_token)
     except Exception as exc:
         raise HTTPException(status_code=500, detail=f"令牌已通过校验，但写入 .env 失败: {exc}")
     set_admin_token(new_token)
     os.environ["ADMIN_TOKEN"] = new_token
-    return {"code": 0, "msg": f"管理员令牌已更新，并已写入 {ENV_FILE_PATH}"}
+    return {"code": 0, "msg": f"兼容管理员令牌已更新，并已写入 {ENV_FILE_PATH}"}
 
 
 @router.get("/admin/runtime-config")
-def admin_runtime_config(request: Request, auth=Depends(admin_auth)):
+def admin_runtime_config(request: Request, auth=Depends(require_permission("config:view"))):
     return {
         "release_main_executable": RELEASE_MAIN_EXECUTABLE,
         "target_platform": TARGET_PLATFORM,
@@ -89,7 +93,7 @@ def admin_runtime_config(request: Request, auth=Depends(admin_auth)):
 
 
 @router.post("/admin/client-config/generate")
-def admin_generate_client_config(body: ClientConfigGenerateRequest, request: Request, auth=Depends(admin_auth)):
+def admin_generate_client_config(body: ClientConfigGenerateRequest, request: Request, auth=Depends(require_permission("config:view"))):
     app_id = body.app_id.strip()
     channel = body.channel.strip() or "stable"
     current_version = body.current_version.strip() or "1.0.0"
@@ -110,6 +114,7 @@ def admin_generate_client_config(body: ClientConfigGenerateRequest, request: Req
         raise HTTPException(status_code=400, detail={"error": "channel_not_found", "msg": f"渠道 {channel} 不存在"})
 
     defaults = default_client_config_values(request)
+    install_root = normalize_install_root(body.install_root, defaults["install_root"])
     main_executable = platform_executable_path(
         normalize_executable_name(body.main_executable),
         defaults["main_executable"],
@@ -126,12 +131,11 @@ def admin_generate_client_config(body: ClientConfigGenerateRequest, request: Req
         "client_protocol": str(client_protocol),
         "launch_token": defaults["launch_token"],
         "license_key": license_key,
-        "api_base_url": api_base_url,
         "client_token": defaults["client_token"],
         "request_timeout_ms": defaults["request_timeout_ms"],
         "temp_folder": defaults["temp_folder"],
         "device_id": "",
-        "install_root": defaults["install_root"],
+        "install_root": install_root,
         "main_executable": main_executable,
         "launcher_executable": defaults["launcher_executable"],
         "updater_executable": defaults["updater_executable"],
@@ -141,10 +145,15 @@ def admin_generate_client_config(body: ClientConfigGenerateRequest, request: Req
         "arch": defaults["arch"],
     }
     crash_test_config = crash_report_test_values(api_base_url)
+    server_config = {
+        "api_base_url": api_base_url,
+    }
     return {
         "config": config,
         "json_text": json.dumps(config, ensure_ascii=False, indent=2),
         "license_warning": license_warning,
+        "server_config": server_config,
+        "server_config_text": json.dumps(server_config, ensure_ascii=False, indent=2),
         "crash_test_config": crash_test_config,
         "crash_test_text": crash_report_test_text(api_base_url),
     }