diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 009a6e29f..6a47cb4ad 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,4 +1,34 @@ -MaxKey v 3.3.0 GA 2022/01/21 +MaxKey v 3.3.1 GA 2022/02/** + *(MAXKEY-220201) 同步器拆分，统一组织在maxkey-synchronizers目录下 + *(MAXKEY-220202) Active Directory同步器优化 + *(MAXKEY-220203) LDAP同步器优化 + *(MAXKEY-220204) 钉钉同步器多组织读取BUG修复 + *(MAXKEY-220205) 新增飞书的同步器 + *(MAXKEY-220206) 修复权限管理的保存错误问题 + *(MAXKEY-220207) 应用扩展属性英文逗号(,)使用ISO8859_1的(#44;)替换，修复多值BUG + *(MAXKEY-220208) WebXss新增属性过滤，优化URL的过滤 + *(MAXKEY-220209) 修复动态角色、动态组、账号策略显示机构名称的无分隔符问题，统一用逗号分隔 + *(MAXKEY-220210) 删除LDAP连接时日志打印密码问题 + *(MAXKEY-220211) LDAP获取条目的字段的详情信息 + *(MAXKEY-220212) 短信验证码SMS发送优化 + *(MAXKEY-220213) 注册地址改为signup + *(MAXKEY-220214) 依赖jar引用、更新和升级 + tomcat 9.0.58 + springBoot 2.6.3 + springSecurity 5.6.1 + springData 2.6.1 + springSession 2.6.1 + springkafka 2.8.2 + jbosslogging 3.4.3.Final + thymeleaf 3.0.14.RELEASE + springbootadmin 2.6.2 + slf4j 1.7.35 + jackson 2.13.1 + woodstox 6.2.8 + nimbusjosejwt 9.16.1 + JustAuth 1.16.5 + +MaxKey v 3.3.0 GA 2022/01/21 *(MAXKEY-220101) 机构管理配置管理 *(MAXKEY-220102) 应用系统名称后台配置及国际化支持 *(MAXKEY-220103) 初步实现国际化存储在数据库 diff --git a/build.gradle b/build.gradle index ae898b5b6..36bbaa3c5 100644 --- a/build.gradle +++ b/build.gradle @@ -406,7 +406,9 @@ subprojects { implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jaxb-annotations', version: "${jacksonVersion}" + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jakarta-xmlbind-annotations', version: "${jacksonVersion}" implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}" + implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}" implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}" //docs implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" diff --git a/config/build_docker.gradle b/config/build_docker.gradle index 17362cc1a..0ca3fcc88 100644 --- a/config/build_docker.gradle +++ b/config/build_docker.gradle @@ -369,7 +369,9 @@ subprojects { implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jaxb-annotations', version: "${jacksonVersion}" + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jakarta-xmlbind-annotations', version: "${jacksonVersion}" implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}" + implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}" implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}" //docs implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" diff --git a/config/build_jar.gradle b/config/build_jar.gradle index 7fe844792..8d48338c9 100644 --- a/config/build_jar.gradle +++ b/config/build_jar.gradle @@ -369,7 +369,9 @@ subprojects { implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jaxb-annotations', version: "${jacksonVersion}" + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jakarta-xmlbind-annotations', version: "${jacksonVersion}" implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}" + implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}" implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}" //docs implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 1495e9261..d5ccb0d20 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -404,7 +404,9 @@ subprojects { implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "${jacksonVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jaxb-annotations', version: "${jacksonVersion}" + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jakarta-xmlbind-annotations', version: "${jacksonVersion}" implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}" + implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}" implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}" //docs implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" diff --git a/gradle.properties b/gradle.properties index a0f7cf045..557e133b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #maxkey properties group =maxkey.top -version =3.3.0 +version =3.3.1 vendor =https://www.maxkey.top author =MaxKeyTop @@ -41,15 +41,15 @@ commonscompressVersion =1.20 log4jVersion =2.17.1 kafkaclientsVersion =2.8.1 poiVersion =5.1.0 -tomcatVersion =9.0.56 +tomcatVersion =9.0.58 tomcatembedloggingjuliVersion =8.5.2 #spring springVersion =5.3.15 -springBootVersion =2.6.2 -springSecurityVersion =5.6.0 -springDataVersion =2.6.0 -springSessionVersion =2.6.0 -springkafkaVersion =2.8.0 +springBootVersion =2.6.3 +springSecurityVersion =5.6.1 +springDataVersion =2.6.1 +springSessionVersion =2.6.1 +springkafkaVersion =2.8.2 springretryVersion =1.3.0 springplugincoreVersion =2.0.0.RELEASE springpluginmetadataVersion =2.0.0.RELEASE @@ -68,7 +68,7 @@ tinkVersion =1.4.0 zxingcoreVersion =3.4.1 concurrentlinkedhashmaplruVersion =1.4.2 #jboss -jbossloggingVersion =3.4.2.Final +jbossloggingVersion =3.4.3.Final hibernateVersion =6.2.0.Final #doc swaggerV3Version =2.1.11 @@ -90,26 +90,27 @@ openwsVersion =1.5.6 xmltoolingVersion =1.4.6 javasupportVersion =7.5.1 #others -thymeleafVersion =3.0.12.RELEASE -springbootadminVersion =2.6.0 +thymeleafVersion =3.0.14.RELEASE +springbootadminVersion =2.6.2 nettyVersion =4.1.66.Final hazelcastVersion =4.2.2 jakartaannotationVersion =2.0.0 jakartavalidationapiVersion =3.0.0 attoparserVersion =2.0.5.RELEASE unbescapeVersion =1.1.6.RELEASE -slf4jVersion =1.7.32 -jacksonVersion =2.12.5 +slf4jVersion =1.7.35 +jacksonVersion =2.13.1 +woodstoxVersion =6.2.8 bouncycastleVersion =1.69 junitVersion =4.11 mockitoallVersion =1.10.19 xmlunitVersion =1.6 -nimbusjosejwtVersion =9.4.1 +nimbusjosejwtVersion =9.16.1 jcipannotationsVersion =1.0 minidevjsonsmartVersion =2.3 minidevasmVersion =1.0.2 simplehttpVersion =1.0.5 -JustAuthVersion =1.16.4 +JustAuthVersion =1.16.5 javassistVersion =3.23.0-GA esapiVersion =2.2.0.0 javaxmailVersion =1.6.2 diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java index d6e402fe5..d384c63aa 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java @@ -232,7 +232,7 @@ public class InitializeContext extends HttpServlet { _logger.info("+ Version {}", WebContext.properties.getProperty("application.formatted-version")); _logger.info("+"); - _logger.info("+ {}Copyright 2018-{} https://www.maxkey.top/", + _logger.info("+ {}Copyright 2018 - {} https://www.maxkey.top/", (char)0xA9 , new DateTime().getYear() ); _logger.info("+ Licensed under the Apache License, Version 2.0 "); diff --git a/maxkey-gataway/src/main/resources/application.yml b/maxkey-gataway/src/main/resources/application.yml index afb9dce09..a8eca9bf7 100644 --- a/maxkey-gataway/src/main/resources/application.yml +++ b/maxkey-gataway/src/main/resources/application.yml @@ -1,7 +1,7 @@ #端口号 application: name: maxkey-gateway-server - formatted-version: v3.3.0 GA + formatted-version: v3.3.1 GA server: port: 9000 spring: diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties index 56afb6718..c1ed615ba 100644 --- a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties @@ -18,7 +18,7 @@ application.title =MaxKey #for dynamic service discovery spring.application.name =maxkey-monitor -application.formatted-version =v3.3.0 GA +application.formatted-version =v3.3.1 GA #nacos discovery spring.cloud.nacos.discovery.enabled =${NACOS_DISCOVERY_ENABLED:false} spring.cloud.nacos.discovery.instance-enabled =false diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties index 89f9864ba..73a242295 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties @@ -16,7 +16,7 @@ #MaxKey Title and Version # ############################################################################ application.title =MaxKey -application.formatted-version =v3.3.0 GA +application.formatted-version =v3.3.1 GA #for dynamic service discovery spring.application.name =maxkey ############################################################################ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties index d9afc3208..8a9e33f84 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties @@ -16,7 +16,7 @@ #MaxKey Title and Version # ############################################################################ application.title =MaxKey-Mgt -application.formatted-version =v3.3.0 GA +application.formatted-version =v3.3.1 GA #for dynamic service discovery spring.application.name =maxkey-mgt ############################################################################