From fb9fd7c1e6df19e41e6d0c1f9596abc04b7a47c4 Mon Sep 17 00:00:00 2001
From: zhangzhangang <zhangzhangang@ly-sky.com>
Date: Thu, 16 Dec 2021 18:11:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-vue/src/pages/node/node-layout/welcome.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web-vue/src/pages/node/node-layout/welcome.vue b/web-vue/src/pages/node/node-layout/welcome.vue
index 62f25678f..8a251a6d8 100644
--- a/web-vue/src/pages/node/node-layout/welcome.vue
+++ b/web-vue/src/pages/node/node-layout/welcome.vue
@@ -13,6 +13,7 @@
         <a-select-option value="python">python</a-select-option>
         <a-select-option value="mysql">mysql</a-select-option>
         <a-select-option value="php">php</a-select-option>
+        <a-select-option value="docker">docker</a-select-option>
       </a-select>
       <!-- <a-button type="primary" @click="loadData">切换</a-button> -->
     </div>
-- 
Gitee


From 0758b461bd8c758adb021c4643e20309bd331362 Mon Sep 17 00:00:00 2001
From: zhangzhangang <zhangzhangang@ly-sky.com>
Date: Mon, 20 Dec 2021 19:58:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/build/BuildInfoController.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/server/src/main/java/io/jpom/controller/build/BuildInfoController.java b/modules/server/src/main/java/io/jpom/controller/build/BuildInfoController.java
index bcbb307c7..13b934eaa 100644
--- a/modules/server/src/main/java/io/jpom/controller/build/BuildInfoController.java
+++ b/modules/server/src/main/java/io/jpom/controller/build/BuildInfoController.java
@@ -363,12 +363,23 @@ public class BuildInfoController extends BaseServerController {
 		// 查询构建信息
 		BuildInfoModel buildInfoModel = buildInfoService.getByKey(id, getRequest());
 		Objects.requireNonNull(buildInfoModel, "没有对应数据");
-
 		File source = BuildUtil.getSourceById(buildInfoModel.getId());
-		boolean del = FileUtil.del(source);
-		if (!del) {
-			del = FileUtil.del(source.toPath());
+		boolean del=false;
+
+		if(source.toPath().endsWith("source")){
+			if(!FileUtil.isWindows()) { // Linux MacOS
+				CommandUtil.execSystemCommand("rm -rf " + source.toPath());
+			}else{ // Windows
+				CommandUtil.execSystemCommand("rd /s/q " + source.toPath());
+			}
+		}else{
+			return JsonMessage.getString(500, "构建路径获取异常", del);
 		}
+
+		// del = FileUtil.del(source);
+		// if (!del) {
+			// del = FileUtil.del(source.toPath());
+		// }
 		return JsonMessage.getString(200, "清理成功", del);
 	}
 
-- 
Gitee