From ff4f3b74d52d3133216507952fc94f2d43bc3e9e Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 11 Oct 2018 17:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...faultAopMethodAuthorizeDefinitionParser.java | 12 ++++++------ .../mybatis/MybatisDaoAutoConfiguration.java | 17 ++++++++--------- ...stomer.java => MybatisMapperCustomizer.java} | 2 +- .../web/dao/mybatis/MybatisProperties.java | 8 ++++---- ...omer.java => AbstractSqlTermCustomizer.java} | 2 +- ...TermCustomer.java => SqlTermCustomizer.java} | 2 +- ...java => TreeStructureSqlTermCustomizer.java} | 4 ++-- .../mapper/dict/DictInTermTypeMapper.java | 5 ++--- .../mybatis/mapper/dict/DictTermTypeMapper.java | 7 ++----- .../entity/EntityFactoryInitConfiguration.java | 4 ++-- ...stomer.java => EntityMappingCustomizer.java} | 2 +- .../simple/terms/UserInRoleSqlTerm.java | 4 ++-- ...ava => DynamicFormInitializeCustomizer.java} | 2 +- .../form/simple/SimpleDynamicFormService.java | 15 ++++++--------- .../simple/terms/InServiceTreeInSqlTerm.java | 4 ++-- .../simple/terms/UserInSqlTerm.java | 4 ++-- .../service/imp/WorkFlowFormServiceImpl.java | 9 ++------- .../web/workflow/terms/ClaimSqlTerm.java | 4 ++-- .../web/workflow/terms/CompletedSqlTerm.java | 4 ++-- .../terms/ProcessParticipateSqlTerm.java | 4 ++-- .../web/workflow/terms/TodoSqlTerm.java | 4 ++-- quick-start/CUSTOM-PROP.md | 13 +++++++------ 22 files changed, 60 insertions(+), 72 deletions(-) rename hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/{MybatisMapperCustomer.java => MybatisMapperCustomizer.java} (81%) rename hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/{AbstractSqlTermCustomer.java => AbstractSqlTermCustomizer.java} (96%) rename hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/{SqlTermCustomer.java => SqlTermCustomizer.java} (76%) rename hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/{TreeStructureSqlTermCustomer.java => TreeStructureSqlTermCustomizer.java} (93%) rename hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/{EntityMappingCustomer.java => EntityMappingCustomizer.java} (82%) rename hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/{DynamicFormInitializeCustomer.java => DynamicFormInitializeCustomizer.java} (81%) diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java index 4998a851c..9c39262e5 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java +++ b/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 cache = new ConcurrentHashMap<>(); - private List parserCustomers; + private List parserCustomizers; private static Set excludeMethodName = new HashSet<>(Arrays.asList("toString", "clone", "hashCode", "getClass")); @Autowired(required = false) - public void setParserCustomers(List parserCustomers) { - this.parserCustomers = parserCustomers; + public void setParserCustomizers(List 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) { diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisDaoAutoConfiguration.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisDaoAutoConfiguration.java index b11a9ee09..7fba7d3c5 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisDaoAutoConfiguration.java +++ b/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 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; diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomer.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomizer.java similarity index 81% rename from hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomer.java rename to hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomizer.java index c0893a68a..14f969a08 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomer.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisMapperCustomizer.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(); diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisProperties.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisProperties.java index e2d53c20f..2f64dacbe 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/MybatisProperties.java +++ b/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 mybatisMappers; + private List mybatisMappers; @Autowired(required = false) - public void setMybatisMappers(List mybatisMappers) { + public void setMybatisMappers(List 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 excludes = new HashSet<>(); if (mybatisMappers != null) { mybatisMappers.stream() - .map(MybatisMapperCustomer::getExcludes) + .map(MybatisMapperCustomizer::getExcludes) .flatMap(Arrays::stream) .forEach(excludes::add); } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomer.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomizer.java similarity index 96% rename from hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomer.java rename to hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomizer.java index c41d22b47..1b76996f8 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomer.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/AbstractSqlTermCustomizer.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; diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomer.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomizer.java similarity index 76% rename from hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomer.java rename to hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomizer.java index f36a00441..4d67cedb1 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomer.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/SqlTermCustomizer.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(); diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomer.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java similarity index 93% rename from hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomer.java rename to hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java index d0302e4fd..a68751668 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomer.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.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; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java index 2f67e5b3b..059cc10a9 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java +++ b/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; diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java index fbe359c9d..69e02a333 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java +++ b/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; diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityFactoryInitConfiguration.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityFactoryInitConfiguration.java index a161b2d58..30f95587d 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityFactoryInitConfiguration.java +++ b/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; } diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomizer.java similarity index 82% rename from hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java rename to hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomizer.java index fcee63ba0..16ed7e86d 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomizer.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); } diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/terms/UserInRoleSqlTerm.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/terms/UserInRoleSqlTerm.java index d52fa743c..5394c7dda 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/terms/UserInRoleSqlTerm.java +++ b/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; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomer.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomizer.java similarity index 81% rename from hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomer.java rename to hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomizer.java index 701ee11c4..5bd6fde5b 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomer.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/initialize/DynamicFormInitializeCustomizer.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); diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java index e8ddd8409..e26f65562 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java +++ b/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 initializeCustomers; + private List initializeCustomizers; @Autowired private ValidatorFactory validatorFactory; @@ -608,8 +605,8 @@ public class SimpleDynamicFormService extends GenericEntityService customer.customTableSetting(context)); + if (!CollectionUtils.isEmpty(initializeCustomizers)) { + initializeCustomizers.forEach(customizer -> customizer.customTableSetting(context)); } } @@ -644,8 +641,8 @@ public class SimpleDynamicFormService extends GenericEntityService customer.customTableColumnSetting(context)); + if (!CollectionUtils.isEmpty(initializeCustomizers)) { + initializeCustomizers.forEach(customer -> customer.customTableColumnSetting(context)); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/InServiceTreeInSqlTerm.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/InServiceTreeInSqlTerm.java index 632b4c5ef..0c01724be 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/InServiceTreeInSqlTerm.java +++ b/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 extends TreeStructureSqlTermCustomer { +public class InServiceTreeInSqlTerm extends TreeStructureSqlTermCustomizer { private QueryService, PK> treeService; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java index 47390de08..770657732 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/terms/UserInSqlTerm.java +++ b/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 extends AbstractSqlTermCustomer { +public abstract class UserInSqlTerm extends AbstractSqlTermCustomizer { @Setter diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java index 88ee2e258..ca0b42b1b 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java +++ b/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; diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ClaimSqlTerm.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ClaimSqlTerm.java index 9d49971d7..7f5a03dac 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ClaimSqlTerm.java +++ b/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); } diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/CompletedSqlTerm.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/CompletedSqlTerm.java index 0dfe30722..093ab9264 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/CompletedSqlTerm.java +++ b/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); } diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ProcessParticipateSqlTerm.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ProcessParticipateSqlTerm.java index 1b4f8aa4a..0bbf6d868 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/ProcessParticipateSqlTerm.java +++ b/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); } diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/TodoSqlTerm.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/TodoSqlTerm.java index 5732c7b01..ccb1afff8 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/terms/TodoSqlTerm.java +++ b/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); } diff --git a/quick-start/CUSTOM-PROP.md b/quick-start/CUSTOM-PROP.md index 0abda00c6..9ffe2d94e 100644 --- a/quick-start/CUSTOM-PROP.md +++ b/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 - - + @@ -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" }; } }