From 549126c4abe89dfbc3213eaffe18f3c96f649d37 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Tue, 5 Nov 2024 15:13:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ASW-134=20application=20=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BB=8E=20git=20=E7=9B=AE=E5=BD=95=E4=B8=AD=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/GitServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java index aa85bd9..b6c6dd5 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java @@ -45,6 +45,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.text.MessageFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -523,23 +524,24 @@ public class GitServiceImpl implements IGitService { List> futureList = T.ListUtil.list(false); while (treeWalk.next()) { + String filePath = treeWalk.getPathString(); String fileName = treeWalk.getNameString(); if (T.StrUtil.equals("meta.json", fileName)) { + // application_name 从目录中获取 + String applicationName = T.PathUtil.getPathEle(Path.of(filePath), 1).toString(); + // filter by name + if (T.StrUtil.isNotEmpty(q) && !T.StrUtil.containsIgnoreCase(applicationName, q)) { + continue; + } + ObjectLoader loader = repository.open(treeWalk.getObjectId(0)); String metaJsonStr = T.StrUtil.utf8Str(loader.getBytes()); metaJsonStr = T.StrUtil.emptyToDefault(metaJsonStr, T.StrUtil.EMPTY_JSON); Map metaJsonMap = T.JSONUtil.toBean(metaJsonStr, Map.class); - // filter by name - if (T.StrUtil.isNotEmpty(q)) { - String appName = T.MapUtil.getStr(metaJsonMap, "name", ""); - if (!T.StrUtil.containsIgnoreCase(appName, q)) { - continue; - } - } - Map m = T.MapUtil.newHashMap(true); m.putAll(metaJsonMap); + m.put("name", applicationName); String appId = T.MapUtil.getStr(metaJsonMap, "id", ""); String appDirPath = treeWalk.getPathString().replaceAll(fileName, "");