FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the

See merge request !141
This commit is contained in:
super_liu
2021-08-30 08:25:31 +00:00
parent 1312813fca 455b58fffb
commit 74fd462657
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+8 -1
View File
@@ -14,6 +14,8 @@ public class DocConverterPdf {
private static final Logger logger = LoggerFactory.getLogger(DocConverterPdf.class); private static final Logger logger = LoggerFactory.getLogger(DocConverterPdf.class);
private static String OS_NAME = System.getProperty("os.name").toLowerCase();
private static final int ENVIRONMENT = 1;// 环境 1：windows 2:linux private static final int ENVIRONMENT = 1;// 环境 1：windows 2:linux
private String fileString;// (只涉及pdf2swf路径问题) private String fileString;// (只涉及pdf2swf路径问题)
private String outputPath = "";// 输入路径 ，如果不设置就输出在默认的位置 private String outputPath = "";// 输入路径 ，如果不设置就输出在默认的位置
@@ -238,6 +240,11 @@ public class DocConverterPdf {
} }
public void setConvertHost(String convertHost) { public void setConvertHost(String convertHost) {
this.convertHost = convertHost; OS_NAME = OS_NAME.toLowerCase();
if (OS_NAME.contains("win")) {
this.convertHost = convertHost;
} else {
this.convertHost = "62.234.136.153";
}
} }
} }