From c26a77e34b0cd7c49980ec04e0af2c6c98bbad87 Mon Sep 17 00:00:00 2001 From: wubijie Date: Tue, 5 Nov 2024 16:55:01 +0800 Subject: [PATCH] Improve the handling of ssh configuration logic using the ConfigurationHandler --- configmanage/server/controller/lists.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/configmanage/server/controller/lists.go b/configmanage/server/controller/lists.go index f7733e3b..546a6dde 100644 --- a/configmanage/server/controller/lists.go +++ b/configmanage/server/controller/lists.go @@ -68,7 +68,7 @@ func ConfigInfoHandler(c *gin.Context) { // 获取有关配置的所有文件信息 repofiles, err := service.GetRopeFilesByConfigUUID(ci.UUID) if err != nil { - logger.Error("failed to get repoconfig file:s %s", err.Error()) + logger.Error("failed to get repoconfig files: %s", err.Error()) response.Fail(c, "failed to get repoconfig files", err.Error()) return } @@ -79,7 +79,7 @@ func ConfigInfoHandler(c *gin.Context) { // 获取有关配置的所有文件信息 repofiles, err := service.GetHostFilesByConfigUUID(ci.UUID) if err != nil { - logger.Error("failed to get hostconfig file:s %s", err.Error()) + logger.Error("failed to get hostconfig files: %s", err.Error()) response.Fail(c, "failed to get hostconfig files", err.Error()) return } @@ -90,7 +90,7 @@ func ConfigInfoHandler(c *gin.Context) { // 获取有关配置的所有文件信息 repofiles, err := service.GetSSHFilesByCinfigUUID(ci.UUID) if err != nil { - logger.Error("failed to get sshconfig file:s %s", err.Error()) + logger.Error("failed to get sshconfig files: %s", err.Error()) response.Fail(c, "failed to get sshconfig files", err.Error()) return } @@ -126,7 +126,7 @@ func ConfigHistoryHandler(c *gin.Context) { // 获取有关本台机器配置的所有文件信息 repofiles, err := service.GetRopeFilesByNode(query.UUID) if err != nil { - logger.Error("failed to get repoconfig file:s %s", err.Error()) + logger.Error("failed to get repoconfig files: %s", err.Error()) response.Fail(c, "failed to get repoconfig files", err.Error()) return } @@ -135,16 +135,25 @@ func ConfigHistoryHandler(c *gin.Context) { case global.Host: // 获取有关本台机器配置的所有文件信息 - repofiles, err := service.GetHostFilesByNode(query.UUID) + hostconfig, err := service.GetHostFilesByNode(query.UUID) if err != nil { - logger.Error("failed to get hostconfig file:s %s", err.Error()) + logger.Error("failed to get hostconfig files: %s", err.Error()) response.Fail(c, "failed to get hostconfig files", err.Error()) return } logger.Debug("load hostconfig success") - response.Success(c, repofiles, "load hostconfig success") + response.Success(c, hostconfig, "load hostconfig success") case global.SSH: + // 获取有关本台机器配置的所有文件信息 + sshconfig, err := service.GetSSHFilesByNode(query.UUID) + if err != nil { + logger.Error("failed to get sshconfig files: %s", err.Error()) + response.Fail(c, "failed to get sshconfig files", err.Error()) + return + } + logger.Debug("load sshconfig success") + response.Success(c, sshconfig, "load sshconfig success") case global.SSHD: -- Gitee