lsm/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2025-09-18 09:44:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化：Office组件运行状态检测

Browse Source
This commit is contained in:
陈精华
2019-11-29 14:40:42 +08:00
committed by kl
parent 09b6964c0e
commit a07c962867
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jodconverter-web/pom.xml
View File

@@ -60,6 +60,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<!-- REDISSON -->
<dependency>
<groupId>org.redisson</groupId>

9
jodconverter-web/src/main/java/cn/keking/utils/ConverterUtils.java
View File

@@ -2,6 +2,7 @@ package cn.keking.utils;
import com.sun.star.document.UpdateDocMode;
import cn.keking.extend.ControlDocumentFormatRegistry;
import org.apache.commons.lang3.StringUtils;
import org.artofsolving.jodconverter.OfficeDocumentConverter;
import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
import org.artofsolving.jodconverter.office.OfficeManager;
@@ -97,8 +98,8 @@ public class ConverterUtils {
} else {
flag = false;
}
}else {
Process p = Runtime.getRuntime().exec(new String[]{"sh","-c","ps -ef | grep "+processName});
} else {
Process p = Runtime.getRuntime().exec(new String[]{"sh","-c","ps -ef | grep " + processName});
ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream os = p.getInputStream();
byte b[] = new byte[256];
@@ -106,8 +107,8 @@ public class ConverterUtils {
baos.write(b);
}
String s = baos.toString();
if (s.indexOf(processName) >= 0) {
String[] cmd ={"sh","-c","killall -9 "+processName};
if (StringUtils.ordinalIndexOf(s, processName, 3) > 0) {
String[] cmd ={"sh","-c","kill -15 `ps -ef|grep " + processName + "|awk 'NR==1{print $2}'`"};
Runtime.getRuntime().exec(cmd);
flag = true;
} else {