diff --git a/configmanage/server/internal/confignode.go b/configmanage/server/internal/confignode.go index 68c56b708b5580dc77cfd5df3c0cffda27fc93aa..5fb589946197e476544abe7cccc6232b5a0de3cb 100644 --- a/configmanage/server/internal/confignode.go +++ b/configmanage/server/internal/confignode.go @@ -19,13 +19,10 @@ func GetConfigNodesByUUID(uuid string) ([]string, error) { return nodes, err } -func IsExistNode(uuid string) bool { +func GetConfigNodesByNode(uuid string) ([]ConfigNode, error) { var cns []ConfigNode err := db.MySQL().Model(&ConfigNode{}).Where("node_id=?", uuid).Find(&cns).Error - if err != nil || len(cns) == 0 { - return false - } - return true + return cns, err } type ConfigBatch struct { diff --git a/configmanage/server/internal/repofile.go b/configmanage/server/internal/repofile.go index 446c6fcd6d533319b1695d67e094b99663cccb3e..20ec36f5ed9098cf1eeffdd01d81900c34dd34d7 100644 --- a/configmanage/server/internal/repofile.go +++ b/configmanage/server/internal/repofile.go @@ -43,10 +43,12 @@ func GetRepoFileByUUID(uuid string) (RepoFile, error) { } func (rf *RepoFile) UpdateByuuid() error { + // 将同类配置的所有标志修改为未使用 err := db.MySQL().Table("repo_file").Where("config_info_uuid=?", rf.ConfigInfoUUID).Update("is_index", 0).Error if err != nil { return err } + // 将成功下发的具体某一个配置状态修改为已使用 return db.MySQL().Table("repo_file").Where("uuid=?", rf.UUID).Update("is_index", 1).Error } diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go index 423920e8b8b685fcb8f01b38fd6ba430e1a2f239..4d76d9c3098e807d272e7df481f56dff3ed79f29 100644 --- a/configmanage/server/service/repo.go +++ b/configmanage/server/service/repo.go @@ -127,10 +127,10 @@ func (rc *RepoConfig) Apply() (json.RawMessage, error) { if err := resp.ParseData(&data); err != nil { return nil, err } - // 将执行失败的机器信息和原因添加到结果字符串中 - for _, v := range data { - if v.Error != "" { - result = result + v.UUID + ":" + v.Error + "\n" + // 将执行失败的文件、机器信息和原因添加到结果字符串中 + for _, d := range data { + if d.Error != "" { + result = result + v.Content + "文件" + d.UUID + ":" + d.Error + "\n" } } } diff --git a/configmanage/server/service/tags.go b/configmanage/server/service/tags.go index 8f4a28e899cb97ac65240dc8e140b7d84e256915..62d8890970fcbe1120cf94490a649d6f249c243f 100644 --- a/configmanage/server/service/tags.go +++ b/configmanage/server/service/tags.go @@ -10,7 +10,11 @@ func GetTags() { tag_cb := func(uuids []string) []common.Tag { var tags []common.Tag for _, uuid := range uuids { - ok := internal.IsExistNode(uuid) + ok := true + cns, err := internal.GetConfigNodesByNode(uuid) + if err != nil || len(cns) == 0 { + ok = false + } if ok { tag := common.Tag{ UUID: uuid,