Trigger docker archive workflow from temp branch

.github/workflows/manual-release-docker-packages.yml

@@ -0,0 +1,91 @@
+name: Manual Release Docker Packages
+
+on:
+  push:
+    branches:
+      - ops/release-v5.0.0-docker
+  workflow_dispatch:
+
+jobs:
+  build-docker-archives:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build server package
+        run: mvn -B -pl server -DskipTests package
+
+      - name: Prepare release Dockerfile
+        run: |
+          cat > Dockerfile.release <<'EOF'
+          FROM ubuntu:24.04
+
+          RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.aliyun.com@g' /etc/apt/sources.list.d/ubuntu.sources && \
+              sed -i 's@//security.ubuntu.com@//mirrors.aliyun.com@g' /etc/apt/sources.list.d/ubuntu.sources && \
+              sed -i 's@//ports.ubuntu.com@//mirrors.aliyun.com@g' /etc/apt/sources.list.d/ubuntu.sources && \
+              apt-get update && \
+              export DEBIAN_FRONTEND=noninteractive && \
+              apt-get install -y --no-install-recommends openjdk-21-jre tzdata locales xfonts-utils fontconfig libreoffice-nogui && \
+              echo 'Asia/Shanghai' > /etc/timezone && \
+              ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+              localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && \
+              locale-gen zh_CN.UTF-8 && \
+              apt-get install -y --no-install-recommends ttf-mscorefonts-installer && \
+              apt-get install -y --no-install-recommends ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy && \
+              apt-get autoremove -y && \
+              apt-get clean && \
+              rm -rf /var/lib/apt/lists/*
+
+          COPY docker/kkfileview-base/fonts/ /usr/share/fonts/chinese/
+
+          RUN cd /usr/share/fonts/chinese && \
+              mkfontscale && \
+              mkfontdir && \
+              fc-cache -fv
+
+          ENV LANG=zh_CN.UTF-8 LC_ALL=zh_CN.UTF-8
+          ADD server/target/kkFileView-*.tar.gz /opt/
+          ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-5.0.0/bin
+          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"]
+          EOF
+
+      - name: Build amd64 docker archive
+        run: |
+          mkdir -p dist
+          docker buildx build \
+            --platform linux/amd64 \
+            --provenance=false \
+            --output type=docker,dest=dist/kkFileView-5.0.0-docker_x64.tar \
+            -f Dockerfile.release \
+            .
+
+      - name: Build arm64 docker archive
+        run: |
+          docker buildx build \
+            --platform linux/arm64 \
+            --provenance=false \
+            --output type=docker,dest=dist/kkFileView-5.0.0-docker_aarch64.tar \
+            -f Dockerfile.release \
+            .
+
+      - name: Upload docker archives
+        uses: actions/upload-artifact@v4
+        with:
+          name: kkfileview-docker-release
+          path: dist/kkFileView-5.0.0-docker_*.tar
+          retention-days: 7

server/src/main/config/application.properties

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

@@ -1,9 +1,11 @@
 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;
 
@@ -21,9 +23,8 @@ public class CacheServiceRedisImpl implements CacheService {
 
     private final RedissonClient redissonClient;
 
-    // 直接注入 Spring 容器中的 RedissonClient Bean
+    public CacheServiceRedisImpl(Config config) {
-    public CacheServiceRedisImpl(RedissonClient redissonClient) {
+        this.redissonClient = Redisson.create(config);
-        this.redissonClient = redissonClient;
     }
 
     @Override

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

@@ -38,7 +38,6 @@ 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/js/pdfwatermark.js

@@ -0,0 +1,69 @@
+
+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,6 +1221,8 @@ 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,83 +9,6 @@ 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:
@@ -13951,43 +13874,37 @@ class PDFPrintService {
     };
     return new Promise(renderNextPage);
   }
-useRenderedPage() {
+  useRenderedPage() {
     this.throwIfInactive();
     const img = document.createElement("img");
+    this.scratchCanvas.toBlob(blob => {
+      img.src = URL.createObjectURL(blob);
+    });
     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);
-    });
-    
     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 {
-    const { promise, resolve, reject } = Promise.withResolvers();
+      promise,
-    img.onload = () => {
+      resolve,
-        // 使用专用函数生成水印，直接传入页面像素尺寸
+      reject
-        addWatermark(wrapper, watermarkTxt, pageWidthPx, pageHeightPx);
+    } = Promise.withResolvers();
-        resolve();
+    img.onload = resolve;
-    };
     img.onerror = reject;
     promise.catch(() => {}).then(() => {
-        URL.revokeObjectURL(img.src);
+      URL.revokeObjectURL(img.src);
     });
     return promise;
-}
+  }
   performPrint() {
     this.throwIfInactive();
     return new Promise(resolve => {
@@ -17695,7 +17612,7 @@ class PDFPageView extends BasePDFPageView {
         }
       });
     }
-	addWatermark(div,watermarkTxt);
+	watermarkObj(div,watermarkTxt);
     if (!this.annotationLayer && this.#annotationMode !== AnnotationMode.DISABLE) {
       const {
         annotationStorage,
@@ -23166,26 +23083,24 @@ initCom(PDFViewerApplication);
 }
 {
   const HOSTED_VIEWER_ORIGINS = new Set(["null", "http://mozilla.github.io", "https://mozilla.github.io"]);
-var validateFileURL = function (file) {
+  var validateFileURL = function (file) {
-  if (!file) {
+    if (!file) {
-    return;
+      return;
-  }
+    }
-  const viewerOrigin = URL.parse(window.location)?.origin || "null";
+    const viewerOrigin = URL.parse(window.location)?.origin || "null";
-  if (HOSTED_VIEWER_ORIGINS.has(viewerOrigin)) {
+    if (HOSTED_VIEWER_ORIGINS.has(viewerOrigin)) {
-    return;
+      return;
-  }
+    }
-  /* 注释掉跨域检查
+    const fileOrigin = URL.parse(file, window.location)?.origin;
-  const fileOrigin = URL.parse(file, window.location)?.origin;
+    if (fileOrigin === viewerOrigin) {
-  if (fileOrigin === viewerOrigin) {
+      return;
-    return;
+    }
-  }
+    const ex = new Error("file origin does not match viewer's");
-  const ex = new Error("file origin does not match viewer's");
+    PDFViewerApplication._documentError("pdfjs-loading-error", {
-  PDFViewerApplication._documentError("pdfjs-loading-error", {
+      message: ex.message
-    message: ex.message
+    });
-  });
+    throw ex;
-  throw ex;
+  };
-  */
-};
   var onFileInputChange = function (evt) {
     if (this.pdfViewer?.isInPresentationMode) {
       return;

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

@@ -1,87 +1,55 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 <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>
 
+<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 class="img-preview" src="images/jpg.svg" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
+    <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()"/>
 </#if>
+</body>
 
 <script type="text/javascript">
-    var url = '${finalUrl}';
+ 	var url = '${finalUrl}';
-    var kkagent = '${kkagent}';
+	var kkagent = '${kkagent}';
     var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/';
     if (kkagent === 'true' || !url.startsWith(baseUrl)) {
-        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url)) + "&key=${kkkey}";
+       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}#page=1&pagemode=thumbs";
+    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight - 10;
+    /**
+     * 页面变化调整高度
+     */
+    window.onresize = function () {
+        var fm = document.getElementsByTagName("iframe")[0];
+        fm.height = window.document.documentElement.clientHeight - 10;
     }
