ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-v1.0 #1

Merged
panchichun merged 41 commits from release-v1.0 into main 2024-09-13 17:03:09 +08:00
Conversation 0 Commits 41 Files Changed 138 +46 -69
25 changed files with 46 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa5178ac92 - Show all commits

2
tool-tech-file-view/src/main/bin/showlog.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
tail -fn 300 ../log/kkFileView.log tail -fn 300 ../log/toolTechFileView.log

22
tool-tech-file-view/src/main/bin/shutdown.sh
View File

@ -1,21 +1,13 @@
#!/bin/bash #!/bin/bash
#
# TTFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd)
############################# PID_FILE_NAME="toolTechFileView.pid"
# Author: sanxi PID_FILE="${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
# Version: 1.0 export TTFILEVIEW_BIN_FOLDER=$TTFILEVIEW_BIN_FOLDER
# 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
# #
## pid文件是否存在 ## pid文件是否存在
if [ ! -e "$PID_FILE" ]; then if [ ! -e "$PID_FILE" ]; then
echo "kkFileView.pid文件不存在！" echo "toolTechFileView.pid文件不存在！"
exit 1 exit 1
else else
## 文件不为空代表程序正在运行，则循环关闭进程。 ## 文件不为空代表程序正在运行，则循环关闭进程。
@ -31,6 +23,6 @@ else
# 关闭所有进程后，重置pid。 # 关闭所有进程后，重置pid。
cat /dev/null > "$PID_FILE" cat /dev/null > "$PID_FILE"
else else
echo "kkFileView进程尚未运行！" echo "toolTechFileView进程尚未运行！"
fi fi
fi fi

15
tool-tech-file-view/src/main/bin/startup.bat
View File

@ -1,10 +1,7 @@
@echo off @echo off
set "KKFILEVIEW_BIN_FOLDER=%cd%" set "TTFILEVIEW_BIN_FOLDER=%cd%"
cd "%KKFILEVIEW_BIN_FOLDER%" cd "%TTFILEVIEW_BIN_FOLDER%"
echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER% echo Using TTFILEVIEW_BIN_FOLDER %TTFILEVIEW_BIN_FOLDER%
echo Starting kkFileView... echo Starting toolTechFileView...
echo Please check log file in ../log/kkFileView.log for more information echo Please check log file in ../log/toolTechFileView.log for more information
echo You can get help in our official home site: https://kkview.cn java -Dspring.config.location=..\config\application.properties -jar tool-tech-file-view-4.4.0.jar -> ..\log\toolTechFileView.log
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

32
tool-tech-file-view/src/main/bin/startup.sh
View File

@ -1,25 +1,16 @@
#!/bin/bash #!/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") 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= FLAG=
OFFICE_HOME= OFFICE_HOME=
KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd) TTFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd)
PID_FILE_NAME="kkFileView.pid" PID_FILE_NAME="toolTechFileView.pid"
PID_FILE="${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" PID_FILE="${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER export TTFILEVIEW_BIN_FOLDER=$TTFILEVIEW_BIN_FOLDER
# #
## 如pid文件不存在则自动创建 ## 如pid文件不存在则自动创建
if [ ! -f ${PID_FILE_NAME} ]; then if [ ! -f ${PID_FILE_NAME} ]; then
touch "${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}" touch "${TTFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
fi fi
## 判断当前是否有进程处于运行状态 ## 判断当前是否有进程处于运行状态
if [ -s "${PID_FILE}" ]; then if [ -s "${PID_FILE}" ]; then
@ -27,8 +18,8 @@ if [ -s "${PID_FILE}" ]; then
echo "进程已处于运行状态，进程号为：${PID}" echo "进程已处于运行状态，进程号为：${PID}"
exit 1 exit 1
else else
cd "$KKFILEVIEW_BIN_FOLDER" || exit 1 cd "$TTFILEVIEW_BIN_FOLDER" || exit 1
echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER" echo "Using TTFILEVIEW_BIN_FOLDER $TTFILEVIEW_BIN_FOLDER"
grep 'office\.home' ../config/application.properties | grep '!^#' grep 'office\.home' ../config/application.properties | grep '!^#'
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Using customized office.home" echo "Using customized office.home"
@ -50,12 +41,9 @@ else
fi fi
## 启动kkFileView ## 启动kkFileView
echo "Starting kkFileView..." echo "Starting ToolTechFileView..."
nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0-beta.jar > ../log/kkFileView.log 2>&1 & 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 "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}') PROCESS=$(ps -ef | grep -v grep | grep java | grep kkFileView | awk 'NR==1{print $2}')
# 启动成功后将进程号写入pid文件 # 启动成功后将进程号写入pid文件
echo "$PROCESS" > "$PID_FILE" echo "$PROCESS" > "$PID_FILE"

