Browse Source

优化命名

zhouhao 6 years ago
parent
commit
ff4f3b74d5
22 changed files with 60 additions and 72 deletions
  1. 6 6
      hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java
  2. 8 9
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisDaoAutoConfiguration.java
  3. 1 1
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomer.java
  4. 4 4
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisProperties.java
  5. 1 1
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomer.java
  6. 1 1
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomer.java
  7. 2 2
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomer.java
  8. 2 3
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java
  9. 2 5
      hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java
  10. 2 2
      hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityFactoryInitConfiguration.java
  11. 1 1
      hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java
  12. 2 2
      hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/terms/UserInRoleSqlTerm.java
  13. 1 1
      hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomer.java
  14. 6 9
      hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java
  15. 2 2
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/InServiceTreeInSqlTerm.java
  16. 2 2
      hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java
  17. 2 7
      hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java
  18. 2 2
      hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ClaimSqlTerm.java
  19. 2 2
      hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/CompletedSqlTerm.java
  20. 2 2
      hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ProcessParticipateSqlTerm.java
  21. 2 2
      hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/TodoSqlTerm.java
  22. 7 6
      quick-start/CUSTOM-PROP.md

+ 6 - 6
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java

@@ -29,13 +29,13 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
 
     private Map<CacheKey, AuthorizeDefinition> cache = new ConcurrentHashMap<>();
 
-    private List<AopMethodAuthorizeDefinitionCustomizerParser> parserCustomers;
+    private List<AopMethodAuthorizeDefinitionCustomizerParser> parserCustomizers;
 
     private static Set<String> excludeMethodName = new HashSet<>(Arrays.asList("toString", "clone", "hashCode", "getClass"));
 
     @Autowired(required = false)
-    public void setParserCustomers(List<AopMethodAuthorizeDefinitionCustomizerParser> parserCustomers) {
-        this.parserCustomers = parserCustomers;
+    public void setParserCustomizers(List<AopMethodAuthorizeDefinitionCustomizerParser> parserCustomizers) {
+        this.parserCustomizers = parserCustomizers;
     }
 
     @Override
@@ -59,9 +59,9 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
             return definition;
         }
         //使用自定义
