mirror of
https://gitee.com/kekingcn/file-online-preview.git
synced 2025-12-29 09:54:41 +08:00
解决tar包office目录层级过长问题
This commit is contained in:
@@ -66,8 +66,7 @@ public class OfficeUtils {
|
|||||||
}
|
}
|
||||||
if (PlatformUtils.isWindows()) {
|
if (PlatformUtils.isWindows()) {
|
||||||
// %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
|
// %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
|
||||||
String separator = File.separator;
|
String homePath = OfficeUtils.getHomePath();
|
||||||
String officeHome = OfficeUtils.getHomePath() + separator + "office";
|
|
||||||
String programFiles = System.getenv("ProgramFiles(x86)");
|
String programFiles = System.getenv("ProgramFiles(x86)");
|
||||||
if (programFiles == null) {
|
if (programFiles == null) {
|
||||||
programFiles = System.getenv("ProgramFiles");
|
programFiles = System.getenv("ProgramFiles");
|
||||||
@@ -75,7 +74,7 @@ public class OfficeUtils {
|
|||||||
return findOfficeHome(
|
return findOfficeHome(
|
||||||
programFiles + File.separator + "OpenOffice 4",
|
programFiles + File.separator + "OpenOffice 4",
|
||||||
programFiles + File.separator + "LibreOffice 4",
|
programFiles + File.separator + "LibreOffice 4",
|
||||||
officeHome + File.separator + "OpenOffice 4"
|
homePath + File.separator + "office"
|
||||||
);
|
);
|
||||||
} else if (PlatformUtils.isMac()) {
|
} else if (PlatformUtils.isMac()) {
|
||||||
return findOfficeHome(
|
return findOfficeHome(
|
||||||
|
|||||||
@@ -10,7 +10,9 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>jodconverter-web</artifactId>
|
<groupId>cn.keking</groupId>
|
||||||
|
<artifactId>kkFileView</artifactId>
|
||||||
|
<version>0.1</version>
|
||||||
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ cd "%KKFILEVIEW_BIN_FOLDER%"
|
|||||||
echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
|
echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
|
||||||
echo Starting kkFileView...
|
echo Starting kkFileView...
|
||||||
echo Please check log file for more information
|
echo Please check log file for more information
|
||||||
java -Dspring.config.location=..\conf\application.properties -jar jodconverter-web-1.5.8.RELEASE.jar -> ..\log\kkFileView.log
|
java -Dspring.config.location=..\conf\application.properties -jar kkFileView-0.1.jar -> ..\log\kkFileView.log
|
||||||
@@ -5,4 +5,4 @@ cd $KKFILEVIEW_BIN_FOLDER
|
|||||||
echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
|
echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
|
||||||
echo "Starting kkFileView..."
|
echo "Starting kkFileView..."
|
||||||
echo "Please check log file for more information"
|
echo "Please check log file for more information"
|
||||||
nohup java -Dspring.config.location=../conf/application.properties -jar jodconverter-web-1.5.8.RELEASE.jar ../log/kkFileView.log 2>&1 &
|
nohup java -Dspring.config.location=../conf/application.properties -jar kkFileView-0.1.jar ../log/kkFileView.log 2>&1 &
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user