This commit is contained in:
thinkgem
2023-06-12 15:54:28 +08:00
parent 6a0edc92d6
commit f16c3abc2a
9 changed files with 30 additions and 21 deletions

View File

@@ -45,11 +45,6 @@
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
<!-- Java serialization -->
<dependency>
@@ -89,6 +84,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<!-- Apache HTTP -->
@@ -194,11 +190,6 @@
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
@@ -262,7 +253,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<developers>

View File

@@ -138,7 +138,7 @@ public class PropertiesUtils {
}
}
}
properties.put("configFiles", StringUtils.join(configFiles, ","));
properties.put("configFiles", StringUtils.joinComma(configFiles));
}
/**

View File

@@ -28,8 +28,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
public static final String UNDERLINE = "_";
/**
* 分隔字符串(默认逗号分隔)
* @param str
* 分隔字符串(逗号分隔)
* @param str 字符串
* @return
*/
public static String[] splitComma(final String str) {
@@ -37,8 +37,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
}
/**
* 连接字符串(默认逗号分隔)
* @param iterable
* 连接字符串(逗号分隔)
* @param array 字符串数组
* @return
*/
public static String joinComma(final Object[] array) {
return join(array, COMMA);
}
/**
* 连接字符串(逗号分隔)
* @param iterable 字符串集合
* @return
*/
public static String joinComma(final Iterable<?> iterable) {

View File

@@ -279,7 +279,7 @@ public class VideoUtils {
*/
private boolean process(List<String> command) {
try {
log.debug(StringUtils.join(command, " "));
log.debug(StringUtils.join(command, StringUtils.SPACE));
// Process process = new ProcessBuilder(command).redirectErrorStream(true).start();
Process process = Runtime.getRuntime().exec(command.toArray(new String[command.size()]));
new PrintErrorReader(process.getErrorStream()).start();