diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index cd78efaed..1162ee80f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,4 +1,20 @@ -MaxKey v 3.5.17 GA 2023/04/25 +MaxKey v 3.5.18 GA 2023/06/06 + *(MAXKEY-230601) 组织机构和用户同步的REST和SCIM从maxkey-web-mgt中分离到新建maxkey-web-openapi + *(MAXKEY-230602) 腾讯企业邮件接口优化 + *(MAXKEY-230603) 修改认证系统 是否需要验证码的配置 + *(MAXKEY-230604) 同步组织机构和用户API REST新增/.search分页查询功能 + *(MAXKEY-230605) #I76SV6 更正JdbcUsersService的username + *(MAXKEY-230606) 增加一次性动态口令验证功能 + *(MAXKEY-230607) 修改项目介绍信息 + *(MAXKEY-230608) 依赖项引用、更新和升级 + spring 5.3.27 + springBoot 2.7.12 + commonsfileupload 1.5 + poi 5.2.3 + log4j 2.20.0 + tomcat 9.0.75 + +MaxKey v 3.5.17 GA 2023/04/25 *(MAXKEY-230501) 4.0.0开发计划 *(MAXKEY-230502) 增加跳转引导配置inducer参数 *(MAXKEY-230503) 本地开发调试模式baseUrl改为本地地址 @tomsun28 @@ -13,7 +29,7 @@ *(MAXKEY-230512) 用户自定义凭证类型前后端不统一修复 *(MAXKEY-230513) arm架构docker @tzk007 *(MAXKEY-230514) .gitignore优化 @tzk007 - *(MAXKEY-230515) 社区版前端文件统一放在maxkey_frontend下maxkey_html、maxkey_mgt_html，配置文件参见conf下 + *(MAXKEY-230515) 社区版前端文件统一放在maxkey_frontend下maxkey_html、maxkey_mgt_html，配置文件参见conf下 *(MAXKEY-230516) 依赖项引用、更新和升级 spring 5.3.27 springBoot 2.7.11 diff --git a/build.gradle b/build.gradle index 0e939cfbb..5930bccb0 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,6 @@ def libjarsmapper=[ 'maxkey-web-resources' :'lib', 'maxkey-authentication-social' :'maxkey', 'maxkey-web-maxkey' :'maxkey', - 'maxkey-web-api-rest' :'maxkey_mgt', - 'maxkey-web-api-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', 'maxkey-synchronizer' :'maxkey_mgt', 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', @@ -55,7 +53,10 @@ def libjarsmapper=[ 'maxkey-synchronizer-dingtalk' :'maxkey_mgt', 'maxkey-synchronizer-jdbc' :'maxkey_mgt', 'maxkey-synchronizer-workweixin' :'maxkey_mgt', - 'maxkey-synchronizer-reorgdept' :'maxkey_mgt' + 'maxkey-synchronizer-reorgdept' :'maxkey_mgt', + 'maxkey-web-openapi' :'maxkey_openapi', + 'maxkey-web-api-rest' :'maxkey_openapi', + 'maxkey-web-api-scim' :'maxkey_openapi', ] configurations.all { diff --git a/config/build_standard.gradle b/config/build_standard.gradle index e7d18305c..e2822157f 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -46,8 +46,6 @@ def libjarsmapper=[ 'maxkey-web-resources' :'lib', 'maxkey-authentication-social' :'maxkey', 'maxkey-web-maxkey' :'maxkey', - 'maxkey-web-api-rest' :'maxkey_mgt', - 'maxkey-web-api-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', 'maxkey-synchronizer' :'maxkey_mgt', 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', @@ -56,6 +54,9 @@ def libjarsmapper=[ 'maxkey-synchronizer-jdbc' :'maxkey_mgt', 'maxkey-synchronizer-workweixin' :'maxkey_mgt', 'maxkey-synchronizer-reorgdept' :'maxkey_mgt' + 'maxkey-web-openapi' :'maxkey_openapi', + 'maxkey-web-api-rest' :'maxkey_openapi', + 'maxkey-web-api-scim' :'maxkey_openapi', ] configurations.all { @@ -480,6 +481,7 @@ project('maxkey-common') { def paths = ["$rootDir/build/MaxKey-v${project.version}GA", "$rootDir/build/MaxKey-v${project.version}GA/maxkey", "$rootDir/build/MaxKey-v${project.version}GA/maxkey_mgt", + "$rootDir/build/MaxKey-v${project.version}GA/maxkey_openapi", "$rootDir/build/MaxKey-v${project.version}GA/lib"]; //遍历数组，调用createDir闭包，创建目录 paths.forEach(){path-> @@ -502,20 +504,6 @@ project('maxkey-common') { build.configure { finalizedBy copyDepJars } } -//copy Dep Jars to /build/maxkey-depjars,only maxkey-boot-monitor deps -project('maxkey-webs:maxkey-boot-monitor') { - task copyDepJars(type:Copy) { - dependsOn assemble - //项目名 项目所在的group version 版本号 - println "subproject " + project.name + ", group " + project.group +" , version " + project.version - //copy runtime - from configurations.runtimeClasspath - into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_monitor"; - } - - build.configure { finalizedBy copyDepJars } -} - tasks.register("buildRelease") { dependsOn 'copyShellScript','copyWindowsShellScript' diff --git a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle index deb7187ef..2f94f6d3e 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle @@ -51,10 +51,6 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") - - //webapis - implementation project(":maxkey-web-apis:maxkey-web-api-scim") - implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle index c800ec4fb..5d2e4a4b4 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle @@ -52,10 +52,6 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") - - //webapis - implementation project(":maxkey-web-apis:maxkey-web-api-scim") - implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle index bb61e2657..4e09596fb 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle @@ -16,10 +16,6 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") - - //webapis - implementation project(":maxkey-web-apis:maxkey-web-api-scim") - implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer")