diff --git a/configmanage/server/controller/lists.go b/configmanage/server/controller/lists.go index 561a34136d99425c981bcb3c9700839af956203f..49a45857dd6ebfcd47db62b923f1579f686aa5ce 100644 --- a/configmanage/server/controller/lists.go +++ b/configmanage/server/controller/lists.go @@ -88,7 +88,7 @@ func ConfigInfoHandler(c *gin.Context) { case global.SSH: // 获取有关配置的所有文件信息 - sshfiles, err := service.GetSSHFilesByCinfigUUID(ci.UUID) + sshfiles, err := service.GetSSHFilesByConfigUUID(ci.UUID) if err != nil { logger.Error("failed to get sshconfig files: %s", err.Error()) response.Fail(c, "failed to get sshconfig files", err.Error()) @@ -99,7 +99,7 @@ func ConfigInfoHandler(c *gin.Context) { case global.SSHD: // 获取有关配置的所有文件信息 - sshdfiles, err := service.GetSSHFilesByCinfigUUID(ci.UUID) + sshdfiles, err := service.GetSSHDFilesByConfigUUID(ci.UUID) if err != nil { logger.Error("failed to get sshdconfig files: %s", err.Error()) response.Fail(c, "failed to get sshdconfig files", err.Error()) @@ -110,7 +110,7 @@ func ConfigInfoHandler(c *gin.Context) { case global.Sysctl: // 获取有关配置的所有文件信息 - sysctlfiles, err := service.GetSysctlFilesByCinfigUUID(ci.UUID) + sysctlfiles, err := service.GetSysctlFilesByConfigUUID(ci.UUID) if err != nil { logger.Error("failed to get sysctlconfig files: %s", err.Error()) response.Fail(c, "failed to get sysctlconfig files", err.Error()) diff --git a/configmanage/server/internal/ssh.go b/configmanage/server/internal/ssh.go index b206c01e520311b7b4eb38b2ee3fa780c1992428..2ea1c78bf279c72b6824c5dacbae089f5d152035 100644 --- a/configmanage/server/internal/ssh.go +++ b/configmanage/server/internal/ssh.go @@ -53,7 +53,7 @@ func (sf *SSHFile) UpdateByuuid() error { } // 根据配置uuid获取所有配置文件 -func GetSSHFilesByCinfigUUID(uuid string) ([]SSHFile, error) { +func GetSSHFilesByConfigUUID(uuid string) ([]SSHFile, error) { var files []SSHFile err := db.MySQL().Model(&SSHFile{}).Where("config_info_uuid=?", uuid).Find(&files).Error return files, err diff --git a/configmanage/server/internal/sshd.go b/configmanage/server/internal/sshd.go index 47ea0c7f0c402e5955c1b59a11ef5e77b8b963c4..f91156da75a2f140deb7daf3c70cb1eb143f9a6d 100644 --- a/configmanage/server/internal/sshd.go +++ b/configmanage/server/internal/sshd.go @@ -52,7 +52,7 @@ func (sdf *SSHDFile) UpdateByuuid() error { } // 根据配置uuid获取所有配置文件 -func GetSSHDFilesByCinfigUUID(uuid string) ([]SSHDFile, error) { +func GetSSHDFilesByConfigUUID(uuid string) ([]SSHDFile, error) { var files []SSHDFile err := db.MySQL().Model(&SSHDFile{}).Where("config_info_uuid=?", uuid).Find(&files).Error return files, err diff --git a/configmanage/server/internal/sysctl.go b/configmanage/server/internal/sysctl.go index 943b8cf7ade48800722d2f8993f335a00118487a..0aae238301de290156bef020897f9c47057b5d30 100644 --- a/configmanage/server/internal/sysctl.go +++ b/configmanage/server/internal/sysctl.go @@ -53,7 +53,7 @@ func (sysf *SysctlFile) UpdateByuuid() error { } // 根据配置uuid获取所有配置文件 -func GetSysctlFilesByCinfigUUID(uuid string) ([]SysctlFile, error) { +func GetSysctlFilesByConfigUUID(uuid string) ([]SysctlFile, error) { var files []SysctlFile err := db.MySQL().Model(&SysctlFile{}).Where("config_info_uuid=?", uuid).Find(&files).Error return files, err diff --git a/configmanage/server/service/ssh.go b/configmanage/server/service/ssh.go index a0158af2e50afd3cb84ad2b57851d6d9dd095f16..0b1b5b454a4cdd1706b8dca2f8080f4e40658fd3 100644 --- a/configmanage/server/service/ssh.go +++ b/configmanage/server/service/ssh.go @@ -283,8 +283,8 @@ func GetSSHFileByInfoUUID(uuid string, isindex interface{}) (SSHFile, error) { } // 根据配置uuid获取所有配置文件 -func GetSSHFilesByCinfigUUID(uuid string) ([]SSHFile, error) { - return internal.GetSSHFilesByCinfigUUID(uuid) +func GetSSHFilesByConfigUUID(uuid string) ([]SSHFile, error) { + return internal.GetSSHFilesByConfigUUID(uuid) } // 查看某台机器某种类型的的历史配置信息 diff --git a/configmanage/server/service/ssh_test.go b/configmanage/server/service/ssh_test.go index 3980127f9115d48864aff5085eef8c787b713f4a..bee599b5df10f2633a61317bb33fd236bf4593d6 100644 --- a/configmanage/server/service/ssh_test.go +++ b/configmanage/server/service/ssh_test.go @@ -52,12 +52,12 @@ func TestGetSSHFileByUUID(t *testing.T) { fmt.Printf("sshfile: %v\n", sf) } -func TestGetSSHFilesByCinfigUUID(t *testing.T) { +func TestGetSSHFilesByConfigUUID(t *testing.T) { // 设置测试数据 scUUID := "5973e993-6236-4b53-9eb6-0cc23c652460" // 调用被测试的函数 - files, err := GetSSHFilesByCinfigUUID(scUUID) + files, err := GetSSHFilesByConfigUUID(scUUID) if err != nil { fmt.Printf("load sshfiles error: %s\n", err) os.Exit(-1) @@ -81,20 +81,3 @@ func TestGetSSHFilesByNode(t *testing.T) { } fmt.Println(len(scs)) } - -func TestGetSSHDFilesByCinfigUUID(t *testing.T) { - // 设置测试数据 - sdcUUID := "5973e993-6236-4b53-9eb6-0cc23c652460" - - // 调用被测试的函数 - files, err := GetSSHDFilesByCinfigUUID(sdcUUID) - if err != nil { - fmt.Printf("load sshdfiles error: %s\n", err) - os.Exit(-1) - } - if len(files) == 0 { - fmt.Printf("files is empty: %s\n", err) - os.Exit(-1) - } - fmt.Println(len(files)) -} diff --git a/configmanage/server/service/sshd.go b/configmanage/server/service/sshd.go index 4e5dd72fe85492c1f454d1f39345bba6fb2123b2..b0e5d3701e568205fc3176309abc5eb6d47fcb03 100644 --- a/configmanage/server/service/sshd.go +++ b/configmanage/server/service/sshd.go @@ -285,8 +285,8 @@ func GetSSHDFileByInfoUUID(uuid string, isindex interface{}) (SSHDFile, error) { } // 根据配置uuid获取所有配置文件 -func GetSSHDFilesByCinfigUUID(uuid string) ([]SSHDFile, error) { - return internal.GetSSHDFilesByCinfigUUID(uuid) +func GetSSHDFilesByConfigUUID(uuid string) ([]SSHDFile, error) { + return internal.GetSSHDFilesByConfigUUID(uuid) } // 查看某台机器某种类型的的历史配置信息 diff --git a/configmanage/server/service/sshd_test.go b/configmanage/server/service/sshd_test.go index 817282510e43ed970f8bdb626fa8de322cdd72f8..e389b687407fcaaed08d9bcd4f8127893115eb78 100644 --- a/configmanage/server/service/sshd_test.go +++ b/configmanage/server/service/sshd_test.go @@ -64,3 +64,20 @@ func TestGetSSHDFilesByNode(t *testing.T) { } fmt.Println(len(sdcs)) } + +func TestGetSSHDFilesByConfigUUID(t *testing.T) { + // 设置测试数据 + sdcUUID := "5973e993-6236-4b53-9eb6-0cc23c652460" + + // 调用被测试的函数 + files, err := GetSSHDFilesByConfigUUID(sdcUUID) + if err != nil { + fmt.Printf("load sshdfiles error: %s\n", err) + os.Exit(-1) + } + if len(files) == 0 { + fmt.Printf("files is empty: %s\n", err) + os.Exit(-1) + } + fmt.Println(len(files)) +} diff --git a/configmanage/server/service/sysctl.go b/configmanage/server/service/sysctl.go index fe0c66897fbd48ece5300fc01ba2ba5235df28c3..2439e37f7eab945e31d0ea805f3f2273809209da 100644 --- a/configmanage/server/service/sysctl.go +++ b/configmanage/server/service/sysctl.go @@ -295,8 +295,8 @@ func GetSysctlFileByInfoUUID(uuid string, isindex interface{}) (SysctlFile, erro } // 根据配置uuid获取所有配置文件 -func GetSysctlFilesByCinfigUUID(uuid string) ([]SysctlFile, error) { - return internal.GetSysctlFilesByCinfigUUID(uuid) +func GetSysctlFilesByConfigUUID(uuid string) ([]SysctlFile, error) { + return internal.GetSysctlFilesByConfigUUID(uuid) } // 查看某台机器某种类型的的历史配置信息 diff --git a/configmanage/server/service/sysctl_test.go b/configmanage/server/service/sysctl_test.go index 4c599f92c8d093be37c53b571c11f5751537f6fe..333664ac48c31ef28e8e1381806ea266d6f8a54a 100644 --- a/configmanage/server/service/sysctl_test.go +++ b/configmanage/server/service/sysctl_test.go @@ -52,12 +52,12 @@ func TestGetSysctlFileByUUID(t *testing.T) { fmt.Printf("SysctlFile: %v\n", sysf) } -func TestGetSysctlFilesByCinfigUUID(t *testing.T) { +func TestGetSysctlFilesByConfigUUID(t *testing.T) { // 设置测试数据 sysdcUUID := "83a15f95-430c-4889-aa60-b27624a81703" // 调用被测试的函数 - files, err := GetSysctlFilesByCinfigUUID(sysdcUUID) + files, err := GetSysctlFilesByConfigUUID(sysdcUUID) if err != nil { fmt.Printf("load sysctl files error: %s\n", err) os.Exit(-1)