From 55d7fce40f4a6a8f066f8ead215ad05938fa0f3b Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 30 Apr 2019 16:23:04 +0800 Subject: [PATCH 01/47] 3.0.9-SNAPSHOT --- .../hsweb-authorization-api/pom.xml | 2 +- .../hsweb-authorization-basic/pom.xml | 2 +- .../hsweb-authorization-jwt/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-authorization-oauth2-client/pom.xml | 2 +- .../hsweb-authorization-oauth2-core/pom.xml | 2 +- .../hsweb-authorization-oauth2/pom.xml | 2 +- hsweb-authorization/pom.xml | 2 +- hsweb-boost/hsweb-boost-aop/pom.xml | 2 +- hsweb-boost/hsweb-boost-excel/pom.xml | 2 +- hsweb-boost/hsweb-boost-ftp/pom.xml | 2 +- hsweb-boost/pom.xml | 2 +- hsweb-commons/hsweb-commons-bean/pom.xml | 2 +- .../hsweb-commons-controller/pom.xml | 2 +- .../hsweb-commons-dao-api/pom.xml | 2 +- .../hsweb-commons-dao-mybatis/pom.xml | 2 +- .../mybatis/builder/EasyOrmSqlBuilder.java | 19 ++++++++++++++----- hsweb-commons/hsweb-commons-dao/pom.xml | 2 +- hsweb-commons/hsweb-commons-entity/pom.xml | 2 +- hsweb-commons/hsweb-commons-model/pom.xml | 2 +- .../hsweb-commons-service-api/pom.xml | 2 +- .../hsweb-commons-service-oauth2/pom.xml | 2 +- .../hsweb-commons-service-simple/pom.xml | 2 +- hsweb-commons/hsweb-commons-service/pom.xml | 2 +- hsweb-commons/hsweb-commons-utils/pom.xml | 2 +- hsweb-commons/pom.xml | 2 +- .../hsweb-concurrent-async-job/pom.xml | 2 +- .../hsweb-concurrent-cache/pom.xml | 2 +- .../hsweb-concurrent-counter-api/pom.xml | 2 +- .../hsweb-concurrent-counter-redis/pom.xml | 2 +- .../hsweb-concurrent-counter/pom.xml | 2 +- .../hsweb-concurrent-lock-api/pom.xml | 2 +- .../hsweb-concurrent-lock-redis/pom.xml | 2 +- .../hsweb-concurrent-lock-starter/pom.xml | 2 +- .../hsweb-concurrent-lock/pom.xml | 2 +- .../hsweb-concurrent-rate-limiter-api/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-concurrent-rate-limiter/pom.xml | 2 +- hsweb-concurrent/pom.xml | 2 +- hsweb-core/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-api/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-jta/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-web/pom.xml | 2 +- hsweb-datasource/pom.xml | 2 +- .../hsweb-access-logging-aop/pom.xml | 2 +- .../hsweb-access-logging-api/pom.xml | 2 +- hsweb-logging/pom.xml | 2 +- .../hsweb-spring-boot-starter/pom.xml | 2 +- hsweb-starter/pom.xml | 2 +- .../hsweb-system-authorization-api/pom.xml | 2 +- .../hsweb-system-authorization-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-authorization-web/pom.xml | 2 +- .../hsweb-system-authorization/pom.xml | 2 +- .../hsweb-system-config-api/pom.xml | 2 +- .../hsweb-system-config-local/pom.xml | 2 +- .../hsweb-system-config-starter/pom.xml | 2 +- .../hsweb-system-config-web/pom.xml | 2 +- hsweb-system/hsweb-system-config/pom.xml | 2 +- .../hsweb-system-dashboard-api/pom.xml | 2 +- .../hsweb-system-dashboard-local/pom.xml | 2 +- .../hsweb-system-dashboard-starter/pom.xml | 2 +- .../hsweb-system-dashboard-web/pom.xml | 2 +- hsweb-system/hsweb-system-dashboard/pom.xml | 2 +- .../hsweb-system-database-manager-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-database-manager-web/pom.xml | 2 +- .../hsweb-system-database-manager/pom.xml | 2 +- .../hsweb-system-datasource-api/pom.xml | 2 +- .../hsweb-system-datasource-local/pom.xml | 2 +- .../hsweb-system-datasource-starter/pom.xml | 2 +- .../hsweb-system-datasource-web/pom.xml | 2 +- hsweb-system/hsweb-system-datasource/pom.xml | 2 +- hsweb-system/hsweb-system-dev-tools/pom.xml | 2 +- .../hsweb-system-dictionary-api/pom.xml | 2 +- .../hsweb-system-dictionary-local/pom.xml | 2 +- .../hsweb-system-dictionary-starter/pom.xml | 2 +- .../hsweb-system-dictionary-web/pom.xml | 2 +- hsweb-system/hsweb-system-dictionary/pom.xml | 2 +- .../hsweb-system-dynamic-form-api/pom.xml | 2 +- .../hsweb-system-dynamic-form-local/pom.xml | 2 +- .../hsweb-system-dynamic-form-starter/pom.xml | 2 +- .../hsweb-system-dynamic-form-web/pom.xml | 2 +- .../hsweb-system-dynamic-form/pom.xml | 2 +- .../hsweb-system-file-api/pom.xml | 2 +- .../hsweb-system-file-local/pom.xml | 2 +- .../hsweb-system-file-oauth2/pom.xml | 2 +- .../hsweb-system-file-starter/pom.xml | 2 +- .../hsweb-system-file-web/pom.xml | 2 +- hsweb-system/hsweb-system-file/pom.xml | 2 +- .../hsweb-system-oauth2-client-api/pom.xml | 2 +- .../hsweb-system-oauth2-client-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-oauth2-client-web/pom.xml | 2 +- .../hsweb-system-oauth2-client/pom.xml | 2 +- .../hsweb-system-oauth2-server-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-oauth2-server-web/pom.xml | 2 +- .../hsweb-system-oauth2-server/pom.xml | 2 +- .../hsweb-system-organizational-api/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-organizational-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-organizational-web/pom.xml | 2 +- .../hsweb-system-organizational/pom.xml | 2 +- .../hsweb-system-schedule-api/pom.xml | 2 +- .../hsweb-system-schedule-local/pom.xml | 2 +- .../hsweb-system-schedule-starter/pom.xml | 2 +- .../hsweb-system-schedule-web/pom.xml | 2 +- hsweb-system/hsweb-system-schedule/pom.xml | 2 +- .../hsweb-system-script-api/pom.xml | 2 +- .../hsweb-system-script-local/pom.xml | 2 +- .../hsweb-system-script-starter/pom.xml | 2 +- .../hsweb-system-script-web/pom.xml | 2 +- hsweb-system/hsweb-system-script/pom.xml | 2 +- .../hsweb-system-template-api/pom.xml | 2 +- .../hsweb-system-template-local/pom.xml | 2 +- .../hsweb-system-template-starter/pom.xml | 2 +- .../hsweb-system-template-web/pom.xml | 2 +- hsweb-system/hsweb-system-template/pom.xml | 2 +- .../hsweb-system-workflow-local/pom.xml | 2 +- .../hsweb-system-workflow-starter/pom.xml | 2 +- hsweb-system/hsweb-system-workflow/pom.xml | 2 +- hsweb-system/pom.xml | 2 +- hsweb-tests/pom.xml | 2 +- .../hsweb-thirdparty-ueditor/pom.xml | 2 +- hsweb-thirdparty/pom.xml | 2 +- pom.xml | 2 +- 129 files changed, 142 insertions(+), 133 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/pom.xml b/hsweb-authorization/hsweb-authorization-api/pom.xml index 32113f56b..76f27a76c 100644 --- a/hsweb-authorization/hsweb-authorization-api/pom.xml +++ b/hsweb-authorization/hsweb-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-basic/pom.xml b/hsweb-authorization/hsweb-authorization-basic/pom.xml index 90dbd8a20..ee2b07b0f 100644 --- a/hsweb-authorization/hsweb-authorization-basic/pom.xml +++ b/hsweb-authorization/hsweb-authorization-basic/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-jwt/pom.xml b/hsweb-authorization/hsweb-authorization-jwt/pom.xml index 3a02a5b86..f23e64809 100644 --- a/hsweb-authorization/hsweb-authorization-jwt/pom.xml +++ b/hsweb-authorization/hsweb-authorization-jwt/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml index 3a9d3b9b4..294d46042 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml index 4b00c6acc..8dd98a02a 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml index 12eecdfe7..6c6f8dbd3 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml index 5b8ef51bb..e00f0f4dd 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/pom.xml b/hsweb-authorization/pom.xml index e1a45d49f..8a7f3f400 100644 --- a/hsweb-authorization/pom.xml +++ b/hsweb-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-aop/pom.xml b/hsweb-boost/hsweb-boost-aop/pom.xml index 769cb5f0e..04172d967 100644 --- a/hsweb-boost/hsweb-boost-aop/pom.xml +++ b/hsweb-boost/hsweb-boost-aop/pom.xml @@ -23,7 +23,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-excel/pom.xml b/hsweb-boost/hsweb-boost-excel/pom.xml index d94b28bbb..2051428a8 100644 --- a/hsweb-boost/hsweb-boost-excel/pom.xml +++ b/hsweb-boost/hsweb-boost-excel/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-ftp/pom.xml b/hsweb-boost/hsweb-boost-ftp/pom.xml index d25e81f5b..88ad02787 100644 --- a/hsweb-boost/hsweb-boost-ftp/pom.xml +++ b/hsweb-boost/hsweb-boost-ftp/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/pom.xml b/hsweb-boost/pom.xml index 9178dadf5..6ddd16170 100644 --- a/hsweb-boost/pom.xml +++ b/hsweb-boost/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-bean/pom.xml b/hsweb-commons/hsweb-commons-bean/pom.xml index 0b04430be..cf7149add 100644 --- a/hsweb-commons/hsweb-commons-bean/pom.xml +++ b/hsweb-commons/hsweb-commons-bean/pom.xml @@ -5,7 +5,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-controller/pom.xml b/hsweb-commons/hsweb-commons-controller/pom.xml index c610f729e..6159d23ee 100644 --- a/hsweb-commons/hsweb-commons-controller/pom.xml +++ b/hsweb-commons/hsweb-commons-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml index 2a701c424..c2bcc266c 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml index 27ecc0cae..a30430461 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 921052945..e1b52f131 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -303,15 +303,16 @@ public String buildSelectFields(String resultMapId, String tableName, Object arg QueryParam param = null; if (arg instanceof QueryParam) { param = ((QueryParam) arg); + if (param.isPaging() && Pager.get() == null) { + Pager.doPaging(param.getPageIndex(), param.getPageSize()); + } else { + Pager.reset(); + } } if (param == null) { return "*"; } - if (param.isPaging() && Pager.get() == null) { - Pager.doPaging(param.getPageIndex(), param.getPageSize()); - } else { - Pager.reset(); - } + RDBTableMetaData tableMetaData = createMeta(tableName, resultMapId); RDBDatabaseMetaData databaseMetaDate = getActiveDatabase(); Dialect dialect = databaseMetaDate.getDialect(); @@ -401,6 +402,14 @@ public String buildWhere(String resultMapId, String tableName, Object param) { } else { terms = new ArrayList<>(); } + if (param instanceof QueryParam) { + QueryParam queryParam = ((QueryParam) param); + if (queryParam.isPaging() && Pager.get() == null) { + Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + } else { + Pager.reset(); + } + } return buildWhere(resultMapId, tableName, terms); } diff --git a/hsweb-commons/hsweb-commons-dao/pom.xml b/hsweb-commons/hsweb-commons-dao/pom.xml index 66bf58bbf..45739172a 100644 --- a/hsweb-commons/hsweb-commons-dao/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-entity/pom.xml b/hsweb-commons/hsweb-commons-entity/pom.xml index 557dfd074..b45508852 100644 --- a/hsweb-commons/hsweb-commons-entity/pom.xml +++ b/hsweb-commons/hsweb-commons-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-model/pom.xml b/hsweb-commons/hsweb-commons-model/pom.xml index 7756ab6c8..b382a7b19 100644 --- a/hsweb-commons/hsweb-commons-model/pom.xml +++ b/hsweb-commons/hsweb-commons-model/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml index c0b1fa74c..f04cd8e82 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml index 13f57432f..63f2b9447 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml index 2eae6c14d..5eb8d43fa 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/pom.xml b/hsweb-commons/hsweb-commons-service/pom.xml index 3daf91111..8d5135c88 100644 --- a/hsweb-commons/hsweb-commons-service/pom.xml +++ b/hsweb-commons/hsweb-commons-service/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-utils/pom.xml b/hsweb-commons/hsweb-commons-utils/pom.xml index 9defca929..1829dfb1d 100644 --- a/hsweb-commons/hsweb-commons-utils/pom.xml +++ b/hsweb-commons/hsweb-commons-utils/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/pom.xml b/hsweb-commons/pom.xml index 218cde18e..d38cb0ae4 100644 --- a/hsweb-commons/pom.xml +++ b/hsweb-commons/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml index 0645d9e60..2e9b1daa8 100644 --- a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml index ef9ead206..afaa12304 100644 --- a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml index 84ca1b712..5c7c3c767 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml index 87282e206..482260ff6 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml index 5a0fbaecf..3b0e32e5c 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml index 1d1ecc086..a08c822e6 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml index c302f3e13..d495882b9 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml index 61d133402..76566b102 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml index 1d8b497af..6d665e879 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml index 4c615bf46..368f253c7 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml index 8f5fdaebf..b3bc93a33 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml index b215c43ec..12581c79f 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/pom.xml b/hsweb-concurrent/pom.xml index 44503da72..1a6d4a3a8 100644 --- a/hsweb-concurrent/pom.xml +++ b/hsweb-concurrent/pom.xml @@ -22,7 +22,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml index 804df4ac3..5c8f5042c 100644 --- a/hsweb-core/pom.xml +++ b/hsweb-core/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-datasource/hsweb-datasource-api/pom.xml b/hsweb-datasource/hsweb-datasource-api/pom.xml index ff432ece5..fd606c06b 100644 --- a/hsweb-datasource/hsweb-datasource-api/pom.xml +++ b/hsweb-datasource/hsweb-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-jta/pom.xml b/hsweb-datasource/hsweb-datasource-jta/pom.xml index d75fddfa1..50809f66b 100644 --- a/hsweb-datasource/hsweb-datasource-jta/pom.xml +++ b/hsweb-datasource/hsweb-datasource-jta/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-web/pom.xml b/hsweb-datasource/hsweb-datasource-web/pom.xml index f1fc0058b..33bd997bb 100644 --- a/hsweb-datasource/hsweb-datasource-web/pom.xml +++ b/hsweb-datasource/hsweb-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/pom.xml b/hsweb-datasource/pom.xml index d6e70cfa6..7b489dd19 100644 --- a/hsweb-datasource/pom.xml +++ b/hsweb-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-logging/hsweb-access-logging-aop/pom.xml b/hsweb-logging/hsweb-access-logging-aop/pom.xml index 2a3a4c5ba..58fa7ed4b 100644 --- a/hsweb-logging/hsweb-access-logging-aop/pom.xml +++ b/hsweb-logging/hsweb-access-logging-aop/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-logging/hsweb-access-logging-api/pom.xml b/hsweb-logging/hsweb-access-logging-api/pom.xml index c5f449e48..a6acb8d9b 100644 --- a/hsweb-logging/hsweb-access-logging-api/pom.xml +++ b/hsweb-logging/hsweb-access-logging-api/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-logging/pom.xml b/hsweb-logging/pom.xml index 743b85671..6f564187d 100644 --- a/hsweb-logging/pom.xml +++ b/hsweb-logging/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-starter/hsweb-spring-boot-starter/pom.xml b/hsweb-starter/hsweb-spring-boot-starter/pom.xml index 497e55287..0527bb90f 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/pom.xml +++ b/hsweb-starter/hsweb-spring-boot-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-starter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-starter/pom.xml b/hsweb-starter/pom.xml index 758075f0c..b59f205f6 100644 --- a/hsweb-starter/pom.xml +++ b/hsweb-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml index 3a4e987af..bd93b1997 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml index 41446a49d..3fb100057 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml index 0bcef558d..6511e0e93 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml index 5147fd25d..7b64ff8f7 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/pom.xml b/hsweb-system/hsweb-system-authorization/pom.xml index db5f62d90..f732cfc51 100644 --- a/hsweb-system/hsweb-system-authorization/pom.xml +++ b/hsweb-system/hsweb-system-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml index f9f4e5ebe..439eb1b0d 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml index 8de70b486..a1ba081e5 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml index 7452c1579..1c7e35ad1 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml index 1d0e1e062..c7a456726 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/pom.xml b/hsweb-system/hsweb-system-config/pom.xml index 1da924a63..d591d205c 100644 --- a/hsweb-system/hsweb-system-config/pom.xml +++ b/hsweb-system/hsweb-system-config/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml index db6ec1d56..4c60a5a9e 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml index a1e61e5b8..d2789772e 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml index 5957d522e..cb9c8a041 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml index 0c769119d..c3da580bf 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/pom.xml b/hsweb-system/hsweb-system-dashboard/pom.xml index c298342de..df63e63f1 100644 --- a/hsweb-system/hsweb-system-dashboard/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml index 04b2bf29e..3ac26ba63 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml index 8c64418f6..d2dc9cc13 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml index 51ef66792..75dda8452 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml index ba1ac2a08..fd1d91263 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/pom.xml b/hsweb-system/hsweb-system-database-manager/pom.xml index 26ebb56e2..c077be1d6 100644 --- a/hsweb-system/hsweb-system-database-manager/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml index b5efd8494..06d96892d 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml index 74904a36b..75c243484 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml index a49c3bb64..8fb023e38 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml index a205c5dc8..ab2cdb610 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/pom.xml b/hsweb-system/hsweb-system-datasource/pom.xml index 6339ec126..b97a4e97f 100644 --- a/hsweb-system/hsweb-system-datasource/pom.xml +++ b/hsweb-system/hsweb-system-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-system/hsweb-system-dev-tools/pom.xml b/hsweb-system/hsweb-system-dev-tools/pom.xml index 56294a3ba..6909a96c9 100644 --- a/hsweb-system/hsweb-system-dev-tools/pom.xml +++ b/hsweb-system/hsweb-system-dev-tools/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml index 891b7025f..dffe8c680 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml index 093074c61..205875d48 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml index 3a48dad08..4ea323199 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml index b41e3e551..6eeefbcff 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/pom.xml b/hsweb-system/hsweb-system-dictionary/pom.xml index 355a2d629..5ae857192 100644 --- a/hsweb-system/hsweb-system-dictionary/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml index 61bae1274..691d609e7 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml index 2171250bf..8affec2b5 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml index 5205ffc20..0820b18b5 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml index 59f0a948a..fce2b6778 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/pom.xml b/hsweb-system/hsweb-system-dynamic-form/pom.xml index b56749437..bfe537271 100644 --- a/hsweb-system/hsweb-system-dynamic-form/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml index b378084bd..208eda81e 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml index 58b19061e..090664b9e 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml index 6ac3a3b9e..50d780b10 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml index e7243bcf5..ba4da1bc8 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml index 80993a379..b56d3cf97 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/pom.xml b/hsweb-system/hsweb-system-file/pom.xml index f2f9ac11a..89de803aa 100644 --- a/hsweb-system/hsweb-system-file/pom.xml +++ b/hsweb-system/hsweb-system-file/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml index 2275e14d6..dd8c0dddf 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml index 4f2cf6b28..88d66a79b 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml index 272667fb2..3214cd09b 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml index 428708b92..ce327fa09 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/pom.xml b/hsweb-system/hsweb-system-oauth2-client/pom.xml index 7ad342730..44ecfd298 100644 --- a/hsweb-system/hsweb-system-oauth2-client/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml index 624d4baa5..1bd62a2ce 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml index f300d8c1c..0639c4593 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml index 04e30e37d..d1c5c3029 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/pom.xml b/hsweb-system/hsweb-system-oauth2-server/pom.xml index 1c9c27f28..c5fc93263 100644 --- a/hsweb-system/hsweb-system-oauth2-server/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml index c8e17d2c3..31e9fe2e8 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml index f225c66c5..1a6cc086d 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml index d72f57c67..95d80c628 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml index bbb2133cc..c84b60596 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml index 930aae60d..3b4c52221 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/pom.xml b/hsweb-system/hsweb-system-organizational/pom.xml index cfd1b80f7..0ca355258 100644 --- a/hsweb-system/hsweb-system-organizational/pom.xml +++ b/hsweb-system/hsweb-system-organizational/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml index ef70bd59b..b0bc1e7ad 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml index f871e50fa..d5662c2e8 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml index 655342fbb..42eda894a 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml index 86d498297..083bb9959 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/pom.xml b/hsweb-system/hsweb-system-schedule/pom.xml index dc5bbeaf8..8e1b34b7d 100644 --- a/hsweb-system/hsweb-system-schedule/pom.xml +++ b/hsweb-system/hsweb-system-schedule/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 pom diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml index b1b122acd..65062552b 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml index 9d17fa654..95dad35d5 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml index 7dedcd5dc..7e334dcd8 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml index abcd61eb0..6669522a1 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/pom.xml b/hsweb-system/hsweb-system-script/pom.xml index 0c2085892..8ac7900db 100644 --- a/hsweb-system/hsweb-system-script/pom.xml +++ b/hsweb-system/hsweb-system-script/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml index be227329d..1e6b61751 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml index f298561b7..405b77491 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml index f4bc4a585..2acfbd092 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml index e708e0119..0a3bbc140 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/pom.xml b/hsweb-system/hsweb-system-template/pom.xml index fbc2dc0d2..39a2d8007 100644 --- a/hsweb-system/hsweb-system-template/pom.xml +++ b/hsweb-system/hsweb-system-template/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml index cafbcf22d..2723b9bbf 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml index e5e7e68c3..8893b2884 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/pom.xml b/hsweb-system/hsweb-system-workflow/pom.xml index 5cffba84d..721ace8d7 100644 --- a/hsweb-system/hsweb-system-workflow/pom.xml +++ b/hsweb-system/hsweb-system-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/pom.xml b/hsweb-system/pom.xml index 2b21e31e3..ff4b0abc8 100644 --- a/hsweb-system/pom.xml +++ b/hsweb-system/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-tests/pom.xml b/hsweb-tests/pom.xml index aa1cbf15d..355b37e35 100644 --- a/hsweb-tests/pom.xml +++ b/hsweb-tests/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml index c1273a9e7..705631994 100644 --- a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml +++ b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml @@ -5,7 +5,7 @@ hsweb-thirdparty org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-thirdparty/pom.xml b/hsweb-thirdparty/pom.xml index 4d77d2bd6..aef185e91 100644 --- a/hsweb-thirdparty/pom.xml +++ b/hsweb-thirdparty/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 77651f10e..2e72c1d31 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.hswebframework.web hsweb-framework - 3.0.8 + 3.0.9-SNAPSHOT hsweb-starter hsweb-core From ccae55e6f702a98e9a85e20de2248cd4d6bce9c4 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Sun, 5 May 2019 10:30:39 +0800 Subject: [PATCH 02/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=88=86=E4=B9=9F=EF=BC=8C=E9=A1=B5=E7=A0=81=E4=BB=8E0?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hswebframework/web/dao/mybatis/plgins/pager/Pager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java index e1a763419..2b538df7d 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java @@ -71,14 +71,13 @@ static void doPaging(int pageIndex, int pageSize, int total) { static void rePaging(int total) { Pager pager = get(); - int pageIndex = 0; if (pager != null) { // 当前页没有数据后跳转到最后一页 if (pager.pageIndex() != 0 && (pager.pageIndex() * pager.pageSize()) >= total) { int tmp = total / pager.pageSize(); - pageIndex = total % pager.pageSize() == 0 ? tmp - 1 : tmp; + int pageIndex = total % pager.pageSize() == 0 ? tmp - 1 : tmp; + doPaging(pageIndex, pager.pageSize()); } - doPaging(pageIndex, pager.pageSize()); } } } From 110e27c9653239301dc4c95c5adb351f9e6d9b27 Mon Sep 17 00:00:00 2001 From: Jia_RG Date: Mon, 18 Feb 2019 18:19:35 +0800 Subject: [PATCH 03/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9README=E8=B7=A8?= =?UTF-8?q?=E5=9F=9F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hsweb-starter/hsweb-spring-boot-starter/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hsweb-starter/hsweb-spring-boot-starter/README.md b/hsweb-starter/hsweb-spring-boot-starter/README.md index d683db30f..df5403e08 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/README.md +++ b/hsweb-starter/hsweb-spring-boot-starter/README.md @@ -15,11 +15,13 @@ hsweb: hsweb: cors: enable: true - allowed-headers: "*" - allowed-methods: "*" - allowed-origins: "*" - allow-credentials: true - max-age: 14400 + configs: + - /**: + allowed-headers: "*" + allowed-methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"] + allowed-origins: ["http://xxx.example.com"] + allow-credentials: true + maxAge: 1800 ``` # json序列化配置 From 73680d221a76001f5941c01f2228bb55386157f3 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 30 Apr 2019 16:23:04 +0800 Subject: [PATCH 04/47] 3.0.9-SNAPSHOT --- .../hsweb-authorization-api/pom.xml | 2 +- .../hsweb-authorization-basic/pom.xml | 2 +- .../hsweb-authorization-jwt/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-authorization-oauth2-client/pom.xml | 2 +- .../hsweb-authorization-oauth2-core/pom.xml | 2 +- .../hsweb-authorization-oauth2/pom.xml | 2 +- hsweb-authorization/pom.xml | 2 +- hsweb-boost/hsweb-boost-aop/pom.xml | 2 +- hsweb-boost/hsweb-boost-excel/pom.xml | 2 +- hsweb-boost/hsweb-boost-ftp/pom.xml | 2 +- hsweb-boost/pom.xml | 2 +- hsweb-commons/hsweb-commons-bean/pom.xml | 2 +- .../hsweb-commons-controller/pom.xml | 2 +- .../hsweb-commons-dao-api/pom.xml | 2 +- .../hsweb-commons-dao-mybatis/pom.xml | 2 +- .../mybatis/builder/EasyOrmSqlBuilder.java | 19 ++++++++++++++----- hsweb-commons/hsweb-commons-dao/pom.xml | 2 +- hsweb-commons/hsweb-commons-entity/pom.xml | 2 +- hsweb-commons/hsweb-commons-model/pom.xml | 2 +- .../hsweb-commons-service-api/pom.xml | 2 +- .../hsweb-commons-service-oauth2/pom.xml | 2 +- .../hsweb-commons-service-simple/pom.xml | 2 +- hsweb-commons/hsweb-commons-service/pom.xml | 2 +- hsweb-commons/hsweb-commons-utils/pom.xml | 2 +- hsweb-commons/pom.xml | 2 +- .../hsweb-concurrent-async-job/pom.xml | 2 +- .../hsweb-concurrent-cache/pom.xml | 2 +- .../hsweb-concurrent-counter-api/pom.xml | 2 +- .../hsweb-concurrent-counter-redis/pom.xml | 2 +- .../hsweb-concurrent-counter/pom.xml | 2 +- .../hsweb-concurrent-lock-api/pom.xml | 2 +- .../hsweb-concurrent-lock-redis/pom.xml | 2 +- .../hsweb-concurrent-lock-starter/pom.xml | 2 +- .../hsweb-concurrent-lock/pom.xml | 2 +- .../hsweb-concurrent-rate-limiter-api/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-concurrent-rate-limiter/pom.xml | 2 +- hsweb-concurrent/pom.xml | 2 +- hsweb-core/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-api/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-jta/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-web/pom.xml | 2 +- hsweb-datasource/pom.xml | 2 +- .../hsweb-access-logging-aop/pom.xml | 2 +- .../hsweb-access-logging-api/pom.xml | 2 +- hsweb-logging/pom.xml | 2 +- .../hsweb-spring-boot-starter/pom.xml | 2 +- hsweb-starter/pom.xml | 2 +- .../hsweb-system-authorization-api/pom.xml | 2 +- .../hsweb-system-authorization-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-authorization-web/pom.xml | 2 +- .../hsweb-system-authorization/pom.xml | 2 +- .../hsweb-system-config-api/pom.xml | 2 +- .../hsweb-system-config-local/pom.xml | 2 +- .../hsweb-system-config-starter/pom.xml | 2 +- .../hsweb-system-config-web/pom.xml | 2 +- hsweb-system/hsweb-system-config/pom.xml | 2 +- .../hsweb-system-dashboard-api/pom.xml | 2 +- .../hsweb-system-dashboard-local/pom.xml | 2 +- .../hsweb-system-dashboard-starter/pom.xml | 2 +- .../hsweb-system-dashboard-web/pom.xml | 2 +- hsweb-system/hsweb-system-dashboard/pom.xml | 2 +- .../hsweb-system-database-manager-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-database-manager-web/pom.xml | 2 +- .../hsweb-system-database-manager/pom.xml | 2 +- .../hsweb-system-datasource-api/pom.xml | 2 +- .../hsweb-system-datasource-local/pom.xml | 2 +- .../hsweb-system-datasource-starter/pom.xml | 2 +- .../hsweb-system-datasource-web/pom.xml | 2 +- hsweb-system/hsweb-system-datasource/pom.xml | 2 +- hsweb-system/hsweb-system-dev-tools/pom.xml | 2 +- .../hsweb-system-dictionary-api/pom.xml | 2 +- .../hsweb-system-dictionary-local/pom.xml | 2 +- .../hsweb-system-dictionary-starter/pom.xml | 2 +- .../hsweb-system-dictionary-web/pom.xml | 2 +- hsweb-system/hsweb-system-dictionary/pom.xml | 2 +- .../hsweb-system-dynamic-form-api/pom.xml | 2 +- .../hsweb-system-dynamic-form-local/pom.xml | 2 +- .../hsweb-system-dynamic-form-starter/pom.xml | 2 +- .../hsweb-system-dynamic-form-web/pom.xml | 2 +- .../hsweb-system-dynamic-form/pom.xml | 2 +- .../hsweb-system-file-api/pom.xml | 2 +- .../hsweb-system-file-local/pom.xml | 2 +- .../hsweb-system-file-oauth2/pom.xml | 2 +- .../hsweb-system-file-starter/pom.xml | 2 +- .../hsweb-system-file-web/pom.xml | 2 +- hsweb-system/hsweb-system-file/pom.xml | 2 +- .../hsweb-system-oauth2-client-api/pom.xml | 2 +- .../hsweb-system-oauth2-client-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-oauth2-client-web/pom.xml | 2 +- .../hsweb-system-oauth2-client/pom.xml | 2 +- .../hsweb-system-oauth2-server-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-oauth2-server-web/pom.xml | 2 +- .../hsweb-system-oauth2-server/pom.xml | 2 +- .../hsweb-system-organizational-api/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-organizational-local/pom.xml | 2 +- .../pom.xml | 2 +- .../hsweb-system-organizational-web/pom.xml | 2 +- .../hsweb-system-organizational/pom.xml | 2 +- .../hsweb-system-schedule-api/pom.xml | 2 +- .../hsweb-system-schedule-local/pom.xml | 2 +- .../hsweb-system-schedule-starter/pom.xml | 2 +- .../hsweb-system-schedule-web/pom.xml | 2 +- hsweb-system/hsweb-system-schedule/pom.xml | 2 +- .../hsweb-system-script-api/pom.xml | 2 +- .../hsweb-system-script-local/pom.xml | 2 +- .../hsweb-system-script-starter/pom.xml | 2 +- .../hsweb-system-script-web/pom.xml | 2 +- hsweb-system/hsweb-system-script/pom.xml | 2 +- .../hsweb-system-template-api/pom.xml | 2 +- .../hsweb-system-template-local/pom.xml | 2 +- .../hsweb-system-template-starter/pom.xml | 2 +- .../hsweb-system-template-web/pom.xml | 2 +- hsweb-system/hsweb-system-template/pom.xml | 2 +- .../hsweb-system-workflow-local/pom.xml | 2 +- .../hsweb-system-workflow-starter/pom.xml | 2 +- hsweb-system/hsweb-system-workflow/pom.xml | 2 +- hsweb-system/pom.xml | 2 +- hsweb-tests/pom.xml | 2 +- .../hsweb-thirdparty-ueditor/pom.xml | 2 +- hsweb-thirdparty/pom.xml | 2 +- pom.xml | 2 +- 129 files changed, 142 insertions(+), 133 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/pom.xml b/hsweb-authorization/hsweb-authorization-api/pom.xml index 32113f56b..76f27a76c 100644 --- a/hsweb-authorization/hsweb-authorization-api/pom.xml +++ b/hsweb-authorization/hsweb-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-basic/pom.xml b/hsweb-authorization/hsweb-authorization-basic/pom.xml index 90dbd8a20..ee2b07b0f 100644 --- a/hsweb-authorization/hsweb-authorization-basic/pom.xml +++ b/hsweb-authorization/hsweb-authorization-basic/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-jwt/pom.xml b/hsweb-authorization/hsweb-authorization-jwt/pom.xml index 3a02a5b86..f23e64809 100644 --- a/hsweb-authorization/hsweb-authorization-jwt/pom.xml +++ b/hsweb-authorization/hsweb-authorization-jwt/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml index 3a9d3b9b4..294d46042 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml index 4b00c6acc..8dd98a02a 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml index 12eecdfe7..6c6f8dbd3 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml index 5b8ef51bb..e00f0f4dd 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/pom.xml b/hsweb-authorization/pom.xml index e1a45d49f..8a7f3f400 100644 --- a/hsweb-authorization/pom.xml +++ b/hsweb-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-aop/pom.xml b/hsweb-boost/hsweb-boost-aop/pom.xml index 769cb5f0e..04172d967 100644 --- a/hsweb-boost/hsweb-boost-aop/pom.xml +++ b/hsweb-boost/hsweb-boost-aop/pom.xml @@ -23,7 +23,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-excel/pom.xml b/hsweb-boost/hsweb-boost-excel/pom.xml index d94b28bbb..2051428a8 100644 --- a/hsweb-boost/hsweb-boost-excel/pom.xml +++ b/hsweb-boost/hsweb-boost-excel/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-ftp/pom.xml b/hsweb-boost/hsweb-boost-ftp/pom.xml index d25e81f5b..88ad02787 100644 --- a/hsweb-boost/hsweb-boost-ftp/pom.xml +++ b/hsweb-boost/hsweb-boost-ftp/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/pom.xml b/hsweb-boost/pom.xml index 9178dadf5..6ddd16170 100644 --- a/hsweb-boost/pom.xml +++ b/hsweb-boost/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-bean/pom.xml b/hsweb-commons/hsweb-commons-bean/pom.xml index 0b04430be..cf7149add 100644 --- a/hsweb-commons/hsweb-commons-bean/pom.xml +++ b/hsweb-commons/hsweb-commons-bean/pom.xml @@ -5,7 +5,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-controller/pom.xml b/hsweb-commons/hsweb-commons-controller/pom.xml index c610f729e..6159d23ee 100644 --- a/hsweb-commons/hsweb-commons-controller/pom.xml +++ b/hsweb-commons/hsweb-commons-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml index 2a701c424..c2bcc266c 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml index 27ecc0cae..a30430461 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 921052945..e1b52f131 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -303,15 +303,16 @@ public String buildSelectFields(String resultMapId, String tableName, Object arg QueryParam param = null; if (arg instanceof QueryParam) { param = ((QueryParam) arg); + if (param.isPaging() && Pager.get() == null) { + Pager.doPaging(param.getPageIndex(), param.getPageSize()); + } else { + Pager.reset(); + } } if (param == null) { return "*"; } - if (param.isPaging() && Pager.get() == null) { - Pager.doPaging(param.getPageIndex(), param.getPageSize()); - } else { - Pager.reset(); - } + RDBTableMetaData tableMetaData = createMeta(tableName, resultMapId); RDBDatabaseMetaData databaseMetaDate = getActiveDatabase(); Dialect dialect = databaseMetaDate.getDialect(); @@ -401,6 +402,14 @@ public String buildWhere(String resultMapId, String tableName, Object param) { } else { terms = new ArrayList<>(); } + if (param instanceof QueryParam) { + QueryParam queryParam = ((QueryParam) param); + if (queryParam.isPaging() && Pager.get() == null) { + Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + } else { + Pager.reset(); + } + } return buildWhere(resultMapId, tableName, terms); } diff --git a/hsweb-commons/hsweb-commons-dao/pom.xml b/hsweb-commons/hsweb-commons-dao/pom.xml index 66bf58bbf..45739172a 100644 --- a/hsweb-commons/hsweb-commons-dao/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-entity/pom.xml b/hsweb-commons/hsweb-commons-entity/pom.xml index 557dfd074..b45508852 100644 --- a/hsweb-commons/hsweb-commons-entity/pom.xml +++ b/hsweb-commons/hsweb-commons-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-model/pom.xml b/hsweb-commons/hsweb-commons-model/pom.xml index 7756ab6c8..b382a7b19 100644 --- a/hsweb-commons/hsweb-commons-model/pom.xml +++ b/hsweb-commons/hsweb-commons-model/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml index c0b1fa74c..f04cd8e82 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml index 13f57432f..63f2b9447 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml index 2eae6c14d..5eb8d43fa 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/pom.xml b/hsweb-commons/hsweb-commons-service/pom.xml index 3daf91111..8d5135c88 100644 --- a/hsweb-commons/hsweb-commons-service/pom.xml +++ b/hsweb-commons/hsweb-commons-service/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-commons/hsweb-commons-utils/pom.xml b/hsweb-commons/hsweb-commons-utils/pom.xml index 9defca929..1829dfb1d 100644 --- a/hsweb-commons/hsweb-commons-utils/pom.xml +++ b/hsweb-commons/hsweb-commons-utils/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-commons/pom.xml b/hsweb-commons/pom.xml index 218cde18e..d38cb0ae4 100644 --- a/hsweb-commons/pom.xml +++ b/hsweb-commons/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml index 0645d9e60..2e9b1daa8 100644 --- a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml index ef9ead206..afaa12304 100644 --- a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml index 84ca1b712..5c7c3c767 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml index 87282e206..482260ff6 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml index 5a0fbaecf..3b0e32e5c 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml index 1d1ecc086..a08c822e6 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml index c302f3e13..d495882b9 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml index 61d133402..76566b102 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml index 1d8b497af..6d665e879 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml index 4c615bf46..368f253c7 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml index 8f5fdaebf..b3bc93a33 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml index b215c43ec..12581c79f 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/pom.xml b/hsweb-concurrent/pom.xml index 44503da72..1a6d4a3a8 100644 --- a/hsweb-concurrent/pom.xml +++ b/hsweb-concurrent/pom.xml @@ -22,7 +22,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml index 804df4ac3..5c8f5042c 100644 --- a/hsweb-core/pom.xml +++ b/hsweb-core/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-datasource/hsweb-datasource-api/pom.xml b/hsweb-datasource/hsweb-datasource-api/pom.xml index ff432ece5..fd606c06b 100644 --- a/hsweb-datasource/hsweb-datasource-api/pom.xml +++ b/hsweb-datasource/hsweb-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-jta/pom.xml b/hsweb-datasource/hsweb-datasource-jta/pom.xml index d75fddfa1..50809f66b 100644 --- a/hsweb-datasource/hsweb-datasource-jta/pom.xml +++ b/hsweb-datasource/hsweb-datasource-jta/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-web/pom.xml b/hsweb-datasource/hsweb-datasource-web/pom.xml index f1fc0058b..33bd997bb 100644 --- a/hsweb-datasource/hsweb-datasource-web/pom.xml +++ b/hsweb-datasource/hsweb-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-datasource/pom.xml b/hsweb-datasource/pom.xml index d6e70cfa6..7b489dd19 100644 --- a/hsweb-datasource/pom.xml +++ b/hsweb-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-logging/hsweb-access-logging-aop/pom.xml b/hsweb-logging/hsweb-access-logging-aop/pom.xml index 2a3a4c5ba..58fa7ed4b 100644 --- a/hsweb-logging/hsweb-access-logging-aop/pom.xml +++ b/hsweb-logging/hsweb-access-logging-aop/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-logging/hsweb-access-logging-api/pom.xml b/hsweb-logging/hsweb-access-logging-api/pom.xml index c5f449e48..a6acb8d9b 100644 --- a/hsweb-logging/hsweb-access-logging-api/pom.xml +++ b/hsweb-logging/hsweb-access-logging-api/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-logging/pom.xml b/hsweb-logging/pom.xml index 743b85671..6f564187d 100644 --- a/hsweb-logging/pom.xml +++ b/hsweb-logging/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-starter/hsweb-spring-boot-starter/pom.xml b/hsweb-starter/hsweb-spring-boot-starter/pom.xml index 497e55287..0527bb90f 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/pom.xml +++ b/hsweb-starter/hsweb-spring-boot-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-starter org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-starter/pom.xml b/hsweb-starter/pom.xml index 758075f0c..b59f205f6 100644 --- a/hsweb-starter/pom.xml +++ b/hsweb-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml index 3a4e987af..bd93b1997 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml index 41446a49d..3fb100057 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml index 0bcef558d..6511e0e93 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml index 5147fd25d..7b64ff8f7 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/pom.xml b/hsweb-system/hsweb-system-authorization/pom.xml index db5f62d90..f732cfc51 100644 --- a/hsweb-system/hsweb-system-authorization/pom.xml +++ b/hsweb-system/hsweb-system-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml index f9f4e5ebe..439eb1b0d 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml index 8de70b486..a1ba081e5 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml index 7452c1579..1c7e35ad1 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml index 1d0e1e062..c7a456726 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/pom.xml b/hsweb-system/hsweb-system-config/pom.xml index 1da924a63..d591d205c 100644 --- a/hsweb-system/hsweb-system-config/pom.xml +++ b/hsweb-system/hsweb-system-config/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml index db6ec1d56..4c60a5a9e 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml index a1e61e5b8..d2789772e 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml index 5957d522e..cb9c8a041 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml index 0c769119d..c3da580bf 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/pom.xml b/hsweb-system/hsweb-system-dashboard/pom.xml index c298342de..df63e63f1 100644 --- a/hsweb-system/hsweb-system-dashboard/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml index 04b2bf29e..3ac26ba63 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml index 8c64418f6..d2dc9cc13 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml index 51ef66792..75dda8452 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml index ba1ac2a08..fd1d91263 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/pom.xml b/hsweb-system/hsweb-system-database-manager/pom.xml index 26ebb56e2..c077be1d6 100644 --- a/hsweb-system/hsweb-system-database-manager/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml index b5efd8494..06d96892d 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml index 74904a36b..75c243484 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml index a49c3bb64..8fb023e38 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml index a205c5dc8..ab2cdb610 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/pom.xml b/hsweb-system/hsweb-system-datasource/pom.xml index 6339ec126..b97a4e97f 100644 --- a/hsweb-system/hsweb-system-datasource/pom.xml +++ b/hsweb-system/hsweb-system-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml diff --git a/hsweb-system/hsweb-system-dev-tools/pom.xml b/hsweb-system/hsweb-system-dev-tools/pom.xml index 56294a3ba..6909a96c9 100644 --- a/hsweb-system/hsweb-system-dev-tools/pom.xml +++ b/hsweb-system/hsweb-system-dev-tools/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml index 891b7025f..dffe8c680 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml index 093074c61..205875d48 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml index 3a48dad08..4ea323199 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml index b41e3e551..6eeefbcff 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/pom.xml b/hsweb-system/hsweb-system-dictionary/pom.xml index 355a2d629..5ae857192 100644 --- a/hsweb-system/hsweb-system-dictionary/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml index 61bae1274..691d609e7 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml index 2171250bf..8affec2b5 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml index 5205ffc20..0820b18b5 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml index 59f0a948a..fce2b6778 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/pom.xml b/hsweb-system/hsweb-system-dynamic-form/pom.xml index b56749437..bfe537271 100644 --- a/hsweb-system/hsweb-system-dynamic-form/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml index b378084bd..208eda81e 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml index 58b19061e..090664b9e 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml index 6ac3a3b9e..50d780b10 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml index e7243bcf5..ba4da1bc8 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml index 80993a379..b56d3cf97 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/pom.xml b/hsweb-system/hsweb-system-file/pom.xml index f2f9ac11a..89de803aa 100644 --- a/hsweb-system/hsweb-system-file/pom.xml +++ b/hsweb-system/hsweb-system-file/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml index 2275e14d6..dd8c0dddf 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml index 4f2cf6b28..88d66a79b 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml index 272667fb2..3214cd09b 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml index 428708b92..ce327fa09 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/pom.xml b/hsweb-system/hsweb-system-oauth2-client/pom.xml index 7ad342730..44ecfd298 100644 --- a/hsweb-system/hsweb-system-oauth2-client/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml index 624d4baa5..1bd62a2ce 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml index f300d8c1c..0639c4593 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml index 04e30e37d..d1c5c3029 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/pom.xml b/hsweb-system/hsweb-system-oauth2-server/pom.xml index 1c9c27f28..c5fc93263 100644 --- a/hsweb-system/hsweb-system-oauth2-server/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml index c8e17d2c3..31e9fe2e8 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml index f225c66c5..1a6cc086d 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml index d72f57c67..95d80c628 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml index bbb2133cc..c84b60596 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml index 930aae60d..3b4c52221 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/pom.xml b/hsweb-system/hsweb-system-organizational/pom.xml index cfd1b80f7..0ca355258 100644 --- a/hsweb-system/hsweb-system-organizational/pom.xml +++ b/hsweb-system/hsweb-system-organizational/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml index ef70bd59b..b0bc1e7ad 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml index f871e50fa..d5662c2e8 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml index 655342fbb..42eda894a 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml index 86d498297..083bb9959 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/pom.xml b/hsweb-system/hsweb-system-schedule/pom.xml index dc5bbeaf8..8e1b34b7d 100644 --- a/hsweb-system/hsweb-system-schedule/pom.xml +++ b/hsweb-system/hsweb-system-schedule/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 pom diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml index b1b122acd..65062552b 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml index 9d17fa654..95dad35d5 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml index 7dedcd5dc..7e334dcd8 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml index abcd61eb0..6669522a1 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/pom.xml b/hsweb-system/hsweb-system-script/pom.xml index 0c2085892..8ac7900db 100644 --- a/hsweb-system/hsweb-system-script/pom.xml +++ b/hsweb-system/hsweb-system-script/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml index be227329d..1e6b61751 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml index f298561b7..405b77491 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml index f4bc4a585..2acfbd092 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml index e708e0119..0a3bbc140 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/pom.xml b/hsweb-system/hsweb-system-template/pom.xml index fbc2dc0d2..39a2d8007 100644 --- a/hsweb-system/hsweb-system-template/pom.xml +++ b/hsweb-system/hsweb-system-template/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml index cafbcf22d..2723b9bbf 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml index e5e7e68c3..8893b2884 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/pom.xml b/hsweb-system/hsweb-system-workflow/pom.xml index 5cffba84d..721ace8d7 100644 --- a/hsweb-system/hsweb-system-workflow/pom.xml +++ b/hsweb-system/hsweb-system-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-system/pom.xml b/hsweb-system/pom.xml index 2b21e31e3..ff4b0abc8 100644 --- a/hsweb-system/pom.xml +++ b/hsweb-system/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-tests/pom.xml b/hsweb-tests/pom.xml index aa1cbf15d..355b37e35 100644 --- a/hsweb-tests/pom.xml +++ b/hsweb-tests/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml index c1273a9e7..705631994 100644 --- a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml +++ b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml @@ -5,7 +5,7 @@ hsweb-thirdparty org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hsweb-thirdparty/pom.xml b/hsweb-thirdparty/pom.xml index 4d77d2bd6..aef185e91 100644 --- a/hsweb-thirdparty/pom.xml +++ b/hsweb-thirdparty/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.8 + 3.0.9-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 77651f10e..2e72c1d31 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.hswebframework.web hsweb-framework - 3.0.8 + 3.0.9-SNAPSHOT hsweb-starter hsweb-core From a597e64e6f322e79a30e10429b11ee71ef05ac79 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Sun, 5 May 2019 10:30:39 +0800 Subject: [PATCH 05/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=88=86=E4=B9=9F=EF=BC=8C=E9=A1=B5=E7=A0=81=E4=BB=8E0?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hswebframework/web/dao/mybatis/plgins/pager/Pager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java index e1a763419..2b538df7d 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/Pager.java @@ -71,14 +71,13 @@ static void doPaging(int pageIndex, int pageSize, int total) { static void rePaging(int total) { Pager pager = get(); - int pageIndex = 0; if (pager != null) { // 当前页没有数据后跳转到最后一页 if (pager.pageIndex() != 0 && (pager.pageIndex() * pager.pageSize()) >= total) { int tmp = total / pager.pageSize(); - pageIndex = total % pager.pageSize() == 0 ? tmp - 1 : tmp; + int pageIndex = total % pager.pageSize() == 0 ? tmp - 1 : tmp; + doPaging(pageIndex, pager.pageSize()); } - doPaging(pageIndex, pager.pageSize()); } } } From 9c838bfab743360a1ac1365f0f351f0a7c535e24 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 10 Jun 2019 14:52:46 +0800 Subject: [PATCH 06/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84parent=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java index 18cb66f2a..754c91018 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/TreeStructureSqlTermCustomizer.java @@ -19,13 +19,14 @@ */ @Slf4j public abstract class TreeStructureSqlTermCustomizer extends AbstractSqlTermCustomizer { - boolean not = false; + protected boolean not; - boolean parent = false; + protected boolean parent; public TreeStructureSqlTermCustomizer(String termType, boolean not, boolean parent) { super(termType); this.not = not; + this.parent = parent; } protected abstract String getTableName(); From c39f124627c2354967fb56a1dd09bcdc84c844cd Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 10 Jun 2019 14:53:47 +0800 Subject: [PATCH 07/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SystemInitializeEvent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemInitializeAutoConfiguration.java | 11 ++++++++++ .../starter/event/SystemInitializeEvent.java | 21 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/event/SystemInitializeEvent.java diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java index 9ad72c63e..40b88876e 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java @@ -30,6 +30,7 @@ import org.hswebframework.web.datasource.DataSourceHolder; import org.hswebframework.web.datasource.DatabaseType; import org.hswebframework.web.service.Service; +import org.hswebframework.web.starter.event.SystemInitializeEvent; import org.hswebframework.web.starter.init.SystemInitialize; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +38,7 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationUtils; @@ -75,6 +77,9 @@ public class SystemInitializeAutoConfiguration implements CommandLineRunner, Bea @Autowired private ApplicationContext applicationContext; + @Autowired + private ApplicationEventPublisher eventPublisher; + private List engines; @Autowired @@ -158,6 +163,12 @@ public void run(String... args) throws Exception { SimpleDatabase database = new SimpleDatabase(metaData, sqlExecutor); database.setAutoParse(true); + + SystemInitializeEvent event = new SystemInitializeEvent(database); + eventPublisher.publishEvent(event); + if (event.isIgnore()) { + return; + } SystemInitialize initialize = new SystemInitialize(sqlExecutor, database, version); initialize.addScriptContext("db", jdbcUserName); diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/event/SystemInitializeEvent.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/event/SystemInitializeEvent.java new file mode 100644 index 000000000..f50e7027b --- /dev/null +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/event/SystemInitializeEvent.java @@ -0,0 +1,21 @@ +package org.hswebframework.web.starter.event; + +import lombok.Getter; +import org.hswebframework.ezorm.rdb.RDBDatabase; + +@Getter +public class SystemInitializeEvent { + + public SystemInitializeEvent(RDBDatabase database){ + this.database=database; + } + + private RDBDatabase database; + + private boolean ignore; + + public void setIgnore(boolean ignore) { + this.ignore = ignore; + } + +} From a1cdaf0f47a6b891cea94060eb873bb7ba49b22c Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 10 Jun 2019 16:08:41 +0800 Subject: [PATCH 08/47] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=80=92=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/commons/entity/TreeSupportEntity.java | 138 +++++++++++------- .../entity/TreeSupportEntityTests.java | 11 +- 2 files changed, 95 insertions(+), 54 deletions(-) diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java index 112112112..5c890fda3 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/TreeSupportEntity.java @@ -19,15 +19,16 @@ package org.hswebframework.web.commons.entity; -import org.hswebframework.web.id.IDGenerator; import org.hswebframework.utils.RandomUtil; +import org.hswebframework.web.id.IDGenerator; +import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.util.*; import java.util.function.*; import java.util.stream.Collectors; import java.util.stream.Stream; +@SuppressWarnings("all") public interface TreeSupportEntity extends GenericEntity { String id = "id"; @@ -64,68 +65,103 @@ static String getParentPath(String path) { } static void forEach(Collection list, Consumer consumer) { - list.forEach(node -> { + Queue queue = new LinkedList<>(list); + Set all = new HashSet<>(); + for (T node = queue.poll(); node != null; node = queue.poll()) { + long hash = System.identityHashCode(node); + if (all.contains(hash)) { + continue; + } + all.add(hash); consumer.accept(node); - if (node.getChildren() != null) { - forEach(node.getChildren(), consumer); + if (!CollectionUtils.isEmpty(node.getChildren())) { + queue.addAll(node.getChildren()); } - }); + } } static , PK> void expandTree2List(T parent, List target, IDGenerator idGenerator) { - expandTree2List(parent,target,idGenerator,null); + expandTree2List(parent, target, idGenerator, null); } - /** - * 将树形结构转为列表结构，并填充对应的数据。
- * 如树结构数据： {name:'父节点',children:[{name:'子节点1'},{name:'子节点2'}]}
- * 解析后:[{id:'id1',name:'父节点',path:'aoSt'},{id:'id2',name:'子节点1',path:'aoSt-oS5a'},{id:'id3',name:'子节点2',path:'aoSt-uGpM'}] - * - * @param parent 树结构的根节点 - * @param target 目标集合,转换后的数据将直接添加({@link List#add(Object)})到这个集合. - * @param 继承{@link TreeSupportEntity}的类型 - * @param idGenerator ID生成策略 - * @param 主键类型 - */ - static , PK> void expandTree2List(T parent, List target, IDGenerator idGenerator, BiConsumer> childConsumer) { - List children = parent.getChildren(); - if(childConsumer!=null){ - childConsumer.accept(parent,new ArrayList<>()); + + /** + * 将树形结构转为列表结构，并填充对应的数据。
+ * 如树结构数据： {name:'父节点',children:[{name:'子节点1'},{name:'子节点2'}]}
+ * 解析后:[{id:'id1',name:'父节点',path:'aoSt'},{id:'id2',name:'子节点1',path:'aoSt-oS5a'},{id:'id3',name:'子节点2',path:'aoSt-uGpM'}] + * + * @param root 树结构的根节点 + * @param target 目标集合,转换后的数据将直接添加({@link List#add(Object)})到这个集合. + * @param 继承{@link TreeSupportEntity}的类型 + * @param idGenerator ID生成策略 + * @param 主键类型 + */ + static , PK> void expandTree2List(T root, List target, IDGenerator idGenerator, BiConsumer> childConsumer) { + + if (CollectionUtils.isEmpty(root.getChildren())) { + target.add(root); + return; } - target.add(parent); - if (parent.getPath() == null) { - parent.setPath(RandomUtil.randomChar(4)); - if (parent.getPath() != null) { - parent.setLevel(parent.getPath().split("-").length); - } - if (parent instanceof SortSupportEntity) { - Long index = ((SortSupportEntity) parent).getSortIndex(); - if (null == index) { - ((SortSupportEntity) parent).setSortIndex(1L); - } + + //尝试设置id + PK parentId = root.getId(); + if (parentId == null) { + parentId = idGenerator.generate(); + root.setId(parentId); + } + //尝试设置树路径path + if (root.getPath() == null) { + root.setPath(RandomUtil.randomChar(4)); + } + if (root.getPath() != null) { + root.setLevel(root.getPath().split("[-]").length); + } + //尝试设置排序 + if (root instanceof SortSupportEntity) { + SortSupportEntity sortableRoot = ((SortSupportEntity) root); + Long index = sortableRoot.getSortIndex(); + if (null == index) { + sortableRoot.setSortIndex(1L); } } - if (children != null) { - PK pid = parent.getId(); - if (pid == null) { - pid = idGenerator.generate(); - parent.setId(pid); + + //所有节点处理队列 + Queue queue = new LinkedList<>(); + queue.add(root); + //已经处理过的节点过滤器 + Set filter = new HashSet<>(); + + for (T parent = queue.poll(); parent != null; parent = queue.poll()) { + long hash = System.identityHashCode(parent); + if (filter.contains(hash)) { + continue; } - for (int i = 0; i < children.size(); i++) { - T child = children.get(i); - if (child instanceof SortSupportEntity && parent instanceof SortSupportEntity) { - Long index = ((SortSupportEntity) parent).getSortIndex(); - if (null == index) { - ((SortSupportEntity) parent).setSortIndex(index = 1L); + filter.add(hash); + + //处理子节点 + if (!CollectionUtils.isEmpty(parent.getChildren())) { + long index = 1; + for (TreeSupportEntity child : parent.getChildren()) { + if (child.getId() == null) { + child.setId(idGenerator.generate()); } - ((SortSupportEntity) child).setSortIndex(new BigDecimal(index + "0" + (i + 1)).longValue()); + child.setParentId(parent.getId()); + child.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4)); + child.setLevel(child.getPath().split("[-]").length); + + //子节点排序 + if (child instanceof SortSupportEntity && parent instanceof SortSupportEntity) { + SortSupportEntity sortableParent = ((SortSupportEntity) parent); + SortSupportEntity sortableChild = ((SortSupportEntity) child); + sortableChild.setSortIndex(sortableParent.getSortIndex() * 100 + index++); + } + queue.add((T) child); } - child.setParentId(pid); - child.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4)); - child.setLevel(child.getPath().split("-").length); - - expandTree2List(child, target, idGenerator,childConsumer); } + if (childConsumer != null) { + childConsumer.accept(parent, new ArrayList<>()); + } + target.add(parent); } } @@ -165,7 +201,7 @@ static , PK> List list2tree(final Collection< Objects.requireNonNull(childConsumer, "child consumer can not be null"); Objects.requireNonNull(predicateFunction, "root predicate function can not be null"); - Supplier> streamSupplier = () -> dataList.size() < 1000 ? dataList.stream() : dataList.parallelStream(); + Supplier> streamSupplier = () -> dataList.size() < 50000 ? dataList.stream() : dataList.parallelStream(); // id,node Map cache = new HashMap<>(); // parentId,children diff --git a/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/TreeSupportEntityTests.java b/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/TreeSupportEntityTests.java index 1979e334f..d01943606 100644 --- a/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/TreeSupportEntityTests.java +++ b/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/TreeSupportEntityTests.java @@ -2,19 +2,18 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import org.hswebframework.web.id.IDGenerator; import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.concurrent.atomic.LongAdder; import java.util.function.Predicate; -import static org.junit.Assert.*; - public class TreeSupportEntityTests { + @Test public void test() { MenuEntity parent = MenuEntity.builder().build(); @@ -48,6 +47,12 @@ public void test() { System.out.println(JSON.toJSONString(tree, SerializerFeature.PrettyFormat)); + LongAdder adder=new LongAdder(); + TreeSupportEntity.forEach(tree,menu->{ + adder.increment(); + }); + Assert.assertEquals(adder.intValue(),4); + List list = new ArrayList<>(); //将树形结构展平为list From 83c4c2fbfe47e2f34d732fa2d8d9461b3f64cdbe Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 10 Jun 2019 16:09:50 +0800 Subject: [PATCH 09/47] =?UTF-8?q?=E4=BC=98=E5=8C=96api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/builder/EasyOrmSqlBuilder.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index e1b52f131..8e8b106f2 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -106,11 +106,11 @@ public static String getJavaType(Class type) { return javaType; } - private final RDBDatabaseMetaData mysql = new MysqlMeta(); - private final RDBDatabaseMetaData oracle = new OracleMeta(); - private final RDBDatabaseMetaData h2 = new H2Meta(); - private final RDBDatabaseMetaData postgresql = new PGMeta(); - private final RDBDatabaseMetaData mssql = new MSSQLMeta(); + public static final RDBDatabaseMetaData mysql = new MysqlMeta(); + public static final RDBDatabaseMetaData oracle = new OracleMeta(); + public static final RDBDatabaseMetaData h2 = new H2Meta(); + public static final RDBDatabaseMetaData postgresql = new PGMeta(); + public static final RDBDatabaseMetaData mssql = new MSSQLMeta(); private final ConcurrentMap> metaCache = new ConcurrentHashMap<>(); @@ -427,7 +427,7 @@ public Dialect getDialect() { return appender.toString(); } - class MysqlMeta extends MysqlRDBDatabaseMetaData { + static class MysqlMeta extends MysqlRDBDatabaseMetaData { MysqlMeta() { super(); renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder()); @@ -440,7 +440,7 @@ public String getDatabaseName() { } } - class OracleMeta extends OracleRDBDatabaseMetaData { + static class OracleMeta extends OracleRDBDatabaseMetaData { OracleMeta() { super(); renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder()); @@ -453,7 +453,7 @@ public String getDatabaseName() { } } - class H2Meta extends H2RDBDatabaseMetaData { + static class H2Meta extends H2RDBDatabaseMetaData { H2Meta() { super(); renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder()); @@ -466,7 +466,7 @@ public String getDatabaseName() { } } - class PGMeta extends PGRDBDatabaseMetaData { + static class PGMeta extends PGRDBDatabaseMetaData { PGMeta() { super(); renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder()); @@ -479,7 +479,7 @@ public String getDatabaseName() { } } - class MSSQLMeta extends MSSQLRDBDatabaseMetaData { + static class MSSQLMeta extends MSSQLRDBDatabaseMetaData { MSSQLMeta() { super(); renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder()); From fc15f9d6236c5ebe56755ef2338a91951305a7d3 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 13 Jun 2019 15:25:00 +0800 Subject: [PATCH 10/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/SimplePersonService.java | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java index 7ae363eba..0704378ea 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java @@ -18,6 +18,7 @@ import org.hswebframework.web.commons.entity.DataStatus; import org.hswebframework.web.commons.entity.TreeSupportEntity; +import org.hswebframework.web.commons.entity.param.QueryParamEntity; import org.hswebframework.web.dao.dynamic.QueryByEntityDao; import org.hswebframework.web.dao.organizational.*; import org.hswebframework.web.entity.authorization.UserEntity; @@ -49,6 +50,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import static org.hswebframework.web.commons.entity.TreeSupportEntity.*; +import static org.hswebframework.web.commons.entity.param.QueryParamEntity.*; +import static org.hswebframework.web.service.DefaultDSLQueryService.*; import static org.springframework.util.StringUtils.isEmpty; /** @@ -480,23 +484,22 @@ protected > List getAllChildrenAndReturnR return new java.util.ArrayList<>(); } //获取根节点 - List root = DefaultDSLQueryService.createQuery(dao) + List rootNodeList = newQuery() .where() - .in(TreeSupportEntity.id, rootIds) - .listNoPaging(); - //节点不存在? - if (!root.isEmpty()) { + .in(id, rootIds) + .execute(dao::query); + + if (!rootNodeList.isEmpty()) { //所有子节点,使用节点的path属性进行快速查询,查询结果包含了根节点 - List allNode = DefaultDSLQueryService - .createQuery(dao) + List allNode = newQuery() //遍历生成查询条件: like path like ?||'%' or path like ?||'%' .... - .each(root, (query, data) -> query.or().like$(TreeSupportEntity.path, data.getPath())) - .listNoPaging(); + .each(rootNodeList, (query, rootNode) -> query.or().like$(rootNode::getPath)) + .noPaging() + .execute(dao::query); + //转为树形结构 - List tree = TreeSupportEntity - .list2tree(allNode, childAccepter, - (Predicate) node -> rootIds.contains(node.getId())); // 根节点判定 - rootConsumer.accept(root); + List tree = list2tree(allNode, childAccepter, (Predicate) node -> rootIds.contains(node.getId())); // 根节点判定 + rootConsumer.accept(rootNodeList); return tree; } return new java.util.ArrayList<>(); @@ -504,7 +507,7 @@ protected > List getAllChildrenAndReturnR public static > Set> transformationTreeNode(V parent, List data) { Set> treeNodes = new HashSet<>(); - data.forEach(node -> { + for (V node : data) { TreeNode treeNode = new TreeNode<>(); if (parent != null) { TreeNode parentNode = new TreeNode<>(); @@ -514,10 +517,11 @@ public static > Set> transf } treeNode.setValue(node.getId()); if (node.getChildren() != null && !node.getChildren().isEmpty()) { + // TODO: 2019-06-13 有不用递归的方式? treeNode.setChildren(transformationTreeNode(node, node.getChildren())); } treeNodes.add(treeNode); - }); + } return treeNodes; } From 7251077a8ef765d326de38a19c202d6c64f3b54f Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 18 Jun 2019 18:09:51 +0800 Subject: [PATCH 11/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=87=E6=8D=A2=E5=99=A8=E9=80=9A=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../switcher/DefaultDataSourceSwitcher.java | 12 ++++++++---- .../datasource/switcher/DefaultDatabaseSwitcher.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java index c804798de..fcb60fa18 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java @@ -18,9 +18,13 @@ public class DefaultDataSourceSwitcher implements DataSourceSwitcher { //默认数据源标识 private static final String DEFAULT_DATASOURCE_ID = DataSourceSwitcher.class.getName() + "_default_"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + protected Logger logger = LoggerFactory.getLogger(this.getClass()); - private Deque getUsedHistoryQueue() { + protected String getDefaultDataSourceIdKey(){ + return DEFAULT_DATASOURCE_ID; + } + + protected Deque getUsedHistoryQueue() { // 从ThreadLocal中获取一个使用记录 return ThreadLocalUtils.get(DefaultDataSourceSwitcher.class.getName() + "_queue", LinkedList::new); } @@ -54,7 +58,7 @@ public void use(String dataSourceId) { @Override public void useDefault() { - getUsedHistoryQueue().addLast(DEFAULT_DATASOURCE_ID); + getUsedHistoryQueue().addLast(getDefaultDataSourceIdKey()); if (logger.isDebugEnabled()) { logger.debug("try use default datasource"); } @@ -67,7 +71,7 @@ public String currentDataSourceId() { } String activeId = getUsedHistoryQueue().getLast(); - if (DEFAULT_DATASOURCE_ID.equals(activeId)) { + if (getDefaultDataSourceIdKey().equals(activeId)) { return null; } return activeId; diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java index 4f87bfd47..38848cddc 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java @@ -18,9 +18,13 @@ public class DefaultDatabaseSwitcher implements DatabaseSwitcher { //默认数据源标识 private static final String DEFAULT_DATASOURCE_ID = DatabaseSwitcher.class.getName() + "_default_"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + protected Logger logger = LoggerFactory.getLogger(this.getClass()); - private Deque getUsedHistoryQueue() { + protected String getDefaultDataSourceIdKey(){ + return DEFAULT_DATASOURCE_ID; + } + + protected Deque getUsedHistoryQueue() { // 从ThreadLocal中获取一个使用记录 return ThreadLocalUtils.get(DefaultDatabaseSwitcher.class.getName() + "_queue", LinkedList::new); } @@ -54,7 +58,7 @@ public void use(String dataSourceId) { @Override public void useDefault() { - getUsedHistoryQueue().addLast(DEFAULT_DATASOURCE_ID); + getUsedHistoryQueue().addLast(getDefaultDataSourceIdKey()); if (logger.isDebugEnabled()) { logger.debug("try use default database"); } @@ -67,7 +71,7 @@ public String currentDatabase() { } String activeId = getUsedHistoryQueue().getLast(); - if (DEFAULT_DATASOURCE_ID.equals(activeId)) { + if (getDefaultDataSourceIdKey().equals(activeId)) { return null; } return activeId; From d3a256b8e0438663e1b87a05d5c95a382d83e058 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 24 Jun 2019 17:54:10 +0800 Subject: [PATCH 12/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/builder/EasyOrmSqlBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 8e8b106f2..98895c6d2 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -303,8 +303,10 @@ public String buildSelectFields(String resultMapId, String tableName, Object arg QueryParam param = null; if (arg instanceof QueryParam) { param = ((QueryParam) arg); - if (param.isPaging() && Pager.get() == null) { - Pager.doPaging(param.getPageIndex(), param.getPageSize()); + if (param.isPaging()) { + if (Pager.get() == null) { + Pager.doPaging(param.getPageIndex(), param.getPageSize()); + } } else { Pager.reset(); } @@ -404,8 +406,10 @@ public String buildWhere(String resultMapId, String tableName, Object param) { } if (param instanceof QueryParam) { QueryParam queryParam = ((QueryParam) param); - if (queryParam.isPaging() && Pager.get() == null) { - Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + if (queryParam.isPaging()) { + if (Pager.get() == null) { + Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + } } else { Pager.reset(); } From fd16374b913a2ca239ed4cf753deeeebb2c30501 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 24 Jun 2019 17:54:35 +0800 Subject: [PATCH 13/47] =?UTF-8?q?=E8=BF=94=E5=9B=9Enew=20map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/hswebframework/web/ThreadLocalUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java index 5237131a9..607ea5e65 100644 --- a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java +++ b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java @@ -48,7 +48,7 @@ private ThreadLocalUtils() { * @return threadLocal中的全部值 */ public static Map getAll() { - return local.get(); + return new HashMap<>(local.get()); } /** From 117c168574ec3c6fed20c97f73ad15ceac89d200 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 26 Jun 2019 10:46:04 +0800 Subject: [PATCH 14/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/builder/EasyOrmSqlBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 98895c6d2..02d212d7d 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -231,6 +231,7 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara List columns = render.parseOperationField(tableMetaData, param); SqlAppender appender = new SqlAppender(); columns.forEach(column -> { + RDBColumnMetaData columnMetaData = column.getRDBColumnMetaData(); if (columnMetaData == null) { return; @@ -238,6 +239,9 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara if (columnMetaData.getName().contains(".")) { return; } + if (columnMetaData.getProperty("read-only").isTrue()) { + return; + } Object value; try { value = propertyUtils.getProperty(param.getData(), columnMetaData.getAlias()); From 95d0409f1fedbddce69a290c1f6aee5c980fd36f Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 26 Jun 2019 16:25:08 +0800 Subject: [PATCH 15/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=A7=92=E8=89=B2=E5=92=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/handler/DefaultAuthorizingHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java index 393c8af5e..080d3e23a 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java @@ -201,7 +201,10 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def Function, Boolean> func = logicalIsOr ? authentication.getRoles().stream()::anyMatch : authentication.getRoles().stream()::allMatch; - access = func.apply(role -> rolesDef.contains(role.getId())); + + access = logicalIsOr + ? access || func.apply(role -> rolesDef.contains(role.getId())) + : access && func.apply(role -> rolesDef.contains(role.getId())); } //控制用户 if (!usersDef.isEmpty()) { @@ -211,7 +214,10 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def Function, Boolean> func = logicalIsOr ? usersDef.stream()::anyMatch : usersDef.stream()::allMatch; - access = func.apply(authentication.getUser().getUsername()::equals); + access = logicalIsOr + ? access || func.apply(authentication.getUser().getUsername()::equals) + : access && func.apply(authentication.getUser().getUsername()::equals); + } if (!access) { throw new AccessDenyException(definition.getMessage()); From 3e1b605334a8c4f01bf5d80534237e453b0c82e6 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 3 Jul 2019 15:44:29 +0800 Subject: [PATCH 16/47] =?UTF-8?q?=E4=BC=98=E5=8C=96bean=20copier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/hswebframework/web/bean/FastBeanCopier.java | 10 +++++----- .../test/java/org/hswebframework/web/bean/Source.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java index b0aa4690a..00dfc7514 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java @@ -141,8 +141,8 @@ public static Copier createCopier(Class source, Class target) { String method = "public void copy(Object s, Object t, java.util.Set ignore, " + "org.hswebframework.web.bean.Converter converter){\n" + "try{\n\t" + - sourceName + " source=(" + sourceName + ")s;\n\t" + - tartName + " target=(" + tartName + ")t;\n\t" + + sourceName + " $$__source=(" + sourceName + ")s;\n\t" + + tartName + " $$__target=(" + tartName + ")t;\n\t" + createCopierCode(source, target) + "}catch(Exception e){\n" + "\tthrow new RuntimeException(e.getMessage(),e);" + @@ -211,7 +211,7 @@ private static String createCopierCode(Class source, Class target) { } code.append("if(!ignore.contains(\"").append(sourceProperty.getName()).append("\")){\n\t"); if (!sourceProperty.isPrimitive()) { - code.append("if(source.").append(sourceProperty.getReadMethod()).append("!=null){\n"); + code.append("if($$__source.").append(sourceProperty.getReadMethod()).append("!=null){\n"); } code.append(targetProperty.generateVar(targetProperty.getName())).append("=") .append(sourceProperty.generateGetter(target, targetProperty.getType())) @@ -220,7 +220,7 @@ private static String createCopierCode(Class source, Class target) { if (!targetProperty.isPrimitive()) { code.append("\tif(").append(sourceProperty.getName()).append("!=null){\n"); } - code.append("\ttarget.").append(targetProperty.generateSetter(targetProperty.getType(), sourceProperty.getName())).append(";\n"); + code.append("\t$$__target.").append(targetProperty.generateSetter(targetProperty.getType(), sourceProperty.getName())).append(";\n"); if (!targetProperty.isPrimitive()) { code.append("\t}\n"); } @@ -310,7 +310,7 @@ protected String castWrapper(String getter) { public BiFunction createGetterFunction() { return (targetBeanType, targetType) -> { - String getterCode = "source." + getReadMethod(); + String getterCode = "$$__source." + getReadMethod(); String generic = "org.hswebframework.web.bean.FastBeanCopier.EMPTY_CLASS_ARRAY"; Field field = ReflectionUtils.findField(targetBeanType, name); diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java index 44b5ed20e..872891df2 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java @@ -55,6 +55,9 @@ public class Source { private String[] arr6 = {"1", "2"}; + private String source; + + private String target; } From b3414232bea2e3d0a2cee4363c892a3a0c7891c4 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 24 Jul 2019 15:00:43 +0800 Subject: [PATCH 17/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/bean/FastBeanCopier.java | 15 ++++++- .../web/bean/FastBeanCopierTest.java | 43 ++++++++----------- .../org/hswebframework/web/bean/Source.java | 2 + .../org/hswebframework/web/bean/Target.java | 2 + 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java index 00dfc7514..7c6c78d58 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java @@ -14,6 +14,7 @@ import org.springframework.util.ReflectionUtils; import java.beans.PropertyDescriptor; +import java.lang.reflect.Array; import java.lang.reflect.Field; import java.util.*; import java.util.function.BiFunction; @@ -540,7 +541,11 @@ public T convert(Object source, Class targetClass, Class[] genericType) { if (targetClass.isEnum()) { if (EnumDict.class.isAssignableFrom(targetClass)) { - Object val = EnumDict.find((Class) targetClass, String.valueOf(source)).orElse(null); + String strVal=String.valueOf(source); + + Object val = EnumDict.find((Class) targetClass, e -> { + return e.eq(source) || e.name().equalsIgnoreCase(strVal); + }).orElse(null); if (targetClass.isInstance(val)) { return ((T) val); } @@ -551,9 +556,17 @@ public T convert(Object source, Class targetClass, Class[] genericType) { return t; } } + log.warn("无法将:{}转为枚举:{}", source, targetClass); return null; } + //转换为数组 + if (targetClass.isArray()) { + Class componentType = targetClass.getComponentType(); + List val = convert(source, List.class, new Class[]{componentType}); + return (T) val.toArray((Object[])Array.newInstance(componentType,val.size())); + } + try { org.apache.commons.beanutils.Converter converter = BeanUtilsBean .getInstance() diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java index 4b37efd62..defe37706 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java @@ -1,9 +1,11 @@ package org.hswebframework.web.bean; import org.apache.commons.beanutils.BeanUtils; +import org.junit.Assert; import org.junit.Test; import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -35,35 +37,26 @@ public void test() throws InvocationTargetException, IllegalAccessException { FastBeanCopier.copy(source, target); - long t = System.currentTimeMillis(); -// for (int i = 10_0000; i > 0; i--) { -// FastBeanCopier.copy(source, target); -// } - System.out.println(System.currentTimeMillis() - t); - System.out.println(source); System.out.println(target); System.out.println(target.getNestObject() == source.getNestObject()); -// Source source1=new Source(); - -// FastBeanCopier.copy(source,source1); - -// System.out.println(source1); -// -// t = System.currentTimeMillis(); -// -// for (int i = 100_0000; i > 0; i--) { -// try { -// BeanUtils.copyProperties(source, target); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// System.out.println(System.currentTimeMillis() - t); -// System.out.println(target); -// System.out.println(target.getNestObject() == source.getNestObject()); } + @Test + public void testMapArray() { + Map data =new HashMap<>(); + data.put("colors", Arrays.asList("RED")); + + + Target target = new Target(); + FastBeanCopier.copy(data, target); + + + System.out.println(target); + Assert.assertNotNull(target.getColors()); + Assert.assertSame(target.getColors()[0], Color.RED); + + } @Test public void testCopyMap() { @@ -85,7 +78,7 @@ public void testCopyMap() { System.out.println(FastBeanCopier.copy(source, target, FastBeanCopier.include("age"))); System.out.println(target); - System.out.println(FastBeanCopier.copy(target, new Source())); + System.out.println(FastBeanCopier.copy(target, new Target())); } diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java index 872891df2..67aa5fb5d 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java @@ -55,6 +55,8 @@ public class Source { private String[] arr6 = {"1", "2"}; + private Color[] colors ={Color.BLUE,Color.RED}; + private String source; private String target; diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java index f41a3f667..8b50678c9 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java @@ -64,6 +64,8 @@ public class Target { private Integer[] arr4; + private Color[] colors; + @Override public String toString() { From 99e4408794053c6be2f5f52a08f80fb0a47b0a08 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 24 Jul 2019 16:59:57 +0800 Subject: [PATCH 18/47] easyorm 3.0.6-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e72c1d31..507b98561 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 1.6.12 5.1.1.Final - 3.0.5 + 3.0.6-SNAPSHOT 3.0.2 3.0.2 From 75e07d8534c2c7422bad18e04d9a9200e91c730a Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Fri, 2 Aug 2019 13:06:41 +0800 Subject: [PATCH 19/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9mybatis=20asso?= =?UTF-8?q?ciation=E6=A0=87=E7=AD=BE=E5=AF=B9=E6=94=AF=E6=8C=81=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9jpa=E6=B3=A8=E8=A7=A3CollectionTable?= =?UTF-8?q?=E5=AF=B9=E6=94=AF=E6=8C=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?boolean=E4=B8=8E=E6=95=B0=E5=AD=97=E8=BD=AC=E6=8D=A2=E5=AF=B9?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/builder/EasyOrmSqlBuilder.java | 134 ++++++++++++------ .../builder/jpa/JpaAnnotationParser.java | 60 ++++---- .../handler/NumberBooleanTypeHandler.java | 49 +++++++ .../web/dao/crud/NestEntity.java | 4 + .../hswebframework/web/dao/crud/TestCrud.java | 8 +- .../web/dao/crud/TestEntity.java | 1 + .../hswebframework/web/dao/test/TestDao.xml | 5 +- 7 files changed, 180 insertions(+), 81 deletions(-) create mode 100644 hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 02d212d7d..99cccc3c2 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -38,9 +38,11 @@ import org.hswebframework.ezorm.rdb.render.support.simple.CommonSqlRender; import org.hswebframework.ezorm.rdb.render.support.simple.SimpleWhereSqlBuilder; import org.hswebframework.web.BusinessException; +import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.commons.entity.Entity; import org.hswebframework.web.commons.entity.factory.EntityFactory; import org.hswebframework.web.dao.mybatis.builder.jpa.JpaAnnotationParser; +import org.hswebframework.web.dao.mybatis.handler.NumberBooleanTypeHandler; import org.hswebframework.web.dao.mybatis.plgins.pager.Pager; import org.hswebframework.web.dao.mybatis.MybatisUtils; import org.hswebframework.utils.StringUtils; @@ -145,6 +147,50 @@ private String getRealTableName(String tableName) { } + private List createColumn(String prefix, String columnName, ResultMapping resultMapping) { + List metaData = new ArrayList<>(); + if (resultMapping.getNestedQueryId() == null) { + + if (resultMapping.getNestedResultMapId() != null) { + ResultMap nests = MybatisUtils.getResultMap(resultMapping.getNestedResultMapId()); + List resultMappings = new ArrayList<>(nests.getResultMappings()); + resultMappings.addAll(nests.getIdResultMappings()); + for (ResultMapping mapping : resultMappings) { + metaData.addAll(createColumn(resultMapping.getProperty(), + org.springframework.util.StringUtils.hasText(resultMapping.getColumn()) + ? resultMapping.getColumn() + : resultMapping.getProperty(), + mapping)); + } + return metaData; + } + + JDBCType jdbcType = JDBCType.VARCHAR; + try { + jdbcType = JDBCType.valueOf(resultMapping.getJdbcType().name()); + } catch (Exception e) { + log.warn("can not parse jdbcType:{}", resultMapping.getJdbcType()); + } + RDBColumnMetaData column = new RDBColumnMetaData(); + column.setJdbcType(jdbcType); + column.setName(org.springframework.util.StringUtils.hasText(columnName) + ? columnName.concat(".").concat(resultMapping.getColumn()) : resultMapping.getColumn()); + + if (resultMapping.getTypeHandler() != null) { + column.setProperty("typeHandler", resultMapping.getTypeHandler().getClass().getName()); + } + if (!StringUtils.isNullOrEmpty(resultMapping.getProperty())) { + column.setAlias(org.springframework.util.StringUtils.hasText(prefix) + ? prefix.concat(".").concat(resultMapping.getProperty()) : resultMapping.getProperty()); + + } + column.setJavaType(resultMapping.getJavaType()); + column.setProperty("resultMapping", resultMapping); + metaData.add(column); + } + return metaData; + } + protected RDBTableMetaData createMeta(String tableName, String resultMapId) { // tableName = getRealTableName(tableName); RDBDatabaseMetaData active = getActiveDatabase(); @@ -169,40 +215,11 @@ public String getName() { List resultMappings = new ArrayList<>(resultMaps.getResultMappings()); resultMappings.addAll(resultMaps.getIdResultMappings()); - for (ResultMapping resultMapping : resultMappings) { - if (resultMapping.getNestedQueryId() == null) { - RDBColumnMetaData column = new RDBColumnMetaData(); - column.setJdbcType(JDBCType.valueOf(resultMapping.getJdbcType().name())); - column.setName(resultMapping.getColumn()); - if (resultMapping.getTypeHandler() != null) { - column.setProperty("typeHandler", resultMapping.getTypeHandler().getClass().getName()); - } - if (!StringUtils.isNullOrEmpty(resultMapping.getProperty())) { - column.setAlias(resultMapping.getProperty()); - } - column.setJavaType(resultMapping.getJavaType()); - column.setProperty("resultMapping", resultMapping); - //时间 - if (column.getJdbcType() == JDBCType.DATE || column.getJdbcType() == JDBCType.TIMESTAMP) { - ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { - @Override - public Object getData(Object value) { - if (value instanceof Number) { - return new Date(((Number) value).longValue()); - } - return super.getData(value); - } - }; - column.setValueConverter(dateConvert); - } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { - column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); - } else if (TypeUtils.isNumberType(column)) { //数字 - //数字 - column.setValueConverter(new NumberValueConverter(column.getJavaType())); - } - rdbTableMetaData.addColumn(column); - } - } + + resultMappings.stream() + .map(mapping -> this.createColumn(null, null, mapping)) + .flatMap(Collection::stream) + .forEach(rdbTableMetaData::addColumn); if (useJpa) { Class type = entityFactory == null ? resultMaps.getType() : entityFactory.getInstanceType(resultMaps.getType()); @@ -217,6 +234,27 @@ public Object getData(Object value) { } } } + for (RDBColumnMetaData column : rdbTableMetaData.getColumns()) { + //时间 + if (column.getJdbcType() == JDBCType.DATE || column.getJdbcType() == JDBCType.TIMESTAMP) { + ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { + @Override + public Object getData(Object value) { + if (value instanceof Number) { + return new Date(((Number) value).longValue()); + } + return super.getData(value); + } + }; + column.setValueConverter(dateConvert); + } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { + column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); + column.setProperty("typeHandler", NumberBooleanTypeHandler.class.getName()); + } else if (TypeUtils.isNumberType(column)) { //数字 + //数字 + column.setValueConverter(new NumberValueConverter(column.getJavaType())); + } + } cache.put(cacheKey, rdbTableMetaData); return rdbTableMetaData; } @@ -230,6 +268,9 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara CommonSqlRender render = (CommonSqlRender) databaseMetaDate.getRenderer(SqlRender.TYPE.SELECT); List columns = render.parseOperationField(tableMetaData, param); SqlAppender appender = new SqlAppender(); + Object data = param.getData(); + Map mapData = FastBeanCopier.copy(data, HashMap::new); + columns.forEach(column -> { RDBColumnMetaData columnMetaData = column.getRDBColumnMetaData(); @@ -242,21 +283,24 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara if (columnMetaData.getProperty("read-only").isTrue()) { return; } - Object value; - try { - value = propertyUtils.getProperty(param.getData(), columnMetaData.getAlias()); - if (value == null) { - return; - } - } catch (Exception e) { + Object value = mapData.get(columnMetaData.getAlias()); + + if (value == null) { return; } + if (value instanceof Sql) { - appender.add(",", encodeColumn(dialect, columnMetaData.getName()) - , "=", ((Sql) value).getSql()); + appender.add(",", encodeColumn(dialect, columnMetaData.getName()), "=", ((Sql) value).getSql()); } else { - String typeHandler = columnMetaData.getProperty("typeHandler") - .getValue(); + value = columnMetaData.getValueConverter().getData(value); + + if (columnMetaData.getOptionConverter() != null) { + value = columnMetaData.getOptionConverter().converterData(value); + } + + mapData.put(columnMetaData.getAlias(), value); + + String typeHandler = columnMetaData.getProperty("typeHandler").getValue(); appender.add(",", encodeColumn(dialect, columnMetaData.getName()) , "=", "#{data.", columnMetaData.getAlias(), diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java index ff849ed88..0da0dfece 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java @@ -15,10 +15,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.StringUtils; -import javax.persistence.Column; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -109,25 +106,31 @@ public class JpaAnnotationParser { } - public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { - Table table = AnnotationUtils.findAnnotation(entityClass, Table.class); - if (table == null) { - return null; - } - RDBTableMetaData tableMetaData = new RDBTableMetaData(); - tableMetaData.setName(table.name()); + private static List parseColumnMeta(String prefix, String columnName, Class entityClass) { PropertyDescriptor[] descriptors = BeanUtilsBean.getInstance() .getPropertyUtils() .getPropertyDescriptors(entityClass); + List columnMetaDataList = new ArrayList<>(); + for (PropertyDescriptor descriptor : descriptors) { Column columnAnn = getAnnotation(entityClass, descriptor, Column.class); + CollectionTable collectionTable = getAnnotation(entityClass, descriptor, CollectionTable.class); + if (columnAnn == null) { + if (collectionTable != null) { + columnMetaDataList.addAll(parseColumnMeta(descriptor.getName(), collectionTable.name(), descriptor.getPropertyType())); + continue; + } continue; } + + String realName = StringUtils.hasText(columnAnn.name()) ? columnAnn.name() : descriptor.getName(); + String realAlias = StringUtils.hasText(prefix) ? prefix.concat(".").concat(descriptor.getName()) : descriptor.getName(); + RDBColumnMetaData column = new RDBColumnMetaData(); - column.setName(columnAnn.name()); - column.setAlias(descriptor.getName()); + column.setName(StringUtils.hasText(columnName) ? columnName.concat(".").concat(realName) : realName); + column.setAlias(realAlias); column.setLength(columnAnn.length()); column.setPrecision(columnAnn.precision()); column.setJavaType(descriptor.getPropertyType()); @@ -151,26 +154,19 @@ public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { .orElse(JDBCType.OTHER); } column.setJdbcType(type); - ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { - @Override - public Object getData(Object value) { - if (value instanceof Number) { - return new Date(((Number) value).longValue()); - } - return super.getData(value); - } - }; - - if (column.getJdbcType() == JDBCType.DATE - || column.getJdbcType() == JDBCType.TIMESTAMP) { - column.setValueConverter(dateConvert); - } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { - column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); - } else if (TypeUtils.isNumberType(column)) { - column.setValueConverter(new NumberValueConverter(column.getJavaType())); - } - tableMetaData.addColumn(column); + columnMetaDataList.add(column); } + return columnMetaDataList; + } + + public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { + Table table = AnnotationUtils.findAnnotation(entityClass, Table.class); + if (table == null) { + return null; + } + RDBTableMetaData tableMetaData = new RDBTableMetaData(); + tableMetaData.setName(table.name()); + parseColumnMeta(null, null, entityClass).forEach(tableMetaData::addColumn); return tableMetaData; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java new file mode 100644 index 000000000..5480ba9e9 --- /dev/null +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java @@ -0,0 +1,49 @@ +package org.hswebframework.web.dao.mybatis.handler; + +import org.apache.ibatis.type.*; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Alias("numberBooleanTypeHandler") +@MappedTypes({Boolean.class}) +@MappedJdbcTypes({JdbcType.NUMERIC, JdbcType.BOOLEAN}) +public class NumberBooleanTypeHandler implements TypeHandler { + @Override + public void setParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { + if (parameter == null) { + ps.setNull(i, jdbcType.TYPE_CODE); + return; + } + if(parameter instanceof Number){ + if (jdbcType == JdbcType.BOOLEAN) { + ps.setBoolean(i, ((Number) parameter).intValue()==1); + }else{ + ps.setInt(i,((Number) parameter).intValue()); + } + }else{ + if (jdbcType == JdbcType.BOOLEAN) { + ps.setBoolean(i, Boolean.TRUE.equals(parameter)); + } else { + ps.setInt(i, Boolean.TRUE.equals(parameter) ? 1 : 0); + } + } + } + + @Override + public Object getResult(ResultSet rs, String columnName) throws SQLException { + return rs.getBoolean(columnName); + } + + @Override + public Object getResult(ResultSet rs, int columnIndex) throws SQLException { + return rs.getBoolean(columnIndex); + } + + @Override + public Object getResult(CallableStatement cs, int columnIndex) throws SQLException { + return cs.getBoolean(columnIndex); + } +} diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java index 20d0c4ede..7d76b52f8 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java @@ -2,6 +2,8 @@ import lombok.Data; +import javax.persistence.Column; + /** * * @author zhouhao @@ -9,5 +11,7 @@ */ @Data public class NestEntity { + + @Column private String name; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java index 42e34da91..70b298be5 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java @@ -77,14 +77,16 @@ public void testCRUD() { //#102 query.where("createTime", "2017-11-10"); -// query.includes("nest.name", "*"); // DataSourceHolder.tableSwitcher().use("h_test", "h_test2"); List entities = testDao.queryNest(query); - + query.includes("name"); + testDao.count(query); testDao.query(query); + + query.includes("nest.name", "*"); testDao.countNest(query); - testDao.count(query); + UpdateParamEntity.newUpdate() .set("name","测试") .set(entity::getDataType) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java index 189d34207..999fa2450 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java @@ -44,6 +44,7 @@ public class TestEntity implements org.hswebframework.web.commons.entity.Entity ) private DataType[] dataTypes; + @CollectionTable(name = "nest_table") private NestEntity nest; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml index ee8bd332a..1824a038e 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml @@ -10,7 +10,10 @@ - + + + + From 3d0d8f761d09f92ee41988d754897cc65cc85aab Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 5 Aug 2019 16:45:27 +0800 Subject: [PATCH 20/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpassword=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization/listener/event/AuthorizationDecodeEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java index 80071046c..ecd860087 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java @@ -39,7 +39,7 @@ public void setUsername(String username) { } public void setPassword(String password) { - super.username = password; + super.password = password; } } From 5d1859fcd8f34ecd61a05f6ab30b4a8a7f54b743 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 13 Jun 2019 15:25:00 +0800 Subject: [PATCH 21/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/SimplePersonService.java | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java index 7ae363eba..0704378ea 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java @@ -18,6 +18,7 @@ import org.hswebframework.web.commons.entity.DataStatus; import org.hswebframework.web.commons.entity.TreeSupportEntity; +import org.hswebframework.web.commons.entity.param.QueryParamEntity; import org.hswebframework.web.dao.dynamic.QueryByEntityDao; import org.hswebframework.web.dao.organizational.*; import org.hswebframework.web.entity.authorization.UserEntity; @@ -49,6 +50,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import static org.hswebframework.web.commons.entity.TreeSupportEntity.*; +import static org.hswebframework.web.commons.entity.param.QueryParamEntity.*; +import static org.hswebframework.web.service.DefaultDSLQueryService.*; import static org.springframework.util.StringUtils.isEmpty; /** @@ -480,23 +484,22 @@ protected > List getAllChildrenAndReturnR return new java.util.ArrayList<>(); } //获取根节点 - List root = DefaultDSLQueryService.createQuery(dao) + List rootNodeList = newQuery() .where() - .in(TreeSupportEntity.id, rootIds) - .listNoPaging(); - //节点不存在? - if (!root.isEmpty()) { + .in(id, rootIds) + .execute(dao::query); + + if (!rootNodeList.isEmpty()) { //所有子节点,使用节点的path属性进行快速查询,查询结果包含了根节点 - List allNode = DefaultDSLQueryService - .createQuery(dao) + List allNode = newQuery() //遍历生成查询条件: like path like ?||'%' or path like ?||'%' .... - .each(root, (query, data) -> query.or().like$(TreeSupportEntity.path, data.getPath())) - .listNoPaging(); + .each(rootNodeList, (query, rootNode) -> query.or().like$(rootNode::getPath)) + .noPaging() + .execute(dao::query); + //转为树形结构 - List tree = TreeSupportEntity - .list2tree(allNode, childAccepter, - (Predicate) node -> rootIds.contains(node.getId())); // 根节点判定 - rootConsumer.accept(root); + List tree = list2tree(allNode, childAccepter, (Predicate) node -> rootIds.contains(node.getId())); // 根节点判定 + rootConsumer.accept(rootNodeList); return tree; } return new java.util.ArrayList<>(); @@ -504,7 +507,7 @@ protected > List getAllChildrenAndReturnR public static > Set> transformationTreeNode(V parent, List data) { Set> treeNodes = new HashSet<>(); - data.forEach(node -> { + for (V node : data) { TreeNode treeNode = new TreeNode<>(); if (parent != null) { TreeNode parentNode = new TreeNode<>(); @@ -514,10 +517,11 @@ public static > Set> transf } treeNode.setValue(node.getId()); if (node.getChildren() != null && !node.getChildren().isEmpty()) { + // TODO: 2019-06-13 有不用递归的方式? treeNode.setChildren(transformationTreeNode(node, node.getChildren())); } treeNodes.add(treeNode); - }); + } return treeNodes; } From 48022daa0168319a7ef4fef0a8e499e412081e23 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 18 Jun 2019 18:09:51 +0800 Subject: [PATCH 22/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=87=E6=8D=A2=E5=99=A8=E9=80=9A=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../switcher/DefaultDataSourceSwitcher.java | 12 ++++++++---- .../datasource/switcher/DefaultDatabaseSwitcher.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java index c804798de..fcb60fa18 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcher.java @@ -18,9 +18,13 @@ public class DefaultDataSourceSwitcher implements DataSourceSwitcher { //默认数据源标识 private static final String DEFAULT_DATASOURCE_ID = DataSourceSwitcher.class.getName() + "_default_"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + protected Logger logger = LoggerFactory.getLogger(this.getClass()); - private Deque getUsedHistoryQueue() { + protected String getDefaultDataSourceIdKey(){ + return DEFAULT_DATASOURCE_ID; + } + + protected Deque getUsedHistoryQueue() { // 从ThreadLocal中获取一个使用记录 return ThreadLocalUtils.get(DefaultDataSourceSwitcher.class.getName() + "_queue", LinkedList::new); } @@ -54,7 +58,7 @@ public void use(String dataSourceId) { @Override public void useDefault() { - getUsedHistoryQueue().addLast(DEFAULT_DATASOURCE_ID); + getUsedHistoryQueue().addLast(getDefaultDataSourceIdKey()); if (logger.isDebugEnabled()) { logger.debug("try use default datasource"); } @@ -67,7 +71,7 @@ public String currentDataSourceId() { } String activeId = getUsedHistoryQueue().getLast(); - if (DEFAULT_DATASOURCE_ID.equals(activeId)) { + if (getDefaultDataSourceIdKey().equals(activeId)) { return null; } return activeId; diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java index 4f87bfd47..38848cddc 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultDatabaseSwitcher.java @@ -18,9 +18,13 @@ public class DefaultDatabaseSwitcher implements DatabaseSwitcher { //默认数据源标识 private static final String DEFAULT_DATASOURCE_ID = DatabaseSwitcher.class.getName() + "_default_"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + protected Logger logger = LoggerFactory.getLogger(this.getClass()); - private Deque getUsedHistoryQueue() { + protected String getDefaultDataSourceIdKey(){ + return DEFAULT_DATASOURCE_ID; + } + + protected Deque getUsedHistoryQueue() { // 从ThreadLocal中获取一个使用记录 return ThreadLocalUtils.get(DefaultDatabaseSwitcher.class.getName() + "_queue", LinkedList::new); } @@ -54,7 +58,7 @@ public void use(String dataSourceId) { @Override public void useDefault() { - getUsedHistoryQueue().addLast(DEFAULT_DATASOURCE_ID); + getUsedHistoryQueue().addLast(getDefaultDataSourceIdKey()); if (logger.isDebugEnabled()) { logger.debug("try use default database"); } @@ -67,7 +71,7 @@ public String currentDatabase() { } String activeId = getUsedHistoryQueue().getLast(); - if (DEFAULT_DATASOURCE_ID.equals(activeId)) { + if (getDefaultDataSourceIdKey().equals(activeId)) { return null; } return activeId; From 458c966e265f19d2fca186aede5bc208b550e976 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 24 Jun 2019 17:54:10 +0800 Subject: [PATCH 23/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/builder/EasyOrmSqlBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 8e8b106f2..98895c6d2 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -303,8 +303,10 @@ public String buildSelectFields(String resultMapId, String tableName, Object arg QueryParam param = null; if (arg instanceof QueryParam) { param = ((QueryParam) arg); - if (param.isPaging() && Pager.get() == null) { - Pager.doPaging(param.getPageIndex(), param.getPageSize()); + if (param.isPaging()) { + if (Pager.get() == null) { + Pager.doPaging(param.getPageIndex(), param.getPageSize()); + } } else { Pager.reset(); } @@ -404,8 +406,10 @@ public String buildWhere(String resultMapId, String tableName, Object param) { } if (param instanceof QueryParam) { QueryParam queryParam = ((QueryParam) param); - if (queryParam.isPaging() && Pager.get() == null) { - Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + if (queryParam.isPaging()) { + if (Pager.get() == null) { + Pager.doPaging(queryParam.getPageIndex(), queryParam.getPageSize()); + } } else { Pager.reset(); } From 06441d5d26c9183b2b1f60a1d56013faea9998c8 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 24 Jun 2019 17:54:35 +0800 Subject: [PATCH 24/47] =?UTF-8?q?=E8=BF=94=E5=9B=9Enew=20map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/hswebframework/web/ThreadLocalUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java index 5237131a9..607ea5e65 100644 --- a/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java +++ b/hsweb-commons/hsweb-commons-utils/src/main/java/org/hswebframework/web/ThreadLocalUtils.java @@ -48,7 +48,7 @@ private ThreadLocalUtils() { * @return threadLocal中的全部值 */ public static Map getAll() { - return local.get(); + return new HashMap<>(local.get()); } /** From 53d17909b96f69e21b5384d8225c4bca1584f121 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 26 Jun 2019 10:46:04 +0800 Subject: [PATCH 25/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/builder/EasyOrmSqlBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 98895c6d2..02d212d7d 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -231,6 +231,7 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara List columns = render.parseOperationField(tableMetaData, param); SqlAppender appender = new SqlAppender(); columns.forEach(column -> { + RDBColumnMetaData columnMetaData = column.getRDBColumnMetaData(); if (columnMetaData == null) { return; @@ -238,6 +239,9 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara if (columnMetaData.getName().contains(".")) { return; } + if (columnMetaData.getProperty("read-only").isTrue()) { + return; + } Object value; try { value = propertyUtils.getProperty(param.getData(), columnMetaData.getAlias()); From 960b9923a3f38997a86d2a20c818a4d17e329051 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 26 Jun 2019 16:25:08 +0800 Subject: [PATCH 26/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=A7=92=E8=89=B2=E5=92=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/handler/DefaultAuthorizingHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java index 393c8af5e..080d3e23a 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/DefaultAuthorizingHandler.java @@ -201,7 +201,10 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def Function, Boolean> func = logicalIsOr ? authentication.getRoles().stream()::anyMatch : authentication.getRoles().stream()::allMatch; - access = func.apply(role -> rolesDef.contains(role.getId())); + + access = logicalIsOr + ? access || func.apply(role -> rolesDef.contains(role.getId())) + : access && func.apply(role -> rolesDef.contains(role.getId())); } //控制用户 if (!usersDef.isEmpty()) { @@ -211,7 +214,10 @@ protected void handleRBAC(Authentication authentication, AuthorizeDefinition def Function, Boolean> func = logicalIsOr ? usersDef.stream()::anyMatch : usersDef.stream()::allMatch; - access = func.apply(authentication.getUser().getUsername()::equals); + access = logicalIsOr + ? access || func.apply(authentication.getUser().getUsername()::equals) + : access && func.apply(authentication.getUser().getUsername()::equals); + } if (!access) { throw new AccessDenyException(definition.getMessage()); From d5262798d2e2cd668cd9b90490399e9ddad3708a Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 3 Jul 2019 15:44:29 +0800 Subject: [PATCH 27/47] =?UTF-8?q?=E4=BC=98=E5=8C=96bean=20copier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/hswebframework/web/bean/FastBeanCopier.java | 10 +++++----- .../test/java/org/hswebframework/web/bean/Source.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java index b0aa4690a..00dfc7514 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java @@ -141,8 +141,8 @@ public static Copier createCopier(Class source, Class target) { String method = "public void copy(Object s, Object t, java.util.Set ignore, " + "org.hswebframework.web.bean.Converter converter){\n" + "try{\n\t" + - sourceName + " source=(" + sourceName + ")s;\n\t" + - tartName + " target=(" + tartName + ")t;\n\t" + + sourceName + " $$__source=(" + sourceName + ")s;\n\t" + + tartName + " $$__target=(" + tartName + ")t;\n\t" + createCopierCode(source, target) + "}catch(Exception e){\n" + "\tthrow new RuntimeException(e.getMessage(),e);" + @@ -211,7 +211,7 @@ private static String createCopierCode(Class source, Class target) { } code.append("if(!ignore.contains(\"").append(sourceProperty.getName()).append("\")){\n\t"); if (!sourceProperty.isPrimitive()) { - code.append("if(source.").append(sourceProperty.getReadMethod()).append("!=null){\n"); + code.append("if($$__source.").append(sourceProperty.getReadMethod()).append("!=null){\n"); } code.append(targetProperty.generateVar(targetProperty.getName())).append("=") .append(sourceProperty.generateGetter(target, targetProperty.getType())) @@ -220,7 +220,7 @@ private static String createCopierCode(Class source, Class target) { if (!targetProperty.isPrimitive()) { code.append("\tif(").append(sourceProperty.getName()).append("!=null){\n"); } - code.append("\ttarget.").append(targetProperty.generateSetter(targetProperty.getType(), sourceProperty.getName())).append(";\n"); + code.append("\t$$__target.").append(targetProperty.generateSetter(targetProperty.getType(), sourceProperty.getName())).append(";\n"); if (!targetProperty.isPrimitive()) { code.append("\t}\n"); } @@ -310,7 +310,7 @@ protected String castWrapper(String getter) { public BiFunction createGetterFunction() { return (targetBeanType, targetType) -> { - String getterCode = "source." + getReadMethod(); + String getterCode = "$$__source." + getReadMethod(); String generic = "org.hswebframework.web.bean.FastBeanCopier.EMPTY_CLASS_ARRAY"; Field field = ReflectionUtils.findField(targetBeanType, name); diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java index 44b5ed20e..872891df2 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java @@ -55,6 +55,9 @@ public class Source { private String[] arr6 = {"1", "2"}; + private String source; + + private String target; } From f67c2f51769da86fcbb381007f60f4a0a406097e Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 24 Jul 2019 15:00:43 +0800 Subject: [PATCH 28/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/bean/FastBeanCopier.java | 15 ++++++- .../web/bean/FastBeanCopierTest.java | 43 ++++++++----------- .../org/hswebframework/web/bean/Source.java | 2 + .../org/hswebframework/web/bean/Target.java | 2 + 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java index 00dfc7514..7c6c78d58 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java @@ -14,6 +14,7 @@ import org.springframework.util.ReflectionUtils; import java.beans.PropertyDescriptor; +import java.lang.reflect.Array; import java.lang.reflect.Field; import java.util.*; import java.util.function.BiFunction; @@ -540,7 +541,11 @@ public T convert(Object source, Class targetClass, Class[] genericType) { if (targetClass.isEnum()) { if (EnumDict.class.isAssignableFrom(targetClass)) { - Object val = EnumDict.find((Class) targetClass, String.valueOf(source)).orElse(null); + String strVal=String.valueOf(source); + + Object val = EnumDict.find((Class) targetClass, e -> { + return e.eq(source) || e.name().equalsIgnoreCase(strVal); + }).orElse(null); if (targetClass.isInstance(val)) { return ((T) val); } @@ -551,9 +556,17 @@ public T convert(Object source, Class targetClass, Class[] genericType) { return t; } } + log.warn("无法将:{}转为枚举:{}", source, targetClass); return null; } + //转换为数组 + if (targetClass.isArray()) { + Class componentType = targetClass.getComponentType(); + List val = convert(source, List.class, new Class[]{componentType}); + return (T) val.toArray((Object[])Array.newInstance(componentType,val.size())); + } + try { org.apache.commons.beanutils.Converter converter = BeanUtilsBean .getInstance() diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java index 4b37efd62..defe37706 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java @@ -1,9 +1,11 @@ package org.hswebframework.web.bean; import org.apache.commons.beanutils.BeanUtils; +import org.junit.Assert; import org.junit.Test; import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -35,35 +37,26 @@ public void test() throws InvocationTargetException, IllegalAccessException { FastBeanCopier.copy(source, target); - long t = System.currentTimeMillis(); -// for (int i = 10_0000; i > 0; i--) { -// FastBeanCopier.copy(source, target); -// } - System.out.println(System.currentTimeMillis() - t); - System.out.println(source); System.out.println(target); System.out.println(target.getNestObject() == source.getNestObject()); -// Source source1=new Source(); - -// FastBeanCopier.copy(source,source1); - -// System.out.println(source1); -// -// t = System.currentTimeMillis(); -// -// for (int i = 100_0000; i > 0; i--) { -// try { -// BeanUtils.copyProperties(source, target); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// System.out.println(System.currentTimeMillis() - t); -// System.out.println(target); -// System.out.println(target.getNestObject() == source.getNestObject()); } + @Test + public void testMapArray() { + Map data =new HashMap<>(); + data.put("colors", Arrays.asList("RED")); + + + Target target = new Target(); + FastBeanCopier.copy(data, target); + + + System.out.println(target); + Assert.assertNotNull(target.getColors()); + Assert.assertSame(target.getColors()[0], Color.RED); + + } @Test public void testCopyMap() { @@ -85,7 +78,7 @@ public void testCopyMap() { System.out.println(FastBeanCopier.copy(source, target, FastBeanCopier.include("age"))); System.out.println(target); - System.out.println(FastBeanCopier.copy(target, new Source())); + System.out.println(FastBeanCopier.copy(target, new Target())); } diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java index 872891df2..67aa5fb5d 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Source.java @@ -55,6 +55,8 @@ public class Source { private String[] arr6 = {"1", "2"}; + private Color[] colors ={Color.BLUE,Color.RED}; + private String source; private String target; diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java index f41a3f667..8b50678c9 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/Target.java @@ -64,6 +64,8 @@ public class Target { private Integer[] arr4; + private Color[] colors; + @Override public String toString() { From 00ebec9409a696d2ccc8a3025debd67467659ca5 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 24 Jul 2019 16:59:57 +0800 Subject: [PATCH 29/47] easyorm 3.0.6-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e72c1d31..507b98561 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 1.6.12 5.1.1.Final - 3.0.5 + 3.0.6-SNAPSHOT 3.0.2 3.0.2 From f5a729c6b1772d57a6baf63a82a9ed60d3a2a057 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Fri, 2 Aug 2019 13:06:41 +0800 Subject: [PATCH 30/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9mybatis=20asso?= =?UTF-8?q?ciation=E6=A0=87=E7=AD=BE=E5=AF=B9=E6=94=AF=E6=8C=81=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9jpa=E6=B3=A8=E8=A7=A3CollectionTable?= =?UTF-8?q?=E5=AF=B9=E6=94=AF=E6=8C=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?boolean=E4=B8=8E=E6=95=B0=E5=AD=97=E8=BD=AC=E6=8D=A2=E5=AF=B9?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/builder/EasyOrmSqlBuilder.java | 134 ++++++++++++------ .../builder/jpa/JpaAnnotationParser.java | 60 ++++---- .../handler/NumberBooleanTypeHandler.java | 49 +++++++ .../web/dao/crud/NestEntity.java | 4 + .../hswebframework/web/dao/crud/TestCrud.java | 8 +- .../web/dao/crud/TestEntity.java | 1 + .../hswebframework/web/dao/test/TestDao.xml | 5 +- 7 files changed, 180 insertions(+), 81 deletions(-) create mode 100644 hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 02d212d7d..99cccc3c2 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -38,9 +38,11 @@ import org.hswebframework.ezorm.rdb.render.support.simple.CommonSqlRender; import org.hswebframework.ezorm.rdb.render.support.simple.SimpleWhereSqlBuilder; import org.hswebframework.web.BusinessException; +import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.commons.entity.Entity; import org.hswebframework.web.commons.entity.factory.EntityFactory; import org.hswebframework.web.dao.mybatis.builder.jpa.JpaAnnotationParser; +import org.hswebframework.web.dao.mybatis.handler.NumberBooleanTypeHandler; import org.hswebframework.web.dao.mybatis.plgins.pager.Pager; import org.hswebframework.web.dao.mybatis.MybatisUtils; import org.hswebframework.utils.StringUtils; @@ -145,6 +147,50 @@ private String getRealTableName(String tableName) { } + private List createColumn(String prefix, String columnName, ResultMapping resultMapping) { + List metaData = new ArrayList<>(); + if (resultMapping.getNestedQueryId() == null) { + + if (resultMapping.getNestedResultMapId() != null) { + ResultMap nests = MybatisUtils.getResultMap(resultMapping.getNestedResultMapId()); + List resultMappings = new ArrayList<>(nests.getResultMappings()); + resultMappings.addAll(nests.getIdResultMappings()); + for (ResultMapping mapping : resultMappings) { + metaData.addAll(createColumn(resultMapping.getProperty(), + org.springframework.util.StringUtils.hasText(resultMapping.getColumn()) + ? resultMapping.getColumn() + : resultMapping.getProperty(), + mapping)); + } + return metaData; + } + + JDBCType jdbcType = JDBCType.VARCHAR; + try { + jdbcType = JDBCType.valueOf(resultMapping.getJdbcType().name()); + } catch (Exception e) { + log.warn("can not parse jdbcType:{}", resultMapping.getJdbcType()); + } + RDBColumnMetaData column = new RDBColumnMetaData(); + column.setJdbcType(jdbcType); + column.setName(org.springframework.util.StringUtils.hasText(columnName) + ? columnName.concat(".").concat(resultMapping.getColumn()) : resultMapping.getColumn()); + + if (resultMapping.getTypeHandler() != null) { + column.setProperty("typeHandler", resultMapping.getTypeHandler().getClass().getName()); + } + if (!StringUtils.isNullOrEmpty(resultMapping.getProperty())) { + column.setAlias(org.springframework.util.StringUtils.hasText(prefix) + ? prefix.concat(".").concat(resultMapping.getProperty()) : resultMapping.getProperty()); + + } + column.setJavaType(resultMapping.getJavaType()); + column.setProperty("resultMapping", resultMapping); + metaData.add(column); + } + return metaData; + } + protected RDBTableMetaData createMeta(String tableName, String resultMapId) { // tableName = getRealTableName(tableName); RDBDatabaseMetaData active = getActiveDatabase(); @@ -169,40 +215,11 @@ public String getName() { List resultMappings = new ArrayList<>(resultMaps.getResultMappings()); resultMappings.addAll(resultMaps.getIdResultMappings()); - for (ResultMapping resultMapping : resultMappings) { - if (resultMapping.getNestedQueryId() == null) { - RDBColumnMetaData column = new RDBColumnMetaData(); - column.setJdbcType(JDBCType.valueOf(resultMapping.getJdbcType().name())); - column.setName(resultMapping.getColumn()); - if (resultMapping.getTypeHandler() != null) { - column.setProperty("typeHandler", resultMapping.getTypeHandler().getClass().getName()); - } - if (!StringUtils.isNullOrEmpty(resultMapping.getProperty())) { - column.setAlias(resultMapping.getProperty()); - } - column.setJavaType(resultMapping.getJavaType()); - column.setProperty("resultMapping", resultMapping); - //时间 - if (column.getJdbcType() == JDBCType.DATE || column.getJdbcType() == JDBCType.TIMESTAMP) { - ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { - @Override - public Object getData(Object value) { - if (value instanceof Number) { - return new Date(((Number) value).longValue()); - } - return super.getData(value); - } - }; - column.setValueConverter(dateConvert); - } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { - column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); - } else if (TypeUtils.isNumberType(column)) { //数字 - //数字 - column.setValueConverter(new NumberValueConverter(column.getJavaType())); - } - rdbTableMetaData.addColumn(column); - } - } + + resultMappings.stream() + .map(mapping -> this.createColumn(null, null, mapping)) + .flatMap(Collection::stream) + .forEach(rdbTableMetaData::addColumn); if (useJpa) { Class type = entityFactory == null ? resultMaps.getType() : entityFactory.getInstanceType(resultMaps.getType()); @@ -217,6 +234,27 @@ public Object getData(Object value) { } } } + for (RDBColumnMetaData column : rdbTableMetaData.getColumns()) { + //时间 + if (column.getJdbcType() == JDBCType.DATE || column.getJdbcType() == JDBCType.TIMESTAMP) { + ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { + @Override + public Object getData(Object value) { + if (value instanceof Number) { + return new Date(((Number) value).longValue()); + } + return super.getData(value); + } + }; + column.setValueConverter(dateConvert); + } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { + column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); + column.setProperty("typeHandler", NumberBooleanTypeHandler.class.getName()); + } else if (TypeUtils.isNumberType(column)) { //数字 + //数字 + column.setValueConverter(new NumberValueConverter(column.getJavaType())); + } + } cache.put(cacheKey, rdbTableMetaData); return rdbTableMetaData; } @@ -230,6 +268,9 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara CommonSqlRender render = (CommonSqlRender) databaseMetaDate.getRenderer(SqlRender.TYPE.SELECT); List columns = render.parseOperationField(tableMetaData, param); SqlAppender appender = new SqlAppender(); + Object data = param.getData(); + Map mapData = FastBeanCopier.copy(data, HashMap::new); + columns.forEach(column -> { RDBColumnMetaData columnMetaData = column.getRDBColumnMetaData(); @@ -242,21 +283,24 @@ public String buildUpdateFields(String resultMapId, String tableName, UpdatePara if (columnMetaData.getProperty("read-only").isTrue()) { return; } - Object value; - try { - value = propertyUtils.getProperty(param.getData(), columnMetaData.getAlias()); - if (value == null) { - return; - } - } catch (Exception e) { + Object value = mapData.get(columnMetaData.getAlias()); + + if (value == null) { return; } + if (value instanceof Sql) { - appender.add(",", encodeColumn(dialect, columnMetaData.getName()) - , "=", ((Sql) value).getSql()); + appender.add(",", encodeColumn(dialect, columnMetaData.getName()), "=", ((Sql) value).getSql()); } else { - String typeHandler = columnMetaData.getProperty("typeHandler") - .getValue(); + value = columnMetaData.getValueConverter().getData(value); + + if (columnMetaData.getOptionConverter() != null) { + value = columnMetaData.getOptionConverter().converterData(value); + } + + mapData.put(columnMetaData.getAlias(), value); + + String typeHandler = columnMetaData.getProperty("typeHandler").getValue(); appender.add(",", encodeColumn(dialect, columnMetaData.getName()) , "=", "#{data.", columnMetaData.getAlias(), diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java index ff849ed88..0da0dfece 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java @@ -15,10 +15,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.StringUtils; -import javax.persistence.Column; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -109,25 +106,31 @@ public class JpaAnnotationParser { } - public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { - Table table = AnnotationUtils.findAnnotation(entityClass, Table.class); - if (table == null) { - return null; - } - RDBTableMetaData tableMetaData = new RDBTableMetaData(); - tableMetaData.setName(table.name()); + private static List parseColumnMeta(String prefix, String columnName, Class entityClass) { PropertyDescriptor[] descriptors = BeanUtilsBean.getInstance() .getPropertyUtils() .getPropertyDescriptors(entityClass); + List columnMetaDataList = new ArrayList<>(); + for (PropertyDescriptor descriptor : descriptors) { Column columnAnn = getAnnotation(entityClass, descriptor, Column.class); + CollectionTable collectionTable = getAnnotation(entityClass, descriptor, CollectionTable.class); + if (columnAnn == null) { + if (collectionTable != null) { + columnMetaDataList.addAll(parseColumnMeta(descriptor.getName(), collectionTable.name(), descriptor.getPropertyType())); + continue; + } continue; } + + String realName = StringUtils.hasText(columnAnn.name()) ? columnAnn.name() : descriptor.getName(); + String realAlias = StringUtils.hasText(prefix) ? prefix.concat(".").concat(descriptor.getName()) : descriptor.getName(); + RDBColumnMetaData column = new RDBColumnMetaData(); - column.setName(columnAnn.name()); - column.setAlias(descriptor.getName()); + column.setName(StringUtils.hasText(columnName) ? columnName.concat(".").concat(realName) : realName); + column.setAlias(realAlias); column.setLength(columnAnn.length()); column.setPrecision(columnAnn.precision()); column.setJavaType(descriptor.getPropertyType()); @@ -151,26 +154,19 @@ public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { .orElse(JDBCType.OTHER); } column.setJdbcType(type); - ValueConverter dateConvert = new DateTimeConverter("yyyy-MM-dd HH:mm:ss", column.getJavaType()) { - @Override - public Object getData(Object value) { - if (value instanceof Number) { - return new Date(((Number) value).longValue()); - } - return super.getData(value); - } - }; - - if (column.getJdbcType() == JDBCType.DATE - || column.getJdbcType() == JDBCType.TIMESTAMP) { - column.setValueConverter(dateConvert); - } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) { - column.setValueConverter(new BooleanValueConverter(column.getJdbcType())); - } else if (TypeUtils.isNumberType(column)) { - column.setValueConverter(new NumberValueConverter(column.getJavaType())); - } - tableMetaData.addColumn(column); + columnMetaDataList.add(column); } + return columnMetaDataList; + } + + public static RDBTableMetaData parseMetaDataFromEntity(Class entityClass) { + Table table = AnnotationUtils.findAnnotation(entityClass, Table.class); + if (table == null) { + return null; + } + RDBTableMetaData tableMetaData = new RDBTableMetaData(); + tableMetaData.setName(table.name()); + parseColumnMeta(null, null, entityClass).forEach(tableMetaData::addColumn); return tableMetaData; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java new file mode 100644 index 000000000..5480ba9e9 --- /dev/null +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/handler/NumberBooleanTypeHandler.java @@ -0,0 +1,49 @@ +package org.hswebframework.web.dao.mybatis.handler; + +import org.apache.ibatis.type.*; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Alias("numberBooleanTypeHandler") +@MappedTypes({Boolean.class}) +@MappedJdbcTypes({JdbcType.NUMERIC, JdbcType.BOOLEAN}) +public class NumberBooleanTypeHandler implements TypeHandler { + @Override + public void setParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { + if (parameter == null) { + ps.setNull(i, jdbcType.TYPE_CODE); + return; + } + if(parameter instanceof Number){ + if (jdbcType == JdbcType.BOOLEAN) { + ps.setBoolean(i, ((Number) parameter).intValue()==1); + }else{ + ps.setInt(i,((Number) parameter).intValue()); + } + }else{ + if (jdbcType == JdbcType.BOOLEAN) { + ps.setBoolean(i, Boolean.TRUE.equals(parameter)); + } else { + ps.setInt(i, Boolean.TRUE.equals(parameter) ? 1 : 0); + } + } + } + + @Override + public Object getResult(ResultSet rs, String columnName) throws SQLException { + return rs.getBoolean(columnName); + } + + @Override + public Object getResult(ResultSet rs, int columnIndex) throws SQLException { + return rs.getBoolean(columnIndex); + } + + @Override + public Object getResult(CallableStatement cs, int columnIndex) throws SQLException { + return cs.getBoolean(columnIndex); + } +} diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java index 20d0c4ede..7d76b52f8 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/NestEntity.java @@ -2,6 +2,8 @@ import lombok.Data; +import javax.persistence.Column; + /** * * @author zhouhao @@ -9,5 +11,7 @@ */ @Data public class NestEntity { + + @Column private String name; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java index 42e34da91..70b298be5 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java @@ -77,14 +77,16 @@ public void testCRUD() { //#102 query.where("createTime", "2017-11-10"); -// query.includes("nest.name", "*"); // DataSourceHolder.tableSwitcher().use("h_test", "h_test2"); List entities = testDao.queryNest(query); - + query.includes("name"); + testDao.count(query); testDao.query(query); + + query.includes("nest.name", "*"); testDao.countNest(query); - testDao.count(query); + UpdateParamEntity.newUpdate() .set("name","测试") .set(entity::getDataType) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java index 189d34207..999fa2450 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java @@ -44,6 +44,7 @@ public class TestEntity implements org.hswebframework.web.commons.entity.Entity ) private DataType[] dataTypes; + @CollectionTable(name = "nest_table") private NestEntity nest; } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml index ee8bd332a..1824a038e 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml @@ -10,7 +10,10 @@ - + + + + From baf153cfffbda936ba1ca2b7b0b740aa67919d1f Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 5 Aug 2019 16:45:27 +0800 Subject: [PATCH 31/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpassword=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization/listener/event/AuthorizationDecodeEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java index 80071046c..ecd860087 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationDecodeEvent.java @@ -39,7 +39,7 @@ public void setUsername(String username) { } public void setPassword(String password) { - super.username = password; + super.password = password; } } From 59a7cc7c5e73551dea28813994028facb237fc2f Mon Sep 17 00:00:00 2001 From: Jia_RG Date: Wed, 7 Aug 2019 13:46:19 +0800 Subject: [PATCH 32/47] =?UTF-8?q?TermExpressionParser=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=E5=B8=A6=E7=A9=BA=E6=A0=BC=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/param/TermExpressionParser.java | 37 ++++++++++++++++--- .../param/TermExpressionParserTest.java | 24 ++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/TermExpressionParser.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/TermExpressionParser.java index 00651bf30..a87ff5d6f 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/TermExpressionParser.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/TermExpressionParser.java @@ -19,19 +19,37 @@ public static List parse(String expression) { NestConditional nest = null; + // 字符容器 char[] buf = new char[128]; + // 记录词项的长度, Arrays.copyOf使用 byte len = 0; + // 空格数量? byte spaceLen = 0; - + // 当前列 char[] currentColumn = null; - - String currentTermType = null; + // 当前列对应的值 char[] currentValue = null; - char[] all = expression.toCharArray(); + // 当前条件类型 eq btw in ... + String currentTermType = null; + // 当前链接类型 and / or String currentType = "and"; + // 是否是引号, 单引号 / 双引号 + byte quotationMarks = 0; + // 表达式字符数组 + char[] all = expression.toCharArray(); + for (char c : all) { - if (c == '(') { + if (c == '\'' || c == '"') { + if (quotationMarks != 0) { + // 碰到(结束的)单/双引号, 标志归零, 跳过 + quotationMarks = 0; + continue; + } + // 碰到(开始的)单/双引号, 做记录, 跳过 + quotationMarks++; + continue; + } else if (c == '(') { nest = (nest == null ? (currentType.equals("or") ? conditional.orNest() : conditional.nest()) : (currentType.equals("or") ? nest.orNest() : nest.nest())); @@ -70,6 +88,11 @@ public static List parse(String expression) { if (len == 0) { continue; } + if (quotationMarks != 0) { + // 如果当前字符是空格，并且前面迭代时碰到过单/双引号, 不处理并且添加到buf中 + buf[len++] = c; + continue; + } spaceLen++; if (currentColumn == null && (spaceLen == 1 || spaceLen % 5 == 0)) { currentColumn = Arrays.copyOf(buf, len); @@ -117,6 +140,10 @@ public static List parse(String expression) { len = 0; spaceLen++; } + } else { + currentColumn = Arrays.copyOf(buf, len); + len = 0; + spaceLen++; } continue; } diff --git a/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/param/TermExpressionParserTest.java b/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/param/TermExpressionParserTest.java index c4407c59a..dfbdb4199 100644 --- a/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/param/TermExpressionParserTest.java +++ b/hsweb-commons/hsweb-commons-entity/src/test/java/org/hswebframework/web/commons/entity/param/TermExpressionParserTest.java @@ -51,7 +51,31 @@ public void testNest() { Assert.assertEquals(terms.get(2).getValue(), "test2"); Assert.assertEquals(terms.get(2).getTermType(), "like"); + } + + /** + * 测试日期字符串空格解析，'2019-07-26 12:00:00' + */ + @Test + public void testDateSpace() { + String expression = "(name=测试 or age=10) and (birth btw \"2019-07-26 12:00:00, 2019-08-04 12:00:00\" or startTime <= '2019-08-04 12:00:00') and finishTime >= '2019-08-01 00:00:00'"; + List terms = TermExpressionParser.parse(expression); + System.out.println(JSON.toJSONString(terms, SerializerFeature.PrettyFormat)); + + Assert.assertEquals(terms.size(), 3); + Assert.assertEquals(terms.get(0).getTerms().size(), 2); + + Assert.assertEquals(terms.get(1).getTerms().get(0).getColumn(), "birth"); + Assert.assertEquals(terms.get(1).getTerms().get(0).getTermType(), "btw"); + Assert.assertEquals(terms.get(1).getTerms().get(0).getValue(), "2019-07-26 12:00:00, 2019-08-04 12:00:00"); + Assert.assertEquals(terms.get(1).getTerms().get(1).getColumn(), "startTime"); + Assert.assertEquals(terms.get(1).getTerms().get(1).getTermType(), "lte"); + Assert.assertEquals(terms.get(1).getTerms().get(1).getValue(), "2019-08-04 12:00:00"); + Assert.assertEquals(terms.get(1).getTerms().get(1).getType(), Term.Type.or); + Assert.assertEquals(terms.get(2).getColumn(), "finishTime"); + Assert.assertEquals(terms.get(2).getValue(), "2019-08-01 00:00:00"); + Assert.assertEquals(terms.get(2).getTermType(), "gte"); } } \ No newline at end of file From 58bffcc9a6c910332f548b7325c7c62333f87628 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 7 Aug 2019 16:37:37 +0800 Subject: [PATCH 33/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=8B=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/builder/EasyOrmSqlBuilder.java | 2 +- .../org/hswebframework/web/dao/crud/TestCrud.java | 7 +++++-- .../hswebframework/web/dao/crud/TestEntity.java | 3 +++ .../org/hswebframework/web/dao/test/TestDao.xml | 14 ++++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 99cccc3c2..b819435d3 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -153,7 +153,7 @@ private List createColumn(String prefix, String columnName, R if (resultMapping.getNestedResultMapId() != null) { ResultMap nests = MybatisUtils.getResultMap(resultMapping.getNestedResultMapId()); - List resultMappings = new ArrayList<>(nests.getResultMappings()); + Set resultMappings = new HashSet<>(nests.getResultMappings()); resultMappings.addAll(nests.getIdResultMappings()); for (ResultMapping mapping : resultMappings) { metaData.addAll(createColumn(resultMapping.getProperty(), diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java index 70b298be5..a6f1c00f1 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java @@ -1,5 +1,6 @@ package org.hswebframework.web.dao.crud; +import lombok.SneakyThrows; import org.apache.ibatis.session.SqlSessionFactory; import org.hswebframework.ezorm.core.param.QueryParam; import org.hswebframework.ezorm.rdb.executor.SqlExecutor; @@ -53,12 +54,13 @@ public void init() throws SQLException { ")"); sqlExecutor.exec("\n" + "create table h_nest_table(\n" + - " id BIGINT AUTO_INCREMENT PRIMARY KEY,\n" + + " id BIGINT PRIMARY KEY,\n" + " name VARCHAR(32)\n" + ")"); } @Test + @SneakyThrows public void testCRUD() { DataSourceHolder.databaseSwitcher().use("PUBLIC"); @@ -69,13 +71,14 @@ public void testCRUD() { entity.setDataTypes(new DataType[]{DataType.TYPE1, DataType.TYPE3}); testDao.insert(entity); Assert.assertNotNull(entity.getId()); + sqlExecutor.insert("insert into h_nest_table (id,name) values(#{id},'1234')",entity); QueryParamEntity query = new QueryParamEntity(); //any in query.where("dataTypes$in$any", Arrays.asList(DataType.TYPE1, DataType.TYPE2)); //#102 - query.where("createTime", "2017-11-10"); + //query.where("createTime", "2017-11-10"); // DataSourceHolder.tableSwitcher().use("h_test", "h_test2"); diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java index 999fa2450..370a33da8 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestEntity.java @@ -47,4 +47,7 @@ public class TestEntity implements org.hswebframework.web.commons.entity.Entity @CollectionTable(name = "nest_table") private NestEntity nest; + @CollectionTable(name = "nest_table2") + private NestEntity nest2; + } diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml index 1824a038e..7972d3e0b 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml @@ -10,9 +10,12 @@ - - - + + + + + + @@ -22,7 +25,8 @@ - + @@ -55,6 +59,7 @@ from ${_fullTableName} h_test left join ${_databasePrefix}h_nest_table nest_table on nest_table.id=h_test.id + left join ${_databasePrefix}h_nest_table nest_table2 on nest_table2.id=h_test.id @@ -68,6 +73,7 @@ count(1) from ${_fullTableName} h_test left join ${_databasePrefix}h_nest_table nest_table on nest_table.id=h_test.id + left join ${_databasePrefix}h_nest_table nest_table2 on nest_table2.id=h_test.id From 6c4b054563d5c49253698fe920f0ad5145927123 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 7 Aug 2019 16:38:27 +0800 Subject: [PATCH 34/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEpermi?= =?UTF-8?q?ssion=E6=9D=A5=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthorizationSettingEntity.java | 2 +- .../AuthorizationSettingService.java | 26 +++++++ .../SimpleAuthorizationSettingService.java | 77 +++++++++++++++++++ .../AuthorizationSettingController.java | 40 +++++++--- 4 files changed, 135 insertions(+), 10 deletions(-) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java index 5fcfa8bdf..60b25921d 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java @@ -32,7 +32,7 @@ public interface AuthorizationSettingEntity extends GenericEntity { | 属性名常量 | ===========================================*/ /** - * 设置类型,如: role + * 设置类型(维度),如: role * * @see org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier */ diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/service/authorization/AuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/service/authorization/AuthorizationSettingService.java index f86646548..ed768ddb8 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/service/authorization/AuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/service/authorization/AuthorizationSettingService.java @@ -41,6 +41,32 @@ public interface AuthorizationSettingService extends CrudService selectByPermissionId(String permissionId); + + /** + * 合并保存权限信息,如果权限信息不存在则新增,如果已存在,则合并,而不是覆盖 + * + * @param settings 权限信息集合 + * @since 3.0.9 + */ + void mergeSetting(List settings); + + /** + * 删除权限设置的单个权限 + * + * @param settingId 权限设置ID + * @param permissionId 权限ID + * @since 3.0.9 + */ + void deleteDetail(String settingId, String permissionId); + /** * 根据类型和被设置者初始化对应的权限信息 * diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 666d73798..2a44460e8 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -26,14 +26,17 @@ import org.hswebframework.web.authorization.simple.SimplePermission; import org.hswebframework.web.authorization.simple.SimpleRole; import org.hswebframework.web.authorization.simple.SimpleUser; +import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.commons.entity.DataStatus; import org.hswebframework.web.commons.entity.TreeSupportEntity; +import org.hswebframework.web.commons.entity.factory.EntityFactory; import org.hswebframework.web.dao.authorization.AuthorizationSettingDao; import org.hswebframework.web.dao.authorization.AuthorizationSettingDetailDao; import org.hswebframework.web.entity.authorization.*; import org.hswebframework.web.id.IDGenerator; import org.hswebframework.web.service.DefaultDSLDeleteService; import org.hswebframework.web.service.DefaultDSLQueryService; +import org.hswebframework.web.service.DefaultDSLUpdateService; import org.hswebframework.web.service.GenericEntityService; import org.hswebframework.web.service.authorization.*; import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier.SettingInfo; @@ -44,6 +47,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.event.TransactionalEventListener; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -54,12 +58,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.Optional.*; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.hswebframework.web.commons.entity.DataStatus.STATUS_ENABLED; import static org.hswebframework.web.entity.authorization.AuthorizationSettingDetailEntity.*; import static org.hswebframework.web.entity.authorization.AuthorizationSettingEntity.settingFor; import static org.hswebframework.web.entity.authorization.AuthorizationSettingEntity.type; +import static org.hswebframework.web.service.DefaultDSLDeleteService.*; import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_AUTH_CACHE_NAME; import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_MENU_CACHE_NAME; @@ -181,6 +187,77 @@ public AuthorizationSettingEntity deleteByPk(String id) { return super.deleteByPk(id); } + @Override + @CacheEvict(cacheNames = {CacheConstants.USER_AUTH_CACHE_NAME, CacheConstants.USER_MENU_CACHE_NAME}, allEntries = true) + public void deleteDetail(String settingId, String permissionId) { + + DefaultDSLDeleteService.createDelete(authorizationSettingDetailDao) + .where(AuthorizationSettingDetailEntity.settingId, settingId) + .and(AuthorizationSettingDetailEntity.permissionId, permissionId) + .exec(); + } + + @Override + @CacheEvict(cacheNames = {CacheConstants.USER_AUTH_CACHE_NAME, CacheConstants.USER_MENU_CACHE_NAME}, allEntries = true) + public void mergeSetting(List settings) { + for (AuthorizationSettingEntity setting : settings) { + if (select(setting.getType(), setting.getSettingFor()) == null) { + insert(setting); + continue; + } + if (!CollectionUtils.isEmpty(setting.getDetails())) { + for (AuthorizationSettingDetailEntity detail : setting.getDetails()) { + detail.setSettingId(setting.getId()); + int i = DefaultDSLUpdateService + .createUpdate(authorizationSettingDetailDao, detail) + .where(detail::getSettingId) + .and(detail::getPermissionId) + .exec(); + if (i == 0) { + detail.setId(IDGenerator.MD5.generate()); + authorizationSettingDetailDao.insert(detail); + } + } + } else if (!CollectionUtils.isEmpty(setting.getMenus())) { + for (AuthorizationSettingMenuEntity menu : setting.getMenus()) { + menu.setSettingId(setting.getId()); + authorizationSettingMenuService.saveOrUpdate(menu); + } + } + } + } + + @Transactional(readOnly = true) + public List selectByPermissionId(String permissionId) { + List detailEntities = DefaultDSLQueryService + .createQuery(authorizationSettingDetailDao) + .where(AuthorizationSettingDetailEntity::getPermissionId, permissionId) + .listNoPaging(); + + if (CollectionUtils.isEmpty(detailEntities)) { + return new ArrayList<>(); + } + + List settingIdList = detailEntities + .stream() + .map(AuthorizationSettingDetailEntity::getPermissionId) + .collect(Collectors.toList()); + + List allSettings = selectByPk(settingIdList) + .stream() + //复制为新对象,防止加载一些没用的信息 + .map(entity -> FastBeanCopier.copy(entity, entityFactory.newInstance(AuthorizationSettingEntity.class), "details", "menus")) + .collect(Collectors.toList()); + + Map> details = detailEntities.stream() + .collect(Collectors.groupingBy(AuthorizationSettingDetailEntity::getSettingId)); + + for (AuthorizationSettingEntity allSetting : allSettings) { + ofNullable(details.get(allSetting.getId())).ifPresent(allSetting::setDetails); + } + + return allSettings; + } private List getUserSetting(String userId) { Map> settingInfo = diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/AuthorizationSettingController.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/AuthorizationSettingController.java index 53f90f738..6db550f10 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/AuthorizationSettingController.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/AuthorizationSettingController.java @@ -1,18 +1,18 @@ /* * Copyright 2019 http://www.hswebframework.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.hswebframework.web.authorization.controller; @@ -27,10 +27,9 @@ import org.hswebframework.web.entity.authorization.AuthorizationSettingEntity; import org.hswebframework.web.service.authorization.AuthorizationSettingService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 权限设置 @@ -39,8 +38,8 @@ */ @RestController @RequestMapping("${hsweb.web.mappings.autz-setting:autz-setting}") -@Authorize(permission = "autz-setting",description = "权限设置") -@Api(tags = "权限-权限设置",value = "权限设置") +@Authorize(permission = "autz-setting", description = "权限设置") +@Api(tags = "权限-权限设置", value = "权限设置") public class AuthorizationSettingController implements SimpleGenericEntityController { private AuthorizationSettingService authorizationSettingService; @@ -61,4 +60,27 @@ public AuthorizationSettingService getService() { public ResponseMessage select(@PathVariable String type, @PathVariable String settingFor) { return ResponseMessage.ok(authorizationSettingService.select(type, settingFor)); } + + @GetMapping("/permission/{permissionId}") + @Authorize(action = Permission.ACTION_GET) + @ApiOperation("根据权限ID获取对应的权限配置信息") + public ResponseMessage> selectByPermissionId(@PathVariable String permissionId) { + return ResponseMessage.ok(authorizationSettingService.selectByPermissionId(permissionId)); + } + + @PutMapping("/merge") + @Authorize(action = Permission.ACTION_UPDATE) + @ApiOperation("合并权限信息") + public ResponseMessage mergeSetting(@RequestBody List list) { + authorizationSettingService.mergeSetting(list); + return ResponseMessage.ok(); + } + + @DeleteMapping("/{settingId}/{permissionId}") + @Authorize(action = Permission.ACTION_UPDATE) + @ApiOperation("删除单个权限配置详情") + public ResponseMessage deleteDetail(@PathVariable String settingId, @PathVariable String permissionId) { + authorizationSettingService.deleteDetail(settingId, permissionId); + return ResponseMessage.ok(); + } } From 29e7cb83530bb1f838195c43ac52d34047422663 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 7 Aug 2019 19:13:15 +0800 Subject: [PATCH 35/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization/simple/SimpleAuthorizationSettingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 2a44460e8..0bb355263 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -240,7 +240,7 @@ public List selectByPermissionId(String permissionId List settingIdList = detailEntities .stream() - .map(AuthorizationSettingDetailEntity::getPermissionId) + .map(AuthorizationSettingDetailEntity::getSettingId) .collect(Collectors.toList()); List allSettings = selectByPk(settingIdList) From a7fdd1c0982a7d525702057a56fc9bd3e65d98c0 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Fri, 9 Aug 2019 16:30:31 +0800 Subject: [PATCH 36/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=E5=B7=B2=E7=BB=8F=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=88=99=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/SimpleAuthorizationSettingService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 0bb355263..7da4efe26 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -201,10 +201,12 @@ public void deleteDetail(String settingId, String permissionId) { @CacheEvict(cacheNames = {CacheConstants.USER_AUTH_CACHE_NAME, CacheConstants.USER_MENU_CACHE_NAME}, allEntries = true) public void mergeSetting(List settings) { for (AuthorizationSettingEntity setting : settings) { - if (select(setting.getType(), setting.getSettingFor()) == null) { + AuthorizationSettingEntity old = select(setting.getType(), setting.getSettingFor()); + if (old == null) { insert(setting); continue; } + setting.setId(old.getId()); if (!CollectionUtils.isEmpty(setting.getDetails())) { for (AuthorizationSettingDetailEntity detail : setting.getDetails()) { detail.setSettingId(setting.getId()); From 87d1825028877aff3c20fa669b37d71895c11797 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 13 Aug 2019 11:21:10 +0800 Subject: [PATCH 37/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/SimpleAuthorizationSettingService.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 7da4efe26..8406a8754 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -28,8 +28,10 @@ import org.hswebframework.web.authorization.simple.SimpleUser; import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.commons.entity.DataStatus; +import org.hswebframework.web.commons.entity.QueryEntity; import org.hswebframework.web.commons.entity.TreeSupportEntity; import org.hswebframework.web.commons.entity.factory.EntityFactory; +import org.hswebframework.web.commons.entity.param.QueryParamEntity; import org.hswebframework.web.dao.authorization.AuthorizationSettingDao; import org.hswebframework.web.dao.authorization.AuthorizationSettingDetailDao; import org.hswebframework.web.entity.authorization.*; @@ -203,6 +205,7 @@ public void mergeSetting(List settings) { for (AuthorizationSettingEntity setting : settings) { AuthorizationSettingEntity old = select(setting.getType(), setting.getSettingFor()); if (old == null) { + setting.setStatus(STATUS_ENABLED); insert(setting); continue; } @@ -220,9 +223,18 @@ public void mergeSetting(List settings) { authorizationSettingDetailDao.insert(detail); } } - } else if (!CollectionUtils.isEmpty(setting.getMenus())) { + } + if (!CollectionUtils.isEmpty(setting.getMenus())) { + Set menus = old.getMenus().stream() + .map(AuthorizationSettingMenuEntity::getMenuId) + .collect(Collectors.toSet()); for (AuthorizationSettingMenuEntity menu : setting.getMenus()) { menu.setSettingId(setting.getId()); + if (menus.contains(menu.getMenuId())) { + continue; + } + menu.setStatus(STATUS_ENABLED); + menus.add(menu.getMenuId()); authorizationSettingMenuService.saveOrUpdate(menu); } } From 38e2a649944b5007c7c8bd3dad7240cabf2c1920 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 20 Aug 2019 10:19:10 +0800 Subject: [PATCH 38/47] =?UTF-8?q?=E5=9C=A8action=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0properties=E4=BB=A5=E5=A2=9E=E5=8A=A0=E6=8B=93?= =?UTF-8?q?=E5=B1=95=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hswebframework/web/entity/authorization/ActionEntity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java index 187bffc35..5ea5fed9a 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Getter @@ -22,6 +23,8 @@ public class ActionEntity implements CloneableEntity { private boolean defaultCheck; + private Map properties; + public ActionEntity(String action) { this.action = action; } From 2a663cca7abf5a6d3c4e08367dfc38c44ae4d319 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 22 Aug 2019 10:13:24 +0800 Subject: [PATCH 39/47] openjdk8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3cac36e3e..2a2d6e619 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java sudo: false jdk: - - oraclejdk8 + - openjdk8 before_install: - chmod +x mvnw script: From 0cf4be6fe3a327de4c8bca354a99443c310e6362 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 27 Aug 2019 11:47:57 +0800 Subject: [PATCH 40/47] =?UTF-8?q?=E4=BC=98=E5=8C=96count=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/mybatis/plgins/pager/PagerInterceptor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/PagerInterceptor.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/PagerInterceptor.java index 39d75d326..7d23c02dc 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/PagerInterceptor.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/plgins/pager/PagerInterceptor.java @@ -49,8 +49,14 @@ public Object plugin(Object target) { MetaObject metaStatementHandler = SystemMetaObject.forObject(statementHandler); String sql = statementHandler.getBoundSql().getSql(); Pager pager = Pager.getAndReset(); - String newSql = sql; - if (sql.trim().toLowerCase().startsWith("select")) { + + String lower = sql.trim(); + + if (lower.startsWith("select")) { + if (lower.contains("count(")) { + return Plugin.wrap(target, this); + } + String newSql = sql; if (pager != null) { newSql = EasyOrmSqlBuilder.getInstance() .getActiveDatabase().getDialect() From bb7fb9058c949058f5954c2d4d5945fbbe8419ce Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 27 Aug 2019 11:48:17 +0800 Subject: [PATCH 41/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/SimpleAuthorizationSettingService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 8406a8754..31ad45674 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -213,12 +213,21 @@ public void mergeSetting(List settings) { if (!CollectionUtils.isEmpty(setting.getDetails())) { for (AuthorizationSettingDetailEntity detail : setting.getDetails()) { detail.setSettingId(setting.getId()); + //删除权限信息 + if (Byte.valueOf((byte) -100).equals(detail.getStatus())) { + DefaultDSLDeleteService.createDelete(authorizationSettingDetailDao) + .where(detail::getSettingId) + .and(detail::getPermissionId) + .exec(); + continue; + } int i = DefaultDSLUpdateService .createUpdate(authorizationSettingDetailDao, detail) .where(detail::getSettingId) .and(detail::getPermissionId) .exec(); if (i == 0) { + detail.setStatus(STATUS_ENABLED); detail.setId(IDGenerator.MD5.generate()); authorizationSettingDetailDao.insert(detail); } From 3f9266d735fff5afc3a14e1ae9b3ff5fd4ff94c7 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 27 Aug 2019 15:20:46 +0800 Subject: [PATCH 42/47] #136 --- .../web/service/file/simple/SimpleFileInfoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java index 6fa784bda..34a59c787 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/java/org/hswebframework/web/service/file/simple/SimpleFileInfoService.java @@ -64,7 +64,7 @@ protected int updateByPk(FileInfoEntity entity) { @Override @Caching(evict = { - @CacheEvict(key = "'md5:'+#target.selectByPk(#id).md5"), + @CacheEvict(key = "'md5:'+#result.md5", condition = "#result!=null"), @CacheEvict(key = "'id:'+#id"), @CacheEvict(key = "'id-or-md5:'+#id"), @CacheEvict(key = "'id-or-md5:'+#id") From d1ba1d250df3f517bea497401e3e1d6cf69462c7 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 28 Aug 2019 10:06:40 +0800 Subject: [PATCH 43/47] easyorm 3.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 507b98561..30d12272f 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 1.6.12 5.1.1.Final - 3.0.6-SNAPSHOT + 3.0.6 3.0.2 3.0.2 From 1af8660f52cde3a262d1ae704f04aa9bcd683d44 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 28 Aug 2019 10:09:15 +0800 Subject: [PATCH 44/47] 3.0.9 release --- hsweb-authorization/hsweb-authorization-api/pom.xml | 2 +- hsweb-authorization/hsweb-authorization-basic/pom.xml | 2 +- hsweb-authorization/hsweb-authorization-jwt/pom.xml | 2 +- .../hsweb-authorization-oauth2-auth-server/pom.xml | 2 +- .../hsweb-authorization-oauth2-client/pom.xml | 2 +- .../hsweb-authorization-oauth2-core/pom.xml | 2 +- hsweb-authorization/hsweb-authorization-oauth2/pom.xml | 2 +- hsweb-authorization/pom.xml | 2 +- hsweb-boost/hsweb-boost-aop/pom.xml | 2 +- hsweb-boost/hsweb-boost-excel/pom.xml | 2 +- hsweb-boost/hsweb-boost-ftp/pom.xml | 2 +- hsweb-boost/pom.xml | 2 +- hsweb-commons/hsweb-commons-bean/pom.xml | 2 +- hsweb-commons/hsweb-commons-controller/pom.xml | 2 +- hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml | 2 +- .../hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml | 2 +- hsweb-commons/hsweb-commons-dao/pom.xml | 2 +- hsweb-commons/hsweb-commons-entity/pom.xml | 2 +- hsweb-commons/hsweb-commons-model/pom.xml | 2 +- .../hsweb-commons-service/hsweb-commons-service-api/pom.xml | 2 +- .../hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml | 2 +- .../hsweb-commons-service/hsweb-commons-service-simple/pom.xml | 2 +- hsweb-commons/hsweb-commons-service/pom.xml | 2 +- hsweb-commons/hsweb-commons-utils/pom.xml | 2 +- hsweb-commons/pom.xml | 2 +- hsweb-concurrent/hsweb-concurrent-async-job/pom.xml | 2 +- hsweb-concurrent/hsweb-concurrent-cache/pom.xml | 2 +- .../hsweb-concurrent-counter-api/pom.xml | 2 +- .../hsweb-concurrent-counter-redis/pom.xml | 2 +- hsweb-concurrent/hsweb-concurrent-counter/pom.xml | 2 +- .../hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml | 2 +- .../hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml | 2 +- .../hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml | 2 +- hsweb-concurrent/hsweb-concurrent-lock/pom.xml | 2 +- .../hsweb-concurrent-rate-limiter-api/pom.xml | 2 +- .../hsweb-concurrent-rate-limiter-starter/pom.xml | 2 +- hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml | 2 +- hsweb-concurrent/pom.xml | 2 +- hsweb-core/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-api/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-jta/pom.xml | 2 +- hsweb-datasource/hsweb-datasource-web/pom.xml | 2 +- hsweb-datasource/pom.xml | 2 +- hsweb-logging/hsweb-access-logging-aop/pom.xml | 2 +- hsweb-logging/hsweb-access-logging-api/pom.xml | 2 +- hsweb-logging/pom.xml | 2 +- hsweb-starter/hsweb-spring-boot-starter/pom.xml | 2 +- hsweb-starter/pom.xml | 2 +- .../hsweb-system-authorization-api/pom.xml | 2 +- .../hsweb-system-authorization-local/pom.xml | 2 +- .../hsweb-system-authorization-starter/pom.xml | 2 +- .../hsweb-system-authorization-web/pom.xml | 2 +- hsweb-system/hsweb-system-authorization/pom.xml | 2 +- .../hsweb-system-config/hsweb-system-config-api/pom.xml | 2 +- .../hsweb-system-config/hsweb-system-config-local/pom.xml | 2 +- .../hsweb-system-config/hsweb-system-config-starter/pom.xml | 2 +- .../hsweb-system-config/hsweb-system-config-web/pom.xml | 2 +- hsweb-system/hsweb-system-config/pom.xml | 2 +- .../hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml | 2 +- .../hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml | 2 +- .../hsweb-system-dashboard-starter/pom.xml | 2 +- .../hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml | 2 +- hsweb-system/hsweb-system-dashboard/pom.xml | 2 +- .../hsweb-system-database-manager-api/pom.xml | 2 +- .../hsweb-system-database-manager-local/pom.xml | 2 +- .../hsweb-system-database-manager-starter/pom.xml | 2 +- .../hsweb-system-database-manager-web/pom.xml | 2 +- hsweb-system/hsweb-system-database-manager/pom.xml | 2 +- .../hsweb-system-datasource/hsweb-system-datasource-api/pom.xml | 2 +- .../hsweb-system-datasource-local/pom.xml | 2 +- .../hsweb-system-datasource-starter/pom.xml | 2 +- .../hsweb-system-datasource/hsweb-system-datasource-web/pom.xml | 2 +- hsweb-system/hsweb-system-datasource/pom.xml | 2 +- hsweb-system/hsweb-system-dev-tools/pom.xml | 2 +- .../hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml | 2 +- .../hsweb-system-dictionary-local/pom.xml | 2 +- .../hsweb-system-dictionary-starter/pom.xml | 2 +- .../hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml | 2 +- hsweb-system/hsweb-system-dictionary/pom.xml | 2 +- .../hsweb-system-dynamic-form-api/pom.xml | 2 +- .../hsweb-system-dynamic-form-local/pom.xml | 2 +- .../hsweb-system-dynamic-form-starter/pom.xml | 2 +- .../hsweb-system-dynamic-form-web/pom.xml | 2 +- hsweb-system/hsweb-system-dynamic-form/pom.xml | 2 +- hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml | 2 +- hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml | 2 +- hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml | 2 +- .../hsweb-system-file/hsweb-system-file-starter/pom.xml | 2 +- hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml | 2 +- hsweb-system/hsweb-system-file/pom.xml | 2 +- .../hsweb-system-oauth2-client-api/pom.xml | 2 +- .../hsweb-system-oauth2-client-local/pom.xml | 2 +- .../hsweb-system-oauth2-client-starter/pom.xml | 2 +- .../hsweb-system-oauth2-client-web/pom.xml | 2 +- hsweb-system/hsweb-system-oauth2-client/pom.xml | 2 +- .../hsweb-system-oauth2-server-local/pom.xml | 2 +- .../hsweb-system-oauth2-server-starter/pom.xml | 2 +- .../hsweb-system-oauth2-server-web/pom.xml | 2 +- hsweb-system/hsweb-system-oauth2-server/pom.xml | 2 +- .../hsweb-system-organizational-api/pom.xml | 2 +- .../hsweb-system-organizational-authorization/pom.xml | 2 +- .../hsweb-system-organizational-local/pom.xml | 2 +- .../hsweb-system-organizational-starter/pom.xml | 2 +- .../hsweb-system-organizational-web/pom.xml | 2 +- hsweb-system/hsweb-system-organizational/pom.xml | 2 +- .../hsweb-system-schedule/hsweb-system-schedule-api/pom.xml | 2 +- .../hsweb-system-schedule/hsweb-system-schedule-local/pom.xml | 2 +- .../hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml | 2 +- .../hsweb-system-schedule/hsweb-system-schedule-web/pom.xml | 2 +- hsweb-system/hsweb-system-schedule/pom.xml | 2 +- .../hsweb-system-script/hsweb-system-script-api/pom.xml | 2 +- .../hsweb-system-script/hsweb-system-script-local/pom.xml | 2 +- .../hsweb-system-script/hsweb-system-script-starter/pom.xml | 2 +- .../hsweb-system-script/hsweb-system-script-web/pom.xml | 2 +- hsweb-system/hsweb-system-script/pom.xml | 2 +- .../hsweb-system-template/hsweb-system-template-api/pom.xml | 2 +- .../hsweb-system-template/hsweb-system-template-local/pom.xml | 2 +- .../hsweb-system-template/hsweb-system-template-starter/pom.xml | 2 +- .../hsweb-system-template/hsweb-system-template-web/pom.xml | 2 +- hsweb-system/hsweb-system-template/pom.xml | 2 +- .../hsweb-system-workflow/hsweb-system-workflow-local/pom.xml | 2 +- .../hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml | 2 +- hsweb-system/hsweb-system-workflow/pom.xml | 2 +- hsweb-system/pom.xml | 2 +- hsweb-tests/pom.xml | 2 +- hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml | 2 +- hsweb-thirdparty/pom.xml | 2 +- pom.xml | 2 +- 128 files changed, 128 insertions(+), 128 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/pom.xml b/hsweb-authorization/hsweb-authorization-api/pom.xml index 76f27a76c..a7f73d70d 100644 --- a/hsweb-authorization/hsweb-authorization-api/pom.xml +++ b/hsweb-authorization/hsweb-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-basic/pom.xml b/hsweb-authorization/hsweb-authorization-basic/pom.xml index ee2b07b0f..3f72ae3df 100644 --- a/hsweb-authorization/hsweb-authorization-basic/pom.xml +++ b/hsweb-authorization/hsweb-authorization-basic/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-jwt/pom.xml b/hsweb-authorization/hsweb-authorization-jwt/pom.xml index f23e64809..247cc817d 100644 --- a/hsweb-authorization/hsweb-authorization-jwt/pom.xml +++ b/hsweb-authorization/hsweb-authorization-jwt/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml index 294d46042..745f0c474 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml index 8dd98a02a..a15805d15 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml index 6c6f8dbd3..8a2853628 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml @@ -23,7 +23,7 @@ hsweb-authorization-oauth2 org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml index e00f0f4dd..78ff64215 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml +++ b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-authorization/pom.xml b/hsweb-authorization/pom.xml index 8a7f3f400..c4fe9f768 100644 --- a/hsweb-authorization/pom.xml +++ b/hsweb-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-boost/hsweb-boost-aop/pom.xml b/hsweb-boost/hsweb-boost-aop/pom.xml index 04172d967..877cf5f7d 100644 --- a/hsweb-boost/hsweb-boost-aop/pom.xml +++ b/hsweb-boost/hsweb-boost-aop/pom.xml @@ -23,7 +23,7 @@ hsweb-boost org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-boost/hsweb-boost-excel/pom.xml b/hsweb-boost/hsweb-boost-excel/pom.xml index 2051428a8..80834ca31 100644 --- a/hsweb-boost/hsweb-boost-excel/pom.xml +++ b/hsweb-boost/hsweb-boost-excel/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-boost/hsweb-boost-ftp/pom.xml b/hsweb-boost/hsweb-boost-ftp/pom.xml index 88ad02787..9e29834a5 100644 --- a/hsweb-boost/hsweb-boost-ftp/pom.xml +++ b/hsweb-boost/hsweb-boost-ftp/pom.xml @@ -5,7 +5,7 @@ hsweb-boost org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-boost/pom.xml b/hsweb-boost/pom.xml index 6ddd16170..2830920c6 100644 --- a/hsweb-boost/pom.xml +++ b/hsweb-boost/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-commons/hsweb-commons-bean/pom.xml b/hsweb-commons/hsweb-commons-bean/pom.xml index cf7149add..05cb8cce1 100644 --- a/hsweb-commons/hsweb-commons-bean/pom.xml +++ b/hsweb-commons/hsweb-commons-bean/pom.xml @@ -5,7 +5,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-controller/pom.xml b/hsweb-commons/hsweb-commons-controller/pom.xml index 6159d23ee..b5bac231b 100644 --- a/hsweb-commons/hsweb-commons-controller/pom.xml +++ b/hsweb-commons/hsweb-commons-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml index c2bcc266c..cf804bc4f 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml index a30430461..565e26385 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-dao org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/pom.xml b/hsweb-commons/hsweb-commons-dao/pom.xml index 45739172a..19e5436bf 100644 --- a/hsweb-commons/hsweb-commons-dao/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-entity/pom.xml b/hsweb-commons/hsweb-commons-entity/pom.xml index b45508852..f780e50c9 100644 --- a/hsweb-commons/hsweb-commons-entity/pom.xml +++ b/hsweb-commons/hsweb-commons-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-commons/hsweb-commons-model/pom.xml b/hsweb-commons/hsweb-commons-model/pom.xml index b382a7b19..80bfe853a 100644 --- a/hsweb-commons/hsweb-commons-model/pom.xml +++ b/hsweb-commons/hsweb-commons-model/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml index f04cd8e82..6a2c980ca 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml index 63f2b9447..d595f12a7 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml index 5eb8d43fa..fecbc2112 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml @@ -23,7 +23,7 @@ hsweb-commons-service org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-commons/hsweb-commons-service/pom.xml b/hsweb-commons/hsweb-commons-service/pom.xml index 8d5135c88..79f1dfdbf 100644 --- a/hsweb-commons/hsweb-commons-service/pom.xml +++ b/hsweb-commons/hsweb-commons-service/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-commons/hsweb-commons-utils/pom.xml b/hsweb-commons/hsweb-commons-utils/pom.xml index 1829dfb1d..d4c447eef 100644 --- a/hsweb-commons/hsweb-commons-utils/pom.xml +++ b/hsweb-commons/hsweb-commons-utils/pom.xml @@ -23,7 +23,7 @@ hsweb-commons org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-commons/pom.xml b/hsweb-commons/pom.xml index d38cb0ae4..22610ba32 100644 --- a/hsweb-commons/pom.xml +++ b/hsweb-commons/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml index 2e9b1daa8..1c6183f47 100644 --- a/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-async-job/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml index afaa12304..afebd0fc7 100644 --- a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml index 5c7c3c767..7803f01e7 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml index 482260ff6..b9533cd45 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-counter org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml index 3b0e32e5c..429d08232 100644 --- a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml index a08c822e6..c0a9bd38f 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml index d495882b9..568d7a67c 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml index 76566b102..2555c2b0c 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-lock org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml index 6d665e879..3c65072bf 100644 --- a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml @@ -22,7 +22,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml index 368f253c7..7fcb18df9 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-api/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml index b3bc93a33..09963bf8d 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/hsweb-concurrent-rate-limiter-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent-rate-limiter org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml index 12581c79f..253d1d977 100644 --- a/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml +++ b/hsweb-concurrent/hsweb-concurrent-rate-limiter/pom.xml @@ -5,7 +5,7 @@ hsweb-concurrent org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-concurrent/pom.xml b/hsweb-concurrent/pom.xml index 1a6d4a3a8..749386cf5 100644 --- a/hsweb-concurrent/pom.xml +++ b/hsweb-concurrent/pom.xml @@ -22,7 +22,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml index 5c8f5042c..406ae47b8 100644 --- a/hsweb-core/pom.xml +++ b/hsweb-core/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-datasource/hsweb-datasource-api/pom.xml b/hsweb-datasource/hsweb-datasource-api/pom.xml index fd606c06b..dca7b91be 100644 --- a/hsweb-datasource/hsweb-datasource-api/pom.xml +++ b/hsweb-datasource/hsweb-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-jta/pom.xml b/hsweb-datasource/hsweb-datasource-jta/pom.xml index 50809f66b..f7a68bf26 100644 --- a/hsweb-datasource/hsweb-datasource-jta/pom.xml +++ b/hsweb-datasource/hsweb-datasource-jta/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-datasource/hsweb-datasource-web/pom.xml b/hsweb-datasource/hsweb-datasource-web/pom.xml index 33bd997bb..dadfae60f 100644 --- a/hsweb-datasource/hsweb-datasource-web/pom.xml +++ b/hsweb-datasource/hsweb-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-datasource/pom.xml b/hsweb-datasource/pom.xml index 7b489dd19..609f6fb52 100644 --- a/hsweb-datasource/pom.xml +++ b/hsweb-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-logging/hsweb-access-logging-aop/pom.xml b/hsweb-logging/hsweb-access-logging-aop/pom.xml index 58fa7ed4b..17ca8b404 100644 --- a/hsweb-logging/hsweb-access-logging-aop/pom.xml +++ b/hsweb-logging/hsweb-access-logging-aop/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-logging/hsweb-access-logging-api/pom.xml b/hsweb-logging/hsweb-access-logging-api/pom.xml index a6acb8d9b..212d1abbf 100644 --- a/hsweb-logging/hsweb-access-logging-api/pom.xml +++ b/hsweb-logging/hsweb-access-logging-api/pom.xml @@ -5,7 +5,7 @@ hsweb-logging org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-logging/pom.xml b/hsweb-logging/pom.xml index 6f564187d..e7bf8ffd2 100644 --- a/hsweb-logging/pom.xml +++ b/hsweb-logging/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-starter/hsweb-spring-boot-starter/pom.xml b/hsweb-starter/hsweb-spring-boot-starter/pom.xml index 0527bb90f..2df5acea2 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/pom.xml +++ b/hsweb-starter/hsweb-spring-boot-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-starter org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-starter/pom.xml b/hsweb-starter/pom.xml index b59f205f6..4ddc828c7 100644 --- a/hsweb-starter/pom.xml +++ b/hsweb-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml index bd93b1997..315382cbc 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml index 3fb100057..fda7431cd 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml index 6511e0e93..26450f17d 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml index 7b64ff8f7..cb24b987d 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-authorization org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-authorization/pom.xml b/hsweb-system/hsweb-system-authorization/pom.xml index f732cfc51..4f5f912f9 100644 --- a/hsweb-system/hsweb-system-authorization/pom.xml +++ b/hsweb-system/hsweb-system-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml index 439eb1b0d..b9c05f82b 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml index a1ba081e5..f9e965426 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-local/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml index 1c7e35ad1..7acfa7a66 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-config org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml index c7a456726..66a32efbc 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-web/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-config/pom.xml b/hsweb-system/hsweb-system-config/pom.xml index d591d205c..875d6ac3a 100644 --- a/hsweb-system/hsweb-system-config/pom.xml +++ b/hsweb-system/hsweb-system-config/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml index 4c60a5a9e..4a5df9252 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml index d2789772e..d78ff4dab 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml index cb9c8a041..2249b1341 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml index c3da580bf..de08f7bed 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dashboard org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/pom.xml b/hsweb-system/hsweb-system-dashboard/pom.xml index df63e63f1..cdaae00bf 100644 --- a/hsweb-system/hsweb-system-dashboard/pom.xml +++ b/hsweb-system/hsweb-system-dashboard/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml index 3ac26ba63..6c78dbee5 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml index d2dc9cc13..9a2f1a58f 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml index 75dda8452..be56c1ed6 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml index fd1d91263..9cae658e2 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/pom.xml b/hsweb-system/hsweb-system-database-manager/pom.xml index c077be1d6..29953be86 100644 --- a/hsweb-system/hsweb-system-database-manager/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml index 06d96892d..b8c3ad3af 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml index 75c243484..6e97bce7b 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml index 8fb023e38..6861720ad 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml index ab2cdb610..3c77355cf 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/pom.xml b/hsweb-system/hsweb-system-datasource/pom.xml index b97a4e97f..b2e23106e 100644 --- a/hsweb-system/hsweb-system-datasource/pom.xml +++ b/hsweb-system/hsweb-system-datasource/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml diff --git a/hsweb-system/hsweb-system-dev-tools/pom.xml b/hsweb-system/hsweb-system-dev-tools/pom.xml index 6909a96c9..08d368f94 100644 --- a/hsweb-system/hsweb-system-dev-tools/pom.xml +++ b/hsweb-system/hsweb-system-dev-tools/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml index dffe8c680..0c7846915 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml index 205875d48..6b910ffee 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml index 4ea323199..e72d57fd4 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml index 6eeefbcff..d729b2116 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dictionary org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/pom.xml b/hsweb-system/hsweb-system-dictionary/pom.xml index 5ae857192..f0318f380 100644 --- a/hsweb-system/hsweb-system-dictionary/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml index 691d609e7..b6acd0d02 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml index 8affec2b5..f9207bb0e 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml index 0820b18b5..b09f5bb1f 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml index fce2b6778..f43e6d7dc 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/pom.xml b/hsweb-system/hsweb-system-dynamic-form/pom.xml index bfe537271..5504b867b 100644 --- a/hsweb-system/hsweb-system-dynamic-form/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml index 208eda81e..abbf23739 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml index 090664b9e..9dae56169 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml index 50d780b10..787be16d6 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml index ba4da1bc8..334ef0546 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml index b56d3cf97..4f3d730a3 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-file/pom.xml b/hsweb-system/hsweb-system-file/pom.xml index 89de803aa..d2e2fd94e 100644 --- a/hsweb-system/hsweb-system-file/pom.xml +++ b/hsweb-system/hsweb-system-file/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml index dd8c0dddf..3cb89ae22 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml index 88d66a79b..ffaaafbcf 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml index 3214cd09b..cd6c50fbe 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml index ce327fa09..be439afcb 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/pom.xml b/hsweb-system/hsweb-system-oauth2-client/pom.xml index 44ecfd298..d1fd604ad 100644 --- a/hsweb-system/hsweb-system-oauth2-client/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml index 1bd62a2ce..1f19e844e 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml index 0639c4593..a9fcbbe34 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml index d1c5c3029..76224459c 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/pom.xml b/hsweb-system/hsweb-system-oauth2-server/pom.xml index c5fc93263..c35442dc8 100644 --- a/hsweb-system/hsweb-system-oauth2-server/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/pom.xml @@ -23,7 +23,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml index 31e9fe2e8..135156912 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml index 1a6cc086d..214b9c73e 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml index 95d80c628..e6d88813f 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml index c84b60596..5f9d3b445 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-starter/pom.xml @@ -22,7 +22,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml index 3b4c52221..e2d1d8584 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/pom.xml b/hsweb-system/hsweb-system-organizational/pom.xml index 0ca355258..387a04713 100644 --- a/hsweb-system/hsweb-system-organizational/pom.xml +++ b/hsweb-system/hsweb-system-organizational/pom.xml @@ -22,7 +22,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml index b0bc1e7ad..c9683522a 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml index d5662c2e8..2c4ca5b67 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml index 42eda894a..3b0c45b55 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml index 083bb9959..a5a987d6b 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/pom.xml b/hsweb-system/hsweb-system-schedule/pom.xml index 8e1b34b7d..7d1884269 100644 --- a/hsweb-system/hsweb-system-schedule/pom.xml +++ b/hsweb-system/hsweb-system-schedule/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 pom diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml index 65062552b..b54d99b74 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml index 95dad35d5..9ff5554b6 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml index 7e334dcd8..b32d84afe 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml index 6669522a1..96c9f0b6f 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-script/pom.xml b/hsweb-system/hsweb-system-script/pom.xml index 8ac7900db..5f2acb5b2 100644 --- a/hsweb-system/hsweb-system-script/pom.xml +++ b/hsweb-system/hsweb-system-script/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml index 1e6b61751..52216df2c 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml index 405b77491..0ad7cdb7b 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml index 2acfbd092..aab00dadf 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml index 0a3bbc140..229310780 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-web/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-template/pom.xml b/hsweb-system/hsweb-system-template/pom.xml index 39a2d8007..8a5069806 100644 --- a/hsweb-system/hsweb-system-template/pom.xml +++ b/hsweb-system/hsweb-system-template/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml index 2723b9bbf..a2dd8389e 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml index 8893b2884..c9c9d9a3b 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/pom.xml b/hsweb-system/hsweb-system-workflow/pom.xml index 721ace8d7..f59966684 100644 --- a/hsweb-system/hsweb-system-workflow/pom.xml +++ b/hsweb-system/hsweb-system-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-system/pom.xml b/hsweb-system/pom.xml index ff4b0abc8..b8f73bc3d 100644 --- a/hsweb-system/pom.xml +++ b/hsweb-system/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-tests/pom.xml b/hsweb-tests/pom.xml index 355b37e35..4e5a6a11a 100644 --- a/hsweb-tests/pom.xml +++ b/hsweb-tests/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml index 705631994..c176b6bf7 100644 --- a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml +++ b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml @@ -5,7 +5,7 @@ hsweb-thirdparty org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml 4.0.0 diff --git a/hsweb-thirdparty/pom.xml b/hsweb-thirdparty/pom.xml index aef185e91..bf7142e86 100644 --- a/hsweb-thirdparty/pom.xml +++ b/hsweb-thirdparty/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0.9-SNAPSHOT + 3.0.9 4.0.0 diff --git a/pom.xml b/pom.xml index 30d12272f..b4d178c32 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.hswebframework.web hsweb-framework - 3.0.9-SNAPSHOT + 3.0.9 hsweb-starter hsweb-core From 60e6d4246be0e53049ef461f8c6fd0b715d372ee Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 28 Aug 2019 18:57:16 +0800 Subject: [PATCH 45/47] =?UTF-8?q?=E5=AE=9E=E7=8E=B0ScopeDataAccessConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization/simple/ScopeByUserDataAccessConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java index 832926ea6..c086bd059 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java @@ -3,6 +3,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hswebframework.web.authorization.access.ScopeDataAccessConfig; import org.hswebframework.web.authorization.simple.AbstractDataAccessConfig; import java.util.Set; @@ -14,7 +15,7 @@ @Getter @Setter @ToString -public class ScopeByUserDataAccessConfig extends AbstractDataAccessConfig { +public class ScopeByUserDataAccessConfig extends AbstractDataAccessConfig implements ScopeDataAccessConfig { private static final long serialVersionUID = 6678003761927318688L; @@ -41,4 +42,8 @@ public boolean equals(Object obj) { return obj instanceof ScopeByUserDataAccessConfig && obj.hashCode() == hashCode(); } + public Set getScope(){ + return ((Set) scope); + } + } From bf2bd1e79643536df787d4411967426b163697f3 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 29 Aug 2019 09:37:00 +0800 Subject: [PATCH 46/47] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dscope=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization/simple/ScopeByUserDataAccessConfig.java | 5 +---- .../authorization/simple/handler/ScopeByUserHandler.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java index c086bd059..85bfcfe52 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java @@ -23,7 +23,7 @@ public class ScopeByUserDataAccessConfig extends AbstractDataAccessConfig implem private String scopeTypeName; - private Set scope; + private Set scope; private boolean children; @@ -42,8 +42,5 @@ public boolean equals(Object obj) { return obj instanceof ScopeByUserDataAccessConfig && obj.hashCode() == hashCode(); } - public Set getScope(){ - return ((Set) scope); - } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java index 9da283df1..31ee0d039 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java @@ -130,7 +130,7 @@ protected boolean doUpdateAccess(ScopeByUserDataAccessConfig config, Authorizing @SneakyThrows private ScopeInfo getScope(ScopeByUserDataAccessConfig config, PersonnelAuthentication authentication) { String termType = null, personTermType = "in"; - Set scope = null, allScope = null; + Set scope = null, allScope = null; ScopeInfo scopeInfo = new ScopeInfo(); if (authentication == null) { return scopeInfo; @@ -226,8 +226,8 @@ class ScopeInfo { String termType; String personTermType; - List scope; - List allScope; + List scope; + List allScope; Consumer> notUserConsumer; From 0cf1bfaba00eede823561bb0b1630f88f5b1da34 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 3 Sep 2019 19:54:04 +0800 Subject: [PATCH 47/47] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AuthorizationInitialize?= =?UTF-8?q?Event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthenticationInitializeService.java | 3 +++ .../listener/event/AuthorizationInitializeEvent.java | 12 ++++++++++++ .../simple/SimpleAuthorizationSettingService.java | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationInitializeEvent.java diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/AuthenticationInitializeService.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/AuthenticationInitializeService.java index d33522141..ead0aa821 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/AuthenticationInitializeService.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/AuthenticationInitializeService.java @@ -18,6 +18,8 @@ package org.hswebframework.web.authorization; +import org.hswebframework.web.authorization.listener.event.AuthorizationInitializeEvent; + /** * 授权信息初始化服务接口,使用该接口初始化用的权限信息 * @@ -30,6 +32,7 @@ public interface AuthenticationInitializeService { * * @param userId 用户ID * @return 权限信息 + * @see AuthorizationInitializeEvent */ Authentication initUserAuthorization(String userId); diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationInitializeEvent.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationInitializeEvent.java new file mode 100644 index 000000000..37a412242 --- /dev/null +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/listener/event/AuthorizationInitializeEvent.java @@ -0,0 +1,12 @@ +package org.hswebframework.web.authorization.listener.event; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.hswebframework.web.authorization.Authentication; + +@Getter +@AllArgsConstructor +public class AuthorizationInitializeEvent { + + private Authentication authentication; +} diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 31ad45674..60edfd531 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -22,6 +22,7 @@ import org.hswebframework.web.authorization.AuthenticationInitializeService; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; +import org.hswebframework.web.authorization.listener.event.AuthorizationInitializeEvent; import org.hswebframework.web.authorization.simple.SimpleAuthentication; import org.hswebframework.web.authorization.simple.SimplePermission; import org.hswebframework.web.authorization.simple.SimpleRole; @@ -440,7 +441,7 @@ public Authentication initUserAuthorization(String userId) { .listNoPaging(); authentication.setPermissions(initPermission(detailList)); - + eventPublisher.publishEvent(new AuthorizationInitializeEvent(authentication)); return authentication; }