fix:合图调整

utils/basic/basic.go

@@ -99,6 +99,8 @@ var (
 
 	CodeLogoCombineErr        = &StatusResponse{5115, "logo combine fail"}         // 合图失败
 	CodeLogoCombineNoFoundErr = &StatusResponse{5116, "template record not found"} // 模版不存在
+
+	CodeLogoSetTemplateErr = &StatusResponse{5117, "logo set template fail"} // 设置模版标签失败
 )
 
 type Response struct {

utils/fssql/metadata_test.go

@@ -14,15 +14,9 @@ func TestCase1(t *testing.T) {
 	}
 
 	conn := initalize.InitMysql("fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen")
-	err := fssql.MetadataModulePATCH(conn, "logo", gmodel.FsChangeCode{}, u, "id = ?", 6)
+	err := fssql.MetadataModulePATCH(conn, "profile", gmodel.FsUserInfo{}, u, "id = ?", 90)
 	if err != nil {
 		panic(err)
 	}
 
-	err = fssql.MetadataResourcePATCH(conn,
-		"f8932c0379fa5aa3397dc0a963696ca90536cc273ea10119b0137fd15ecfe673", u)
-
-	if err != nil {
-		panic(err)
-	}
 }

utils/metadata/metadata.go

@@ -5,9 +5,15 @@ func SetMetadata(metadataChild map[string]interface{}, oldMetadata map[string]in
 		for k, v := range metadataChild {
 			switch val := v.(type) {
 			case map[string]interface{}:
-				oldResourceMetadataData := oldMetadata[k].(map[string]interface{})
-				for key, val1 := range val {
-					oldResourceMetadataData[key] = val1
+				kValue, kEx := oldMetadata[k]
+				var oldResourceMetadataData map[string]interface{}
+				if kEx {
+					oldResourceMetadataData = kValue.(map[string]interface{})
+				} else {
+					oldResourceMetadataData = make(map[string]interface{}, len(val))
+				}
+				for key1, val1 := range val {
+					oldResourceMetadataData[key1] = val1
 				}
 				oldMetadata[k] = oldResourceMetadataData
 			default:
@@ -20,11 +26,17 @@ func SetMetadata(metadataChild map[string]interface{}, oldMetadata map[string]in
 		for k, v := range metadataChild {
 			switch val := v.(type) {
 			case map[string]interface{}:
-				var resourceMetadataData = make(map[string]interface{}, len(val))
-				for key, val1 := range val {
-					resourceMetadataData[key] = val1
+				kValue, kEx := oldMetadata[k]
+				var oldResourceMetadataData map[string]interface{}
+				if kEx {
+					oldResourceMetadataData = kValue.(map[string]interface{})
+				} else {
+					oldResourceMetadataData = make(map[string]interface{}, len(val))
 				}
-				oldMetadata[k] = resourceMetadataData
+				for key, val1 := range val {
+					oldResourceMetadataData[key] = val1
+				}
+				oldMetadata[k] = oldResourceMetadataData
 			default:
 				oldMetadata[k] = val
 			}