diff --git a/hsweb-authorization/hsweb-authorization-api/pom.xml b/hsweb-authorization/hsweb-authorization-api/pom.xml index 808939785..db7037278 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-basic/pom.xml b/hsweb-authorization/hsweb-authorization-basic/pom.xml index 40acc02b7..18520420c 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-cloud/pom.xml b/hsweb-authorization/hsweb-authorization-cloud/pom.xml index 515c9a232..27b53a1ba 100644 --- a/hsweb-authorization/hsweb-authorization-cloud/pom.xml +++ b/hsweb-authorization/hsweb-authorization-cloud/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-jwt/pom.xml b/hsweb-authorization/hsweb-authorization-jwt/pom.xml index b08fce5d4..a6bba6598 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-ldap/pom.xml b/hsweb-authorization/hsweb-authorization-ldap/pom.xml index 89fa5201b..3abf6b7aa 100644 --- a/hsweb-authorization/hsweb-authorization-ldap/pom.xml +++ b/hsweb-authorization/hsweb-authorization-ldap/pom.xml @@ -5,7 +5,7 @@ hsweb-authorization org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 c6a7f4d99..dfb01ae5c 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-SNAPSHOT + 3.0.0-RC-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 40ef86ec5..9a0336634 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-SNAPSHOT + 3.0.0-RC-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 812fbabc4..25a40e76e 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/hsweb-authorization-oauth2/pom.xml b/hsweb-authorization/hsweb-authorization-oauth2/pom.xml index 79b454dfd..29719f87f 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-authorization/pom.xml b/hsweb-authorization/pom.xml index 5cf748006..2560ab5fd 100644 --- a/hsweb-authorization/pom.xml +++ b/hsweb-authorization/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-aop/pom.xml b/hsweb-boost/hsweb-boost-aop/pom.xml index 1094bc29e..f4c18dea0 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-ftp/pom.xml b/hsweb-boost/hsweb-boost-ftp/pom.xml index c42ba2375..3ebe7bc10 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-api/pom.xml b/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-api/pom.xml index a3ad210bd..7e18dfdba 100644 --- a/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-api/pom.xml +++ b/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-api/pom.xml @@ -23,7 +23,7 @@ hsweb-boost-validator org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-group/pom.xml b/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-group/pom.xml index db9649a6f..a8587ef25 100644 --- a/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-group/pom.xml +++ b/hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-group/pom.xml @@ -5,7 +5,7 @@ hsweb-boost-validator org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/hsweb-boost-validator/pom.xml b/hsweb-boost/hsweb-boost-validator/pom.xml index c2a8d9483..158991e92 100644 --- a/hsweb-boost/hsweb-boost-validator/pom.xml +++ b/hsweb-boost/hsweb-boost-validator/pom.xml @@ -23,7 +23,7 @@ hsweb-boost org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-boost/pom.xml b/hsweb-boost/pom.xml index 7f38287a2..b78b3f745 100644 --- a/hsweb-boost/pom.xml +++ b/hsweb-boost/pom.xml @@ -23,7 +23,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-bean/pom.xml b/hsweb-commons/hsweb-commons-bean/pom.xml index ba99e558d..1b7baa47f 100644 --- a/hsweb-commons/hsweb-commons-bean/pom.xml +++ b/hsweb-commons/hsweb-commons-bean/pom.xml @@ -5,13 +5,15 @@ hsweb-commons org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 hsweb-commons-bean + org.hswebframework.web hsweb-core diff --git a/hsweb-commons/hsweb-commons-controller/pom.xml b/hsweb-commons/hsweb-commons-controller/pom.xml index 70a4cd543..b0c085f37 100644 --- a/hsweb-commons/hsweb-commons-controller/pom.xml +++ b/hsweb-commons/hsweb-commons-controller/pom.xml @@ -23,7 +23,8 @@ hsweb-commons org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 b06adc228..14460a394 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,8 @@ hsweb-commons-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 e684855b2..d3019effd 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,8 @@ hsweb-commons-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-dao/pom.xml b/hsweb-commons/hsweb-commons-dao/pom.xml index 76bc786da..0978de307 100644 --- a/hsweb-commons/hsweb-commons-dao/pom.xml +++ b/hsweb-commons/hsweb-commons-dao/pom.xml @@ -23,7 +23,8 @@ hsweb-commons org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 b11f085de..5fc1bf1aa 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-commons/hsweb-commons-model/pom.xml b/hsweb-commons/hsweb-commons-model/pom.xml index 5f1915cbd..5a41e97e1 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-SNAPSHOT + 3.0.0-RC-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 3f84591be..21ad80984 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,8 @@ hsweb-commons-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 674c94b8d..273194453 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,9 @@ hsweb-commons-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + + ../pom.xml 4.0.0 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 b013834d2..be7bae30c 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,9 @@ hsweb-commons-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml + 4.0.0 diff --git a/hsweb-commons/hsweb-commons-service/pom.xml b/hsweb-commons/hsweb-commons-service/pom.xml index 07318380a..a2a38bbf2 100644 --- a/hsweb-commons/hsweb-commons-service/pom.xml +++ b/hsweb-commons/hsweb-commons-service/pom.xml @@ -23,7 +23,9 @@ hsweb-commons org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + + ../pom.xml 4.0.0 diff --git a/hsweb-commons/hsweb-commons-utils/pom.xml b/hsweb-commons/hsweb-commons-utils/pom.xml index f1cffb148..b5f8a0b25 100644 --- a/hsweb-commons/hsweb-commons-utils/pom.xml +++ b/hsweb-commons/hsweb-commons-utils/pom.xml @@ -23,7 +23,8 @@ hsweb-commons org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/hsweb-commons/pom.xml b/hsweb-commons/pom.xml index f862fd027..5dfd45d55 100644 --- a/hsweb-commons/pom.xml +++ b/hsweb-commons/pom.xml @@ -23,7 +23,8 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 227a4b17b..d235a1a0b 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-cache/pom.xml b/hsweb-concurrent/hsweb-concurrent-cache/pom.xml index 295613597..14c8c8984 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-SNAPSHOT + 3.0.0-RC-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 c4a1a55f5..443a98c34 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-SNAPSHOT + 3.0.0-RC-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 47b0c4f74..6e8454cf9 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-counter/pom.xml b/hsweb-concurrent/hsweb-concurrent-counter/pom.xml index 6a22ece8a..e334f3db5 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-SNAPSHOT + 3.0.0-RC-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 36f2bc0f0..749a852da 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-SNAPSHOT + 3.0.0-RC-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 ae3fdd2ab..b1168642b 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-SNAPSHOT + 3.0.0-RC-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 5539391ad..e633a13ee 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/hsweb-concurrent-lock/pom.xml b/hsweb-concurrent/hsweb-concurrent-lock/pom.xml index d77bebd9e..8bb9c02be 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-concurrent/pom.xml b/hsweb-concurrent/pom.xml index ae6c5c754..982decc95 100644 --- a/hsweb-concurrent/pom.xml +++ b/hsweb-concurrent/pom.xml @@ -22,7 +22,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml index 8931bf6b4..f52591ab3 100644 --- a/hsweb-core/pom.xml +++ b/hsweb-core/pom.xml @@ -5,7 +5,8 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 cb23b63b6..989cbf9f1 100644 --- a/hsweb-datasource/hsweb-datasource-api/pom.xml +++ b/hsweb-datasource/hsweb-datasource-api/pom.xml @@ -5,7 +5,9 @@ hsweb-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + + ../pom.xml 4.0.0 diff --git a/hsweb-datasource/hsweb-datasource-jta/pom.xml b/hsweb-datasource/hsweb-datasource-jta/pom.xml index 17416a6db..caa46e92f 100644 --- a/hsweb-datasource/hsweb-datasource-jta/pom.xml +++ b/hsweb-datasource/hsweb-datasource-jta/pom.xml @@ -5,7 +5,9 @@ hsweb-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml + 4.0.0 diff --git a/hsweb-datasource/hsweb-datasource-web/pom.xml b/hsweb-datasource/hsweb-datasource-web/pom.xml index a28e7522d..176309c21 100644 --- a/hsweb-datasource/hsweb-datasource-web/pom.xml +++ b/hsweb-datasource/hsweb-datasource-web/pom.xml @@ -5,7 +5,9 @@ hsweb-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + + ../pom.xml 4.0.0 diff --git a/hsweb-datasource/pom.xml b/hsweb-datasource/pom.xml index 8d269af85..d213b18c2 100644 --- a/hsweb-datasource/pom.xml +++ b/hsweb-datasource/pom.xml @@ -5,7 +5,9 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + + ../pom.xml 4.0.0 diff --git a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-gateway/pom.xml b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-gateway/pom.xml index e9a20b431..263b92b86 100644 --- a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-gateway/pom.xml +++ b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-gateway/pom.xml @@ -5,7 +5,7 @@ hsweb-examples-cloud org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-service01/pom.xml b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-service01/pom.xml index 04688924b..4402a4724 100644 --- a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-service01/pom.xml +++ b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-service01/pom.xml @@ -5,7 +5,7 @@ hsweb-examples-cloud org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-user-center/pom.xml b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-user-center/pom.xml index 991382377..1b8d583ec 100644 --- a/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-user-center/pom.xml +++ b/hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-user-center/pom.xml @@ -5,7 +5,7 @@ hsweb-examples-cloud org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 @@ -85,7 +85,7 @@ org.hswebframework.web hsweb-spring-boot-starter - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT org.springframework.cloud diff --git a/hsweb-examples/hsweb-examples-cloud/pom.xml b/hsweb-examples/hsweb-examples-cloud/pom.xml index d897de20f..f3ecf1587 100644 --- a/hsweb-examples/hsweb-examples-cloud/pom.xml +++ b/hsweb-examples/hsweb-examples-cloud/pom.xml @@ -5,7 +5,7 @@ hsweb-examples org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-custom-entity/pom.xml b/hsweb-examples/hsweb-examples-custom-entity/pom.xml index 6460b4010..1b1295b4b 100644 --- a/hsweb-examples/hsweb-examples-custom-entity/pom.xml +++ b/hsweb-examples/hsweb-examples-custom-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-examples org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-custom-entity/src/main/resources/custom/mappers/UserMapper.xml b/hsweb-examples/hsweb-examples-custom-entity/src/main/resources/custom/mappers/UserMapper.xml index 91375b69d..a8c7c558f 100644 --- a/hsweb-examples/hsweb-examples-custom-entity/src/main/resources/custom/mappers/UserMapper.xml +++ b/hsweb-examples/hsweb-examples-custom-entity/src/main/resources/custom/mappers/UserMapper.xml @@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -40,7 +40,7 @@ - + diff --git a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-client/pom.xml b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-client/pom.xml index a860fe803..130e021a8 100644 --- a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-client/pom.xml +++ b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-client/pom.xml @@ -23,7 +23,7 @@ hsweb-examples-oauth2 org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/pom.xml b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/pom.xml index d80e196b1..8b0885f46 100644 --- a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/pom.xml +++ b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/pom.xml @@ -23,7 +23,7 @@ hsweb-examples-oauth2 org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java index 21b7911d5..cb38c5c5a 100644 --- a/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java +++ b/hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java @@ -21,6 +21,7 @@ package org.hswebframework.web.example.oauth2; import com.alibaba.fastjson.JSON; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; +import org.hswebframework.web.authorization.entity.*; import org.hswebframework.web.authorization.oauth2.server.entity.OAuth2ClientEntity; import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig; import org.hswebframework.web.commons.entity.DataStatus; diff --git a/hsweb-examples/hsweb-examples-oauth2/pom.xml b/hsweb-examples/hsweb-examples-oauth2/pom.xml index aa64c7878..d1ce07bf3 100644 --- a/hsweb-examples/hsweb-examples-oauth2/pom.xml +++ b/hsweb-examples/hsweb-examples-oauth2/pom.xml @@ -23,7 +23,7 @@ hsweb-examples org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-simple/pom.xml b/hsweb-examples/hsweb-examples-simple/pom.xml index 3528e6164..f57a756a7 100644 --- a/hsweb-examples/hsweb-examples-simple/pom.xml +++ b/hsweb-examples/hsweb-examples-simple/pom.xml @@ -22,7 +22,7 @@ hsweb-examples org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java b/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java index 768d4fcbb..842d32553 100644 --- a/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java +++ b/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java @@ -22,10 +22,9 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import org.hswebframework.web.authorization.Authentication; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; -import org.hswebframework.web.authorization.basic.aop.AopMethodAuthorizeDefinitionCustomizerParser; import org.hswebframework.web.authorization.basic.configuration.EnableAopAuthorize; -import org.hswebframework.web.authorization.basic.define.EmptyAuthorizeDefinition; import org.hswebframework.web.authorization.define.AuthorizeDefinitionInitializedEvent; +import org.hswebframework.web.authorization.entity.*; import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig; import org.hswebframework.web.commons.entity.DataStatus; import org.hswebframework.web.commons.entity.factory.EntityFactory; diff --git a/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java b/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java index 03fc7c554..e5afbf8cb 100644 --- a/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java +++ b/hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java @@ -1,7 +1,6 @@ package org.hswebframework.web.example.simple; import io.swagger.annotations.ApiOperation; -import org.apache.commons.codec.digest.DigestUtils; import org.hswebframework.web.authorization.Authentication; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.annotation.Authorize; @@ -21,7 +20,6 @@ import org.hswebframework.web.service.QueryByEntityService; import org.hswebframework.web.service.QueryService; import org.springframework.web.bind.annotation.*; -import java.util.Base64; import java.util.List; diff --git a/hsweb-examples/hsweb-examples-workflow/pom.xml b/hsweb-examples/hsweb-examples-workflow/pom.xml index b969dbf34..7952c85c2 100644 --- a/hsweb-examples/hsweb-examples-workflow/pom.xml +++ b/hsweb-examples/hsweb-examples-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-examples org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-examples/pom.xml b/hsweb-examples/pom.xml index 8a2932259..213eed462 100644 --- a/hsweb-examples/pom.xml +++ b/hsweb-examples/pom.xml @@ -22,7 +22,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-i18n/hsweb-i18n-cn/pom.xml b/hsweb-i18n/hsweb-i18n-cn/pom.xml deleted file mode 100644 index 2cd015ff7..000000000 --- a/hsweb-i18n/hsweb-i18n-cn/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - hsweb-i18n - org.hswebframework.web - 3.0-SNAPSHOT - - 4.0.0 - - hsweb-i18n-cn - - - \ No newline at end of file diff --git a/hsweb-i18n/hsweb-i18n-cn/src/main/resources/messages_zh_CN.properties b/hsweb-i18n/hsweb-i18n-cn/src/main/resources/messages_zh_CN.properties deleted file mode 100644 index 3671dec8c..000000000 --- a/hsweb-i18n/hsweb-i18n-cn/src/main/resources/messages_zh_CN.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# /* -# * Copyright 2016 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. -# */ -# -error=错误 -decrypt_param_error=解密参数错误 -user_not_exists=用户不存在 -user_is_disabled=用户已禁用 -password_error=密码错误 -private_key_is_null=私钥为空 -verify_code_error=验证码错误 \ No newline at end of file diff --git a/hsweb-i18n/hsweb-i18n-en/pom.xml b/hsweb-i18n/hsweb-i18n-en/pom.xml deleted file mode 100644 index 78862954a..000000000 --- a/hsweb-i18n/hsweb-i18n-en/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - hsweb-i18n - org.hswebframework.web - 3.0-SNAPSHOT - - 4.0.0 - - hsweb-i18n-en - - - \ No newline at end of file diff --git a/hsweb-i18n/hsweb-i18n-en/src/main/resources/messages_en_US.properties b/hsweb-i18n/hsweb-i18n-en/src/main/resources/messages_en_US.properties deleted file mode 100644 index 195e706ba..000000000 --- a/hsweb-i18n/hsweb-i18n-en/src/main/resources/messages_en_US.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# /* -# * Copyright 2016 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. -# */ -# -error=Error -decrypt_param_error=Error in decrypting parameters -user_not_exists=The user does not exist -user_is_disabled=The user is disabled -password_error=Wrong password -private_key_is_null=Private key is empty -verify_code_error=Wrong verification code \ No newline at end of file diff --git a/hsweb-i18n/pom.xml b/hsweb-i18n/pom.xml deleted file mode 100644 index 69a083c2a..000000000 --- a/hsweb-i18n/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - hsweb-framework - org.hswebframework.web - 3.0-SNAPSHOT - - 4.0.0 - - hsweb-i18n - pom - - hsweb-i18n-cn - hsweb-i18n-en - - - - \ No newline at end of file diff --git a/hsweb-logging/hsweb-access-logging-aop/pom.xml b/hsweb-logging/hsweb-access-logging-aop/pom.xml index 0a802cf0b..62219c0d0 100644 --- a/hsweb-logging/hsweb-access-logging-aop/pom.xml +++ b/hsweb-logging/hsweb-access-logging-aop/pom.xml @@ -5,7 +5,8 @@ hsweb-logging org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 209ede34f..369957c51 100644 --- a/hsweb-logging/hsweb-access-logging-api/pom.xml +++ b/hsweb-logging/hsweb-access-logging-api/pom.xml @@ -5,7 +5,8 @@ hsweb-logging org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/hsweb-logging/pom.xml b/hsweb-logging/pom.xml index d452ce72c..a02f42747 100644 --- a/hsweb-logging/pom.xml +++ b/hsweb-logging/pom.xml @@ -23,7 +23,8 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/hsweb-message/hsweb-message-api/pom.xml b/hsweb-message/hsweb-message-api/pom.xml index 7a75483ac..abf3c9c75 100644 --- a/hsweb-message/hsweb-message-api/pom.xml +++ b/hsweb-message/hsweb-message-api/pom.xml @@ -5,7 +5,7 @@ hsweb-message org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-message/hsweb-message-jms/pom.xml b/hsweb-message/hsweb-message-jms/pom.xml index cd74e4440..8628f1a3d 100644 --- a/hsweb-message/hsweb-message-jms/pom.xml +++ b/hsweb-message/hsweb-message-jms/pom.xml @@ -5,7 +5,7 @@ hsweb-message org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-message/hsweb-message-redis/pom.xml b/hsweb-message/hsweb-message-redis/pom.xml index 60bce4d61..4019baa8c 100644 --- a/hsweb-message/hsweb-message-redis/pom.xml +++ b/hsweb-message/hsweb-message-redis/pom.xml @@ -5,7 +5,7 @@ hsweb-message org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-message/hsweb-message-websocket/pom.xml b/hsweb-message/hsweb-message-websocket/pom.xml index e231d4de7..474943627 100644 --- a/hsweb-message/hsweb-message-websocket/pom.xml +++ b/hsweb-message/hsweb-message-websocket/pom.xml @@ -5,7 +5,7 @@ hsweb-message org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-message/pom.xml b/hsweb-message/pom.xml index ecadb011c..ebce36f79 100644 --- a/hsweb-message/pom.xml +++ b/hsweb-message/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-starter/hsweb-spring-boot-starter/pom.xml b/hsweb-starter/hsweb-spring-boot-starter/pom.xml index 64c5f39c5..f769d28c1 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-starter/pom.xml b/hsweb-starter/pom.xml index ae7858331..afbdae31a 100644 --- a/hsweb-starter/pom.xml +++ b/hsweb-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 d0f5d61f4..20e3a274e 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-SNAPSHOT + 3.0.0-RC-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 3196c7604..914be889b 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-SNAPSHOT + 3.0.0-RC-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 185287f7a..d9c724101 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-SNAPSHOT + 3.0.0-RC-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 775d8cc50..f85447947 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 @@ -29,10 +29,5 @@ hsweb-commons-controller ${project.version} - - org.hswebframework.web - hsweb-system-authorization-model - ${project.version} - \ No newline at end of file diff --git a/hsweb-system/hsweb-system-authorization/pom.xml b/hsweb-system/hsweb-system-authorization/pom.xml index e3b19fba2..63dfcb86a 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-controller/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-controller/pom.xml index 41f3235cd..8edb7ca84 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-controller/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-api/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-api/pom.xml index 467f764b1..4446aa786 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-mybatis/pom.xml index 32a4b6209..38697133c 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/pom.xml index 3413d508d..066c5bd34 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-dao/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-entity/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-entity/pom.xml index cfcd5223a..54c413019 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-entity/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-api/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-api/pom.xml index a541ab347..8c2176ec8 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-api/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-simple/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-simple/pom.xml index b2c001359..835fc1549 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-simple/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-service/pom.xml b/hsweb-system/hsweb-system-config/hsweb-system-config-service/pom.xml index be642ac57..37c9c3656 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-service/pom.xml +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-service/pom.xml @@ -23,7 +23,7 @@ hsweb-system-config org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 9f6cc172e..04951926d 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-config/pom.xml b/hsweb-system/hsweb-system-config/pom.xml index aed0a556f..5afafce1e 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-SNAPSHOT + 3.0.0-RC-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 c446ce9f8..077b61a90 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-SNAPSHOT + 3.0.0-RC-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 09917598c..e7f564ffe 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-SNAPSHOT + 3.0.0-RC-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 5d571727f..46b539fd6 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-SNAPSHOT + 3.0.0-RC-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 32ef6efae..19d40c99c 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java index bb5818e5d..60e39e0c2 100644 --- a/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java +++ b/hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java @@ -11,20 +11,16 @@ import org.hswebframework.web.controller.dashboard.model.UserDashBoardResponse; import org.hswebframework.web.controller.message.ResponseMessage; import org.hswebframework.web.dashboard.DashBoardConfigEntity; import org.hswebframework.web.dashboard.DashBoardService; -import org.hswebframework.web.dashboard.executor.DashBoardExecutor; -import org.hswebframework.web.entity.authorization.UserSettingEntity; -import org.hswebframework.web.service.authorization.UserSettingService; +import org.hswebframework.web.authorization.entity.UserSettingEntity; +import org.hswebframework.web.authorization.service.UserSettingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import javax.annotation.PostConstruct; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Objects; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.stream.Collectors; /** diff --git a/hsweb-system/hsweb-system-dashboard/pom.xml b/hsweb-system/hsweb-system-dashboard/pom.xml index 0cca0b312..dd7c23488 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-SNAPSHOT + 3.0.0-RC-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 4df49759f..274ca6416 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-simple/pom.xml b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-simple/pom.xml index 6af7d14c9..faaebfafb 100644 --- a/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-simple/pom.xml +++ b/hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-database-manager org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 4ec4e6340..f8c08ce7d 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-SNAPSHOT + 3.0.0-RC-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 f4a44a57f..d082e4440 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-SNAPSHOT + 3.0.0-RC-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 c988e6220..2ff350e62 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-controller/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-controller/pom.xml index 862dc9563..b959a0d3e 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-controller/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-api/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-api/pom.xml index 8ffcfa6ef..d83bd7351 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-mybatis/pom.xml index b9865fb8e..b8669203d 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/hsweb-system-datasource-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/pom.xml index ea56c5db4..afb5c3b5e 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-entity/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-entity/pom.xml index 344fad35b..8575cd552 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-entity/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-api/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-api/pom.xml index 801011770..1e0f16848 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-api/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-simple/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-simple/pom.xml index 27486465b..98fa74cb0 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/hsweb-system-datasource-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/pom.xml b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/pom.xml index 40cedb79d..aef97a8a8 100644 --- a/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/pom.xml +++ b/hsweb-system/hsweb-system-datasource/hsweb-system-datasource-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-datasource org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 f02a02cb9..b219a89af 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-datasource/pom.xml b/hsweb-system/hsweb-system-datasource/pom.xml index 675a762d3..22a72f284 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 pom diff --git a/hsweb-system/hsweb-system-dev-tools/pom.xml b/hsweb-system/hsweb-system-dev-tools/pom.xml index 2164c5fea..6d31656c0 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-SNAPSHOT + 3.0.0-RC-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 a98b222f3..eabac9745 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-SNAPSHOT + 3.0.0-RC-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 bbf1282c6..ae9f52d24 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-SNAPSHOT + 3.0.0-RC-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 d4e521cb3..b73f72046 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-SNAPSHOT + 3.0.0-RC-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 7e1559ee6..571d2ede4 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dictionary/pom.xml b/hsweb-system/hsweb-system-dictionary/pom.xml index 752763b69..ffb4c1c05 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-controller/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-controller/pom.xml index de8239b70..792b163ec 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-controller/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-api/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-api/pom.xml index d3205d6f0..b83044e5b 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-mybatis/pom.xml index e8bb024b6..308c6ab41 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/pom.xml index b9374df2e..65900e663 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/pom.xml index 96a94fb6c..d45cd03b6 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/pom.xml index d6aa1289b..ecabc99b7 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/pom.xml index 529d8d3b5..592a7ee31 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/pom.xml index bfa2b928a..eaa2b0e60 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/pom.xml +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-dynamic-form org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 9e5b51bfe..1b1bc0cdc 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-dynamic-form/pom.xml b/hsweb-system/hsweb-system-dynamic-form/pom.xml index c10537bbf..20950a583 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml index bb168822c..a0d527c0f 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml index 99d949092..ea5e545db 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml index 4b8ba5ccc..c1e23d871 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/hsweb-system-file-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml index 7c8c54866..6844fe360 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml index 062f51e03..e37544f69 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml index 4696a3357..f319fe3e0 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml index a7fed49d5..1831c8d72 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-oauth2/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml index 97f505c32..76e3f7e77 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-service/hsweb-system-file-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml b/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml index f84f2c5f3..f1615dcfc 100644 --- a/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml +++ b/hsweb-system/hsweb-system-file/hsweb-system-file-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-file org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 7f4b0bede..6de142379 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-file/pom.xml b/hsweb-system/hsweb-system-file/pom.xml index d22ebda4a..0942b703d 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-monitor/pom.xml b/hsweb-system/hsweb-system-monitor/pom.xml index e078b788d..f5ea83605 100644 --- a/hsweb-system/hsweb-system-monitor/pom.xml +++ b/hsweb-system/hsweb-system-monitor/pom.xml @@ -5,7 +5,7 @@ hsweb-system org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-controller/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-controller/pom.xml index fe6a6d4fa..c503e8325 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-controller/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-api/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-api/pom.xml index 86df6ecc4..d128d24e6 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-client-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-mybatis/pom.xml index 4d9578c22..c6cb476a8 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/hsweb-system-oauth2-client-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-client-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/pom.xml index 2bca8d392..eaeecf447 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-entity/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-entity/pom.xml index 44c5d87ec..d5bfabfe4 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-entity/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/pom.xml index e2614b74c..a415efb2b 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/pom.xml @@ -21,7 +21,7 @@ hsweb-system-oauth2-client-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-simple/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-simple/pom.xml index 425e6ec07..93e7820f8 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-system-oauth2-client-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/pom.xml b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/pom.xml index ce1952d97..d9560ef78 100644 --- a/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/pom.xml @@ -21,7 +21,7 @@ hsweb-system-oauth2-client org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 d9f20795f..d444652b2 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-SNAPSHOT + 3.0.0-RC-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 1906c5503..bf7cb63d9 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml index a70b46f3f..b40d94c71 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml index f8e1799b8..48a7b90cc 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml index 9ff9c6311..b48a5c3d3 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml index 2ee857d71..e93b67342 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-entity/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-entity/pom.xml index e04808875..a8346f4c5 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-entity/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml index f766170fe..4528e0f49 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml index c1b9c5537..96fc5b011 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml @@ -23,7 +23,7 @@ hsweb-system-oauth2-server org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/service/oauth2/server/simple/SimplePasswordService.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/service/oauth2/server/simple/SimplePasswordService.java index cd963c37f..392cb4228 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/service/oauth2/server/simple/SimplePasswordService.java +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/service/oauth2/server/simple/SimplePasswordService.java @@ -19,8 +19,8 @@ package org.hswebframework.web.service.oauth2.server.simple; import org.hswebframework.web.authorization.oauth2.server.support.password.PasswordService; -import org.hswebframework.web.entity.authorization.UserEntity; -import org.hswebframework.web.service.authorization.UserService; +import org.hswebframework.web.authorization.entity.UserEntity; +import org.hswebframework.web.authorization.service.UserService; /** * @author zhouhao 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 20a6e990b..64a70d798 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/java/org/hswebframework/web/oauth2/OAuth2GranterAutoConfiguration.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/java/org/hswebframework/web/oauth2/OAuth2GranterAutoConfiguration.java index d25340acc..4ca8203e3 100644 --- a/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/java/org/hswebframework/web/oauth2/OAuth2GranterAutoConfiguration.java +++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/java/org/hswebframework/web/oauth2/OAuth2GranterAutoConfiguration.java @@ -39,7 +39,7 @@ import org.hswebframework.web.commons.entity.factory.EntityFactory; import org.hswebframework.web.dao.oauth2.AuthorizationCodeDao; import org.hswebframework.web.dao.oauth2.OAuth2AccessDao; import org.hswebframework.web.dao.oauth2.OAuth2ClientDao; -import org.hswebframework.web.service.authorization.UserService; +import org.hswebframework.web.authorization.service.UserService; import org.hswebframework.web.service.oauth2.server.simple.*; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hsweb-system/hsweb-system-oauth2-server/pom.xml b/hsweb-system/hsweb-system-oauth2-server/pom.xml index fc56c5c0f..00a3aab66 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-SNAPSHOT + 3.0.0-RC-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 caff0bbcf..672307a91 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationSettingTypeSupplier.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationSettingTypeSupplier.java index e592c6335..843737f96 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationSettingTypeSupplier.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationSettingTypeSupplier.java @@ -1,8 +1,7 @@ package org.hswebframework.web.organizational.authorization; -import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier; +import org.hswebframework.web.authorization.service.AuthorizationSettingTypeSupplier; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import java.util.HashSet; import java.util.Set; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/pom.xml index d6f4befca..6c7d8e333 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-controller/pom.xml @@ -22,7 +22,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-api/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-api/pom.xml index a4b7c4455..84d38c04f 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-organizational-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/pom.xml index 199f74e09..a8f801e9b 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/hsweb-system-organizational-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-system-organizational-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/pom.xml index 539ce240d..da65f4195 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/pom.xml index bd092dda5..c7ca687d7 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/pom.xml index 950987414..cde1afe1a 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-api/pom.xml @@ -21,7 +21,7 @@ hsweb-system-organizational-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml index a89fcdd72..074313a94 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-system-organizational-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java index a0dd1fcd1..2f1f7c7b7 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java @@ -20,7 +20,7 @@ import org.hswebframework.web.commons.entity.DataStatus; import org.hswebframework.web.commons.entity.TreeSupportEntity; import org.hswebframework.web.dao.dynamic.QueryByEntityDao; import org.hswebframework.web.dao.organizational.*; -import org.hswebframework.web.entity.authorization.UserEntity; +import org.hswebframework.web.authorization.entity.UserEntity; import org.hswebframework.web.entity.organizational.*; import org.hswebframework.web.id.IDGenerator; import org.hswebframework.web.organizational.authorization.*; @@ -30,7 +30,7 @@ import org.hswebframework.web.organizational.authorization.relation.SimpleRelati import org.hswebframework.web.organizational.authorization.simple.*; import org.hswebframework.web.service.DefaultDSLQueryService; import org.hswebframework.web.service.GenericEntityService; -import org.hswebframework.web.service.authorization.UserService; +import org.hswebframework.web.authorization.service.UserService; import org.hswebframework.web.service.organizational.*; import org.hswebframework.web.service.organizational.event.ClearPersonCacheEvent; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/pom.xml index c648c13d3..22f68995c 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/pom.xml @@ -21,7 +21,7 @@ hsweb-system-organizational org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 5432ac4cc..3ed13772c 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-organizational/pom.xml b/hsweb-system/hsweb-system-organizational/pom.xml index a1ff209cf..e98f57f08 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-controller/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-controller/pom.xml index 1f1cbf1f4..e2c418d22 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-controller/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-api/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-api/pom.xml index 7290ac1c0..fe202916d 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-mybatis/pom.xml index 5b8b38787..05cfc3538 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/hsweb-system-schedule-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/pom.xml index ec9b4bc81..6f590bcea 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-entity/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-entity/pom.xml index 224514cbe..877fb45f9 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-entity/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-api/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-api/pom.xml index 325fdfc95..5781b44b3 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-api/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-simple/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-simple/pom.xml index a99a0321e..d3bcde966 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/hsweb-system-schedule-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/pom.xml b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/pom.xml index 1611dc3fa..f6976a6e3 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/pom.xml +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-schedule org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 d615d3c7c..37f023e7e 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-schedule/pom.xml b/hsweb-system/hsweb-system-schedule/pom.xml index 0a24e158e..f7919fdf2 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 pom diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-controller/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-controller/pom.xml index 489eec20c..c84e49ee4 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-controller/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-api/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-api/pom.xml index 2a8c51d93..221583346 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-mybatis/pom.xml index cbe302aa1..ca3c26913 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/hsweb-system-script-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/pom.xml index 307682cd7..65563bb36 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-dao/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-entity/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-entity/pom.xml index 8afbd60aa..32e998b40 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-entity/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-api/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-api/pom.xml index a065b791f..df2123b25 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-api/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-simple/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-simple/pom.xml index 3e108774f..eebe1165a 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-service/hsweb-system-script-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/hsweb-system-script-service/pom.xml b/hsweb-system/hsweb-system-script/hsweb-system-script-service/pom.xml index f2041b9ea..1b73eca6c 100644 --- a/hsweb-system/hsweb-system-script/hsweb-system-script-service/pom.xml +++ b/hsweb-system/hsweb-system-script/hsweb-system-script-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-script org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 d6ffb6d8b..b51c18a50 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-script/pom.xml b/hsweb-system/hsweb-system-script/pom.xml index 7cf4119ec..757e96e7a 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-controller/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-controller/pom.xml index 0240903aa..e0c154207 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-controller/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-api/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-api/pom.xml index f370e8c23..e936b837f 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-mybatis/pom.xml index 52b4b883e..2ffb6e8df 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/hsweb-system-template-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/pom.xml index 88a60c0a9..a909603da 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-dao/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-dao/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-entity/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-entity/pom.xml index 533c52fbb..bc77f32e5 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-entity/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-entity/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-api/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-api/pom.xml index 5c980680c..5bbb598ef 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-api/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-simple/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-simple/pom.xml index f0ffe3fe3..f578c0f6e 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/hsweb-system-template-service/pom.xml b/hsweb-system/hsweb-system-template/hsweb-system-template-service/pom.xml index 6987f60bc..d40be65e0 100644 --- a/hsweb-system/hsweb-system-template/hsweb-system-template-service/pom.xml +++ b/hsweb-system/hsweb-system-template/hsweb-system-template-service/pom.xml @@ -5,7 +5,7 @@ hsweb-system-template org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-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 5bda0b58f..fc5bdb0b9 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-template/pom.xml b/hsweb-system/hsweb-system-template/pom.xml index 5a8c9c38e..3c58fb84a 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-api/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-api/pom.xml index 1e1f24801..eeae0aa8f 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-api/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-api/pom.xml @@ -23,7 +23,7 @@ hsweb-system-workflow-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-mybatis/pom.xml index 176bb10b1..ef28bb699 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-mybatis/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-mybatis/pom.xml @@ -23,7 +23,7 @@ hsweb-system-workflow-dao org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/pom.xml index 9b011d905..50ef46369 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/pom.xml @@ -23,7 +23,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/pom.xml index fda6f6afe..d7fbc01f2 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/pom.xml @@ -23,7 +23,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml index 8288b3560..074cf2c03 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml @@ -5,7 +5,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/FlowableAutoConfiguration.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/FlowableAutoConfiguration.java index de67cc422..8fbb8f377 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/FlowableAutoConfiguration.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/FlowableAutoConfiguration.java @@ -2,7 +2,7 @@ package org.hswebframework.web.workflow.flowable; import org.activiti.engine.impl.interceptor.SessionFactory; import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer; -import org.hswebframework.web.service.authorization.UserService; +import org.hswebframework.web.authorization.service.UserService; import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManager; import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManagerFactory; import org.hswebframework.web.workflow.flowable.utils.CustomUserEntityManager; diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/ActivitiUserUtil.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/ActivitiUserUtil.java index a1779ab9c..1ebcfe1ea 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/ActivitiUserUtil.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/ActivitiUserUtil.java @@ -3,7 +3,7 @@ package org.hswebframework.web.workflow.flowable.utils; import org.activiti.engine.identity.Group; import org.activiti.engine.impl.persistence.entity.GroupEntity; import org.activiti.engine.impl.persistence.entity.UserEntity; -import org.hswebframework.web.entity.authorization.RoleEntity; +import org.hswebframework.web.authorization.entity.RoleEntity; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; * @Date 2017/8/3. */ public class ActivitiUserUtil { - public static UserEntity toActivitiUser(org.hswebframework.web.entity.authorization.UserEntity bUser) { + public static UserEntity toActivitiUser(org.hswebframework.web.authorization.entity.UserEntity bUser) { UserEntity userEntity = new UserEntity(); userEntity.setId(bUser.getId()); userEntity.setFirstName(bUser.getUsername()); diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomGroupEntityManager.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomGroupEntityManager.java index 02c4c1480..c7f206471 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomGroupEntityManager.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomGroupEntityManager.java @@ -5,14 +5,11 @@ import org.activiti.engine.impl.GroupQueryImpl; import org.activiti.engine.impl.Page; import org.activiti.engine.impl.persistence.entity.GroupEntity; import org.activiti.engine.impl.persistence.entity.GroupEntityManager; -import org.hswebframework.web.entity.authorization.RoleEntity; -import org.hswebframework.web.service.authorization.UserService; -import org.springframework.beans.factory.annotation.Autowired; +import org.hswebframework.web.authorization.entity.RoleEntity; +import org.hswebframework.web.authorization.service.UserService; import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class CustomGroupEntityManager extends GroupEntityManager { diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java index adacba3ed..3ab2f718e 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java @@ -6,13 +6,11 @@ import org.activiti.engine.impl.UserQueryImpl; import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity; import org.activiti.engine.impl.persistence.entity.UserEntity; import org.activiti.engine.impl.persistence.entity.UserEntityManager; -import org.hswebframework.web.entity.authorization.RoleEntity; -import org.hswebframework.web.service.authorization.UserService; +import org.hswebframework.web.authorization.entity.RoleEntity; +import org.hswebframework.web.authorization.service.UserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.stereotype.Service; import java.util.List; @@ -31,7 +29,7 @@ public class CustomUserEntityManager extends UserEntityManager { return null; } try { - org.hswebframework.web.entity.authorization.UserEntity user = userService.selectByPk(userId); + org.hswebframework.web.authorization.entity.UserEntity user = userService.selectByPk(userId); return ActivitiUserUtil.toActivitiUser(user); } catch (EmptyResultDataAccessException e) { return null; diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-api/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-api/pom.xml index cc58420e4..732a88051 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-api/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-api/pom.xml @@ -21,7 +21,7 @@ hsweb-system-workflow-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml index ba4a163c3..d80bf1118 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-system-workflow-service org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/pom.xml b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/pom.xml index 2c1334b34..776a46faa 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/pom.xml +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/pom.xml @@ -21,7 +21,7 @@ hsweb-system-workflow org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 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 84bbb8cd9..f87760697 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/hsweb-system-workflow/pom.xml b/hsweb-system/hsweb-system-workflow/pom.xml index 77d1c2b75..4070ca043 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-system/pom.xml b/hsweb-system/pom.xml index 439824088..0e3fa9377 100644 --- a/hsweb-system/pom.xml +++ b/hsweb-system/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-tests/pom.xml b/hsweb-tests/pom.xml index 9a84e29fa..5672085d3 100644 --- a/hsweb-tests/pom.xml +++ b/hsweb-tests/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml b/hsweb-thirdparty/hsweb-thirdparty-ueditor/pom.xml index 9797b82ad..4fc70e978 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-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/hsweb-thirdparty/pom.xml b/hsweb-thirdparty/pom.xml index e683d4ebb..159652a1d 100644 --- a/hsweb-thirdparty/pom.xml +++ b/hsweb-thirdparty/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hswebframework.web - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 651dd16ab..d0b0ae889 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.hswebframework.web hsweb-framework - 3.0-SNAPSHOT + 3.0.0-RC-SNAPSHOT hsweb-starter hsweb-core @@ -34,7 +34,6 @@ hsweb-tests hsweb-datasource hsweb-commons - hsweb-i18n hsweb-logging hsweb-concurrent hsweb-examples