fix:重构合图模块

server/resource/resource_test.go

@@ -4,9 +4,6 @@ import (
 	"testing"
 )
 
-// var configFile = flag.String("f", "etc/home-user-auth.yaml", "the config file")
-
 func TestMain(t *testing.T) {
-	// log.Println(model.RawFieldNames[FsCanteenType]())
 	main()
 }

service/repositories/image_handle.go

@@ -92,15 +92,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 		return nil, err
 	}
 	var groupOptions map[string]interface{}
-	if productTemplateV2Info.GroupOptions != nil {
-		err = json.Unmarshal([]byte(*productTemplateV2Info.GroupOptions), &groupOptions)
-
-		if err != nil {
-			logx.Error(err)
-			return nil, err
-		}
-	}
-
 	var materialList []interface{}
 	if productTemplateV2Info.TemplateInfo != nil {
 		var templateInfo map[string]interface{}
@@ -111,6 +102,7 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 			return nil, err
 		}
 		materialList = templateInfo["materialList"].([]interface{})
+		groupOptions = templateInfo["groupOptions"].(map[string]interface{})
 	}
 
 	var moduleDataMap = make(map[string]interface{}, 4)