-    var viewerUrl = baseUrl + "pdfjs/web/viewer.html?file=" + encodeURIComponent(url);
-	var watermarkEncoded = encodeURIComponent('${watermarkTxt?js_string}');
-    var highlightEncoded = encodeURIComponent('${highlightall?js_string}');
-    viewerUrl += "&disablepresentationmode=${pdfPresentationModeDisable}";
-    viewerUrl += "&disableopenfile=${pdfOpenFileDisable}";
-    viewerUrl += "&disableprint=${pdfPrintDisable}";
-    viewerUrl += "&disabledownload=${pdfDownloadDisable}";
-    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 href = window.location.href;
+        var url = window.location.href
-        if (href.indexOf("officePreviewType=pdf") !== -1) {
+        if (url.indexOf("officePreviewType=pdf") != -1) {
-            href = href.replace("officePreviewType=pdf", "officePreviewType=image");
+            url = url.replace("officePreviewType=pdf", "officePreviewType=image");
         } else {
-            href += (href.indexOf('?') === -1 ? '?' : '&') + "officePreviewType=image";
+            url = url + "&officePreviewType=image";
         }
-        window.location.href = href;
+        window.location.href = url;
+    }
+
+    /*初始化水印*/
+    window.onload = function () {
+        initWaterMark();
     }
 </script>
-</body>
 </html>

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

@@ -27,12 +27,10 @@ public class PdfViewerCompatibilityTests {
     }
 
     @Test
-    void shouldRenderPdfSidebarModeByDefaultBasedOnConfig() throws IOException {
+    void shouldOpenPdfPreviewWithThumbnailSidebarByDefault() throws IOException {
         String pdfTemplate = readResource("/web/pdf.ftl");
 
-        assertTrue(pdfTemplate.contains("<#if \"true\" == pdfSidebarOpen>"));
+        assertTrue(pdfTemplate.contains("#page=1&pagemode=thumbs"));
-        assertTrue(pdfTemplate.contains("viewerUrl += \"&pagemode=thumbs\";"));
-        assertTrue(pdfTemplate.contains("viewerUrl += \"&pagemode=none\";"));
     }
 
     @Test