gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决 meta.json 解析错误导致无法查看 application lastCommit 问题

Browse Source
This commit is contained in:
shizhendong
2024-11-13 18:09:25 +08:00
parent beb8ccdce6
commit fe55a7fcf8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
View File

@@ -594,9 +594,8 @@ public class GitServiceImpl implements IGitService {
m.putAll(metaJsonMap); m.putAll(metaJsonMap);
m.put("name", applicationName); m.put("name", applicationName);
String appId = T.MapUtil.getStr(metaJsonMap, "id", "");
String appDirPath = treeWalk.getPathString().replaceAll(fileName, ""); String appDirPath = treeWalk.getPathString().replaceAll(fileName, "");
appDirPathMapping.put(appId, appDirPath); appDirPathMapping.put(applicationName, appDirPath);
resultList.add(m); resultList.add(m);
} else if (T.StrUtil.equals("icon.png", fileName)) { } else if (T.StrUtil.equals("icon.png", fileName)) {
@@ -620,8 +619,7 @@ public class GitServiceImpl implements IGitService {
} }
} }
String appId = T.MapUtil.getStr(map, "id"); RevCommit lastCommit = T.MapUtil.get(lastCommitMapping, applicationName, RevCommit.class);
RevCommit lastCommit = T.MapUtil.get(lastCommitMapping, appId, RevCommit.class);
map.put("commit", this.buildAswCommitInfo(lastCommit)); map.put("commit", this.buildAswCommitInfo(lastCommit));
} }
} }