From aa5178ac926190ac45ffa894ae367b6e367faee2 Mon Sep 17 00:00:00 2001 From: hanjian <272005125@qq.com> Date: Mon, 2 Sep 2024 20:54:44 +0800 Subject: [PATCH] update --- tool-tech-file-view/src/main/bin/showlog.sh | 2 +- tool-tech-file-view/src/main/bin/shutdown.sh | 22 ++++--------- tool-tech-file-view/src/main/bin/startup.bat | 15 ++++----- tool-tech-file-view/src/main/bin/startup.sh | 32 ++++++------------- .../src/main/resources/web/code.ftl | 2 +- .../src/main/resources/web/csv.ftl | 2 +- .../src/main/resources/web/dcm.ftl | 2 +- .../src/main/resources/web/drawio.ftl | 2 +- .../src/main/resources/web/eml.ftl | 2 +- .../src/main/resources/web/epub.ftl | 2 +- .../src/main/resources/web/html.ftl | 2 +- .../src/main/resources/web/markdown.ftl | 2 +- .../src/main/resources/web/media.ftl | 2 +- .../src/main/resources/web/ofd.ftl | 2 +- .../src/main/resources/web/officePicture.ftl | 2 +- .../src/main/resources/web/officeweb.ftl | 2 +- .../src/main/resources/web/online3D.ftl | 2 +- .../src/main/resources/web/pdf.ftl | 2 +- .../src/main/resources/web/picture.ftl | 2 +- .../src/main/resources/web/ppt.ftl | 2 +- .../src/main/resources/web/svg.ftl | 2 +- .../src/main/resources/web/tiff.ftl | 2 +- .../src/main/resources/web/txt.ftl | 4 +-- .../src/main/resources/web/xmind.ftl | 2 +- .../src/main/resources/web/xml.ftl | 2 +- 25 files changed, 46 insertions(+), 69 deletions(-) diff --git a/tool-tech-file-view/src/main/bin/showlog.sh b/tool-tech-file-view/src/main/bin/showlog.sh index 5f32596..a28138b 100644 --- a/tool-tech-file-view/src/main/bin/showlog.sh +++ b/tool-tech-file-view/src/main/bin/showlog.sh @@ -1,2 +1,2 @@ #!/bin/bash -tail -fn 300 ../log/kkFileView.log \ No newline at end of file +tail -fn 300 ../log/toolTechFileView.log \ No newline at end of file diff --git a/tool-tech-file-view/src/main/bin/shutdown.sh b/tool-tech-file-view/src/main/bin/shutdown.sh index a505923..a8cacb3 100644 --- a/tool-tech-file-view/src/main/bin/shutdown.sh +++ b/tool-tech-file-view/src/main/bin/shutdown.sh @@ -1,21 +1,13 @@ #!/bin/bash -# -# -############################# -# Author: sanxi -# Version: 1.0 -# Date: 2021/09/17 -# Description: v1.0：修改kkFileView关闭进程机制 -############################# -# -KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd) -PID_FILE_NAME="kkFileView.pid" -PID_FILE="${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" -export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER + +TTFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd) +PID_FILE_NAME="toolTechFileView.pid" +PID_FILE="${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" +export TTFILEVIEW_BIN_FOLDER=$TTFILEVIEW_BIN_FOLDER # ## pid文件是否存在 if [ ! -e "$PID_FILE" ]; then - echo "kkFileView.pid文件不存在！" + echo "toolTechFileView.pid文件不存在！" exit 1 else ## 文件不为空代表程序正在运行，则循环关闭进程。 @@ -31,6 +23,6 @@ else # 关闭所有进程后，重置pid。 cat /dev/null > "$PID_FILE" else - echo "kkFileView进程尚未运行！" + echo "toolTechFileView进程尚未运行！" fi fi diff --git a/tool-tech-file-view/src/main/bin/startup.bat b/tool-tech-file-view/src/main/bin/startup.bat index 13a1452..e6588f8 100644 --- a/tool-tech-file-view/src/main/bin/startup.bat +++ b/tool-tech-file-view/src/main/bin/startup.bat @@ -1,10 +1,7 @@ @echo off -set "KKFILEVIEW_BIN_FOLDER=%cd%" -cd "%KKFILEVIEW_BIN_FOLDER%" -echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER% -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-beta.jar -> ..\log\kkFileView.log +set "TTFILEVIEW_BIN_FOLDER=%cd%" +cd "%TTFILEVIEW_BIN_FOLDER%" +echo Using TTFILEVIEW_BIN_FOLDER %TTFILEVIEW_BIN_FOLDER% +echo Starting toolTechFileView... +echo Please check log file in ../log/toolTechFileView.log for more information +java -Dspring.config.location=..\config\application.properties -jar tool-tech-file-view-4.4.0.jar -> ..\log\toolTechFileView.log diff --git a/tool-tech-file-view/src/main/bin/startup.sh b/tool-tech-file-view/src/main/bin/startup.sh index 1a7f129..d0927ba 100644 --- a/tool-tech-file-view/src/main/bin/startup.sh +++ b/tool-tech-file-view/src/main/bin/startup.sh @@ -1,25 +1,16 @@ #!/bin/bash -# -# -############################# -# First_Author: 凯京科技 -# Second_Author: sanxi -# Version: 1.1 -# Date: 2021/09/17 -# Description: v1.1：修改进程启动机制为pid形式。 -############################# -# + DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.1" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/libreoffice7.2" "/opt/libreoffice7.3" "/opt/libreoffice7.4" "/opt/libreoffice7.5" "/opt/libreoffice7.6" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice") FLAG= OFFICE_HOME= -KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd) -PID_FILE_NAME="kkFileView.pid" -PID_FILE="${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" -export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER +TTFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd) +PID_FILE_NAME="toolTechFileView.pid" +PID_FILE="${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" +export TTFILEVIEW_BIN_FOLDER=$TTFILEVIEW_BIN_FOLDER # ## 如pid文件不存在则自动创建 if [ ! -f ${PID_FILE_NAME} ]; then - touch "${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" + touch "${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" fi ## 判断当前是否有进程处于运行状态 if [ -s "${PID_FILE}" ]; then @@ -27,8 +18,8 @@ if [ -s "${PID_FILE}" ]; then echo "进程已处于运行状态，进程号为：${PID}" exit 1 else - cd "$KKFILEVIEW_BIN_FOLDER" || exit 1 - echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER" + cd "$TTFILEVIEW_BIN_FOLDER" || exit 1 + echo "Using TTFILEVIEW_BIN_FOLDER $TTFILEVIEW_BIN_FOLDER" grep 'office\.home' ../config/application.properties | grep '!^#' if [ $? -eq 0 ]; then echo "Using customized office.home" @@ -50,12 +41,9 @@ else fi ## 启动kkFileView - echo "Starting kkFileView..." - nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0-beta.jar > ../log/kkFileView.log 2>&1 & + echo "Starting ToolTechFileView..." + nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar tool-tech-file-view-4.4.0.jar > ../log/toolTechFileView.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" - echo "If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers" PROCESS=$(ps -ef | grep -v grep | grep java | grep kkFileView | awk 'NR==1{print $2}') # 启动成功后将进程号写入pid文件 echo "$PROCESS" > "$PID_FILE" diff --git a/tool-tech-file-view/src/main/resources/web/code.ftl b/tool-tech-file-view/src/main/resources/web/code.ftl index 454eb7c..e1f0ce3 100644 --- a/tool-tech-file-view/src/main/resources/web/code.ftl +++ b/tool-tech-file-view/src/main/resources/web/code.ftl @@ -44,7 +44,7 @@ * 初始化 */ window.onload = function () { - initWaterMark(); + //initWaterMark(); loadText(); } diff --git a/tool-tech-file-view/src/main/resources/web/csv.ftl b/tool-tech-file-view/src/main/resources/web/csv.ftl index d3a3a59..c4698b2 100644 --- a/tool-tech-file-view/src/main/resources/web/csv.ftl +++ b/tool-tech-file-view/src/main/resources/web/csv.ftl @@ -76,7 +76,7 @@ reader.readAsArrayBuffer(file); if (!!window.ActiveXObject || "ActiveXObject" in window) { }else{ - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/dcm.ftl b/tool-tech-file-view/src/main/resources/web/dcm.ftl index 4d8d24f..7a74daf 100644 --- a/tool-tech-file-view/src/main/resources/web/dcm.ftl +++ b/tool-tech-file-view/src/main/resources/web/dcm.ftl @@ -96,7 +96,7 @@ ); /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/drawio.ftl b/tool-tech-file-view/src/main/resources/web/drawio.ftl index 377a97e..7eb3c54 100644 --- a/tool-tech-file-view/src/main/resources/web/drawio.ftl +++ b/tool-tech-file-view/src/main/resources/web/drawio.ftl @@ -34,7 +34,7 @@ /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/eml.ftl b/tool-tech-file-view/src/main/resources/web/eml.ftl index 5c6336d..1c9458f 100644 --- a/tool-tech-file-view/src/main/resources/web/eml.ftl +++ b/tool-tech-file-view/src/main/resources/web/eml.ftl @@ -38,7 +38,7 @@ if (!!window.ActiveXObject || "ActiveXObject" in window) { }else{ - initWaterMark(); + //initWaterMark(); } \ No newline at end of file diff --git a/tool-tech-file-view/src/main/resources/web/epub.ftl b/tool-tech-file-view/src/main/resources/web/epub.ftl index 42f0c14..52948bf 100644 --- a/tool-tech-file-view/src/main/resources/web/epub.ftl +++ b/tool-tech-file-view/src/main/resources/web/epub.ftl @@ -153,7 +153,7 @@ function blobToArrayBuffer(blob) { if (!!window.ActiveXObject || "ActiveXObject" in window) { }else{ - initWaterMark(); + //initWaterMark(); } \ No newline at end of file diff --git a/tool-tech-file-view/src/main/resources/web/html.ftl b/tool-tech-file-view/src/main/resources/web/html.ftl index f4da55b..925dea9 100644 --- a/tool-tech-file-view/src/main/resources/web/html.ftl +++ b/tool-tech-file-view/src/main/resources/web/html.ftl @@ -27,7 +27,7 @@ } /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/markdown.ftl b/tool-tech-file-view/src/main/resources/web/markdown.ftl index cfd882e..b3869a3 100644 --- a/tool-tech-file-view/src/main/resources/web/markdown.ftl +++ b/tool-tech-file-view/src/main/resources/web/markdown.ftl @@ -42,7 +42,7 @@ */ window.onload = function () { $("#markdown_btn").hide() - initWaterMark(); + //initWaterMark(); loadMarkdown(); } function htmlEscape(str){ diff --git a/tool-tech-file-view/src/main/resources/web/media.ftl b/tool-tech-file-view/src/main/resources/web/media.ftl index c16d030..2d50af1 100644 --- a/tool-tech-file-view/src/main/resources/web/media.ftl +++ b/tool-tech-file-view/src/main/resources/web/media.ftl @@ -102,7 +102,7 @@ if (!!window.ActiveXObject || "ActiveXObject" in window) { }else{ - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/ofd.ftl b/tool-tech-file-view/src/main/resources/web/ofd.ftl index d05ea30..0370305 100644 --- a/tool-tech-file-view/src/main/resources/web/ofd.ftl +++ b/tool-tech-file-view/src/main/resources/web/ofd.ftl @@ -45,7 +45,7 @@ } /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/officePicture.ftl b/tool-tech-file-view/src/main/resources/web/officePicture.ftl index e9d6903..b46fedc 100644 --- a/tool-tech-file-view/src/main/resources/web/officePicture.ftl +++ b/tool-tech-file-view/src/main/resources/web/officePicture.ftl @@ -43,7 +43,7 @@ \ No newline at end of file diff --git a/tool-tech-file-view/src/main/resources/web/pdf.ftl b/tool-tech-file-view/src/main/resources/web/pdf.ftl index 845ac8c..756355e 100644 --- a/tool-tech-file-view/src/main/resources/web/pdf.ftl +++ b/tool-tech-file-view/src/main/resources/web/pdf.ftl @@ -55,7 +55,7 @@ /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/picture.ftl b/tool-tech-file-view/src/main/resources/web/picture.ftl index 39ea6b6..53b85ab 100644 --- a/tool-tech-file-view/src/main/resources/web/picture.ftl +++ b/tool-tech-file-view/src/main/resources/web/picture.ftl @@ -40,7 +40,7 @@ /*初始化水印*/ window.onload = function() { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/ppt.ftl b/tool-tech-file-view/src/main/resources/web/ppt.ftl index 5709205..d343aa5 100644 --- a/tool-tech-file-view/src/main/resources/web/ppt.ftl +++ b/tool-tech-file-view/src/main/resources/web/ppt.ftl @@ -138,7 +138,7 @@ } window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/svg.ftl b/tool-tech-file-view/src/main/resources/web/svg.ftl index 82f4f9a..3865d5b 100644 --- a/tool-tech-file-view/src/main/resources/web/svg.ftl +++ b/tool-tech-file-view/src/main/resources/web/svg.ftl @@ -46,7 +46,7 @@ createNewEmbed(url); /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/tiff.ftl b/tool-tech-file-view/src/main/resources/web/tiff.ftl index e03cf28..13e0e9a 100644 --- a/tool-tech-file-view/src/main/resources/web/tiff.ftl +++ b/tool-tech-file-view/src/main/resources/web/tiff.ftl @@ -138,7 +138,7 @@ html += ""; /*初始化水印*/ window.onload = function () { - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/txt.ftl b/tool-tech-file-view/src/main/resources/web/txt.ftl index bb7167a..c5a3239 100644 --- a/tool-tech-file-view/src/main/resources/web/txt.ftl +++ b/tool-tech-file-view/src/main/resources/web/txt.ftl @@ -288,7 +288,7 @@ background-color:#000000 * 初始化 */ window.onload = function () { - initWaterMark(); + //initWaterMark(); } <#else/> @@ -322,7 +322,7 @@ background-color:#000000 * 初始化 */ window.onload = function () { - initWaterMark(); + //initWaterMark(); loadText(); } diff --git a/tool-tech-file-view/src/main/resources/web/xmind.ftl b/tool-tech-file-view/src/main/resources/web/xmind.ftl index 3912e34..f7dedea 100644 --- a/tool-tech-file-view/src/main/resources/web/xmind.ftl +++ b/tool-tech-file-view/src/main/resources/web/xmind.ftl @@ -47,7 +47,7 @@ if (!!window.ActiveXObject || "ActiveXObject" in window) { }else{ - initWaterMark(); + //initWaterMark(); } diff --git a/tool-tech-file-view/src/main/resources/web/xml.ftl b/tool-tech-file-view/src/main/resources/web/xml.ftl index dd7a277..c05938b 100644 --- a/tool-tech-file-view/src/main/resources/web/xml.ftl +++ b/tool-tech-file-view/src/main/resources/web/xml.ftl @@ -43,7 +43,7 @@ */ window.onload = function () { $("#xml_btn").hide() - initWaterMark(); + //initWaterMark(); loadXmlData() }