-        if (!CollectionUtils.isEmpty(parserCustomers)) {
-            definition = parserCustomers.stream()
-                    .map(customer -> customer.parse(target, method, context))
+        if (!CollectionUtils.isEmpty(parserCustomizers)) {
+            definition = parserCustomizers.stream()
+                    .map(customizer -> customizer.parse(target, method, context))
                     .filter(Objects::nonNull)
                     .findAny().orElse(null);
             if (definition instanceof EmptyAuthorizeDefinition) {

+ 8 - 9
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisDaoAutoConfiguration.java

@@ -20,7 +20,7 @@ package org.hswebframework.web.dao.mybatis;
 
 import org.hswebframework.ezorm.rdb.render.dialect.Dialect;
 import org.hswebframework.web.dao.Dao;
-import org.hswebframework.web.dao.mybatis.mapper.SqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.SqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.dict.DictInTermTypeMapper;
 import org.hswebframework.web.dao.mybatis.mapper.dict.DictTermTypeMapper;
 import org.mybatis.spring.annotation.MapperScan;
@@ -34,7 +34,6 @@ import org.springframework.context.annotation.Configuration;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 
 @Configuration
 @ComponentScan("org.hswebframework.web.dao.mybatis")
@@ -65,7 +64,7 @@ public class MybatisDaoAutoConfiguration {
     }
 
     @Bean
-    public BeanPostProcessor SqlTermCustomerRegister() {
+    public BeanPostProcessor sqlTermCustomizerRegister() {
 
         List<Dialect> dialects = Arrays.asList(
                 Dialect.H2
@@ -82,14 +81,14 @@ public class MybatisDaoAutoConfiguration {
 
             @Override
             public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-                if (bean instanceof SqlTermCustomer) {
-                    SqlTermCustomer customer = ((SqlTermCustomer) bean);
-                    if (customer.forDialect() != null) {
-                        for (Dialect dialect : customer.forDialect()) {
-                            dialect.setTermTypeMapper(customer.getTermType(), customer);
+                if (bean instanceof SqlTermCustomizer) {
+                    SqlTermCustomizer customizer = ((SqlTermCustomizer) bean);
+                    if (customizer.forDialect() != null) {
+                        for (Dialect dialect : customizer.forDialect()) {
+                            dialect.setTermTypeMapper(customizer.getTermType(), customizer);
                         }
                     } else {
-                        dialects.forEach(dialect -> dialect.setTermTypeMapper(customer.getTermType(), customer));
+                        dialects.forEach(dialect -> dialect.setTermTypeMapper(customizer.getTermType(), customizer));
                     }
                 }
                 return bean;

+ 1 - 1
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomer.java

@@ -6,7 +6,7 @@ package org.hswebframework.web.dao.mybatis;
  * @author zhouhao
  * @since 3.0
  */
-public interface MybatisMapperCustomer {
+public interface MybatisMapperCustomizer {
     String[] getExcludes();
 
     String[] getIncludes();

+ 4 - 4
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisProperties.java

@@ -61,10 +61,10 @@ public class MybatisProperties extends org.mybatis.spring.boot.autoconfigure.Myb
      */
     private              boolean  useJpa                 = true;
 
-    private List<MybatisMapperCustomer> mybatisMappers;
+    private List<MybatisMapperCustomizer> mybatisMappers;
 
     @Autowired(required = false)
-    public void setMybatisMappers(List<MybatisMapperCustomer> mybatisMappers) {
+    public void setMybatisMappers(List<MybatisMapperCustomizer> mybatisMappers) {
         this.mybatisMappers = mybatisMappers;
     }
 
@@ -107,7 +107,7 @@ public class MybatisProperties extends org.mybatis.spring.boot.autoconfigure.Myb
 
         if (mybatisMappers != null) {
             mybatisMappers.stream()
-                    .map(MybatisMapperCustomer::getIncludes)
+                    .map(MybatisMapperCustomizer::getIncludes)
                     .flatMap(Arrays::stream)
                     .forEach(locations::add);
         }
@@ -125,7 +125,7 @@ public class MybatisProperties extends org.mybatis.spring.boot.autoconfigure.Myb
         Set<String> excludes = new HashSet<>();
         if (mybatisMappers != null) {
             mybatisMappers.stream()
-                    .map(MybatisMapperCustomer::getExcludes)
+                    .map(MybatisMapperCustomizer::getExcludes)
                     .flatMap(Arrays::stream)
                     .forEach(excludes::add);
         }

+ 1 - 1
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomer.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 3.0.0-RC
  */
 @AllArgsConstructor
-public abstract class AbstractSqlTermCustomer implements SqlTermCustomer {
+public abstract class AbstractSqlTermCustomizer implements SqlTermCustomizer {
 
     @Getter
     protected final String termType;

+ 1 - 1
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomer.java

@@ -6,7 +6,7 @@ import org.hswebframework.ezorm.rdb.render.dialect.Dialect;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public interface SqlTermCustomer extends Dialect.TermTypeMapper {
+public interface SqlTermCustomizer extends Dialect.TermTypeMapper {
     String getTermType();
 
     Dialect[] forDialect();

+ 2 - 2
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomer.java

@@ -18,12 +18,12 @@ import java.util.stream.Collectors;
  * @since 3.0.0-RC
  */
 @Slf4j
-public abstract class TreeStructureSqlTermCustomer extends AbstractSqlTermCustomer {
+public abstract class TreeStructureSqlTermCustomizer extends AbstractSqlTermCustomizer {
     boolean not = false;
 
     boolean parent = false;
 
-    public TreeStructureSqlTermCustomer(String termType, boolean not,boolean parent) {
+    public TreeStructureSqlTermCustomizer(String termType, boolean not, boolean parent) {
         super(termType);
         this.not = not;
     }

+ 2 - 3
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java

@@ -9,21 +9,20 @@ import org.hswebframework.ezorm.rdb.render.dialect.Dialect;
 import org.hswebframework.ezorm.rdb.render.dialect.RenderPhase;
 import org.hswebframework.ezorm.rdb.render.dialect.function.SqlFunction;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 import org.hswebframework.web.dict.EnumDict;
 
 import java.sql.JDBCType;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class DictInTermTypeMapper extends AbstractSqlTermCustomer {
+public class DictInTermTypeMapper extends AbstractSqlTermCustomizer {
 
     private boolean not;
 

+ 2 - 5
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java

@@ -6,17 +6,14 @@ import org.hswebframework.ezorm.core.param.TermType;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.Dialect;
-import org.hswebframework.ezorm.rdb.render.dialect.RenderPhase;
-import org.hswebframework.ezorm.rdb.render.dialect.function.SqlFunction;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 import org.hswebframework.web.dict.EnumDict;
 
 import java.sql.JDBCType;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import static org.hswebframework.web.dao.mybatis.mapper.dict.DictInTermTypeMapper.USE_DICT_MASK_FLAG;
@@ -25,7 +22,7 @@ import static org.hswebframework.web.dao.mybatis.mapper.dict.DictInTermTypeMappe
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class DictTermTypeMapper extends AbstractSqlTermCustomer {
+public class DictTermTypeMapper extends AbstractSqlTermCustomizer {
 
     private boolean not;
 

+ 2 - 2
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityFactoryInitConfiguration.java

@@ -24,8 +24,8 @@ public class EntityFactoryInitConfiguration implements BeanPostProcessor {
         } else if (bean instanceof PropertyCopier) {
             mapperEntityFactory.addCopier(((PropertyCopier) bean));
         }
-        if (bean instanceof EntityMappingCustomer) {
-            ((EntityMappingCustomer) bean).customize(mapperEntityFactory);
+        if (bean instanceof EntityMappingCustomizer) {
+            ((EntityMappingCustomizer) bean).customize(mapperEntityFactory);
         }
         return bean;
     }

+ 1 - 1
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java

@@ -5,6 +5,6 @@ import org.hswebframework.web.commons.entity.factory.MapperEntityFactory;
 /**
  * @author zhouhao
  */
-public interface EntityMappingCustomer {
+public interface EntityMappingCustomizer {
     void customize(MapperEntityFactory entityFactory);
 }

+ 2 - 2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/terms/UserInRoleSqlTerm.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @author zhouhao
  * @since 3.0
  */
-public class UserInRoleSqlTerm extends AbstractSqlTermCustomer {
+public class UserInRoleSqlTerm extends AbstractSqlTermCustomizer {
 
     private boolean not;
 

+ 1 - 1
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomer.java

@@ -4,7 +4,7 @@ package org.hswebframework.web.service.form.initialize;
  * @author zhouhao
  * @since 3.0
  */
-public interface DynamicFormInitializeCustomer {
+public interface DynamicFormInitializeCustomizer {
     void customTableSetting(TableInitializeContext context);
 
     void customTableColumnSetting(ColumnInitializeContext context);

+ 6 - 9
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java

@@ -31,10 +31,8 @@ import org.hswebframework.web.service.GenericEntityService;
 import org.hswebframework.web.service.form.*;
 import org.hswebframework.web.service.form.events.FormDeployEvent;
 import org.hswebframework.web.service.form.initialize.ColumnInitializeContext;
-import org.hswebframework.web.service.form.initialize.DynamicFormInitializeCustomer;
+import org.hswebframework.web.service.form.initialize.DynamicFormInitializeCustomizer;
 import org.hswebframework.web.service.form.initialize.TableInitializeContext;
-import org.hswebframework.web.service.form.simple.cluster.ClusterDatabase;
-import org.hswebframework.web.service.form.simple.convert.SmartValueConverter;
 import org.hswebframework.web.service.form.simple.dict.EnumDictValueConverter;
 import org.hswebframework.web.validator.group.CreateGroup;
 import org.hswebframework.web.validator.group.UpdateGroup;
@@ -53,7 +51,6 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.sql.Array;
 import java.sql.JDBCType;
 import java.sql.SQLException;
 import java.util.*;
@@ -94,7 +91,7 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
     private OptionalConvertBuilder optionalConvertBuilder;
 
     @Autowired(required = false)
-    private List<DynamicFormInitializeCustomer> initializeCustomers;
+    private List<DynamicFormInitializeCustomizer> initializeCustomizers;
 
     @Autowired
     private ValidatorFactory validatorFactory;
@@ -608,8 +605,8 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
                 return table;
             }
         };
-        if (!CollectionUtils.isEmpty(initializeCustomers)) {
-            initializeCustomers.forEach(customer -> customer.customTableSetting(context));
+        if (!CollectionUtils.isEmpty(initializeCustomizers)) {
+            initializeCustomizers.forEach(customizer -> customizer.customTableSetting(context));
         }
     }
 
@@ -644,8 +641,8 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
                 return table;
             }
         };
-        if (!CollectionUtils.isEmpty(initializeCustomers)) {
-            initializeCustomers.forEach(customer -> customer.customTableColumnSetting(context));
+        if (!CollectionUtils.isEmpty(initializeCustomizers)) {
+            initializeCustomizers.forEach(customer -> customer.customTableColumnSetting(context));
         }
     }
 

+ 2 - 2
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/InServiceTreeInSqlTerm.java

@@ -1,7 +1,7 @@
 package org.hswebframework.web.service.organizational.simple.terms;
 
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
-import org.hswebframework.web.dao.mybatis.mapper.TreeStructureSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.TreeStructureSqlTermCustomizer;
 import org.hswebframework.web.service.QueryService;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class InServiceTreeInSqlTerm<PK> extends TreeStructureSqlTermCustomer {
+public class InServiceTreeInSqlTerm<PK> extends TreeStructureSqlTermCustomizer {
 
     private QueryService<? extends TreeSupportEntity<PK>, PK> treeService;
 

+ 2 - 2
hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java

@@ -8,7 +8,7 @@ import org.hswebframework.ezorm.rdb.render.dialect.Dialect;
 import org.hswebframework.ezorm.rdb.render.dialect.RenderPhase;
 import org.hswebframework.ezorm.rdb.render.dialect.function.SqlFunction;
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.service.QueryService;
 
 import java.util.Arrays;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @since 3.0.0-RC
  */
 @Slf4j
-public abstract class UserInSqlTerm<PK> extends AbstractSqlTermCustomer {
+public abstract class UserInSqlTerm<PK> extends AbstractSqlTermCustomizer {
 
 
     @Setter

+ 2 - 7
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java

@@ -3,7 +3,6 @@ package org.hswebframework.web.workflow.service.imp;
 import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.hswebframework.ezorm.rdb.RDBTable;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData;
 import org.hswebframework.ezorm.rdb.meta.converter.DateTimeConverter;
@@ -13,21 +12,17 @@ import org.hswebframework.web.commons.entity.PagerResult;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.service.form.DynamicFormOperationService;
 import org.hswebframework.web.service.form.initialize.ColumnInitializeContext;
-import org.hswebframework.web.service.form.initialize.DynamicFormInitializeCustomer;
+import org.hswebframework.web.service.form.initialize.DynamicFormInitializeCustomizer;
 import org.hswebframework.web.service.form.initialize.TableInitializeContext;
 import org.hswebframework.web.workflow.dao.entity.ActivityConfigEntity;
 import org.hswebframework.web.workflow.dao.entity.ProcessDefineConfigEntity;
 import org.hswebframework.web.workflow.service.ActivityConfigService;
 import org.hswebframework.web.workflow.service.ProcessDefineConfigService;
-import org.hswebframework.web.workflow.service.config.ProcessConfigurationService;
 import org.hswebframework.web.workflow.service.WorkFlowFormService;
-import org.hswebframework.web.workflow.service.config.ActivityConfiguration;
-import org.hswebframework.web.workflow.service.config.ProcessConfiguration;
 import org.hswebframework.web.workflow.service.request.SaveFormRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.sql.JDBCType;
@@ -39,7 +34,7 @@ import java.util.*;
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class WorkFlowFormServiceImpl extends AbstractFlowableService implements WorkFlowFormService, DynamicFormInitializeCustomer {
+public class WorkFlowFormServiceImpl extends AbstractFlowableService implements WorkFlowFormService, DynamicFormInitializeCustomizer {
 
     @Autowired
     private DynamicFormOperationService dynamicFormOperationService;

+ 2 - 2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ClaimSqlTerm.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class ClaimSqlTerm extends AbstractSqlTermCustomer {
+public class ClaimSqlTerm extends AbstractSqlTermCustomizer {
     public ClaimSqlTerm(String termType) {
         super(termType);
     }

+ 2 - 2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/CompletedSqlTerm.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class CompletedSqlTerm extends AbstractSqlTermCustomer {
+public class CompletedSqlTerm extends AbstractSqlTermCustomizer {
     public CompletedSqlTerm(String termType) {
         super(termType);
     }

+ 2 - 2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ProcessParticipateSqlTerm.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class ProcessParticipateSqlTerm extends AbstractSqlTermCustomer {
+public class ProcessParticipateSqlTerm extends AbstractSqlTermCustomizer {
     public ProcessParticipateSqlTerm(String termType) {
         super(termType);
     }

+ 2 - 2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/TodoSqlTerm.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData;
 import org.hswebframework.ezorm.rdb.render.SqlAppender;
 import org.hswebframework.ezorm.rdb.render.dialect.term.BoostTermTypeMapper;
-import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomer;
+import org.hswebframework.web.dao.mybatis.mapper.AbstractSqlTermCustomizer;
 import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author zhouhao
  * @since 3.0.0-RC
  */
-public class TodoSqlTerm extends AbstractSqlTermCustomer {
+public class TodoSqlTerm extends AbstractSqlTermCustomizer {
     public TodoSqlTerm(String termType) {
         super(termType);
     }

+ 7 - 6
quick-start/CUSTOM-PROP.md

@@ -79,7 +79,7 @@ hsweb:
 #### java类方式
 ```java
     @Component
-    public class CustomEntityMappingCustomer implements EntityMappingCustomer {
+    public class CustomEntityMappingCustomizer implements EntityMappingCustomizer {
         @Override
         public void customize(MapperEntityFactory entityFactory) {
             //OrganizationalEntity使用CustomOrganizationalEntity实现
@@ -100,14 +100,15 @@ jpa注解和mapper配置各有优势(jpa更简单,但只支持简单的字段.my
 
 1. 创建mapper.xml,可直接复制旧的xml进行修改.旧的xml可在`hsweb-system`中对应的模块进行查找.
 
+`com/myproject/mappers/OrganizationalMapper.xml`
+
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.hswebframework.web.dao.organizational.OrganizationalDao">
-     <!--修改type为新的实体类型-->
-    <resultMap id="OrganizationalResultMap" type="com.myproject.entity.CustomOrganizationalEntity">
+    <resultMap id="OrganizationalResultMap" type="org.hswebframework.web.entity.organizational.OrganizationalEntity">
         <!--默认的属性-->
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
@@ -172,13 +173,13 @@ application.yml方式:
 ```yaml
 mybatis:
   mapper-location-excludes: classpath*:org/hswebframework/**/OrganizationalMapper.xml #不加载的xml
-  mapper-locations: classpath*:custom/mappers/OrganizationalMapper.xml
+  mapper-locations: classpath*:com/myproject/mappers/OrganizationalMapper.xml
 ```
 
 java类配置方式:
 ```java
 @Component //提供给spring才会生效
-public class CustomMybatisMapperCustomer implements MybatisMapperCustomer {
+public class CustomMybatisMapperCustomizer implements MybatisMapperCustomizer {
     @Override
     public String[] getExcludes() {
         return new String[]{
@@ -189,7 +190,7 @@ public class CustomMybatisMapperCustomer implements MybatisMapperCustomer {
     @Override
     public String[] getIncludes() {
         return new String[]{
-                "classpath*:custom/mappers/OrganizationalMapper.xml"
+                "classpath*:com/myproject/mappers/OrganizationalMapper.xml"
         };
     }
 }