Skip to content

Commit 6e0d244

Browse files
[IMP] 设置yaml解析文件路径
1 parent 26bfdf1 commit 6e0d244

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>devops-service</artifactId>
6-
<version>1.3.5.RELEASE</version>
6+
<version>1.3.6-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<url>https://github.com/open-hand/devops-service</url>
99

src/main/java/io/choerodon/devops/infra/util/FileUtil.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.commons.compress.utils.IOUtils;
3030
import org.apache.commons.io.FileUtils;
3131
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.ObjectUtils;
3233
import org.hzero.core.base.BaseConstants;
3334
import org.slf4j.Logger;
3435
import org.slf4j.LoggerFactory;
@@ -56,7 +57,16 @@ public class FileUtil {
5657

5758
private static final int BUFFER_SIZE = 2048;
5859
private static final Logger logger = LoggerFactory.getLogger(FileUtil.class);
59-
private static final String EXEC_PATH = "/usr/lib/yaml/values_yaml";
60+
private static final String EXEC_PATH;
61+
62+
static {
63+
String values_yaml_path = System.getenv("VALUES_YAML_PATH");
64+
if (ObjectUtils.isEmpty(values_yaml_path)) {
65+
EXEC_PATH = "/usr/lib/yaml/values_yaml";
66+
} else {
67+
EXEC_PATH = values_yaml_path;
68+
}
69+
}
6070

6171

6272
private FileUtil() {

0 commit comments

Comments
 (0)