Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	hsweb-concurrent/hsweb-concurrent-cache/pom.xml
#	hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml
#	hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml
#	hsweb-concurrent/pom.xml
#	hsweb-core/pom.xml
#	hsweb-datasource/hsweb-datasource-jta/pom.xml
#	hsweb-examples/pom.xml
#	hsweb-message/hsweb-message-redis/pom.xml
#	hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java
#	hsweb-starter/pom.xml
#	hsweb-tests/pom.xml
#	hsweb-web-bean/pom.xml
#	hsweb-web-controller/pom.xml
#	hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java
#	hsweb-web-controller/src/main/java/org/hsweb/web/controller/login/AuthorizeController.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/annotation/Authorize.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/session/redis/RedisHttpSessionManager.java
#	hsweb-web-core/src/main/java/org/hsweb/web/core/utils/WebUtil.java
#	hsweb-web-dao/hsweb-web-dao-api/pom.xml
#	hsweb-web-dao/hsweb-web-dao-mybatis/README.md
#	hsweb-web-datasource/pom.xml
#	hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java
#	hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml
#	hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml
#	hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml
#	hsweb-web-oauth2/pom.xml
#	hsweb-web-service/hsweb-web-service-simple/pom.xml
#	hsweb-web-starter/pom.xml
#	hsweb-web-starter/src/main/java/org/hsweb/web/starter/SystemInitialize.java
#	hsweb-web-starter/src/main/java/org/hsweb/web/starter/SystemVersion.java
#	hsweb-web-websocket/pom.xml
#	hsweb-web-workflow/pom.xml
#	pom.xml