diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4b470512f..3b087a840 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -2,10 +2,28 @@ *(MAXKEY-210101) 动态用户组实现优化，增加时间段控制 *(MAXKEY-210102) 官方网站优化，取消加载动态图表；增加统计功能 *(MAXKEY-210103) 优化社交登录的图标 - *(MAXKEY-210104) 语言选择位置调整 - *(MAXKEY-210105) 短信验证码存储Redis修复 - *(MAXKEY-210106) OAuthDetail修复Visible - + *(MAXKEY-210104) 社交账号支持Gitee和微信 + *(MAXKEY-210105) 社交账号绑定列表化，显示绑定时间和最近登录时间，绑定的操作，支持多个OAuth第三方，参见JustAuth + *(MAXKEY-210106) 语言选择位置调整 + *(MAXKEY-210107) 短信验证码存储Redis修复 + *(MAXKEY-210108) OAuthDetail修复Visible + *(MAXKEY-210109) 镜像加速gradle默认使用阿里云aliyun + *(MAXKEY-201025) 依赖jar引用、更新和升级 + spring 5.3.3 + springBoot 2.4.2 + jedis 3.4.1 + druid 1.2.4 + JustAuth 1.15.9 + joda-time 2.10.9 + zxing 3.4.1 + jackson 2.12.1 + guava 30.1-jre + mybatis 3.5.6 + mybatis-spring 2.0.6 + hibernate 6.2.0.Final + jibGradlePlugin 2.7.0 + nimbus-jose-jwt 9.4.1 + tomcat-embed-core 9.0.41 MaxKey v 2.4.0 GA 2021/01/01 *(MAXKEY-201001) 动态用户组实现(基于用户属性或机构) diff --git a/build.gradle b/build.gradle index aeb332bf0..c84982bf8 100644 --- a/build.gradle +++ b/build.gradle @@ -219,7 +219,7 @@ subprojects { compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.6' compile group: 'net.shibboleth.utilities', name: 'java-support', version: '7.5.1' //jose-jwt - compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.0.1' + compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.4.1' compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0' compile group: 'net.minidev', name: 'json-smart', version: '2.3' compile group: 'net.minidev', name: 'asm', version: '1.0.2' @@ -266,24 +266,24 @@ subprojects { compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2' //database compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.21' - compile group: 'com.alibaba', name: 'druid', version: '1.2.1' - compile group: 'com.alibaba', name: 'druid-spring-boot-starter', version: '1.2.1' - compile group: 'redis.clients', name: 'jedis', version: '3.3.0' + compile group: 'com.alibaba', name: 'druid', version: '1.2.4' + compile group: 'com.alibaba', name: 'druid-spring-boot-starter', version: '1.2.4' + compile group: 'redis.clients', name: 'jedis', version: '3.4.1' compile group: 'org.ehcache', name: 'ehcache', version: '3.9.0' //mybatis - compile group: 'org.mybatis', name: 'mybatis', version: '3.5.5' - compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.5' + compile group: 'org.mybatis', name: 'mybatis', version: '3.5.6' + compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.6' //hibernate compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: "${hibernateVersion}" compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: "${hibernateVersion}" compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: "${hibernateVersion}" //usefull - compile group: 'joda-time', name: 'joda-time', version: '2.10.6' + compile group: 'joda-time', name: 'joda-time', version: '2.10.9' compile group: 'org.yaml', name: 'snakeyaml', version: '1.26' compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22' compile group: 'org.jdom', name: 'jdom', version: '2.0.2' - compile group: 'com.google.zxing', name: 'core', version: '3.4.0' - compile group: 'com.google.guava', name: 'guava', version: '29.0-jre' + compile group: 'com.google.zxing', name: 'core', version: '3.4.1' + compile group: 'com.google.guava', name: 'guava', version: '30.1-jre' compile group: 'ognl', name: 'ognl', version: '3.2.14' compile group: 'cglib', name: 'cglib', version: '3.3.0' compile group: 'org.ow2.asm', name: 'asm', version: '7.3.1' @@ -305,7 +305,7 @@ subprojects { compile group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: '3.1.33' //tomcat embed Core Tomcat implementation - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.38' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.41' //JULI logging implementation for embedded Tomcat compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' } diff --git a/gradle.properties b/gradle.properties index 02e6980ab..3743c8175 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ group =maxkey.top -version =2.4.0 +version =2.5.0 vendor =https://www.maxkey.top author =maxkeyTop #Version For use jar log4jVersion =2.14.0 -springVersion =5.3.2 -springBootVersion =2.4.1 +springVersion =5.3.3 +springBootVersion =2.4.2 springSecurityVersion =5.4.2 springDataVersion =2.4.1 springSessionVersion =2.4.1 -hibernateVersion =6.1.5.Final +hibernateVersion =6.2.0.Final slf4jVersion =1.7.30 -jacksonVersion =2.11.2 +jacksonVersion =2.12.1 bouncycastleVersion =1.64 httpcomponentsVersion =4.5.12 poiVersion =4.1.2 -jibGradlePluginVersion =2.6.0 +jibGradlePluginVersion =2.7.0 diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index e47da3534..8e5d98634 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -2,7 +2,7 @@ #application application.title=MaxKey application.name=MaxKey-Mgt -application.formatted-version=v2.4.0 GA +application.formatted-version=v2.5.0 GA #server config #server port server.port=9521 diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties index e128b2d23..71397932e 100644 --- a/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-web-maxkey/src/main/resources/application.properties @@ -2,7 +2,7 @@ #application application.title=MaxKey application.name=MaxKey -application.formatted-version=v2.4.0 GA +application.formatted-version=v2.5.0 GA #server port #server.port=80