open-source/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2026-03-15 13:43:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新windows内置office目录名, 适配jodconverter

Browse Source
This commit is contained in:
陈精华
2022-12-19 14:45:45 +08:00
parent 7d3a4ebc4e
commit d761d0cc88
12504 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/assembly/dist-win32.xml
View File

@@ -25,8 +25,8 @@
<outputDirectory>${file.separator}log</outputDirectory>
</fileSet>
<fileSet>
<directory>windows-office</directory>
<outputDirectory>${file.separator}windows-office</outputDirectory>
<directory>libreoffice</directory>
<outputDirectory>${file.separator}libreoffice</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>

2
server/src/main/java/cn/keking/utils/LocalOfficeUtils.java
View File

@@ -44,7 +44,7 @@ public class LocalOfficeUtils {
final String programFiles64 = System.getenv("ProgramFiles");
final String programFiles32 = System.getenv("ProgramFiles(x86)");
return findOfficeHome(EXECUTABLE_WINDOWS,
userDir + File.separator + "windows-office",
userDir + File.separator + "libreoffice",
programFiles32 + File.separator + "LibreOffice",
programFiles64 + File.separator + "LibreOffice 7",
programFiles32 + File.separator + "LibreOffice 7",