From ed9e28b1c2785b7dc4178272cc82ad4cb0eaf0dc Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Fri, 15 Dec 2023 11:33:27 +0800
Subject: [PATCH] [ Agent ] [ App ] - offline build nfs client - 2

---
 agent-go/executor/BaseFunction.go             | 53 ++++---------------
 .../func/auto/service/BaseFuncScheduler.java  | 10 ++--
 2 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/agent-go/executor/BaseFunction.go b/agent-go/executor/BaseFunction.go
index fd1097e..5bcb721 100644
--- a/agent-go/executor/BaseFunction.go
+++ b/agent-go/executor/BaseFunction.go
@@ -782,12 +782,7 @@ func (op *AgentOsOperator) installDockerOfflineExec(args []string) (bool, []stri
 		"/root/install",
 	})
 
-	AllCommandExecutor([]string{
-		"chmod",
-		"777",
-		"-R",
-		"/root/install/docker/*",
-	})
+	HardCodeCommandExecutor("chmod 777 -R /root/install/docker/*")
 
 	resultOk, l := HardCodeCommandExecutor("mv /root/install/docker/* /usr/bin")
 	if !resultOk {
@@ -2052,33 +2047,13 @@ func (op *AgentOsOperator) installZSHExec() (bool, []string) {
 		}
 	}
 
-	ok, resultLog := AllCompleteExecutor([][]string{
-		{
-			"rm",
-			"-rf",
-			"/root/.oh-my-zsh",
-		},
-		{
-			"rm",
-			"-rf",
-			"/root/wdd/zsh-install.sh",
-		},
-		{
-			"rm",
-			"-rf",
-			"/root/wdd/oh-my-zsh-plugins-list.txt",
-		},
-		{
-			"mkdir",
-			"-p",
-			"/root/wdd/",
-		},
-		append(
-			op.InstallCommandPrefix,
-			"zsh",
-			"git",
-		),
-	})
+	BasicRemoveFolderComplete("/root/.oh-my-zsh")
+	BasicRemoveFolderComplete("/root/wdd/zsh-install.sh")
+	BasicRemoveFolderComplete("/root/wdd/oh-my-zsh-plugins-list.txt")
+	BasicCreateFolder("/root/wdd/")
+
+	ok, resultLog := AllCommandExecutor(
+		append(op.InstallCommandPrefix, "zsh", "git"))
 	if !ok {
 		return false, resultLog
 	}
@@ -2091,14 +2066,8 @@ func (op *AgentOsOperator) installZSHExec() (bool, []string) {
 		zshRemoteGitUrl = "https://gitee.com/mirrors/oh-my-zsh/raw/master/tools/install.sh"
 	}
 	log.InfoF("开始下载zsh的安装脚本 => %s", zshRemoteGitUrl)
-	resultOk, l := AllCommandExecutor([]string{
-		"wget",
-		"--timeout=5",
-		zshRemoteGitUrl,
-		"-qO",
-		"/root/wdd/zsh-install.sh",
-	},
-	)
+
+	resultOk, l := BasicDownloadFile(zshRemoteGitUrl, "/root/wdd/zsh-install.sh")
 	if !resultOk {
 		l = append(l, "zsh-install.sh 下载失败！ 安装终止")
 		return false, l
@@ -2218,6 +2187,6 @@ func (op *AgentOsOperator) ok(funcArgs []string) [][]string {
 }
 
 func (op *AgentOsOperator) okExec(funcArgs []string) (bool, []string) {
-	log.WarnF("call empty base func ! func args are => %#v", funcArgs)
+	log.WarnF("[okExec] - call empty base func ! func args are => %#v ", funcArgs)
 	return true, nil
 }
diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
index 8130033..bbd22ca 100644
--- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
+++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
@@ -95,10 +95,10 @@ public class BaseFuncScheduler {
 
 
         List<BaseFunctionEnum> masterNodeProcedureList = List.of(
-                BaseFunctionEnum.DISABLE_SWAP,
-                BaseFunctionEnum.SHUTDOWN_FIREWALL,
-                BaseFunctionEnum.CHRONY_TO_MASTER,
-                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY
+//                BaseFunctionEnum.DISABLE_SWAP,
+//                BaseFunctionEnum.SHUTDOWN_FIREWALL,
+//                BaseFunctionEnum.CHRONY_TO_MASTER,
+//                BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY
         );
 
 
@@ -132,7 +132,7 @@ public class BaseFuncScheduler {
         }
 
         List<BaseFunctionEnum> masterNodeDurationTaskList = List.of(
-                BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
+//                BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
                 BaseFunctionEnum.INSTALL_DOCKER,
                 BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
                 BaseFunctionEnum.MODIFY_DOCKER_CONFIG,