diff --git a/configmanage/server/controller/configinstance.go b/configmanage/server/controller/configinstance.go index 1ab5628e0932495d8187fc94af4f599c7f1e82d3..7e9129d01c18a0f88964c174ad933e3c7d16b3ec 100644 --- a/configmanage/server/controller/configinstance.go +++ b/configmanage/server/controller/configinstance.go @@ -2,7 +2,6 @@ package controller import ( "encoding/json" - "fmt" "gitee.com/openeuler/PilotGo/sdk/response" "github.com/gin-gonic/gin" @@ -22,7 +21,7 @@ func AddConfigHandler(c *gin.Context) { }{} err := c.ShouldBindJSON(query) if err != nil { - response.Fail(c, gin.H{"status": false}, err.Error()) + response.Fail(c, "parameter error", err.Error()) return } @@ -37,7 +36,7 @@ func AddConfigHandler(c *gin.Context) { } err = ci.Add() if err != nil { - response.Fail(c, gin.H{"status": false}, err.Error()) + response.Fail(c, "add configinfo fail:", err.Error()) return } @@ -55,7 +54,7 @@ func AddConfigHandler(c *gin.Context) { //将参数添加到数据库 err = repoconfig.Record() if err != nil { - response.Fail(c, gin.H{"status": false}, err.Error()) + response.Fail(c, "add repofile fail:", err.Error()) return } response.Success(c, nil, "Add repo config success") @@ -69,7 +68,52 @@ func AddConfigHandler(c *gin.Context) { case global.Sysctl: default: - fmt.Println("Unknown type:", query.Type) + response.Fail(c, nil, "Unknown type:"+query.Type) + } +} + +func LoadConfigHandler(c *gin.Context) { + //TODO:修改请求的参数 + query := &struct { + UUID string `json:"uuid"` + }{} + err := c.ShouldBindJSON(query) + if err != nil { + response.Fail(c, "parameter error", err.Error()) + return + } + + //获取configinfo + ci, err := service.GetInfoByUUID(query.UUID) + if err != nil { + response.Fail(c, "get configinfo fail:", err.Error()) + return + } + + //获取对应配置管理的参数 + switch ci.Type { + case global.Repo: + repoconfig := &service.RepoConfig{ + ConfigInfoUUID: ci.UUID, + } + //加载配置 + err = repoconfig.Load() + if err != nil { + response.Fail(c, "get repofile fail:", err.Error()) + return + } + response.Success(c, repoconfig, "load repo config success") + + case global.Host: + + case global.SSH: + + case global.SSHD: + + case global.Sysctl: + + default: + response.Fail(c, nil, "Unknown type of configinfo:"+query.UUID) } } diff --git a/configmanage/server/internal/configfile.go b/configmanage/server/internal/configfile.go index 9c89b6c6490fcb6ca882e8a722bd83d4161862b8..2b8c5f5fe85e867be16ca7d31f5a820c4c451b18 100644 --- a/configmanage/server/internal/configfile.go +++ b/configmanage/server/internal/configfile.go @@ -21,7 +21,7 @@ func (rf *RepoFile) Add() error { return db.MySQL().Save(&rf).Error } -func GetRepoFileByUUID(uuid string) (RepoFile, error) { +func GetRepoFileByInfoUUID(uuid string) (RepoFile, error) { var file RepoFile err := db.MySQL().Where("config_info_uuid=? && is_index = 1", uuid).Find(&file).Error return file, err diff --git a/configmanage/server/router/router.go b/configmanage/server/router/router.go index 1227fc23ac6d29823f3c3c381d196b946ead5740..d30254012ecba04df6ce8707c1e7c2a5a994b7ae 100644 --- a/configmanage/server/router/router.go +++ b/configmanage/server/router/router.go @@ -20,7 +20,8 @@ func RegisterAPIs(router *gin.Engine) { pg := router.Group("/plugin/" + global.GlobalClient.PluginInfo.Name) { pg.POST("/add", controller.AddConfigHandler) - pg.POST("/apply", controller.ApplyConfigHandler) + pg.GET("/load", controller.LoadConfigHandler) + //pg.POST("/apply", controller.ApplyConfigHandler) } } diff --git a/configmanage/server/service/configinstance.go b/configmanage/server/service/configinstance.go index 493ae59d2b76d68be0d32a1c0fe37b4ffc2795f5..4bdf63bc54b61ea76a9ba6c9119b3a5e61ff1f5b 100644 --- a/configmanage/server/service/configinstance.go +++ b/configmanage/server/service/configinstance.go @@ -90,6 +90,6 @@ func (ci *ConfigInstance) Add() error { return nil } -func GetInfoByConfigUUID(configuuid string) (ConfigInfo, error) { +func GetInfoByUUID(configuuid string) (ConfigInfo, error) { return internal.GetInfoByUUID(configuuid) } diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go index 621b14e4fe8bf77ead73e3651ebafaef2b79bcec..0158ca12cf73d92c7699993d132be42dc580e475 100644 --- a/configmanage/server/service/repo.go +++ b/configmanage/server/service/repo.go @@ -28,7 +28,7 @@ func (rc *RepoConfig) Record() error { } func (c *RepoConfig) Load() error { - rf, err := internal.GetRepoFileByUUID(c.UUID) + rf, err := internal.GetRepoFileByInfoUUID(c.UUID) if err != nil { return err }