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

fix: application 新增|导入 接口默认不再添加 icon.png 文件

Browse Source
This commit is contained in:
shizhendong
2024-11-18 09:39:09 +08:00
parent b368080eaf
commit 55a2dabc0d
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
View File

@@ -163,7 +163,7 @@ public class ApplicationServiceImpl implements IApplicationService {
} }
// 新增APP // 新增APP
for (ApplicationEntity entity : addAppList) { for (ApplicationEntity entity : addAppList) {
for (String fileName : T.ListUtil.of("README.md", "meta.json", "signature.json", "icon.png")) { for (String fileName : T.ListUtil.of("README.md", "meta.json", "signature.json")) {
String fileContent = T.StrUtil.EMPTY; String fileContent = T.StrUtil.EMPTY;
if ("meta.json".equals(fileName)) { if ("meta.json".equals(fileName)) {
JSONObject tempJSONObject = T.JSONUtil.parseObj(entity); JSONObject tempJSONObject = T.JSONUtil.parseObj(entity);

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

@@ -592,9 +592,7 @@ public class GitServiceImpl implements IGitService {
treeWalk.setFilter(PathFilter.create("applications/")); treeWalk.setFilter(PathFilter.create("applications/"));
treeWalk.setRecursive(true); treeWalk.setRecursive(true);
Map<String, String> appIconDataMapping = T.MapUtil.newHashMap();
Map<String, String> appDirPathMapping = T.MapUtil.newHashMap(true); Map<String, String> appDirPathMapping = T.MapUtil.newHashMap(true);
while (treeWalk.next()) { while (treeWalk.next()) {
String filePath = treeWalk.getPathString(); String filePath = treeWalk.getPathString();
String fileName = treeWalk.getNameString(); String fileName = treeWalk.getNameString();
@@ -624,13 +622,6 @@ public class GitServiceImpl implements IGitService {
appDirPathMapping.put(applicationName, appDirPath); appDirPathMapping.put(applicationName, appDirPath);
resultList.add(m); resultList.add(m);
} else if (T.StrUtil.equals("icon.png", fileName)) {
ObjectLoader loader = repository.open(treeWalk.getObjectId(0));
byte[] bytes = loader.getBytes();
if (T.ObjectUtil.isNotEmpty(bytes)) {
String dirPath = treeWalk.getPathString().replaceAll(fileName, "");
appIconDataMapping.put(dirPath, Base64.getEncoder().encodeToString(bytes));
}
} }
} }
@@ -638,13 +629,6 @@ public class GitServiceImpl implements IGitService {
for (Map<Object, Object> map : resultList) { for (Map<Object, Object> map : resultList) {
String applicationName = T.MapUtil.getStr(map, "name"); String applicationName = T.MapUtil.getStr(map, "name");
if (T.StrUtil.isNotEmpty(applicationName)) {
String iconBase64Str = appIconDataMapping.get(T.StrUtil.concat(true, "applications/", applicationName, "/"));
if (T.StrUtil.isNotEmpty(iconBase64Str)) {
map.put("icon", "data:image/png;base64," + iconBase64Str);
}
}
RevCommit lastCommit = T.MapUtil.get(lastCommitMapping, applicationName, RevCommit.class); RevCommit lastCommit = T.MapUtil.get(lastCommitMapping, applicationName, RevCommit.class);
map.put("commit", this.buildAswCommitInfo(lastCommit)); map.put("commit", this.buildAswCommitInfo(lastCommit));
} }
@@ -718,7 +702,7 @@ public class GitServiceImpl implements IGitService {
Repository repository = git.getRepository(); Repository repository = git.getRepository();
Map<String, ObjectId> filePathAndBlobIdMap = T.MapUtil.newHashMap(true); Map<String, ObjectId> filePathAndBlobIdMap = T.MapUtil.newHashMap(true);
for (String str : T.ListUtil.of("README.md", "meta.json", "signature.json", "icon.png")) { for (String str : T.ListUtil.of("README.md", "meta.json", "signature.json")) {
String savePath = T.StrUtil.concat(true, "applications/", applicationName, "/", str); String savePath = T.StrUtil.concat(true, "applications/", applicationName, "/", str);
String fileContent = T.StrUtil.EMPTY; String fileContent = T.StrUtil.EMPTY;