diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index af43247dd..e76e81fe9 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,8 @@ -MaxKey v 2.9.0 GA 2021/08/** +MaxKey v 2.9.0 GA 2021/08/25 *(MAXKEY-210601) 企业微信扫描登录 *(MAXKEY-210602) 钉钉扫描登录 *(MAXKEY-210603) 第三方登录异常问题修复 - *(MAXKEY-210604) 新建maxkey-webs目录，包含maxkey-web-maxkey、maxkey-web-mgt、maxkey-web-resources + *(MAXKEY-210604) 新建maxkey-webs目录，包含maxkey-web-maxkey、maxkey-web-mgt、maxkey-web-resources、maxkey-boot-monitor *(MAXKEY-210605) 静态文件的合并到maxkey-web-resources *(MAXKEY-210606) 腾讯企业邮箱适配器优化 *(MAXKEY-210607) 移除*.xml的spring配置文件 @@ -34,12 +34,38 @@ *(MAXKEY-210633) 登录密码错误n次,n小于设定的次数，后一次登录密码正确，设置密码错误次数为0 *(MAXKEY-210634) CAS参数优化及认证参数bug修复 *(MAXKEY-210635) Redis集群时OAUTH2登录Approval空值bug修复 - *(MAXKEY-210636) 依赖jar引用、更新和升级 - spring 5.3.9 - springBoot 2.5.3 - springSession 2.5.1 - tomcat 9.0.50 - JustAuth 1.16.2 + *(MAXKEY-210636) maxkey-boot-monitor Spring Boot Admin服务监控 + *(MAXKEY-210637) 用户会话管理及优化 + *(MAXKEY-210638) 会话结束事件监听控制管理 + *(MAXKEY-210639) 定时任务功能优化 + *(MAXKEY-210640) 登录时间，注销时间等相关时间不一致修复 + *(MAXKEY-210641) 统一用户在线会话ID和在线令牌 + *(MAXKEY-210642) 字段uid统一改为userid + *(MAXKEY-210643) 依赖jar引用、更新和升级 + spring 5.3.9 + springBoot 2.5.4 + springSession 2.5.2 + springSecurity 2.5.2 + springData 2.5.2 + springkafka 2.7.6 + JustAuth 1.16.3 + kafkaclients 2.6.2 + poi 5.0.0 + tomcat 9.0.52 + gson 2.8.7 + jbosslogging 3.4.2.Final + hibernate 7.0.1.Final + swaggerV3 2.1.10 + knife4j 3.0.3 + druid 1.2.6 + jedis 3.6.3 + ehcache 3.9.5 + slf4j 1.7.32 + jackson 2.12.4 + fastjson 1.2.78 + jodatime 2.10.10 + snakeyaml 1.29 + mybatis-jpa-extra 2.4 MaxKey v 2.8.1 GA 2021/06/25 diff --git a/gradle.properties b/gradle.properties index ad140397c..ec40a9557 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,17 +31,17 @@ freemarkerVersion =2.3.31 xmlbeansVersion =3.0.1 commonscompressVersion =1.20 log4jVersion =2.14.1 -kafkaclientsVersion =2.6.1 -poiVersion =4.1.2 -tomcatVersion =9.0.50 +kafkaclientsVersion =2.6.2 +poiVersion =5.0.0 +tomcatVersion =9.0.52 tomcatembedloggingjuliVersion =8.5.2 #spring springVersion =5.3.9 -springBootVersion =2.5.3 -springSecurityVersion =5.5.1 -springDataVersion =2.5.1 -springSessionVersion =2.5.1 -springkafkaVersion =2.7.1 +springBootVersion =2.5.4 +springSecurityVersion =5.5.2 +springDataVersion =2.5.2 +springSessionVersion =2.5.2 +springkafkaVersion =2.7.6 springretryVersion =1.3.0 springplugincoreVersion =2.0.0.RELEASE springpluginmetadataVersion =2.0.0.RELEASE @@ -52,25 +52,25 @@ springcloudalibabacsplVersion =1.8.2 #google jibGradlePluginVersion =2.7.1 kaptchaVersion =2.3.2 -gsonVersion =2.8.6 +gsonVersion =2.8.7 guavaVersion =30.1.1-jre tinkVersion =1.4.0 zxingcoreVersion =3.4.1 concurrentlinkedhashmaplruVersion =1.4.2 #jboss -jbossloggingVersion =3.4.1.Final -hibernateVersion =6.2.0.Final +jbossloggingVersion =3.4.2.Final +hibernateVersion =7.0.1.Final #doc swaggerVersion =1.6.2 -swaggerV3Version =2.1.6 -knife4jVersion =3.0.2 +swaggerV3Version =2.1.10 +knife4jVersion =3.0.3 #database postgresqlVersion =42.2.20 mysqlconnectorjavaVersion =8.0.21 -druidVersion =1.2.5 -druidspringbootstarterVersion =1.2.5 -jedisVersion =3.6.0 -ehcacheVersion =3.9.0 +druidVersion =1.2.6 +druidspringbootstarterVersion =1.2.6 +jedisVersion =3.6.3 +ehcacheVersion =3.9.5 mybatisVersion =3.5.7 mybatisspringVersion =2.0.6 #saml @@ -87,8 +87,8 @@ jakartaannotationVersion =2.0.0 attoparserVersion =2.0.5.RELEASE unbescapeVersion =1.1.6.RELEASE jhlabsfiltersVersion =2.0.235-1 -slf4jVersion =1.7.30 -jacksonVersion =2.12.1 +slf4jVersion =1.7.32 +jacksonVersion =2.12.4 bouncycastleVersion =1.64 junitVersion =4.11 mockitoallVersion =1.10.19 @@ -98,7 +98,7 @@ jcipannotationsVersion =1.0 minidevjsonsmartVersion =2.3 minidevasmVersion =1.0.2 simplehttpVersion =1.0.3 -JustAuthVersion =1.16.2 +JustAuthVersion =1.16.3 javassistVersion =3.23.0-GA esapiVersion =2.2.0.0 javaxmailVersion =1.6.2 @@ -114,15 +114,15 @@ jaxbcoreVersion =2.3.0.1 jaxbimplVersion =2.3.2 jaxbxjcVersion =2.3.2 classmateVersion =1.5.0 -fastjsonVersion =1.2.74 +fastjsonVersion =1.2.78 reactivestreamsVersion =1.0.3 reactorcoreVersion =3.4.9 reactornettyVersion =1.0.10 reactorextraVersion =3.4.4 szxcvbnVersion =0.2 quartzVersion =2.3.2 -jodatimeVersion =2.10.9 -snakeyamlVersion =1.28 +jodatimeVersion =2.10.10 +snakeyamlVersion =1.29 nekohtmlVersion =1.9.22 ognlVersion =3.2.14 cglibVersion =3.3.0 diff --git a/settings.gradle b/settings.gradle index 2998e4d2b..e765af649 100644 --- a/settings.gradle +++ b/settings.gradle @@ -45,4 +45,4 @@ include 'maxkey-webs:maxkey-web-mgt' //maxkey-boot-monitor include 'maxkey-webs:maxkey-boot-monitor' -include 'maxkey-gataway' +//#include 'maxkey-gataway'