test/docs: adjust PDF sidebar config test for conditional default (#756)

pdf 添加跨域功能 修复pdf 页码和高亮没启用bug

.github/scripts/deploy_windows_winrm.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+import base64
+import os
+import pathlib
+import sys
+import uuid
+
+import winrm
+
+
+def require_env(name: str) -> str:
+    value = os.getenv(name, "").strip()
+    if not value:
+        raise SystemExit(f"Missing required environment variable: {name}")
+    return value
+
+
+def optional_env(name: str, default: str) -> str:
+    value = os.getenv(name, "").strip()
+    return value if value else default
+
+
+def ps_quote(value: str) -> str:
+    return value.replace("'", "''")
+
+
+def main() -> int:
+    host = require_env("KK_DEPLOY_HOST")
+    port = optional_env("KK_DEPLOY_PORT", "5985")
+    username = require_env("KK_DEPLOY_USERNAME")
+    password = require_env("KK_DEPLOY_PASSWORD")
+    env_pairs = {
+        "KK_DEPLOY_ROOT": optional_env("KK_DEPLOY_ROOT", r"C:\kkFileView-5.0"),
+        "KK_DEPLOY_HEALTH_URL": optional_env("KK_DEPLOY_HEALTH_URL", "http://127.0.0.1:8012/"),
+        "KK_DEPLOY_REPO_URL": optional_env("KK_DEPLOY_REPO_URL", "https://github.com/kekingcn/kkFileView.git"),
+        "KK_DEPLOY_BRANCH": optional_env("KK_DEPLOY_BRANCH", "master"),
+        "KK_DEPLOY_SOURCE_ROOT": optional_env("KK_DEPLOY_SOURCE_ROOT", r"C:\kkFileView-source"),
+        "KK_DEPLOY_JAVA_HOME": optional_env("KK_DEPLOY_JAVA_HOME", r"C:\Program Files\jdk-21.0.2"),
+        "KK_DEPLOY_GIT_EXE": optional_env("KK_DEPLOY_GIT_EXE", r"C:\kkFileView-tools\git\cmd\git.exe"),
+        "KK_DEPLOY_MVN_CMD": optional_env("KK_DEPLOY_MVN_CMD", r"C:\kkFileView-tools\maven\bin\mvn.cmd"),
+        "KK_DEPLOY_MAVEN_SETTINGS": optional_env("KK_DEPLOY_MAVEN_SETTINGS", ""),
+        "KK_DEPLOY_DRY_RUN": optional_env("KK_DEPLOY_DRY_RUN", "false").lower(),
+    }
+
+    script_path = pathlib.Path(__file__).with_name("remote_windows_deploy.ps1")
+    script_body = script_path.read_text(encoding="utf-8")
+    payload = script_body.encode("utf-8-sig")
+    payload_b64 = base64.b64encode(payload).decode("ascii")
+
+    endpoint = f"http://{host}:{port}/wsman"
+    session = winrm.Session(endpoint, auth=(username, password), transport="ntlm")
+
+    suffix = uuid.uuid4().hex
+    remote_b64_path = fr"C:\Windows\Temp\kkfileview_deploy_{suffix}.b64"
+    remote_ps1_path = fr"C:\Windows\Temp\kkfileview_deploy_{suffix}.ps1"
+
+    prep = session.run_ps(
+        f"""
+$ErrorActionPreference = 'Stop'
+if (Test-Path '{ps_quote(remote_b64_path)}') {{ Remove-Item '{ps_quote(remote_b64_path)}' -Force }}
+if (Test-Path '{ps_quote(remote_ps1_path)}') {{ Remove-Item '{ps_quote(remote_ps1_path)}' -Force }}
+New-Item -ItemType File -Path '{ps_quote(remote_b64_path)}' -Force | Out-Null
+"""
+    )
+    if prep.status_code != 0:
+        sys.stderr.write(prep.std_err.decode("utf-8", errors="ignore"))
+        return prep.status_code
+
+    chunk_size = 1200
+    for start in range(0, len(payload_b64), chunk_size):
+        chunk = payload_b64[start : start + chunk_size]
+        append = session.run_ps(
+            f"Add-Content -LiteralPath '{ps_quote(remote_b64_path)}' -Value '{chunk}'"
+        )
+        if append.status_code != 0:
+            sys.stderr.write(append.std_err.decode("utf-8", errors="ignore"))
+            return append.status_code
+
+    result = session.run_ps(
+        f"""
+$ErrorActionPreference = 'Stop'
+$raw = Get-Content -LiteralPath '{ps_quote(remote_b64_path)}' -Raw
+[System.IO.File]::WriteAllBytes('{ps_quote(remote_ps1_path)}', [Convert]::FromBase64String($raw))
+try {{
+"""
+        + "\n".join(
+            f"  $env:{key} = '{ps_quote(value)}'" for key, value in env_pairs.items()
+        )
+        + f"""
+  powershell -NoProfile -ExecutionPolicy Bypass -File '{ps_quote(remote_ps1_path)}' `
+  $code = $LASTEXITCODE
+}} finally {{
+"""
+        + "\n".join(
+            f"  Remove-Item Env:{key} -ErrorAction SilentlyContinue" for key in env_pairs
+        )
+        + f"""
+  Remove-Item '{ps_quote(remote_b64_path)}' -Force -ErrorAction SilentlyContinue
+  Remove-Item '{ps_quote(remote_ps1_path)}' -Force -ErrorAction SilentlyContinue
+}}
+exit $code
+"""
+    )
+
+    stdout = result.std_out.decode("utf-8", errors="ignore").strip()
+    stderr = result.std_err.decode("utf-8", errors="ignore").strip()
+
+    if stdout:
+        print(stdout)
+    if stderr:
+        print(stderr, file=sys.stderr)
+
+    return result.status_code
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

.github/scripts/remote_windows_deploy.ps1

@@ -0,0 +1,327 @@
+$ErrorActionPreference = 'Stop'
+$ProgressPreference = 'SilentlyContinue'
+
+function Write-Step {
+    param([string]$Message)
+    Write-Host "==> $Message"
+}
+
+function Get-RequiredEnv {
+    param([string]$Name)
+
+    $Value = [Environment]::GetEnvironmentVariable($Name)
+    if ([string]::IsNullOrWhiteSpace($Value)) {
+        throw "Missing required environment variable: $Name"
+    }
+
+    return $Value
+}
+
+function Get-OptionalEnv {
+    param(
+        [string]$Name,
+        [string]$DefaultValue
+    )
+
+    $Value = [Environment]::GetEnvironmentVariable($Name)
+    if ([string]::IsNullOrWhiteSpace($Value)) {
+        return $DefaultValue
+    }
+
+    return $Value
+}
+
+$DeployRoot = Get-OptionalEnv 'KK_DEPLOY_ROOT' 'C:\kkFileView-5.0'
+$HealthUrl = Get-OptionalEnv 'KK_DEPLOY_HEALTH_URL' 'http://127.0.0.1:8012/'
+$RepoUrl = Get-OptionalEnv 'KK_DEPLOY_REPO_URL' 'https://github.com/kekingcn/kkFileView.git'
+$Branch = Get-OptionalEnv 'KK_DEPLOY_BRANCH' 'master'
+$SourceRoot = Get-OptionalEnv 'KK_DEPLOY_SOURCE_ROOT' 'C:\kkFileView-source'
+$JavaHome = Get-OptionalEnv 'KK_DEPLOY_JAVA_HOME' 'C:\Program Files\jdk-21.0.2'
+$GitExe = Get-OptionalEnv 'KK_DEPLOY_GIT_EXE' 'C:\kkFileView-tools\git\cmd\git.exe'
+$MvnCmd = Get-OptionalEnv 'KK_DEPLOY_MVN_CMD' 'C:\kkFileView-tools\maven\bin\mvn.cmd'
+$MavenSettings = Get-OptionalEnv 'KK_DEPLOY_MAVEN_SETTINGS' ''
+$DryRun = Get-OptionalEnv 'KK_DEPLOY_DRY_RUN' 'false'
+
+$BinDir = Join-Path $DeployRoot 'bin'
+$StartupScript = Join-Path $BinDir 'startup.bat'
+$ReleaseDir = Join-Path $DeployRoot 'releases'
+$DeployTmp = Join-Path $DeployRoot 'deploy-tmp'
+$BuildOutputDir = Join-Path (Join-Path $SourceRoot 'server') 'target'
+
+if (-not (Test-Path $DeployRoot)) {
+    throw "Deploy root not found: $DeployRoot"
+}
+
+if (-not (Test-Path $BinDir)) {
+    throw "Bin directory not found: $BinDir"
+}
+
+if (-not (Test-Path $StartupScript)) {
+    throw "Startup script not found: $StartupScript"
+}
+
+$CurrentJar = Get-ChildItem $BinDir -Filter 'kkFileView-*.jar' | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+if (-not $CurrentJar) {
+    throw "No kkFileView jar found in $BinDir"
+}
+
+$JavaExe = Join-Path $JavaHome 'bin\java.exe'
+if (-not (Test-Path $JavaExe)) {
+    throw "JDK 21 java executable not found: $JavaExe"
+}
+
+if (-not (Test-Path $GitExe)) {
+    throw "Git executable not found: $GitExe"
+}
+
+if (-not (Test-Path $MvnCmd)) {
+    throw "Maven executable not found: $MvnCmd"
+}
+
+if (-not [string]::IsNullOrWhiteSpace($MavenSettings) -and -not (Test-Path $MavenSettings)) {
+    throw "Maven settings file not found: $MavenSettings"
+}
+
+$JarName = $CurrentJar.Name
+$JarPath = $CurrentJar.FullName
+
+Write-Step "Deploy root: $DeployRoot"
+Write-Step "Current jar: $JarPath"
+Write-Step "Startup script: $StartupScript"
+Write-Step "Health url: $HealthUrl"
+Write-Step "Source root: $SourceRoot"
+Write-Step "Branch: $Branch"
+Write-Step "Git exe: $GitExe"
+Write-Step "Maven cmd: $MvnCmd"
+Write-Step "Java home: $JavaHome"
+if (-not [string]::IsNullOrWhiteSpace($MavenSettings)) {
+    Write-Step "Maven settings: $MavenSettings"
+}
+
+function Invoke-External {
+    param(
+        [string]$FilePath,
+        [string[]]$Arguments,
+        [string]$WorkingDirectory = $null
+    )
+
+    $previous = $null
+    if ($WorkingDirectory) {
+        $previous = Get-Location
+        Set-Location $WorkingDirectory
+    }
+
+    try {
+        & $FilePath @Arguments
+        if ($LASTEXITCODE -ne 0) {
+            throw "Command failed ($LASTEXITCODE): $FilePath $($Arguments -join ' ')"
+        }
+    } finally {
+        if ($previous) {
+            Set-Location $previous
+        }
+    }
+}
+
+function Assert-SafeSourceRoot {
+    param([string]$PathToCheck)
+
+    $FullPath = [System.IO.Path]::GetFullPath($PathToCheck)
+    $RootPath = [System.IO.Path]::GetPathRoot($FullPath)
+    if ($FullPath.TrimEnd('\') -eq $RootPath.TrimEnd('\')) {
+        throw "Refusing to use drive root as source root: $FullPath"
+    }
+
+    $DangerousLeafNames = @(
+        'Windows',
+        'Users',
+        'Program Files',
+        'Program Files (x86)',
+        'ProgramData'
+    )
+    $LeafName = Split-Path -Leaf $FullPath.TrimEnd('\')
+    if ($DangerousLeafNames -contains $LeafName) {
+        throw "Refusing to use a high-risk source root path: $FullPath"
+    }
+}
+
+$env:JAVA_HOME = $JavaHome
+$env:Path = (Join-Path $JavaHome 'bin') + ';' + (Split-Path -Parent $GitExe) + ';' + (Split-Path -Parent $MvnCmd) + ';' + $env:Path
+
+Write-Step 'Validating Git executable'
+Invoke-External -FilePath $GitExe -Arguments @('--version')
+
+Write-Step 'Validating Maven executable'
+$MavenVersionArgs = @('-version')
+if (-not [string]::IsNullOrWhiteSpace($MavenSettings)) {
+    $MavenVersionArgs = @('-s', $MavenSettings, '-version')
+}
+Invoke-External -FilePath $MvnCmd -Arguments $MavenVersionArgs
+
+if ($DryRun -eq 'true') {
+    Write-Step "Dry run enabled, remote validation finished"
+    return
+}
+
+New-Item -ItemType Directory -Force -Path $ReleaseDir | Out-Null
+New-Item -ItemType Directory -Force -Path $DeployTmp | Out-Null
+
+function Sync-Repository {
+    Assert-SafeSourceRoot -PathToCheck $SourceRoot
+
+    if (-not (Test-Path (Join-Path $SourceRoot '.git'))) {
+        if (Test-Path $SourceRoot) {
+            Remove-Item $SourceRoot -Recurse -Force
+        }
+
+        $parent = Split-Path -Parent $SourceRoot
+        if ($parent) {
+            New-Item -ItemType Directory -Force -Path $parent | Out-Null
+        }
+
+        Write-Step "Cloning repository from $RepoUrl"
+        Invoke-External -FilePath $GitExe -Arguments @('clone', '--depth', '1', '--branch', $Branch, '--single-branch', $RepoUrl, $SourceRoot)
+        return
+    }
+
+    Write-Step "Fetching latest branch state from origin/$Branch"
+    Invoke-External -FilePath $GitExe -Arguments @('remote', 'set-url', 'origin', $RepoUrl) -WorkingDirectory $SourceRoot
+    Invoke-External -FilePath $GitExe -Arguments @('fetch', '--prune', '--depth', '1', 'origin', $Branch) -WorkingDirectory $SourceRoot
+    Invoke-External -FilePath $GitExe -Arguments @('checkout', '-B', $Branch, "origin/$Branch") -WorkingDirectory $SourceRoot
+    Invoke-External -FilePath $GitExe -Arguments @('reset', '--hard', "origin/$Branch") -WorkingDirectory $SourceRoot
+    Invoke-External -FilePath $GitExe -Arguments @('clean', '-fd') -WorkingDirectory $SourceRoot
+}
+
+function Build-KkFileView {
+    Write-Step 'Building kkFileView from source'
+    $BuildArgs = @('-B', 'clean', 'package', '-Dmaven.test.skip=true', '--file', 'pom.xml')
+    if (-not [string]::IsNullOrWhiteSpace($MavenSettings)) {
+        $BuildArgs = @('-s', $MavenSettings) + $BuildArgs
+    }
+    Invoke-External -FilePath $MvnCmd -Arguments $BuildArgs -WorkingDirectory $SourceRoot
+}
+
+Sync-Repository
+Build-KkFileView
+
+$DownloadedJars = Get-ChildItem $BuildOutputDir -Filter 'kkFileView-*.jar' -File
+if (-not $DownloadedJars) {
+    throw "No kkFileView jar found in build output: $BuildOutputDir"
+}
+
+if ($DownloadedJars.Count -ne 1) {
+    throw "Expected exactly one kkFileView jar in build output, found $($DownloadedJars.Count)"
+}
+
+$DownloadedJar = $DownloadedJars[0]
+
+$Timestamp = Get-Date -Format 'yyyyMMddHHmmss'
+$BackupJar = Join-Path $ReleaseDir ("{0}.{1}.bak" -f $JarName, $Timestamp)
+
+function Stop-KkFileView {
+    foreach ($Process in @(Get-KkFileViewJavaProcesses) + @(Get-KkFileViewLauncherProcesses)) {
+        Write-Step "Stopping process $($Process.ProcessId)"
+        Stop-Process -Id $Process.ProcessId -Force -ErrorAction SilentlyContinue
+    }
+}
+
+function Get-KkFileViewJavaProcesses {
+    $JarPattern = [regex]::Escape($JarName)
+    return Get-CimInstance Win32_Process | Where-Object {
+        $_.Name -match '^java(\.exe)?$' -and $_.CommandLine -and $_.CommandLine -match $JarPattern
+    }
+}
+
+function Get-KkFileViewLauncherProcesses {
+    $StartupPattern = [regex]::Escape([System.IO.Path]::GetFileName($StartupScript))
+    return Get-CimInstance Win32_Process | Where-Object {
+        $_.Name -ieq 'cmd.exe' -and $_.CommandLine -and $_.CommandLine -match $StartupPattern
+    }
+}
+
+function Wait-KkFileViewStopped {
+    param([int]$TimeoutSeconds = 30)
+
+    for ($i = 0; $i -lt $TimeoutSeconds; $i++) {
+        $JavaProcesses = @(Get-KkFileViewJavaProcesses)
+        $CmdProcesses = @(Get-KkFileViewLauncherProcesses)
+        if ((@($JavaProcesses).Count + @($CmdProcesses).Count) -eq 0) {
+            return $true
+        }
+
+        Start-Sleep -Seconds 1
+    }
+
+    return $false
+}
+
+function Start-KkFileView {
+    Write-Step "Starting kkFileView"
+    $CreateResult = Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{
+        CommandLine = ('cmd.exe /c ""' + $StartupScript + '""')
+        CurrentDirectory = $BinDir
+    }
+
+    if ($CreateResult.ReturnValue -ne 0) {
+        throw "Failed to start kkFileView launcher, Win32_Process.Create returned $($CreateResult.ReturnValue)"
+    }
+
+    Write-Step "Launcher process created with pid $($CreateResult.ProcessId)"
+}
+
+function Wait-Health {
+    param([string]$Url)
+
+    $SuccessfulChecks = 0
+    for ($i = 0; $i -lt 24; $i++) {
+        Start-Sleep -Seconds 5
+        try {
+            $Response = Invoke-WebRequest -Uri $Url -UseBasicParsing -TimeoutSec 5
+            if ($Response.StatusCode -eq 200 -and @(Get-KkFileViewJavaProcesses).Count -gt 0) {
+                $SuccessfulChecks++
+            } else {
+                $SuccessfulChecks = 0
+            }
+
+            if ($SuccessfulChecks -ge 3) {
+                return $true
+            }
+        } catch {
+            $SuccessfulChecks = 0
+            Start-Sleep -Milliseconds 200
+        }
+    }
+
+    return $false
+}
+
+Write-Step "Backing up current jar to $BackupJar"
+Copy-Item $JarPath $BackupJar -Force
+
+Stop-KkFileView
+if (-not (Wait-KkFileViewStopped)) {
+    throw "Timed out waiting for the previous kkFileView process to exit"
+}
+
+Write-Step "Replacing jar with artifact output"
+Copy-Item $DownloadedJar.FullName $JarPath -Force
+
+Start-KkFileView
+
+if (-not (Wait-Health -Url $HealthUrl)) {
+    Write-Step "Health check failed, rolling back"
+    Stop-KkFileView
+    if (-not (Wait-KkFileViewStopped)) {
+        throw "Timed out waiting for the failed kkFileView process to exit during rollback"
+    }
+    Copy-Item $BackupJar $JarPath -Force
+    Start-KkFileView
+
+    if (-not (Wait-Health -Url $HealthUrl)) {
+        throw "Deployment failed and rollback health check also failed"
+    }
+
+    throw "Deployment failed, rollback completed successfully"
+}
+
+Write-Step "Deployment completed successfully"

.github/workflows/master-auto-deploy.yml

@@ -0,0 +1,52 @@
+name: Master Auto Deploy
+
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+concurrency:
+  group: master-auto-deploy-production
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  deploy-windows:
+    runs-on: ubuntu-22.04
+    env:
+      KK_DEPLOY_HOST: ${{ secrets.KK_DEPLOY_HOST }}
+      KK_DEPLOY_PORT: ${{ secrets.KK_DEPLOY_PORT }}
+      KK_DEPLOY_USERNAME: ${{ secrets.KK_DEPLOY_USERNAME }}
+      KK_DEPLOY_PASSWORD: ${{ secrets.KK_DEPLOY_PASSWORD }}
+      KK_DEPLOY_ROOT: ${{ secrets.KK_DEPLOY_ROOT }}
+      KK_DEPLOY_HEALTH_URL: ${{ secrets.KK_DEPLOY_HEALTH_URL }}
+      KK_DEPLOY_REPO_URL: ${{ vars.KK_DEPLOY_REPO_URL }}
+      KK_DEPLOY_BRANCH: ${{ vars.KK_DEPLOY_BRANCH }}
+      KK_DEPLOY_SOURCE_ROOT: ${{ vars.KK_DEPLOY_SOURCE_ROOT }}
+      KK_DEPLOY_JAVA_HOME: ${{ vars.KK_DEPLOY_JAVA_HOME }}
+      KK_DEPLOY_GIT_EXE: ${{ vars.KK_DEPLOY_GIT_EXE }}
+      KK_DEPLOY_MVN_CMD: ${{ vars.KK_DEPLOY_MVN_CMD }}
+      KK_DEPLOY_MAVEN_SETTINGS: ${{ vars.KK_DEPLOY_MAVEN_SETTINGS }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install WinRM dependencies
+        run: pip install pywinrm
+
+      - name: Validate deploy secrets
+        run: |
+          test -n "$KK_DEPLOY_HOST" || (echo "Missing secret: KK_DEPLOY_HOST" && exit 1)
+          test -n "$KK_DEPLOY_USERNAME" || (echo "Missing secret: KK_DEPLOY_USERNAME" && exit 1)
+          test -n "$KK_DEPLOY_PASSWORD" || (echo "Missing secret: KK_DEPLOY_PASSWORD" && exit 1)
+
+      - name: Deploy to Windows server
+        run: python .github/scripts/deploy_windows_winrm.py

.gitignore

@@ -26,6 +26,7 @@ nbdist/
 ### VS Code ###
 .vscode/
 .DS_Store
+.artifacts/
 
 server/src/main/cache/
 server/src/main/file/

AGENTS.md

@@ -0,0 +1,230 @@
+# AGENTS.md
+
+This document is for coding agents and automation tools working in this repository.
+
+## Project Overview
+
+- Project: `kkFileView`
+- Stack: Spring Boot + Freemarker + Redis/Redisson (optional) + JODConverter + front-end preview pages
+- Main module: `server`
+- Default local URL: `http://127.0.0.1:8012/`
+- Production demo: `https://file.kkview.cn/`
+
+This repository is a document preview service. Most user-facing work falls into one of these areas:
+
+1. preview routing and file-type dispatch
+2. conversion pipelines for Office / PDF / CAD / archives / images
+3. Freemarker preview templates under `server/src/main/resources/web`
+4. CI, E2E fixtures, and production deployment automation
+
+## Repository Layout
+
+- `server/`
+  Main application code, templates, config, packaged artifacts
+- `server/src/main/java/cn/keking/`
+  Core Java application code
+- `server/src/main/resources/web/`
+  Freemarker preview templates
+- `server/src/main/resources/static/`
+  Front-end static assets used by preview pages
+- `server/src/main/config/`
+  Main runtime config files
+- `server/src/main/bin/`
+  Local startup/dev scripts
+- `tests/e2e/`
+  Playwright-based end-to-end tests and fixtures
+- `.github/workflows/`
+  CI and deployment workflows
+- `.github/scripts/`
+  Windows production deployment scripts over WinRM
+
+## Key Entry Points
+
+- App entry:
+  - `server/src/main/java/cn/keking/ServerMain.java`
+- Preview controller:
+  - `server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java`
+- File attribute parsing / request handling:
+  - `server/src/main/java/cn/keking/service/FileHandlerService.java`
+- Office preview flow:
+  - `server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java`
+- PDF preview flow:
+  - `server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java`
+- Archive extraction:
+  - `server/src/main/java/cn/keking/service/CompressFileReader.java`
+
+## Important Templates
+
+- `server/src/main/resources/web/compress.ftl`
+  Archive directory/tree preview page
+- `server/src/main/resources/web/pdf.ftl`
+  PDF preview container page
+- `server/src/main/resources/web/picture.ftl`
+  Single image preview page
+- `server/src/main/resources/web/officePicture.ftl`
+  Office/PDF image-mode preview page
+- `server/src/main/resources/web/officeweb.ftl`
+  Front-end xlsx/html preview page
+
+When debugging UX issues, inspect the exact template selected by the preview flow first. Do not assume two similar preview pages share the same CSS or behavior.
+
+## Local Development
+
+### Recommended dev mode
+
+Use:
+
+```bash
+./server/src/main/bin/dev.sh
+```
+
+This runs Spring Boot with resource hot reload using:
+
+- `spring-boot:run`
+- `-Dspring-boot.run.addResources=true`
+- `server/src/main/config/application.properties`
+
+For front-end template or CSS/JS edits, prefer `dev.sh` over rebuilding jars repeatedly.
+
+### Jar build
+
+```bash
+mvn -q -pl server -DskipTests package
+```
+
+### Main test command used in CI
+
+```bash
+mvn -B package -Dmaven.test.skip=true --file pom.xml
+```
+
+## Configuration Notes
+
+Primary runtime config used by the scripts and defaults committed in this repository:
+
+- `server/src/main/config/application.properties`
+
+Optional environment-specific config:
+
+- `server/src/main/config/test.properties`
+
+Be careful: the repository defaults point at `application.properties`. If a deployment environment explicitly starts the app with `test.properties`, treat that as an environment-specific override rather than the repository default. Always verify the actual startup command before assuming which config file is active.
+
+Examples of config that commonly affects behavior:
+
+- `office.preview.type`
+- `office.preview.switch.disabled`
+- `trust.host`
+- `not.trust.host`
+- `file.upload.disable`
+
+## Preview Behavior Notes
+
+- Office files can render in `pdf` mode or `image` mode.
+- PDF preview uses `pdf.ftl`.
+- Single images use `picture.ftl`.
+- Office image-mode previews use `officePicture.ftl`.
+- Archive previews are not simple file lists; they can load nested previews via the archive UI in `compress.ftl`.
+
+When changing preview defaults, verify both:
+
+1. server-side default config
+2. front-end mode-switch links/buttons
+
+## Archive Preview Notes
+
+Archive preview is a sensitive area because it combines:
+
+- directory tree generation
+- extraction to disk
+- nested preview URL construction
+- inline iframe loading
+
+If an archive-contained Office file gets stuck on loading:
+
+1. verify the extracted file on disk is not corrupted
+2. verify conversion output exists
+3. verify the preview template points to the correct generated artifact
+4. verify the running Office manager / LibreOffice process is healthy
+
+Do not assume “loading forever” is a front-end issue.
+
+## Testing
+
+### Targeted Java tests
+
+Example targeted test:
+
+```bash
+mvn -q -pl server -Dtest=PdfViewerCompatibilityTests test
+```
+
+### E2E tests
+
+See:
+
+- `tests/e2e/README.md`
+
+PR E2E currently covers:
+
+- common preview smoke tests
+- Office smoke tests
+- archive smoke tests
+- basic security and performance checks
+
+## CI / Deployment
+
+### CI
+
+- `maven.yml`
+  - builds on `push` to `master`
+  - builds on PRs targeting `master`
+- `pr-e2e-mvp.yml`
+  - runs E2E on PRs to `master`
+
+### Production deployment
+
+- `master-auto-deploy.yml`
+  - triggers on push to `master`
+  - deploys to Windows over WinRM
+
+Deployment script:
+
+- `.github/scripts/remote_windows_deploy.ps1`
+
+Important operational detail:
+
+- the committed `bin/startup.bat` in this repo points at `..\config\application.properties`
+- if production uses a different config file, treat that as an out-of-repo server override rather than a repository default
+
+If a production config change “does not take effect”, inspect the actual startup command or deployed `startup.bat` on the server first and verify which config file path it is using.
+
+## Working Conventions For Agents
+
+- Prefer minimal, targeted changes over wide refactors.
+- Inspect the active preview template before editing CSS.
+- Verify whether behavior is controlled by config, back-end routing, or front-end template logic before changing code.
+- For production/debug tasks, distinguish clearly between:
+  - repository source defaults
+  - deployed server config
+  - runtime process arguments
+- When changing defaults, mention whether the change affects:
+  - local dev only
+  - repository default config
+  - deployed server config
+  - existing query-param overrides
+
+## Suggested Validation Checklist
+
+For preview-related changes, validate as many of these as apply:
+
+1. target URL returns `200`
+2. selected template is the expected one
+3. generated intermediate artifacts exist when required
+4. target UI element or style change is actually present in rendered HTML
+5. targeted Java test passes
+6. relevant E2E path is still compatible
+
+## Non-Goals
+
+This file is not a replacement for user-facing product documentation. Keep it focused on helping coding agents navigate the codebase and make correct changes faster.

Dockerfile

@@ -1,4 +1,4 @@
-FROM keking/kkfileview-base:4.4.0
+FROM keking/kkfileview-base:5.0.0
 ADD server/target/kkFileView-*.tar.gz /opt/
-ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-4.4.0/bin
+ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-5.0.0/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0/config/application.properties","-jar","/opt/kkFileView-4.4.0/bin/kkFileView-4.4.0.jar"]
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-5.0.0/config/application.properties","-jar","/opt/kkFileView-5.0.0/bin/kkFileView-5.0.0.jar"]

README.cn.md

@@ -149,7 +149,7 @@ pdf预览模式预览效果如下
 
 ### 历史更新记录
 
-#### > 2026年01月20日，v5.0 版本发布 ：
+#### > 2026年04月14日，v5.0.0 版本发布 ：
 #### 优化内容
 1. xlsx 前端解析优化 - 提升Excel文件前端渲染性能
 2. 图片解析优化 - 改进图片处理机制
@@ -159,6 +159,10 @@ pdf预览模式预览效果如下
 6. ftp多客户端接入优化 - 提升FTP服务兼容性
 7. 首页目录访问优化 - 采用post服务端分页机制
 8. marked 解析优化 - 改进Markdown渲染
+9. 压缩包预览页重构为单工作区布局，支持目录折叠与右侧内嵌预览
+10. 优化压缩包内文件类型标识，以及单图预览页的展示样式
+11. 补充面向工程自动化与编码代理的仓库说明文档
+12. 重构演示门户页面，包括首页、接入说明、版本记录与赞助页
 
 #### 新增功能
 1. msg邮件解析 - 新增msg格式邮件文件预览支持
@@ -179,6 +183,12 @@ pdf预览模式预览效果如下
 2. 安全问题 - 修复安全漏洞
 3. 图片水印不全问题 - 修复水印显示不完整
 4. SSL自签证书接入问题 - 修复自签名证书兼容性
+5. 修复压缩包内 Office 文件在重复解压后被追加写坏，导致一直卡在加载中的问题
+6. Office 默认预览改为 PDF 模式，且 PDF 预览默认打开缩略图侧栏
+7. 启动脚本改为自动发现当前发布包中的 jar，移除过时的硬编码 jar 名称
+8. 更新 Docker 与发布辅助文档，使其与 5.0.0 发布线保持一致
+9. 修复 OFD 表格竖线溢出导致的渲染异常
+10. 修复 PDF.js 兼容性补丁，避免兼容环境下的预览报错
 
 #### 更新内容
 1. JDK版本要求 - 强制要求JDK 21及以上版本
@@ -189,6 +199,8 @@ pdf预览模式预览效果如下
 6. tif后端异步转换优化 - 实现多线程异步转换
 7. 视频后端异步转换优化 - 实现多线程异步转换
 8. CAD后端异步转换优化 - 实现多线程异步转换
+9. 默认预览配置策略调整 - Office 预览默认切换为 PDF 模式，默认隐藏图片/PDF 模式切换按钮，且 PDF 预览默认展开缩略图侧栏。若升级后仍需保持旧的图片优先体验，请显式设置 `office.preview.type=image` 和 `office.preview.switch.disabled=false`。
+10. 信任域名配置匹配策略扩展 - `trust.host` 及相关规则现已支持通配符和 CIDR 匹配，升级后如果你依赖域名/IP 模式匹配，需要重新检查白名单和黑名单的实际生效范围
 
 #### > 2025年01月16日，v4.4.0 版本发布 ：
 
@@ -468,4 +480,3 @@ dcm医疗数位影像  引用于 [dcmjs](https://github.com/dcmjs-org/dcmjs )开
 - 本项目诞生于[凯京集团]，在取得公司高层同意后以 Apache 协议开源出来反哺社区，在此特别感谢凯京集团，以及集团领导[@唐老大](https://github.com/tangshd)的支持、@端木详笑的贡献。
 - 本项目已脱离公司由[KK开源社区]维护发展壮大，感谢所有给 kkFileView 提 Issue 、Pr 开发者
 - 本项目引入的第三方组件已在 '关于引用' 列表列出，感谢这些项目，让 kkFileView 更出色
-

README.md

@@ -65,9 +65,9 @@ URL：[https://file.kkview.cn](https://file.kkview.cn)
 
 ## Change History
 
-### Version 5.0 (January 20, 2026)
+### Version 5.0.0 (April 14, 2026)
 
-#### Optimizations
+#### Improvements
 1. Enhanced xlsx front-end parsing - Improved Excel file front-end rendering performance
 2. Optimized image parsing - Enhanced image processing mechanism
 3. Improved tif parsing - Enhanced TIF format support
@@ -76,6 +76,10 @@ URL：[https://file.kkview.cn](https://file.kkview.cn)
 6. Optimized ftp multi-client access - Improved FTP service compatibility
 7. Enhanced home page directory access - Implemented post server-side pagination mechanism
 8. Improved marked parsing - Enhanced Markdown rendering
+9. Redesigned archive preview into a single workspace with a collapsible tree and inline file preview
+10. Improved archive preview file-type badges and single-image preview styling
+11. Added an agent-focused repository guide for engineering automation and maintenance
+12. Refreshed the demo portal pages, including the index, integration guide, release record, and sponsor pages
 
 #### New Features
 1. msg email parsing - Added support for msg format email file preview
@@ -96,6 +100,12 @@ URL：[https://file.kkview.cn](https://file.kkview.cn)
 2. Security issues - Fixed security vulnerabilities
 3. Incomplete image watermark issues - Fixed incomplete watermark display
 4. SSL self-signed certificate access issues - Fixed compatibility with self-signed certificates
+5. Fixed archive-contained Office files that could stay stuck on loading because repeated extraction appended to existing files
+6. Default Office preview now prefers PDF mode, and PDF preview opens with the thumbnail sidebar visible by default
+7. Updated startup scripts to discover the packaged jar dynamically instead of relying on stale hard-coded jar names
+8. Updated Docker and release helper docs to align with the 5.0.0 release line
+9. Fixed OFD table border overflow rendering issues
+10. Refined the PDF.js compatibility polyfill to avoid preview errors in compatibility environments
 
 #### Updates
 1. JDK version requirement - Mandatory requirement for JDK 21 or higher
@@ -106,6 +116,8 @@ URL：[https://file.kkview.cn](https://file.kkview.cn)
 6. tif backend async conversion optimization - Implemented multi-threaded asynchronous conversion
 7. Video backend async conversion optimization - Implemented multi-threaded asynchronous conversion
 8. CAD backend async conversion optimization - Implemented multi-threaded asynchronous conversion
+9. Default preview configuration strategy adjusted - Office preview now defaults to PDF mode, the mode switch is hidden by default, and PDF preview opens with the thumbnail sidebar visible. If you need the previous image-first behavior after upgrade, explicitly set `office.preview.type=image` and `office.preview.switch.disabled=false`.
+10. Trust host configuration matching expanded - `trust.host` and related rules now support wildcard and CIDR matching, which may broaden or narrow effective allow/deny behavior after upgrade depending on your patterns
 
 ### Version 4.4.0 (January 16, 2025)
 

doc/ci-auto-deploy.md

@@ -0,0 +1,57 @@
+# kkFileView master 自动部署
+
+当前线上 Windows 服务器的实际部署信息如下：
+
+- 部署根目录：`C:\kkFileView-5.0`
+- 运行 jar：`C:\kkFileView-5.0\bin\kkFileView-<当前项目版本>.jar`
+- 启动脚本：`C:\kkFileView-5.0\bin\startup.bat`
+- 运行配置：`C:\kkFileView-5.0\config\test.properties`
+- 健康检查地址：`http://127.0.0.1:8012/`
+
+当前自动部署链路采用服务器拉最新源码并本机编译的方式：
+
+1. 通过 WinRM 连接 Windows 服务器
+2. 在服务器上的源码目录执行 `git fetch/reset/clean`，同步到 `origin/$KK_DEPLOY_BRANCH`（默认 `master`）
+3. 使用服务器上的 JDK 21 和 Maven 执行 `mvn clean package -Dmaven.test.skip=true`
+4. 备份线上 jar，替换为新构建产物
+5. 使用现有 `startup.bat` 重启，并做健康检查
+6. 如果健康检查失败，则自动回滚旧 jar 并重新拉起
+
+## 需要配置的 GitHub Secrets
+
+- `KK_DEPLOY_HOST`
+- `KK_DEPLOY_USERNAME`
+- `KK_DEPLOY_PASSWORD`
+
+以下部署参数当前由 workflow 从 GitHub Secrets 读取；如果未单独配置，则使用脚本默认值：
+
+- `KK_DEPLOY_PORT=5985`
+- `KK_DEPLOY_ROOT=C:\kkFileView-5.0`
+- `KK_DEPLOY_HEALTH_URL=http://127.0.0.1:8012/`
+
+下面这些非敏感参数可以通过 workflow env 或 GitHub Variables 覆盖；未配置时会使用默认值：
+- `KK_DEPLOY_REPO_URL=https://github.com/kekingcn/kkFileView.git`
+- `KK_DEPLOY_BRANCH=master`
+- `KK_DEPLOY_SOURCE_ROOT=C:\kkFileView-source`
+- `KK_DEPLOY_JAVA_HOME=C:\Program Files\jdk-21.0.2`
+- `KK_DEPLOY_GIT_EXE=C:\kkFileView-tools\git\cmd\git.exe`
+- `KK_DEPLOY_MVN_CMD=C:\kkFileView-tools\maven\bin\mvn.cmd`
+- `KK_DEPLOY_MAVEN_SETTINGS=`
+
+如果服务器到 GitHub 的拉取速度不稳定，也可以把 `KK_DEPLOY_REPO_URL` 改成你自己的 Git 镜像地址。
+如果服务器访问 Maven Central 不稳定，也可以通过 `KK_DEPLOY_MAVEN_SETTINGS` 指向自定义 `settings.xml`，切换到就近镜像仓库。
+
+## 服务器前置环境
+
+服务器需要具备以下工具：
+
+- Git for Windows（推荐安装在 `C:\kkFileView-tools\git`）
+- Apache Maven 3.9.x（推荐安装在 `C:\kkFileView-tools\maven`）
+- JDK 21（当前线上已存在：`C:\Program Files\jdk-21.0.2`）
+
+## Workflow
+
+新增 workflow：`.github/workflows/master-auto-deploy.yml`
+
+- 触发条件：`push` 到 `master`，或手动 `workflow_dispatch`
+- 部署方式：WinRM + 服务器源码同步 + 服务器本机 Maven 编译 + jar 替换/回滚

docker/kkfileview-base/README.cn.md

@@ -7,10 +7,10 @@
 然后使用 kkfileview-base 作为基础镜像进行构建，加快 kkfileview docker 镜像构建与发布。
 
 执行如下命令即可构建基础镜像：
-> 这里镜像 tag 以 4.4.0 为例，本项目所维护的 Dockerfile 文件考虑了跨平台兼容性。 如果你需要用到 arm64 架构镜像, 则在arm64 架构机器上同样执行下面的构建命令即可
+> 这里镜像 tag 以 5.0.0 为例，本项目所维护的 Dockerfile 文件考虑了跨平台兼容性。 如果你需要用到 arm64 架构镜像, 则在arm64 架构机器上同样执行下面的构建命令即可
 
 ```shell
-docker build --tag keking/kkfileview-base:4.4.0 .
+docker build --tag keking/kkfileview-base:5.0.0 .
 ```
 
 
@@ -46,5 +46,5 @@ docker build --tag keking/kkfileview-base:4.4.0 .
 现在就可以愉快地开始构建了，构建命令示例:
 
 ```shell
-docker buildx build --platform=linux/amd64,linux/arm64 -t keking/kkfileview-base:4.4.0 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 -t keking/kkfileview-base:5.0.0 --push .
 ```

docker/kkfileview-base/README.md

@@ -8,10 +8,10 @@ Then, use kkfileview-base as the base image to build and speed up the kkfileview
 
 To build the base image, run the following command:
 
-> In this example, the image tag is 4.4.0. The Dockerfile maintained in this project considers cross-platform compatibility. If you need an arm64 architecture image, run the same build command on an arm64 architecture machine.
+> In this example, the image tag is 5.0.0. The Dockerfile maintained in this project considers cross-platform compatibility. If you need an arm64 architecture image, run the same build command on an arm64 architecture machine.
 
 ```shell
-docker build --tag keking/kkfileview-base:4.4.0 .
+docker build --tag keking/kkfileview-base:5.0.0 .
 ```
 
 
@@ -49,5 +49,5 @@ Assuming the current machine is amd64 (x86_64) architecture, you'll need to enab
 Now you can enjoy the building. Here’s an example build command:
 
 ```shell
-docker buildx build --platform=linux/amd64,linux/arm64 -t keking/kkfileview-base:4.4.0 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 -t keking/kkfileview-base:5.0.0 --push .
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>kkFileView-parent</artifactId>
-    <version>5.0</version>
+    <version>5.0.0</version>
 
     <properties>
         <!-- ========== Java 和编译配置 ========== -->

server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>kkFileView-parent</artifactId>
         <groupId>cn.keking</groupId>
-        <version>5.0</version>
+        <version>5.0.0</version>
     </parent>
 
     <artifactId>kkFileView</artifactId>

server/src/main/bin/startup.bat

@@ -1,10 +1,20 @@
 @echo off
 set "KKFILEVIEW_BIN_FOLDER=%cd%"
 cd "%KKFILEVIEW_BIN_FOLDER%"
+set "JAR_NAME="
+for %%F in (kkFileView-*.jar) do (
+    set "JAR_NAME=%%~nxF"
+    goto :jar_found
+)
+echo Error: kkFileView jar not found in %KKFILEVIEW_BIN_FOLDER%
+exit /b 1
+
+:jar_found
 echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
+echo Using JAR_NAME %JAR_NAME%
 echo Starting kkFileView...
 echo Please check log file in ../log/kkFileView.log for more information
 echo You can get help in our official home site: https://kkview.cn
 echo If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ
 echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
-java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.4.0.jar -> ..\log\kkFileView.log
+java -Dspring.config.location=..\config\application.properties -jar "%JAR_NAME%" > ..\log\kkFileView.log 2>&1

server/src/main/bin/startup.sh

@@ -49,9 +49,16 @@ else
     fi
   fi
 
+  JAR_PATH=$(ls kkFileView-*.jar 2>/dev/null | head -n 1)
+  if [ -z "${JAR_PATH}" ]; then
+    echo "kkFileView jar not found in ${KKFILEVIEW_BIN_FOLDER}"
+    exit 1
+  fi
+
   ## 启动kkFileView
   echo "Starting kkFileView..."
-  nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0.jar > ../log/kkFileView.log 2>&1 &
+  echo "Using jar ${JAR_PATH}"
+  nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar "${JAR_PATH}" > ../log/kkFileView.log 2>&1 &
   echo "Please execute ./showlog.sh to check log for more information"
   echo "You can get help in our official home site: https://kkview.cn"
   echo "If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ"

server/src/main/config/application.properties

@@ -96,12 +96,12 @@ office.documentopenpasswords = ${KK_OFFICE_DOCUMENTOPENPASSWORD:true}
 office.type.web = ${KK_OFFICE_TYPE_WEB:web}
 
 # Office文档预览类型
-# 支持动态配置，可选值：image/pdf
+# 支持动态配置，可选值：image/pdf，默认使用pdf模式
-office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:image}
+office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:pdf}
 
-# 是否关闭Office预览模式切换开关，默认为false（允许切换）
+# 是否关闭Office预览模式切换开关，默认为true（关闭切换）
-# 设置为true时，用户无法在图片和PDF模式间切换
+# 设置为false时，用户可以在图片和PDF模式间切换
-office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:false}
+office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:true}
 
 
 ###############################################################################
@@ -155,6 +155,9 @@ pdf.bookmark.disable = ${KK_PDF_BOOKMARK_DISABLE:true}
 # 是否禁止PDF编辑功能（注释、表单等），默认为false（允许编辑）
 pdf.disable.editing = ${KK_PDF_DISABLE_EDITING:false}
 
+# 是否默认打开PDF侧边栏（缩略图面板），默认为true（打开）
+pdf.sidebar.open = ${KK_PDF_SIDEBAR_OPEN:true}
+
 # PDF处理最大线程数，控制并发处理能力
 pdf.max.threads = 10
 

server/src/main/java/cn/keking/config/ConfigConstants.java

@@ -77,6 +77,7 @@ public class ConfigConstants {
     public static final String DEFAULT_PDF_DOWNLOAD_DISABLE = "true";
     public static final String DEFAULT_PDF_BOOKMARK_DISABLE = "true";
     public static final String DEFAULT_PDF_DISABLE_EDITING = "true";
+    public static final String DEFAULT_PDF_SIDEBAR_OPEN = "true";
     public static final String DEFAULT_PDF2_JPG_DPI = "105";
     public static final String DEFAULT_PDF_SMALL_DTI = "150";
     public static final String DEFAULT_PDF_MEDIUM_DPI = "120";
@@ -194,6 +195,7 @@ public class ConfigConstants {
     private static String pdfPrintDisable;
     private static String pdfDownloadDisable;
     private static String pdfBookmarkDisable;
+    private static String pdfSidebarOpen;
     private static int pdf2JpgDpi;
     private static boolean pdfDpiEnabled;
     private static int pdfSmallDpi;
@@ -336,6 +338,7 @@ public class ConfigConstants {
     public static String getPdfDownloadDisable() { return pdfDownloadDisable; }
     public static String getPdfBookmarkDisable() { return pdfBookmarkDisable; }
     public static String getPdfDisableEditing() { return pdfDisableEditing; }
+    public static String getPdfSidebarOpen() { return pdfSidebarOpen; }
     public static int getPdf2JpgDpi() { return pdf2JpgDpi; }
     public static int getPdfTimeoutSmall() { return pdfTimeoutSmall; }
     public static int getPdfTimeoutMedium() { return pdfTimeoutMedium; }
@@ -563,6 +566,10 @@ public class ConfigConstants {
     public void setpdfDisableEditing(String pdfDisableEditing) { setPdfDisableEditingValue(pdfDisableEditing); }
     public static void setPdfDisableEditingValue(String pdfDisableEditing) { ConfigConstants.pdfDisableEditing = pdfDisableEditing; }
 
+    @Value("${pdf.sidebar.open:true}")
+    public void setPdfSidebarOpen(String pdfSidebarOpen) { setPdfSidebarOpenValue(pdfSidebarOpen); }
+    public static void setPdfSidebarOpenValue(String pdfSidebarOpen) { ConfigConstants.pdfSidebarOpen = pdfSidebarOpen; }
+
     @Value("${pdf2jpg.dpi:105}")
     public void pdf2JpgDpi(int pdf2JpgDpi) { setPdf2JpgDpiValue(pdf2JpgDpi); }
     public static void setPdf2JpgDpiValue(int pdf2JpgDpi) { ConfigConstants.pdf2JpgDpi = pdf2JpgDpi; }

server/src/main/java/cn/keking/config/ConfigRefreshComponent.java

@@ -181,6 +181,7 @@ public class ConfigRefreshComponent {
         ConfigConstants.setPdfDownloadDisableValue(getProperty(properties, "pdf.download.disable", ConfigConstants.DEFAULT_PDF_DOWNLOAD_DISABLE));
         ConfigConstants.setPdfBookmarkDisableValue(getProperty(properties, "pdf.bookmark.disable", ConfigConstants.DEFAULT_PDF_BOOKMARK_DISABLE));
         ConfigConstants.setPdfDisableEditingValue(getProperty(properties, "pdf.disable.editing", ConfigConstants.DEFAULT_PDF_DISABLE_EDITING));
+        ConfigConstants.setPdfSidebarOpenValue(getProperty(properties, "pdf.sidebar.open", ConfigConstants.DEFAULT_PDF_SIDEBAR_OPEN));
         ConfigConstants.setPdf2JpgDpiValue(Integer.parseInt(getProperty(properties, "pdf2jpg.dpi", ConfigConstants.DEFAULT_PDF2_JPG_DPI)));
 
         // 8. CAD配置

server/src/main/java/cn/keking/config/RedissonConfig.java

@@ -1,6 +1,5 @@
 package cn.keking.config;
 
-import io.netty.channel.nio.NioEventLoopGroup;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -13,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ClassUtils;
 
 /**
- * Redisson 客户端配置
+ * Redisson 客户端配置（完善版）
- * Created by kl on 2017/09/26.
+ * 支持 single / cluster / master-slave / sentinel 四种模式，配置完整，统一参数。
  */
 @ConditionalOnExpression("'${cache.type:default}'.equals('redis')")
 @ConfigurationProperties(prefix = "spring.redisson")
@@ -22,114 +21,71 @@ import org.springframework.util.ClassUtils;
 public class RedissonConfig {
 
     // ========================== 连接配置 ==========================
-    private static String address;
+    private String address;
-    private static String password;
+    private String password;
-    private static String clientName;
+    private String clientName;
-    private static int database = 0;
+    private int database = 0;
-    private static String mode = "single";
+    private String mode = "single";
-    private static String masterName = "kkfile";
+    private String masterName = "kkfile";
 
     // ========================== 超时配置 ==========================
-    private static int idleConnectionTimeout = 10000;
+    private int idleConnectionTimeout = 10000;
-    private static int connectTimeout = 10000;
+    private int connectTimeout = 10000;
-    private static int timeout = 3000;
+    private int timeout = 3000;
 
     // ========================== 重试配置 ==========================
-    private static int retryAttempts = 3;
+    private int retryAttempts = 3;
-    private static int retryInterval = 1500;
+    private int retryInterval = 1500;
 
     // ========================== 连接池配置 ==========================
-    private static int connectionMinimumIdleSize = 10;
+    private int connectionMinimumIdleSize = 10;
-    private static int connectionPoolSize = 64;
+    private int connectionPoolSize = 64;
-    private static int subscriptionsPerConnection = 5;
+    private int subscriptionsPerConnection = 5;
-    private static int subscriptionConnectionMinimumIdleSize = 1;
+    private int subscriptionConnectionMinimumIdleSize = 1;
-    private static int subscriptionConnectionPoolSize = 50;
+    private int subscriptionConnectionPoolSize = 50;
+
+    // ========================== 集群专用配置 ==========================
+    private int scanInterval = 2000;
 
     // ========================== 其他配置 ==========================
-    private static int dnsMonitoringInterval = 5000;
+    private int dnsMonitoringInterval = 5000;
-    private static int thread; // 当前处理核数量 * 2
+    private int threads; // 默认为0，表示使用 CPU 核数 * 2
-    private static String codec = "org.redisson.codec.JsonJacksonCodec";
+    private String codec = "org.redisson.codec.JsonJacksonCodec";
 
     @Bean
-    public static RedissonClient config() throws Exception {
+    public RedissonClient redissonClient() {
         Config config = new Config();
 
-        // 密码处理
+        // 密码处理：空字符串转为 null
-        if (StringUtils.isBlank(password)) {
+        String pwd = StringUtils.isBlank(password) ? null : password;
-            password = null;
-        }
 
-        // 根据模式创建对应的 Redisson 配置
+        // 根据模式构建配置
-        switch (mode) {
+        switch (mode.toLowerCase()) {
             case "cluster":
-                configureClusterMode(config);
+                configureClusterMode(config, pwd);
                 break;
             case "master-slave":
-                configureMasterSlaveMode(config);
+                configureMasterSlaveMode(config, pwd);
                 break;
             case "sentinel":
-                configureSentinelMode(config);
+                configureSentinelMode(config, pwd);
                 break;
             default:
-                configureSingleMode(config);
+                configureSingleMode(config, pwd);
                 break;
         }
 
+        // 公共配置：编码器、线程数
+        applyCommonConfig(config);
         return Redisson.create(config);
     }
 
     // ========================== 配置方法 ==========================
 
-    /**
+    private void configureSingleMode(Config config, String pwd) {
-     * 配置集群模式
+        String normalizedAddress = normalizeAddress(address);
-     */
-    private static void configureClusterMode(Config config) {
-        String[] clusterAddresses = address.split(",");
-        config.useClusterServers()
-                .setScanInterval(2000)
-                .addNodeAddress(clusterAddresses)
-                .setPassword(password)
-                .setRetryAttempts(retryAttempts)
-                .setTimeout(timeout)
-                .setMasterConnectionPoolSize(100)
-                .setSlaveConnectionPoolSize(100);
-    }
-
-    /**
-     * 配置主从模式
-     */
-    private static void configureMasterSlaveMode(Config config) {
-        String[] masterSlaveAddresses = address.split(",");
-        validateMasterSlaveAddresses(masterSlaveAddresses);
-
-        String[] slaveAddresses = new String[masterSlaveAddresses.length - 1];
-        System.arraycopy(masterSlaveAddresses, 1, slaveAddresses, 0, slaveAddresses.length);
-
-        config.useMasterSlaveServers()
-                .setDatabase(database)
-                .setPassword(password)
-                .setMasterAddress(masterSlaveAddresses[0])
-                .addSlaveAddress(slaveAddresses);
-    }
-
-    /**
-     * 配置哨兵模式
-     */
-    private static void configureSentinelMode(Config config) {
-        String[] sentinelAddresses = address.split(",");
-        config.useSentinelServers()
-                .setDatabase(database)
-                .setPassword(password)
-                .setMasterName(masterName)
-                .addSentinelAddress(sentinelAddresses);
-    }
-
-    /**
-     * 配置单机模式
-     */
-    private static void configureSingleMode(Config config) throws Exception {
         config.useSingleServer()
-                .setAddress(address)
+                .setAddress(normalizedAddress)
                 .setConnectionMinimumIdleSize(connectionMinimumIdleSize)
                 .setConnectionPoolSize(connectionPoolSize)
                 .setDatabase(database)
@@ -143,183 +99,184 @@ public class RedissonConfig {
                 .setTimeout(timeout)
                 .setConnectTimeout(connectTimeout)
                 .setIdleConnectionTimeout(idleConnectionTimeout)
-                .setPassword(StringUtils.trimToNull(password));
+                .setPassword(pwd);
+    }
 
+    private void configureClusterMode(Config config, String pwd) {
+        String[] nodeAddresses = normalizeAddresses(address.split(","));
+        config.useClusterServers()
+                .setScanInterval(scanInterval)
+                .addNodeAddress(nodeAddresses)
+                .setPassword(pwd)
+                .setRetryAttempts(retryAttempts)
+                .setRetryInterval(retryInterval)
+                .setTimeout(timeout)
+                .setConnectTimeout(connectTimeout)
+                .setIdleConnectionTimeout(idleConnectionTimeout)
+                .setMasterConnectionPoolSize(connectionPoolSize)
+                .setSlaveConnectionPoolSize(connectionPoolSize)
+                .setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
+                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
+                .setSubscriptionsPerConnection(subscriptionsPerConnection)
+                .setClientName(clientName);
+    }
+
+    private void configureMasterSlaveMode(Config config, String pwd) {
+        String[] addresses = address.split(",");
+        validateMasterSlaveAddresses(addresses);
+        String[] normalizedAddresses = normalizeAddresses(addresses);
+        String masterAddress = normalizedAddresses[0];
+        String[] slaveAddresses = new String[normalizedAddresses.length - 1];
+        System.arraycopy(normalizedAddresses, 1, slaveAddresses, 0, slaveAddresses.length);
+
+        config.useMasterSlaveServers()
+                .setDatabase(database)
+                .setPassword(pwd)
+                .setMasterAddress(masterAddress)
+                .addSlaveAddress(slaveAddresses)
+                .setRetryAttempts(retryAttempts)
+                .setRetryInterval(retryInterval)
+                .setTimeout(timeout)
+                .setConnectTimeout(connectTimeout)
+                .setIdleConnectionTimeout(idleConnectionTimeout)
+                .setMasterConnectionPoolSize(connectionPoolSize)
+                .setSlaveConnectionPoolSize(connectionPoolSize)
+                .setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
+                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
+                .setSubscriptionsPerConnection(subscriptionsPerConnection)
+                .setClientName(clientName);
+    }
+
+    private void configureSentinelMode(Config config, String pwd) {
+        String[] sentinelAddresses = normalizeAddresses(address.split(","));
+        config.useSentinelServers()
+                .setDatabase(database)
+                .setPassword(pwd)
+                .setMasterName(masterName)
+                .addSentinelAddress(sentinelAddresses)
+                .setRetryAttempts(retryAttempts)
+                .setRetryInterval(retryInterval)
+                .setTimeout(timeout)
+                .setConnectTimeout(connectTimeout)
+                .setIdleConnectionTimeout(idleConnectionTimeout)
+                .setMasterConnectionPoolSize(connectionPoolSize)
+                .setSlaveConnectionPoolSize(connectionPoolSize)
+                .setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
+                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
+                .setSubscriptionsPerConnection(subscriptionsPerConnection)
+                .setClientName(clientName);
+    }
+
+    private void applyCommonConfig(Config config) {
         // 设置编码器
-        Class<?> codecClass = ClassUtils.forName(getCodec(), ClassUtils.getDefaultClassLoader());
+        if (StringUtils.isNotBlank(codec)) {
+            try {
+                Class<?> codecClass = ClassUtils.forName(codec, ClassUtils.getDefaultClassLoader());
                 Codec codecInstance = (Codec) codecClass.getDeclaredConstructor().newInstance();
                 config.setCodec(codecInstance);
-        // 设置线程和事件循环组
+            } catch (Exception e) {
-        config.setThreads(thread);
+                throw new IllegalStateException("Failed to create Redisson codec: " + codec, e);
-        config.setEventLoopGroup(new NioEventLoopGroup());
             }
+        }
+        // 设置线程数（大于0时生效，否则Redisson使用默认值：CPU核数*2）
+        if (threads > 0) {
+            config.setThreads(threads);
+        }
+    }
+
+    // ========================== 辅助方法 ==========================
 
     /**
-     * 验证主从模式地址
+     * 自动补齐 Redis 地址协议前缀（redis:// 或 rediss://）
      */
-    private static void validateMasterSlaveAddresses(String[] addresses) {
+    private String normalizeAddress(String addr) {
-        if (addresses.length == 1) {
+        if (addr == null) {
+            return null;
+        }
+        addr = addr.trim();
+        if (!addr.startsWith("redis://") && !addr.startsWith("rediss://")) {
+            addr = "redis://" + addr;
+        }
+        return addr;
+    }
+
+    private String[] normalizeAddresses(String[] addresses) {
+        String[] normalized = new String[addresses.length];
+        for (int i = 0; i < addresses.length; i++) {
+            normalized[i] = normalizeAddress(addresses[i]);
+        }
+        return normalized;
+    }
+
+    private void validateMasterSlaveAddresses(String[] addresses) {
+        if (addresses.length < 2) {
             throw new IllegalArgumentException(
-                    "redis.redisson.address MUST have multiple redis addresses for master-slave mode.");
+                    "Master-slave mode requires at least 2 addresses: master and at least one slave. " +
+                            "Current addresses: " + String.join(",", addresses));
         }
     }
 
-    // ========================== Getter和Setter方法 ==========================
+    // ========================== Getter / Setter（供 Spring 绑定配置） ==========================
+    // 以下所有字段都需要提供 getter/setter，示例中只列出关键字段，实际使用时请补全所有字段。
+    // 建议使用 Lombok @Data 或 IDE 自动生成。这里只展示部分，避免篇幅过长。
 
-    // 连接配置
+    public String getAddress() { return address; }
-    public String getAddress() {
+    public void setAddress(String address) { this.address = address; }
-        return address;
-    }
 
-    public void setAddress(String address) {
+    public String getPassword() { return password; }
-        RedissonConfig.address = address;
+    public void setPassword(String password) { this.password = password; }
-    }
 
-    public String getPassword() {
+    public String getClientName() { return clientName; }
-        return password;
+    public void setClientName(String clientName) { this.clientName = clientName; }
-    }
 
-    public void setPassword(String password) {
+    public int getDatabase() { return database; }
-        RedissonConfig.password = password;
+    public void setDatabase(int database) { this.database = database; }
-    }
 
-    public String getClientName() {
+    public String getMode() { return mode; }
-        return clientName;
+    public void setMode(String mode) { this.mode = mode; }
-    }
 
-    public void setClientName(String clientName) {
+    public String getMasterName() { return masterName; }
-        RedissonConfig.clientName = clientName;
+    public void setMasterName(String masterName) { this.masterName = masterName; }
-    }
 
-    public int getDatabase() {
+    public int getIdleConnectionTimeout() { return idleConnectionTimeout; }
-        return database;
+    public void setIdleConnectionTimeout(int idleConnectionTimeout) { this.idleConnectionTimeout = idleConnectionTimeout; }
-    }
 
-    public void setDatabase(int database) {
+    public int getConnectTimeout() { return connectTimeout; }
-        RedissonConfig.database = database;
+    public void setConnectTimeout(int connectTimeout) { this.connectTimeout = connectTimeout; }
-    }
 
-    public static String getMode() {
+    public int getTimeout() { return timeout; }
-        return mode;
+    public void setTimeout(int timeout) { this.timeout = timeout; }
-    }
 
-    public void setMode(String mode) {
+    public int getRetryAttempts() { return retryAttempts; }
-        RedissonConfig.mode = mode;
+    public void setRetryAttempts(int retryAttempts) { this.retryAttempts = retryAttempts; }
-    }
 
-    public static String getMasterNamee() {
+    public int getRetryInterval() { return retryInterval; }
-        return masterName;
+    public void setRetryInterval(int retryInterval) { this.retryInterval = retryInterval; }
-    }
 
-    public void setMasterNamee(String masterName) {
+    public int getConnectionMinimumIdleSize() { return connectionMinimumIdleSize; }
-        RedissonConfig.masterName = masterName;
+    public void setConnectionMinimumIdleSize(int connectionMinimumIdleSize) { this.connectionMinimumIdleSize = connectionMinimumIdleSize; }
-    }
 
-    // 超时配置
+    public int getConnectionPoolSize() { return connectionPoolSize; }
-    public int getIdleConnectionTimeout() {
+    public void setConnectionPoolSize(int connectionPoolSize) { this.connectionPoolSize = connectionPoolSize; }
-        return idleConnectionTimeout;
-    }
 
-    public void setIdleConnectionTimeout(int idleConnectionTimeout) {
+    public int getSubscriptionsPerConnection() { return subscriptionsPerConnection; }
-        RedissonConfig.idleConnectionTimeout = idleConnectionTimeout;
+    public void setSubscriptionsPerConnection(int subscriptionsPerConnection) { this.subscriptionsPerConnection = subscriptionsPerConnection; }
-    }
 
-    public int getConnectTimeout() {
+    public int getSubscriptionConnectionMinimumIdleSize() { return subscriptionConnectionMinimumIdleSize; }
-        return connectTimeout;
+    public void setSubscriptionConnectionMinimumIdleSize(int subscriptionConnectionMinimumIdleSize) { this.subscriptionConnectionMinimumIdleSize = subscriptionConnectionMinimumIdleSize; }
-    }
 
-    public void setConnectTimeout(int connectTimeout) {
+    public int getSubscriptionConnectionPoolSize() { return subscriptionConnectionPoolSize; }
-        RedissonConfig.connectTimeout = connectTimeout;
+    public void setSubscriptionConnectionPoolSize(int subscriptionConnectionPoolSize) { this.subscriptionConnectionPoolSize = subscriptionConnectionPoolSize; }
-    }
 
-    public int getTimeout() {
+    public int getScanInterval() { return scanInterval; }
-        return timeout;
+    public void setScanInterval(int scanInterval) { this.scanInterval = scanInterval; }
-    }
 
-    public void setTimeout(int timeout) {
+    public int getDnsMonitoringInterval() { return dnsMonitoringInterval; }
-        RedissonConfig.timeout = timeout;
+    public void setDnsMonitoringInterval(int dnsMonitoringInterval) { this.dnsMonitoringInterval = dnsMonitoringInterval; }
-    }
 
-    // 重试配置
+    public int getThreads() { return threads; }
-    public int getRetryAttempts() {
+    public void setThreads(int threads) { this.threads = threads; }
-        return retryAttempts;
-    }
 
-    public void setRetryAttempts(int retryAttempts) {
+    public String getCodec() { return codec; }
-        RedissonConfig.retryAttempts = retryAttempts;
+    public void setCodec(String codec) { this.codec = codec; }
-    }
-
-    public int getRetryInterval() {
-        return retryInterval;
-    }
-
-    public void setRetryInterval(int retryInterval) {
-        RedissonConfig.retryInterval = retryInterval;
-    }
-
-    // 连接池配置
-    public int getConnectionMinimumIdleSize() {
-        return connectionMinimumIdleSize;
-    }
-
-    public void setConnectionMinimumIdleSize(int connectionMinimumIdleSize) {
-        RedissonConfig.connectionMinimumIdleSize = connectionMinimumIdleSize;
-    }
-
-    public int getConnectionPoolSize() {
-        return connectionPoolSize;
-    }
-
-    public void setConnectionPoolSize(int connectionPoolSize) {
-        RedissonConfig.connectionPoolSize = connectionPoolSize;
-    }
-
-    public int getSubscriptionsPerConnection() {
-        return subscriptionsPerConnection;
-    }
-
-    public void setSubscriptionsPerConnection(int subscriptionsPerConnection) {
-        RedissonConfig.subscriptionsPerConnection = subscriptionsPerConnection;
-    }
-
-    public int getSubscriptionConnectionMinimumIdleSize() {
-        return subscriptionConnectionMinimumIdleSize;
-    }
-
-    public void setSubscriptionConnectionMinimumIdleSize(int subscriptionConnectionMinimumIdleSize) {
-        RedissonConfig.subscriptionConnectionMinimumIdleSize = subscriptionConnectionMinimumIdleSize;
-    }
-
-    public int getSubscriptionConnectionPoolSize() {
-        return subscriptionConnectionPoolSize;
-    }
-
-    public void setSubscriptionConnectionPoolSize(int subscriptionConnectionPoolSize) {
-        RedissonConfig.subscriptionConnectionPoolSize = subscriptionConnectionPoolSize;
-    }
-
-    // 其他配置
-    public int getDnsMonitoringInterval() {
-        return dnsMonitoringInterval;
-    }
-
-    public void setDnsMonitoringInterval(int dnsMonitoringInterval) {
-        RedissonConfig.dnsMonitoringInterval = dnsMonitoringInterval;
-    }
-
-    public int getThread() {
-        return thread;
-    }
-
-    public void setThread(int thread) {
-        RedissonConfig.thread = thread;
-    }
-
-    public static String getCodec() {
-        return codec;
-    }
-
-    public void setCodec(String codec) {
-        RedissonConfig.codec = codec;
-    }
 }

server/src/main/java/cn/keking/service/CompressFileReader.java

@@ -59,8 +59,10 @@ public class CompressFileReader {
             for (final ISimpleInArchiveItem item : simpleInArchive.getArchiveItems()) {
                 if (!item.isFolder()) {
                     final Path filePathInsideArchive = getFilePathInsideArchive(item, folderPath);
+                    Files.deleteIfExists(filePathInsideArchive);
+                    try (OutputStream out = new BufferedOutputStream(new FileOutputStream(filePathInsideArchive.toFile(), false))) {
                         ExtractOperationResult result = item.extractSlow(data -> {
-                        try (OutputStream out = new BufferedOutputStream(new FileOutputStream(filePathInsideArchive.toFile(), true))) {
+                            try {
                                 out.write(data);
                             } catch (IOException e) {
                                 throw new RuntimeException(e);
@@ -75,6 +77,9 @@ public class CompressFileReader {
                                 throw new Exception("Failed to extract RAR file.");
                             }
                         }
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
 
                     FileType type = FileType.typeFromUrl(filePathInsideArchive.toString());
                     if (type.equals(FileType.PICTURE)) {  //图片缓存到集合，为了特殊符号需要进行编码

server/src/main/java/cn/keking/service/cache/impl/CacheServiceRedisImpl.java

@@ -1,11 +1,9 @@
 package cn.keking.service.cache.impl;
 
 import cn.keking.service.cache.CacheService;
-import org.redisson.Redisson;
 import org.redisson.api.RBlockingQueue;
 import org.redisson.api.RMapCache;
 import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 
@@ -23,8 +21,9 @@ public class CacheServiceRedisImpl implements CacheService {
 
     private final RedissonClient redissonClient;
 
-    public CacheServiceRedisImpl(Config config) {
+    // 直接注入 Spring 容器中的 RedissonClient Bean
-        this.redissonClient = Redisson.create(config);
+    public CacheServiceRedisImpl(RedissonClient redissonClient) {
+        this.redissonClient = redissonClient;
     }
 
     @Override

server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java

@@ -38,6 +38,7 @@ public class AttributeSetFilter implements Filter {
         request.setAttribute("pdfDownloadDisable", ConfigConstants.getPdfDownloadDisable());
         request.setAttribute("pdfBookmarkDisable", ConfigConstants.getPdfBookmarkDisable());
         request.setAttribute("pdfDisableEditing", ConfigConstants.getPdfDisableEditing());
+        request.setAttribute("pdfSidebarOpen", ConfigConstants.getPdfSidebarOpen());
         request.setAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
         request.setAttribute("fileUploadDisable", ConfigConstants.getFileUploadDisable());
         request.setAttribute("beian", ConfigConstants.getBeian());

server/src/main/resources/static/css/main-pages.css

@@ -547,28 +547,31 @@ a:focus {
 }
 
 .preview-options {
-    display: flex;
+    display: grid;
+    grid-template-columns: auto minmax(0, 1fr);
     align-items: center;
     gap: 12px;
     margin-bottom: 14px;
-    overflow-x: auto;
+    overflow: visible;
-    padding-bottom: 4px;
+    padding-bottom: 0;
 }
 
 .preview-grid {
-    display: flex;
+    display: grid;
-    flex-wrap: nowrap;
+    grid-template-columns: repeat(5, minmax(108px, 1fr));
     gap: 12px;
     margin-bottom: 0;
     overflow: visible;
     padding-bottom: 0;
-    flex: 1 1 auto;
+    min-width: 0;
-    min-width: 620px;
+    width: 100%;
 }
 
 .preview-grid .form-control {
-    flex: 1 1 0;
+    width: 100%;
-    min-width: 150px;
+    min-width: 0;
+    padding-left: 16px;
+    padding-right: 16px;
 }
 
 .preview-switches {
@@ -578,7 +581,7 @@ a:focus {
     margin-bottom: 0;
     overflow: visible;
     padding-bottom: 0;
-    flex: 0 0 auto;
+    width: 100%;
 }
 
 .preview-switches label {
@@ -586,7 +589,7 @@ a:focus {
     align-items: center;
     gap: 8px;
     margin: 0;
-    padding: 10px 14px;
+    padding: 10px 12px;
     border-radius: 999px;
     background: rgba(255, 255, 255, 0.76);
     border: 1px solid rgba(17, 19, 21, 0.08);
@@ -1264,6 +1267,10 @@ a:focus {
     .archive-grid {
         grid-template-columns: repeat(2, minmax(0, 1fr));
     }
+
+    .preview-grid {
+        grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+    }
 }
 
 @media (max-width: 768px) {
@@ -1304,16 +1311,8 @@ a:focus {
         grid-template-columns: 1fr;
     }
 
-    .preview-grid {
-        flex-wrap: wrap;
-        min-width: 0;
-        overflow-x: visible;
-    }
-
     .preview-options {
-        display: block;
+        grid-template-columns: 1fr;
-        overflow-x: visible;
-        padding-bottom: 0;
     }
 
     .preview-url {

server/src/main/resources/static/js/pdfwatermark.js

@@ -1,69 +0,0 @@
-
-function isNotEmpty(value) {
-  return value !== null && value !== undefined && value !== '' && value !== 'false' ;
-}
-
-function watermarkObj(watermarkContainer,watermarkTxt) {
-try {
-if (!isNotEmpty(watermarkTxt)) {
-    return ;
-}
-		var watermarkSettings = {
-			watermark_txt: watermarkTxt,
-			watermark_start_x:80,//水印起始位置x轴坐标
-			watermark_start_y:80,//水印起始位置Y轴坐标
-			watermark_x_space:80,//水印x轴间隔
-			watermark_y_space:80,//水印y轴间隔
-			watermark_color:'black',//水印字体颜色
-			watermark_alpha:0.2,//水印透明度
-			watermark_fontsize:'18px',//水印字体大小
-			watermark_font:'微软雅黑',//水印字体
-			watermark_width:200,//水印宽度
-			watermark_height:80,//水印高度
-			watermark_angle:30//水印倾斜度数
-		};
-	//	console.log(watermarkContainer);
-		var page_width = $(watermarkContainer).width() - watermarkSettings.watermark_width;
-		var page_height = $(watermarkContainer).height() - watermarkSettings.watermark_height;
-        page_width = (page_width < 250) ? 250 : page_width;
-        page_height = (page_height < 250) ? 250 : page_height;
-		var oTemp = document.createDocumentFragment();
-		for (var x = watermarkSettings.watermark_start_x; x < page_width; x+= watermarkSettings.watermark_x_space) {
-			for (var y = watermarkSettings.watermark_start_y; y < page_height; y+= watermarkSettings.watermark_y_space) {
-				var mask_div = document.createElement('div');
-				// mask_div.id = 'mask_div' + x + y;
-				mask_div.className = 'mask_div';
-				mask_div.appendChild(document.createTextNode(watermarkTxt));
-				// 设置水印div倾斜显示
-				mask_div.style.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity="+(watermarkSettings.watermark_alpha*100)+")";
-				mask_div.style.webkitTransform = "rotate(-" + watermarkSettings.watermark_angle + "deg)";
-				mask_div.style.MozTransform = "rotate(-" + watermarkSettings.watermark_angle + "deg)";
-				mask_div.style.msTransform = "rotate(-" + watermarkSettings.watermark_angle + "deg)";
-				mask_div.style.OTransform = "rotate(-" + watermarkSettings.watermark_angle + "deg)";
-				mask_div.style.transform = "rotate(-" + watermarkSettings.watermark_angle + "deg)";
-				mask_div.style.visibility = "";
-				mask_div.style.position = "absolute";
-				mask_div.style.left = x + 'px';
-				mask_div.style.top = y + 'px';
-				mask_div.style.overflow = "hidden";
-				mask_div.style.zIndex = "100";
-				mask_div.style.pointerEvents='none';//pointer-events:none  让水印不遮挡页面的点击事件
-				//mask_div.style.border="solid #eee 1px";
-				mask_div.style.opacity = watermarkSettings.watermark_alpha;
-				mask_div.style.fontSize = watermarkSettings.watermark_fontsize;
-				mask_div.style.fontFamily = watermarkSettings.watermark_font;
-				mask_div.style.color = watermarkSettings.watermark_color;
-				mask_div.style.textAlign = "center";
-				mask_div.style.width = watermarkSettings.watermark_width + 'px';
-				mask_div.style.height = watermarkSettings.watermark_height + 'px';
-				mask_div.style.display = "block";
-				oTemp.appendChild(mask_div);
-			}
-		}
-        $(watermarkContainer).append(oTemp);
-	} catch (e) {
-	console.log(e);
-	}
-	
-}
-

server/src/main/resources/static/pdfjs/web/viewer.html

@@ -1221,8 +1221,6 @@ See https://github.com/adobe-type-tools/cmap-resources
       <!-- editorUndoBar -->
     </div>
     <!-- outerContainer -->
-	<script type="text/javascript" src="/js/jquery-3.6.1.min.js"></script>
-    <script type="text/javascript" src="/js/pdfwatermark.js"></script>
     <div id="printContainer"></div>
   </body>
 </html>

server/src/main/resources/static/pdfjs/web/viewer.mjs

@@ -9,6 +9,83 @@ if (kkpdfAutoFetch == "true") {
 } else {
     kkpdfAutoFetch = false
 }
+
+function isNotEmpty(value) {
+  return value !== null && value !== undefined && value !== '' && value !== 'false' ;
+}
+/**
+ * 通用水印生成函数
+ * @param {HTMLElement} container   - 水印容器（相对定位的父元素）
+ * @param {string} watermarkTxt     - 水印文字
+ * @param {number} [explicitWidth]  - 可选：显式指定容器宽度（px），不传则自动获取
+ * @param {number} [explicitHeight] - 可选：显式指定容器高度（px），不传则自动获取
+ */
+function addWatermark(container, watermarkTxt, explicitWidth = null, explicitHeight = null) {
+    if (!isNotEmpty(watermarkTxt)) return;
+
+    // 公共配置
+    const settings = {
+        start_x: 80,
+        start_y: 80,
+        x_space: 80,
+        y_space: 80,
+        color: 'black',
+        alpha: 0.2,
+        fontsize: '18px',
+        font: '微软雅黑',
+        width: 200,
+        height: 80,
+        angle: 30
+    };
+
+    // 确定实际使用的宽高
+    let pageWidth, pageHeight;
+    if (explicitWidth !== null && explicitHeight !== null) {
+        pageWidth = explicitWidth;
+        pageHeight = explicitHeight;
+    } else {
+        const rect = container.getBoundingClientRect();
+        pageWidth = rect.width;
+        pageHeight = rect.height;
+    }
+
+    let maxX = pageWidth - settings.width;
+    let maxY = pageHeight - settings.height;
+    maxX = Math.max(maxX, 250);
+    maxY = Math.max(maxY, 250);
+
+    const fragment = document.createDocumentFragment();
+    for (let x = settings.start_x; x < maxX; x += settings.x_space) {
+        for (let y = settings.start_y; y < maxY; y += settings.y_space) {
+            const div = document.createElement('div');
+            div.className = 'mask_div';
+            div.appendChild(document.createTextNode(watermarkTxt));
+            div.style.cssText = `
+                filter: progid:DXImageTransform.Microsoft.Alpha(opacity=${settings.alpha * 100});
+                transform: rotate(-${settings.angle}deg);
+                visibility: visible;
+                position: absolute;
+                left: ${x}px;
+                top: ${y}px;
+                overflow: hidden;
+                z-index: 100;
+                pointer-events: none;
+                opacity: ${settings.alpha};
+                font-size: ${settings.fontsize};
+                font-family: ${settings.font};
+                color: ${settings.color};
+                text-align: center;
+                width: ${settings.width}px;
+                height: ${settings.height}px;
+                display: block;
+            `;
+            fragment.appendChild(div);
+        }
+    }
+    container.appendChild(fragment);
+}
+
+
 /******/ var __webpack_modules__ = ({
 
 /***/ 34:
@@ -13877,28 +13954,34 @@ class PDFPrintService {
 useRenderedPage() {
     this.throwIfInactive();
     const img = document.createElement("img");
+    const wrapper = document.createElement("div");
+    wrapper.className = "printedPage";
+    wrapper.style.position = "relative";
+    
+    // 获取当前页面的尺寸（单位：点，1pt=1/72英寸）
+    const pageSizePt = this.pagesOverview[0];
+    // 转换为 CSS 像素（1pt = 96/72 px）
+    const pageWidthPx = pageSizePt.width * 96 / 72;
+    const pageHeightPx = pageSizePt.height * 96 / 72;
+    
+    // 设置 wrapper 尺寸（CSS 像素）
+    wrapper.style.width = `${pageWidthPx}px`;
+    wrapper.style.height = `${pageHeightPx}px`;
+    wrapper.style.backgroundColor = "white";
+    
     this.scratchCanvas.toBlob(blob => {
         img.src = URL.createObjectURL(blob);
     });
-    const wrapper = document.createElement("div");
+    
-    wrapper.className = "printedPage";
     wrapper.append(img);
-	 var printWatermarkDiv = document.createElement('div');
-    // console.log(pageSize);
-    printWatermarkDiv.style.position = 'absolute';
-    printWatermarkDiv.style.left = '0px';
-    printWatermarkDiv.style.top = '0px';
-    printWatermarkDiv.style.width = '1024px';
-    printWatermarkDiv.style.height = pageSize.height*pageCount+ "px";
-    watermarkObj(printWatermarkDiv,watermarkTxt);
-    wrapper.appendChild(printWatermarkDiv);
     this.printContainer.append(wrapper);
-    const {
+    
-      promise,
+    const { promise, resolve, reject } = Promise.withResolvers();
-      resolve,
+    img.onload = () => {
-      reject
+        // 使用专用函数生成水印，直接传入页面像素尺寸
-    } = Promise.withResolvers();
+        addWatermark(wrapper, watermarkTxt, pageWidthPx, pageHeightPx);
-    img.onload = resolve;
+        resolve();
+    };
     img.onerror = reject;
     promise.catch(() => {}).then(() => {
         URL.revokeObjectURL(img.src);
@@ -17612,7 +17695,7 @@ class PDFPageView extends BasePDFPageView {
         }
       });
     }
-	watermarkObj(div,watermarkTxt);
+	addWatermark(div,watermarkTxt);
     if (!this.annotationLayer && this.#annotationMode !== AnnotationMode.DISABLE) {
       const {
         annotationStorage,
@@ -23091,6 +23174,7 @@ initCom(PDFViewerApplication);
   if (HOSTED_VIEWER_ORIGINS.has(viewerOrigin)) {
     return;
   }
+  /* 注释掉跨域检查
   const fileOrigin = URL.parse(file, window.location)?.origin;
   if (fileOrigin === viewerOrigin) {
     return;
@@ -23100,6 +23184,7 @@ initCom(PDFViewerApplication);
     message: ex.message
   });
   throw ex;
+  */
 };
   var onFileInputChange = function (evt) {
     if (this.pdfViewer?.isInPresentationMode) {

server/src/main/resources/web/main/index.ftl

@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
     <link rel="stylesheet" href="bootstrap-table/bootstrap-table.min.css"/>
     <link rel="stylesheet" href="css/theme.css"/>
-    <link rel="stylesheet" href="css/main-pages.css?v=v1-polish-20260411-3"/>
+    <link rel="stylesheet" href="css/main-pages.css?v=v1-polish-20260411-5"/>
     <script type="text/javascript" src="js/jquery-3.6.1.min.js"></script>
     <script type="text/javascript" src="js/jquery.form.min.js"></script>
     <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
@@ -493,8 +493,8 @@
             search: false,
             searchOnEnterKey: false,
             showSearchButton: false,
-            showRefresh: true,
+            showRefresh: false,
-            showColumns: true,
+            showColumns: false,
             clickToSelect: true,
             locale: 'zh-CN',
             columns: [{

server/src/main/resources/web/main/record.ftl

@@ -41,10 +41,10 @@
                     你可以先看最新版本的升级重点，再顺着时间轴继续了解历史版本细节。
                 </p>
                 <div class="release-badge-row">
-                    <span class="tag highlight">最新版本 v5.0</span>
+                    <span class="tag highlight">最新版本 v5.0.0</span>
-                    <span class="tag brand">发布日期 2026-01-20</span>
+                    <span class="tag brand">发布日期 2026-04-14</span>
                     <span class="tag warn">JDK 21+ 强制要求</span>
-                    <span class="tag">PDF / TIF / CAD 异步化</span>
+                    <span class="tag">压缩包工作区预览 / PDF 默认模式</span>
                 </div>
             </div>
         </section>
@@ -53,9 +53,9 @@
             <div class="timeline-year">2026</div>
             <div class="timeline-list">
                 <article class="release-card">
-                    <h3>v5.0</h3>
+                    <h3>v5.0.0</h3>
                     <div class="release-meta">
-                        <span class="tag brand">2026-01-20</span>
+                        <span class="tag brand">2026-04-14</span>
                         <span class="tag highlight">最新稳定版本</span>
                         <span class="tag warn">升级需 JDK 21+</span>
                     </div>
@@ -66,6 +66,9 @@
                                 <li>优化 xlsx、图片、tif、svg、json 解析效果。</li>
                                 <li>优化 FTP 多客户端接入与 marked 解析。</li>
                                 <li>首页支持目录访问，并切换为 POST 服务端分页。</li>
+                                <li>压缩包预览页重构为单工作区布局，支持目录折叠与右侧内嵌预览。</li>
+                                <li>优化压缩包内文件类型标识，以及单图预览页展示样式。</li>
+                                <li>重构演示门户页面，包括首页、接入说明、版本记录与赞助页。</li>
                             </ul>
                         </div>
                         <div class="release-group">
@@ -74,6 +77,7 @@
                                 <li>新增 msg、heic/heif、页码、高亮、AES、Basic Auth、秘钥等能力。</li>
                                 <li>新增防重复转换、异步等待、上传限制与 cadviewer 转换方法。</li>
                                 <li>新增 pptm 支持。</li>
+                                <li>补充面向工程自动化与编码代理的仓库说明文档。</li>
                             </ul>
                         </div>
                         <div class="release-group">
@@ -82,6 +86,9 @@
                                 <li>修复压缩包路径问题与安全问题。</li>
                                 <li>修复图片水印不完整。</li>
                                 <li>修复 SSL 自签证书接入问题。</li>
+                                <li>修复压缩包内 Office 文件重复解压后被追加写坏、导致一直加载中的问题。</li>
+                                <li>Office 默认预览切到 PDF 模式，并默认展开 PDF 缩略图侧栏。</li>
+                                <li>修复 OFD 表格竖线溢出导致的渲染异常，并修正 PDF.js 兼容性补丁。</li>
                             </ul>
                         </div>
                         <div class="release-group">
@@ -90,6 +97,9 @@
                                 <li>JDK 版本要求升级到 21 及以上。</li>
                                 <li>前端解析链路升级：PDF、ODF、3D 模型。</li>
                                 <li>后端异步转换升级：PDF、TIF、视频、CAD。</li>
+                                <li>启动脚本改为自动发现当前发布包中的 jar，并同步更新 Docker 与发布辅助文档。</li>
+                                <li>默认配置策略调整：Office 预览默认使用 PDF 模式，默认隐藏图片/PDF 模式切换按钮；如需保留旧的图片优先体验，请显式设置 <code>office.preview.type=image</code> 与 <code>office.preview.switch.disabled=false</code>。</li>
+                                <li>信任域名配置匹配策略扩展：<code>trust.host</code> 及相关规则支持通配符与 CIDR 匹配；升级后请重新核对白名单和黑名单的匹配范围。</li>
                             </ul>
                         </div>
                     </div>

server/src/main/resources/web/pdf.ftl

@@ -1,24 +1,49 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN">
 <head>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
     <title>PDF预览</title>
     <#include "*/commonHeader.ftl">
     <script src="js/base64.min.js" type="text/javascript"></script>
+    <style>
+        /* 简单全屏布局，无滚动条 */
+        html, body {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            overflow: hidden;
+        }
+        iframe {
+            width: 100%;
+            height: 100%;
+            border: none;
+            display: block;
+        }
+        .img-preview {
+            position: fixed;
+            bottom: 20px;
+            right: 20px;
+            cursor: pointer;
+            z-index: 999;
+            width: 48px;
+            height: 48px;
+        }
+    </style>
 </head>
-
 <body>
+
 <#if pdfUrl?contains("http://") || pdfUrl?contains("https://")>
     <#assign finalUrl="${pdfUrl}">
 <#else>
     <#assign finalUrl="${baseUrl}${pdfUrl}">
 </#if>
-<iframe src="" width="100%" frameborder="0"></iframe>
+
+<iframe id="pdfFrame" src="about:blank"></iframe>
+
 <#if "false" == switchDisabled>
-    <img src="images/jpg.svg" width="48" height="48" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
+    <img class="img-preview" src="images/jpg.svg" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
 </#if>
-</body>
 
 <script type="text/javascript">
     var url = '${finalUrl}';
@@ -27,29 +52,36 @@
     if (kkagent === 'true' || !url.startsWith(baseUrl)) {
         url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url)) + "&key=${kkkey}";
     }
-    document.getElementsByTagName('iframe')[0].src = "${baseUrl}pdfjs/web/viewer.html?file=" + encodeURIComponent(url) + "&disablepresentationmode=${pdfPresentationModeDisable}&disableopenfile=${pdfOpenFileDisable}&disableprint=${pdfPrintDisable}&disabledownload=${pdfDownloadDisable}&disablebookmark=${pdfBookmarkDisable}&disableediting=${pdfDisableEditing}";
+    var viewerUrl = baseUrl + "pdfjs/web/viewer.html?file=" + encodeURIComponent(url);
-    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight - 10;
+	var watermarkEncoded = encodeURIComponent('${watermarkTxt?js_string}');
-    /**
+    var highlightEncoded = encodeURIComponent('${highlightall?js_string}');
-     * 页面变化调整高度
+    viewerUrl += "&disablepresentationmode=${pdfPresentationModeDisable}";
-     */
+    viewerUrl += "&disableopenfile=${pdfOpenFileDisable}";
-    window.onresize = function () {
+    viewerUrl += "&disableprint=${pdfPrintDisable}";
-        var fm = document.getElementsByTagName("iframe")[0];
+    viewerUrl += "&disabledownload=${pdfDownloadDisable}";
-        fm.height = window.document.documentElement.clientHeight - 10;
+    viewerUrl += "&disablebookmark=${pdfBookmarkDisable}";
-    }
+    viewerUrl += "&disableediting=${pdfDisableEditing}";
+    viewerUrl += "&watermarktxt=" + watermarkEncoded;
+    viewerUrl += "&pdfhighlightall=" + highlightEncoded;
+    viewerUrl += "#page=${page}";   // ?c 确保数字不包含千位分隔符
+<#if "true" == pdfSidebarOpen>
+	viewerUrl += "&pagemode=thumbs";
+<#else>
+	viewerUrl += "&pagemode=none";
+</#if>
+    var iframe = document.getElementById('pdfFrame');
+    iframe.src = viewerUrl;
 
+    // 图片预览切换
     function goForImage() {
-        var url = window.location.href
+        var href = window.location.href;
-        if (url.indexOf("officePreviewType=pdf") != -1) {
+        if (href.indexOf("officePreviewType=pdf") !== -1) {
-            url = url.replace("officePreviewType=pdf", "officePreviewType=image");
+            href = href.replace("officePreviewType=pdf", "officePreviewType=image");
         } else {
-            url = url + "&officePreviewType=image";
+            href += (href.indexOf('?') === -1 ? '?' : '&') + "officePreviewType=image";
         }
-        window.location.href = url;
+        window.location.href = href;
-    }
-
-    /*初始化水印*/
-    window.onload = function () {
-        initWaterMark();
     }
 </script>
+</body>
 </html>

server/src/main/resources/web/picture.ftl

@@ -9,7 +9,15 @@
     <script src="js/base64.min.js"></script>
     <style>
         body {
-            background-color: #404040;
+            background-color: #f1f3f5;
+        }
+        .viewer-container:focus {
+            outline: none !important;
+        }
+        .viewer-container:focus-visible {
+            outline: 2px solid rgba(95, 107, 122, 0.65) !important;
+            outline-offset: 2px;
+            box-shadow: 0 0 0 4px rgba(95, 107, 122, 0.14);
         }
         #image { width: 800px; margin: 0 auto; font-size: 0;}
         #image li {  display: inline-block;width: 50px;height: 50px; margin-left: 1%; padding-top: 1%;}

server/src/test/java/cn/keking/PdfViewerCompatibilityTests.java

@@ -26,6 +26,22 @@ public class PdfViewerCompatibilityTests {
         assertTrue(workerScript.contains("import \"../web/compatibility.mjs\";"));
     }
 
+    @Test
+    void shouldRenderPdfSidebarModeByDefaultBasedOnConfig() throws IOException {
+        String pdfTemplate = readResource("/web/pdf.ftl");
+
+        assertTrue(pdfTemplate.contains("<#if \"true\" == pdfSidebarOpen>"));
+        assertTrue(pdfTemplate.contains("viewerUrl += \"&pagemode=thumbs\";"));
+        assertTrue(pdfTemplate.contains("viewerUrl += \"&pagemode=none\";"));
+    }
+
+    @Test
+    void shouldPreferPdfForOfficePreviewByDefault() throws IOException {
+        String properties = readResource("/application.properties");
+
+        assertTrue(properties.contains("office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:pdf}"));
+    }
+
     private String readResource(String resourcePath) throws IOException {
         try (InputStream inputStream = getClass().getResourceAsStream(resourcePath)) {
             assertNotNull(inputStream);