diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index f6b3d9391..aad0c1482 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,12 +1,23 @@ MaxKey v 2.0.0 RC1 2020/**/** *(MAXKEY-200601) RBAC 基于角色的访问控制(Role-Based Access Control )支持 - *(MAXKEY-200602) 主题切换支持 黑色经典|薄荷清新|激情紫荆 - *(MAXKEY-200603) 修复用户组访问权限删除问题 - *(MAXKEY-200604) Javascript验证及AJAX提交优化 - *(MAXKEY-200605) DAO层整合 - *(MAXKEY-200606) 社交账号关联调整 - *(MAXKEY-200607) 数据库表字段的注释修复 - *(MAXKEY-200608) 官方网站优化 + *(MAXKEY-200602) xml配置改为Spring annotation,提升模块间的组件化 + *(MAXKEY-200603) 管理MGT界面优化及增加菜单图标,认证Maxkey主题切换支持-黑色经典|薄荷清新|激情紫荆 + *(MAXKEY-200604) 修复用户组访问权限删除问题 + *(MAXKEY-200605) Javascript验证及AJAX提交优化 + *(MAXKEY-200606) DAO层整合 + *(MAXKEY-200607) 社交账号关联调整 + *(MAXKEY-200608) 数据库表字段的注释修复 + *(MAXKEY-200609) 官方网站优化 + *(MAXKEY-200610) properties优化 + *(MAXKEY-200611) 访问控制修复,访问重定向的问题修复 + *(MAXKEY-200607) 依赖jar升级,消除非必要依赖 + spring 5.2.6.RELEASE + springBoot 2.3.0.RELEASE + springSecurity 5.3.2.RELEASE + jackson 2.11.0 + log4j 2.13.3 + font-awesome 4.7.0 + tomcat-embed 9.0.35 MaxKey v 1.4.0 GA 2020/05/01 *(MAXKEY-200501) 登录错误修复 @@ -36,7 +47,7 @@ MaxKey v 1.4.0 GA 2020/05/01 bootstrap 4.4.1 bootstrap-table v1.16.0 jquery 3.5.0 - + MaxKey v 1.3.0 GA 2020/04/04 *(MAXKEY-200401) 记住登录修复,RememberMe fix *(MAXKEY-200402) 应用账号配置修复 diff --git a/build.gradle b/build.gradle index e3e0eef86..9b957c638 100644 --- a/build.gradle +++ b/build.gradle @@ -284,7 +284,7 @@ subprojects { compile group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: '3.1.33' //tomcat embed - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.29' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.35' compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' } diff --git a/gradle.properties b/gradle.properties index a20ef0e5b..3a8d95c58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,12 @@ version =2.0.0.RELEASE vendor =https://github.com/shimingxy/MaxKey author =shimingxy #Version For use jar -jackson2Version =2.9.8 -log4jVersion =2.13.2 +log4jVersion =2.13.3 springVersion =5.2.6.RELEASE springBootVersion =2.3.0.RELEASE springSecurityVersion =5.3.2.RELEASE hibernateVersion =6.1.2.Final slf4jVersion =1.7.30 -jacksonVersion =2.10.3 +jacksonVersion =2.11.0 bouncycastleVersion =1.64 httpcomponentsVersion =4.5.12