优化以来和test

Author: zhou-hao

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>hsweb-system-workflow</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0.0-RC-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dimension/DefaultCandidateDimensionParser.java

@@ -39,7 +39,7 @@ public CandidateDimension parse(DimensionContext context, String jsonConfig) {
                     List<String> list = strategies
                             .stream()
                             .filter(strategy -> strategy.support(type))
-                            .map(strategy -> strategy.parse(config))
+                            .map(strategy -> strategy.parse(context,config))
                             .filter(CollectionUtils::isNotEmpty)
                             .flatMap(Collection::stream)
                             .collect(Collectors.toList());

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>hsweb-system-workflow</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0.0-RC-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/src/main/java/org/hswebframework/web/workflow/starter/WorkFlowAutoConfiguration.java

@@ -1,19 +1,10 @@
 package org.hswebframework.web.workflow.starter;
 
-import org.hswebframework.web.service.workflow.ActDefService;
-import org.hswebframework.web.service.workflow.simple.SimpleActDefService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @ComponentScan("org.hswebframework.web.workflow")
 public class WorkFlowAutoConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean(ActDefService.class)
-    public SimpleActDefService simpleActDefService(){
-        return new SimpleActDefService();
-    }
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/src/test/java/org/hswebframework/web/workflow/flowable/ControllerTest.java

@@ -6,6 +6,7 @@
         <artifactId>hsweb-system</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0.0-RC-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>