diff --git a/configmanage/server/controller/repo.go b/configmanage/server/controller/repo.go index 5d5cf9084d965577e8a5e86713caf448b55c56d9..9691efcfbf28b2bee2cb38fd9ad7779da2b60a5e 100644 --- a/configmanage/server/controller/repo.go +++ b/configmanage/server/controller/repo.go @@ -17,9 +17,9 @@ func AddRepoHandler(c *gin.Context) { return } - fileuuid := uuid.New().String() + configuuid := uuid.New().String() config := &service.RepoConfig{ - UUID: fileuuid, + UUID: configuuid, Name: "", File: "", } @@ -33,13 +33,12 @@ func AddRepoHandler(c *gin.Context) { UUID: uuid.New().String(), Type: global.Repo, Description: "", - FileUUID: fileuuid, BatchIds: []uint{}, DepartIds: []int{}, - NodeS: []string{}, + Nodes: []string{}, Config: config, } - err = ci.Record() + err = ci.Add(configuuid) if err != nil { response.Fail(c, gin.H{"status": false}, err.Error()) return @@ -55,7 +54,7 @@ func GetRepoConfig(c *gin.Context) { return } config := &service.RepoConfig{ - UUID: "fileuuid", + UUID: "configuuid", } err = config.Load() if err != nil { diff --git a/configmanage/server/internal/configfile.go b/configmanage/server/internal/configfile.go index 263e2da31551d35018f88d7ffd42c9e1a83e2fc3..d7ee5d861616ee5f778d712154a60c93de2bf0cf 100644 --- a/configmanage/server/internal/configfile.go +++ b/configmanage/server/internal/configfile.go @@ -18,7 +18,7 @@ func (cf *ConfigFile) Add() error { return db.MySQL().Save(&cf).Error } -func GetConfigFilesByUUID(uuid string) (ConfigFile, error) { +func GetConfigFileByUUID(uuid string) (ConfigFile, error) { var file ConfigFile err := db.MySQL().Where("uuid=?", uuid).Find(&file).Error return file, err diff --git a/configmanage/server/service/configinstance.go b/configmanage/server/service/configinstance.go index 01ad0b8b7fd8a4fc1a6720cfd8e7721720882a55..2a8c50da7a21fd51f4051de70f256a3b76d09388 100644 --- a/configmanage/server/service/configinstance.go +++ b/configmanage/server/service/configinstance.go @@ -11,10 +11,9 @@ type ConfigInstance struct { UUID string `json:"uuid"` Type string `json:"type"` Description string `json:"description"` - FileUUID string `json:"fileuuid"` BatchIds []uint `json:"batchids"` DepartIds []int `json:"departids"` - NodeS []string `json:"uuids"` + Nodes []string `json:"uuids"` Config Config } @@ -35,17 +34,10 @@ type ConfigInfo = internal.ConfigInfo type ConfigFile = internal.ConfigFile type ConfigNode = internal.ConfigNode -type ConfigResult struct { - ConfigInfo - BatchIds []uint - DepartIds []int - UUIDS []string -} - -func (ci *ConfigInstance) Record() error { +func (ci *ConfigInstance) Add(configuuid string) error { cm := ConfigInfo{ UUID: ci.UUID, - ConfigFileUUID: ci.FileUUID, + ConfigFileUUID: configuuid, Type: ci.Type, Description: ci.Description, } @@ -78,7 +70,7 @@ func (ci *ConfigInstance) Record() error { } } - for _, v := range ci.NodeS { + for _, v := range ci.Nodes { cn := ConfigNode{ ConfigInfoUUID: ci.UUID, NodeId: "n" + v, diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go index 7b70a312fee5e560348cdc7fe22c3d41b86f6c51..10df12da0d679710aac0cab4c0ab59728f8af9a2 100644 --- a/configmanage/server/service/repo.go +++ b/configmanage/server/service/repo.go @@ -19,7 +19,7 @@ func (c *RepoConfig) Record() error { } func (c *RepoConfig) Load() error { - cf, err := internal.GetConfigFilesByUUID(c.UUID) + cf, err := internal.GetConfigFileByUUID(c.UUID) if err != nil { return err }