fix:资源管理

This commit is contained in:
momo
2023-09-07 11:28:06 +08:00
parent 9462856ff9
commit ba0f1e1ba2
5 changed files with 31 additions and 14 deletions

View File

@@ -60,8 +60,7 @@ func (d *defaultResource) UpdateMetadata(ctx context.Context, in *UpdateMetadata
logc.Errorf(ctx, "FindOneByQuery oldResource error: %v", err)
return err
}
var newResourceMetadata string
if oldResource.Metadata != nil && *oldResource.Metadata != "{}" && *oldResource.Metadata != "" {
if oldResource.Metadata != nil {
var oldResourceMetadata map[string]interface{}
err = json.Unmarshal([]byte(*oldResource.Metadata), &oldResourceMetadata)
if err != nil {
@@ -83,7 +82,7 @@ func (d *defaultResource) UpdateMetadata(ctx context.Context, in *UpdateMetadata
logc.Errorf(ctx, "Marshal oldResourceMetadata error: %v", err)
return err
}
newResourceMetadata = string(oldResourceMetadataB)
oldResource.Metadata = &oldResourceMetadataB
} else {
var resourceMetadata = make(map[string]interface{}, len(in.MetadataChild))
for k, v := range in.MetadataChild {
@@ -101,9 +100,8 @@ func (d *defaultResource) UpdateMetadata(ctx context.Context, in *UpdateMetadata
logc.Errorf(ctx, "Marshal oldResourceMetadata error: %v", err)
return err
}
newResourceMetadata = string(newResourceMetadataB)
oldResource.Metadata = &newResourceMetadataB
}
oldResource.Metadata = &newResourceMetadata
_, err = NewFsResourceModel.BuilderUpdate(ctx, tx, oldResource)
if err != nil {
logc.Errorf(ctx, "Transaction UpdateMetadata error: %v", err)