diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6766553b4..39ea482b9 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -21,13 +21,16 @@ *(MAXKEY-210720) Jira SAML集成指南 *(MAXKEY-210721) 官方网站内容的优化，增加同类产品的比较，用户构建指南，完善集成应用列表 *(MAXKEY-210722) 日志信息的完善，包括登录过程日志，初始化日志，单点登录日志等 - *(MAXKEY-210723) mgt登录错误提示信息 - *(MAXKEY-210724) 依赖jar引用、更新和升级 + *(MAXKEY-210723) mgt登录错误提示信息 + *(MAXKEY-210724) 警告提示信息修复 + *(MAXKEY-210725) 工具类增强和优化 + *(MAXKEY-210726) 依赖jar引用、更新和升级 spring 5.3.10 springBoot 2.5.5 springkafka 2.7.7 spring-cloud 3.0.4 springcloudalibabacspl 1.8.2 + mybatis-jpa-extra 2.5 tomcat 9.0.53 kafkaclients 2.8.1 jibGradlePlugin 3.1.4 diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java index c78a0bd04..c8009f862 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java @@ -51,7 +51,7 @@ public class ScimOrganizationController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) public MappingJacksonValue getOrganization(@PathVariable String id, @RequestParam(required = false) String attributes) { - Organization user = null; + //Organization user = null; return null; } diff --git a/maxkey-lib/mybatis-jpa-extra-2.4.jar b/maxkey-lib/mybatis-jpa-extra-2.4.jar deleted file mode 100644 index 472c458e2..000000000 Binary files a/maxkey-lib/mybatis-jpa-extra-2.4.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-2.5.jar b/maxkey-lib/mybatis-jpa-extra-2.5.jar new file mode 100644 index 000000000..dd7986829 Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-2.5.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.4.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.5.jar similarity index 72% rename from maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.4.jar rename to maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.5.jar index 4ae8f8f59..464e92251 100644 Binary files a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.4.jar and b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.5.jar differ diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java index 2ffe25727..af12afc64 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -40,6 +40,7 @@ import org.opensaml.common.binding.security.IssueInstantRule; import org.opensaml.common.binding.security.MessageReplayRule; import org.opensaml.util.storage.MapBasedStorageService; import org.opensaml.util.storage.ReplayCache; +import org.opensaml.util.storage.ReplayCacheEntry; import org.opensaml.xml.ConfigurationException; import org.opensaml.xml.parse.BasicParserPool; import org.slf4j.Logger; @@ -195,7 +196,7 @@ public class Saml20AutoConfiguration implements InitializingBean { * @return replayCache */ @Bean(name = "replayCache") - public ReplayCache replayCache(MapBasedStorageService mapBasedStorageService, + public ReplayCache replayCache(MapBasedStorageService mapBasedStorageService, @Value("${maxkey.saml.v20.replay.cache.life.in.millis}") long duration) { ReplayCache replayCache = new ReplayCache(mapBasedStorageService,duration); return replayCache; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java index 29ffa9130..95647b5dc 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java @@ -139,7 +139,7 @@ public class AdaptersController { public Message delete(@ModelAttribute("appsAdapter") AppsAdapters appsAdapter) { _logger.debug("-delete appsAdapter :" + appsAdapter); - if (appsAdaptersService.remove(appsAdapter.getId())) { + if (appsAdaptersService.batchDelete(appsAdapter.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java index d29b9216f..69c188d57 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java @@ -157,7 +157,7 @@ public class ApplicationsController extends BaseAppContorller { @RequestMapping(value={"/delete"}) public Message delete(@ModelAttribute("application") Apps application) { _logger.debug("-delete application :" + application); - if (appsService.delete(application)) { + if (appsService.batchDelete(application.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java index d50b9838a..10c466fd0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java @@ -135,10 +135,7 @@ public class AccountsController { _logger.debug("-delete AppAccounts :" + appAccounts); - String[] appAccountsds=appAccounts.getId().split(","); - for(int i=0;i