Merge pull request #452 from ioito/hotfix/qx-metadata-list

兼容标签返回结构

pkg/cloudcommon/db/metadata.go

@@ -112,19 +112,24 @@ func (manager *SMetadataManager) GetPropertyTagValuePairs(ctx context.Context, u
 	if err != nil {
 		return nil, err
 	}
-	metadatas := []SMetadata{}
-	err = sql.All(&metadatas)
+	result := &struct {
+		Total int
+		Data  []struct {
+			Key   string
+			Value string
+		}
+	}{
+		Total: 0,
+		Data: []struct {
+			Key   string
+			Value string
+		}{},
+	}
+	err = sql.All(&result.Data)
 	if err != nil {
 		return nil, err
 	}
-	result := map[string][]string{}
-	for i := 0; i < len(metadatas); i++ {
-		key, value := metadatas[i].Key, metadatas[i].Value
-		if _, ok := result[key]; !ok {
-			result[key] = []string{}
-		}
-		result[key] = append(result[key], value)
-	}
+	result.Total = len(result.Data)
 	return jsonutils.Marshal(result), nil
 }