2
tool-tech-file-view/src/main/resources/web/code.ftl
View File

@ -44,7 +44,7 @@
* 初始化 * 初始化
*/ */
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
loadText(); loadText();
} }

2
tool-tech-file-view/src/main/resources/web/csv.ftl
View File

@ -76,7 +76,7 @@ reader.readAsArrayBuffer(file);
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>

2
tool-tech-file-view/src/main/resources/web/dcm.ftl
View File

@ -96,7 +96,7 @@
); );
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/drawio.ftl
View File

@ -34,7 +34,7 @@
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/eml.ftl
View File

@ -38,7 +38,7 @@
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/epub.ftl
View File

@ -153,7 +153,7 @@ function blobToArrayBuffer(blob) {
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/html.ftl
View File

@ -27,7 +27,7 @@
} }
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/markdown.ftl
View File

@ -42,7 +42,7 @@
*/ */
window.onload = function () { window.onload = function () {
$("#markdown_btn").hide() $("#markdown_btn").hide()
initWaterMark(); //initWaterMark();
loadMarkdown(); loadMarkdown();
} }
function htmlEscape(str){ function htmlEscape(str){

2
tool-tech-file-view/src/main/resources/web/media.ftl
View File

@ -102,7 +102,7 @@
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>

2
tool-tech-file-view/src/main/resources/web/ofd.ftl
View File

@ -45,7 +45,7 @@
} }
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/officePicture.ftl
View File

@ -43,7 +43,7 @@
<script> <script>
window.onload = function () { window.onload = function () {
/*初始化水印*/ /*初始化水印*/
initWaterMark(); //initWaterMark();
checkImgs(); checkImgs();
}; };
window.onscroll = throttle(checkImgs); window.onscroll = throttle(checkImgs);

2
tool-tech-file-view/src/main/resources/web/officeweb.ftl
View File

@ -81,7 +81,7 @@
} }
let mask = document.getElementById("lucky-mask-demo"); let mask = document.getElementById("lucky-mask-demo");
function loadText() { function loadText() {
initWaterMark(); // 是否显示水印 //initWaterMark(); // 是否显示水印
var value = url; var value = url;
var name = '${file.name}'; var name = '${file.name}';
if(value==""){ if(value==""){

2
tool-tech-file-view/src/main/resources/web/online3D.ftl
View File

@ -44,7 +44,7 @@
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/pdf.ftl
View File

@ -55,7 +55,7 @@
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</html> </html>

2
tool-tech-file-view/src/main/resources/web/picture.ftl
View File

@ -40,7 +40,7 @@
/*初始化水印*/ /*初始化水印*/
window.onload = function() { window.onload = function() {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/ppt.ftl
View File

@ -138,7 +138,7 @@
} }
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/svg.ftl
View File

@ -46,7 +46,7 @@
createNewEmbed(url); createNewEmbed(url);
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/tiff.ftl
View File

@ -138,7 +138,7 @@ html += "</html>";
/*初始化水印*/ /*初始化水印*/
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

4
tool-tech-file-view/src/main/resources/web/txt.ftl
View File

@ -288,7 +288,7 @@ background-color:#000000
* 初始化 * 初始化
*/ */
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
} }
</script> </script>
<#else/> <#else/>
@ -322,7 +322,7 @@ background-color:#000000
* 初始化 * 初始化
*/ */
window.onload = function () { window.onload = function () {
initWaterMark(); //initWaterMark();
loadText(); loadText();
} }
</script> </script>

2
tool-tech-file-view/src/main/resources/web/xmind.ftl
View File

@ -47,7 +47,7 @@
if (!!window.ActiveXObject || "ActiveXObject" in window) if (!!window.ActiveXObject || "ActiveXObject" in window)
{ {
}else{ }else{
initWaterMark(); //initWaterMark();
} }
</script> </script>
</body> </body>

2
tool-tech-file-view/src/main/resources/web/xml.ftl
View File

@ -43,7 +43,7 @@
*/ */
window.onload = function () { window.onload = function () {
$("#xml_btn").hide() $("#xml_btn").hide()
initWaterMark(); //initWaterMark();
loadXmlData() loadXmlData()
} }