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/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(RedissonClient redissonClient) {
-        this.redissonClient = redissonClient;
+    public CacheServiceRedisImpl(Config config) {
+        this.redissonClient = Redisson.create(config);
     }
 
     @Override

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:
@@ -13954,34 +13877,28 @@ 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, resolve, reject } = Promise.withResolvers();
-    img.onload = () => {
-        // 使用专用函数生成水印，直接传入页面像素尺寸
-        addWatermark(wrapper, watermarkTxt, pageWidthPx, pageHeightPx);
-        resolve();
-    };
+    const {
+      promise,
+      resolve,
+      reject
+    } = Promise.withResolvers();
+    img.onload = resolve;
     img.onerror = reject;
     promise.catch(() => {}).then(() => {
       URL.revokeObjectURL(img.src);
@@ -17695,7 +17612,7 @@ class PDFPageView extends BasePDFPageView {
         }
       });
     }
-	addWatermark(div,watermarkTxt);
+	watermarkObj(div,watermarkTxt);
     if (!this.annotationLayer && this.#annotationMode !== AnnotationMode.DISABLE) {
       const {
         annotationStorage,
@@ -23174,7 +23091,6 @@ var validateFileURL = function (file) {
     if (HOSTED_VIEWER_ORIGINS.has(viewerOrigin)) {
       return;
     }
-  /* 注释掉跨域检查
     const fileOrigin = URL.parse(file, window.location)?.origin;
     if (fileOrigin === viewerOrigin) {
       return;
@@ -23184,7 +23100,6 @@ var validateFileURL = function (file) {
       message: ex.message
     });
     throw ex;
-  */
   };
   var onFileInputChange = function (evt) {
     if (this.pdfViewer?.isInPresentationMode) {

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

@@ -1,49 +1,24 @@
 <!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 id="pdfFrame" src="about:blank"></iframe>
-
+<iframe src="" width="100%" frameborder="0"></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}';
@@ -52,32 +27,29 @@
     if (kkagent === 'true' || !url.startsWith(baseUrl)) {
        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url))+ "&key=${kkkey}";
     }
-    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 确保数字不包含千位分隔符
-	viewerUrl += "&pagemode=thumbs";     
-    var iframe = document.getElementById('pdfFrame');
-    iframe.src = viewerUrl;
-
-    // 图片预览切换
-    function goForImage() {
-        var href = window.location.href;
-        if (href.indexOf("officePreviewType=pdf") !== -1) {
-            href = href.replace("officePreviewType=pdf", "officePreviewType=image");
-        } else {
-            href += (href.indexOf('?') === -1 ? '?' : '&') + "officePreviewType=image";
+    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;
     }
-        window.location.href = href;
+
+    function goForImage() {
+        var url = window.location.href
+        if (url.indexOf("officePreviewType=pdf") != -1) {
+            url = url.replace("officePreviewType=pdf", "officePreviewType=image");
+        } else {
+            url = url + "&officePreviewType=image";
+        }
+        window.location.href = url;
+    }
+
+    /*初始化水印*/
+    window.onload = function () {
+        initWaterMark();
     }
 </script>
-</body>
 </html>