test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-29 18:38:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

pre commit 2.11.0.2

Browse Source
This commit is contained in:
bwcx_jzy 2024-01-02 11:58:49 +08:00
parent 3b37bac06f
commit ccd449893a
No known key found for this signature in database
GPG Key ID: E187D6E9DDDE8C53
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG-BETA.md
View File

@ -1,5 +1,13 @@
# 🚀 版本日志 # 🚀 版本日志
### 2.11.0.2-beta (2024-01-02)
### 🐞 解决BUG、优化功能
1. 【all】修复 环境变量为 null 是未忽略
------
### 2.11.0.1-beta (2024-01-02) ### 2.11.0.1-beta (2024-01-02)
### 🐣 新增功能 ### 🐣 新增功能

4
modules/common/src/main/java/org/dromara/jpom/model/EnvironmentMapBuilder.java
View File

@ -90,6 +90,10 @@ public class EnvironmentMapBuilder {
Map<String, String> map = new LinkedHashMap<>(this.map.size()); Map<String, String> map = new LinkedHashMap<>(this.map.size());
for (Map.Entry<String, Item> entry : this.map.entrySet()) { for (Map.Entry<String, Item> entry : this.map.entrySet()) {
Item entryValue = entry.getValue(); Item entryValue = entry.getValue();
if (entryValue.value == null) {
// 值不能为 null
continue;
}
map.put(entry.getKey(), entryValue.value); map.put(entry.getKey(), entryValue.value);
} }
Optional.ofNullable(appendMap).ifPresent(objectMap -> { Optional.ofNullable(appendMap).ifPresent(objectMap -> {

20
modules/common/src/main/java/org/dromara/jpom/util/StringUtil.java
View File

@ -256,15 +256,17 @@ public class StringUtil {
return MapUtil.newHashMap(); return MapUtil.newHashMap();
} }
List<Tuple> collect = envStrList.stream() List<Tuple> collect = envStrList.stream()
.map(StrUtil::trim) .map(StrUtil::trim)
.filter(s -> !StrUtil.isEmpty(s) && !StrUtil.startWith(s, "#")) .filter(s -> !StrUtil.isEmpty(s) && !StrUtil.startWith(s, "#"))
.map(s -> { .map(s -> {
List<String> list1 = StrUtil.splitTrim(s, "="); List<String> list1 = StrUtil.splitTrim(s, "=");
if (CollUtil.size(list1) != 2) { if (CollUtil.size(list1) != 2) {
return null; return null;
} }
return new Tuple(list1.get(0), list1.get(1)); return new Tuple(list1.get(0), list1.get(1));
}).filter(Objects::nonNull).collect(Collectors.toList()); })
.filter(Objects::nonNull)
.collect(Collectors.toList());
return CollStreamUtil.toMap(collect, objects -> objects.get(0), objects -> objects.get(1)); return CollStreamUtil.toMap(collect, objects -> objects.get(0), objects -> objects.get(1));
} }