diff --git a/maxkey-lib/mybatis-jpa-extra-3.2.2.jar b/maxkey-lib/mybatis-jpa-extra-3.2.2.jar deleted file mode 100644 index 09caf709..00000000 Binary files a/maxkey-lib/mybatis-jpa-extra-3.2.2.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-3.3.0.jar b/maxkey-lib/mybatis-jpa-extra-3.3.0.jar new file mode 100644 index 00000000..4ab74245 Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-3.3.0.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.2.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.2.jar deleted file mode 100644 index e17ea266..00000000 Binary files a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.2.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.3.0.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.3.0.jar new file mode 100644 index 00000000..f8818366 Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.3.0.jar differ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java index 4aec2e5d..2590d210 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java @@ -114,10 +114,9 @@ public class AccountsService extends JpaService{ return this.getMapper().updateStatus(accounts) > 0; } - @Override public boolean remove(String id) { Accounts account = this.get(id); - if (super.remove(id)) { + if (super.delete(id)) { UserInfo loadUserInfo = null; if(provisionService.getApplicationConfig().isProvisionSupport()) { loadUserInfo = userInfoService.findUserRelated(account.getUserId()); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java index aa57e5f4..8a34109a 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java @@ -60,7 +60,7 @@ public class AccountsStrategyService extends JpaService imple } public boolean deleteById(String groupId) { - this.remove(groupId); + this.delete(groupId); //groupMemberService.deleteByGroupId(groupId); return true; } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java index 6214ff4b..f47a90c1 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java @@ -63,7 +63,7 @@ public class GroupMemberService extends JpaService{ public JpaPageResults noMember(GroupMember entity) { - entity.setPageResultSelectUUID(entity.generateId()); + entity.setPageSelectId(entity.generateId()); entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize())); entity.setPageable(true); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java index 622521f7..0d6861a1 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java @@ -70,7 +70,7 @@ public class GroupsService extends JpaService implements Serializable { } public boolean deleteById(String groupId) { - this.remove(groupId); + this.delete(groupId); groupMemberService.deleteByGroupId(groupId); return true; } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java index db08cd58..5a4a525c 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java @@ -92,9 +92,8 @@ public class OrganizationsService extends JpaService{ return getMapper().queryOrgs(organization); } - @Override public boolean delete(Organizations organization) { - if(super.delete(organization)){ + if(super.delete(organization.getId())){ provisionService.send( ProvisionTopic.ORG_TOPIC, organization, ProvisionAction.DELETE_ACTION); return true; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java index e4e05ba9..ebdd1acb 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java @@ -130,14 +130,13 @@ public class UserInfoService extends JpaService { return false; } - @Override public boolean delete(UserInfo userInfo) { UserInfo loadUserInfo = null; if(provisionService.getApplicationConfig().isProvisionSupport()) { loadUserInfo = findUserRelated(userInfo.getId()); } - if( super.delete(userInfo)){ + if( super.delete(userInfo.getId())){ provisionService.send( ProvisionTopic.USERINFO_TOPIC, loadUserInfo, diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java index 90b4fbb6..2c47803d 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java @@ -54,7 +54,7 @@ public class FormBasedDetailsServiceTest { service.insert(formBasedDetails); Thread.sleep(1000); - service.remove(formBasedDetails.getId()); + service.delete(formBasedDetails.getId()); } @@ -74,7 +74,7 @@ public class FormBasedDetailsServiceTest { _logger.info("remove..."); AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setId("921d3377-937a-4578-b1e2-92fb23b5e512"); - service.remove(formBasedDetails.getId()); + service.delete(formBasedDetails.getId()); } diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index b25612ef..1dfd77aa 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -78,7 +78,7 @@ public class AuthorizeBaseEndpoint { account.setAppName(app.getAppName()); if(loadApp.getCredential().equalsIgnoreCase(Apps.CREDENTIALS.USER_DEFINED)){ - account = accountsService.load( Query.builder().eq("appId", loadApp.getId()).eq("userid", userInfo.getId())); + account = accountsService.get( Query.builder().eq("appId", loadApp.getId()).eq("userid", userInfo.getId())); if(account != null){ account.setRelatedPassword( PasswordReciprocal.getInstance().decoder(account.getRelatedPassword())); diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java index 79d0b357..423daa3d 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java @@ -98,7 +98,7 @@ public class RestOrganizationController { @ResponseStatus(HttpStatus.OK) public void delete(@PathVariable final String id) { _logger.debug("Organizations id {} ", id ); - organizationsService.remove(id); + organizationsService.delete(id); } diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java index f6035b9b..c0082c75 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java @@ -101,7 +101,7 @@ public class RestUserInfoController { @ResponseStatus(HttpStatus.OK) public void delete(@PathVariable final String id) { _logger.debug("UserInfo id {} ", id ); - userInfoService.logicDelete(id); + userInfoService.delete(id); } @GetMapping(value = { "/.search" }, produces = {MediaType.APPLICATION_JSON_VALUE}) diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java index 1937ee72..4a7266e5 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java @@ -103,7 +103,7 @@ public class ScimGroupController { @ResponseStatus(HttpStatus.OK) public void delete(@PathVariable final String id) { _logger.debug("ScimGroup id {} " , id); - groupsService.remove(id); + groupsService.delete(id); } @RequestMapping(method = RequestMethod.GET) diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java index db7b22d6..bdb6ce53 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java @@ -96,7 +96,7 @@ public class ScimOrganizationController { @ResponseStatus(HttpStatus.OK) public void delete(@PathVariable final String id) { _logger.debug("ScimOrganization id {}", id ); - organizationsService.remove(id); + organizationsService.delete(id); } @RequestMapping(method = RequestMethod.GET) diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java index f1e17941..3a1783aa 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java @@ -108,7 +108,7 @@ public class ScimUserController { @ResponseStatus(HttpStatus.OK) public void delete(@PathVariable final String id) { _logger.debug("ScimUser id {} ", id ); - userInfoService.remove(id); + userInfoService.delete(id); } @RequestMapping(method = RequestMethod.GET) diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java index 4797afc2..ec790421 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java @@ -93,7 +93,7 @@ public class AppListController { Accounts account = null ; if (credential.equalsIgnoreCase(Apps.CREDENTIALS.USER_DEFINED)) { - account = accountsService.load(Query.builder().eq("appId", appId).eq("userid", currentUser.getId())); + account = accountsService.get(Query.builder().eq("appId", appId).eq("userid", currentUser.getId())); account.setRelatedPassword( PasswordReciprocal.getInstance().decoder( account.getRelatedPassword())); @@ -116,7 +116,7 @@ public class AppListController { @CurrentUser UserInfo currentUser) { Accounts appUsers = new Accounts(); if (credential.equalsIgnoreCase(Apps.CREDENTIALS.USER_DEFINED)) { - appUsers = accountsService.load(Query.builder().eq("appId", account.getAppId()).eq("userid", currentUser.getId())); + appUsers = accountsService.get(Query.builder().eq("appId", account.getAppId()).eq("userid", currentUser.getId())); if (appUsers == null) { appUsers = new Accounts(); appUsers.setId(appUsers.generateId()); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java index 8cb60663..2ca7aabc 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java @@ -81,7 +81,7 @@ public class ProfileController { // } if(StringUtils.isNotBlank(userInfo.getPictureId())) { userInfo.setPicture(fileUploadService.get(userInfo.getPictureId()).getUploaded()); - fileUploadService.remove(userInfo.getPictureId()); + fileUploadService.delete(userInfo.getPictureId()); } if (userInfoService.updateProfile(userInfo) > 0) { diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java index 071c4a7b..96201753 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java @@ -56,7 +56,7 @@ public class SocialSignOnListController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsAssociatesService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/GroupPermissionsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/GroupPermissionsController.java index 5ab6e301..798046a3 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/GroupPermissionsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/GroupPermissionsController.java @@ -16,6 +16,8 @@ package org.dromara.maxkey.web.access.contorller; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.GroupPermissions; @@ -114,7 +116,7 @@ public class GroupPermissionsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (groupPermissionssService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java index 688baba0..ac2ac57a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java @@ -18,6 +18,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -123,7 +125,7 @@ public class ApplicationsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java index cb555581..eae979fc 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java @@ -65,7 +65,7 @@ public class BaseAppContorller { */ if(StringUtils.isNotBlank(application.getIconId())){ application.setIcon(fileUploadService.get(application.getIconId()).getUploaded()); - fileUploadService.remove(application.getIconId()); + fileUploadService.delete(application.getIconId()); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java index 1b6ad684..68258953 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -90,7 +92,7 @@ public class CasDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java index 28caeb6b..4cb7ab97 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -95,7 +97,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public ResponseEntity delete( - @RequestParam("ids") String ids, + @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java index 0123764a..34be009a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -99,7 +101,7 @@ public class FormBasedDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public ResponseEntity delete( - @RequestParam("ids") String ids, + @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (formBasedDetailsService.deleteBatch(ids) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java index 1f8e194c..01d4a03f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -93,7 +95,7 @@ public class JwtDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (jwtDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java index 9efcdbc6..08f48aeb 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; @@ -124,10 +126,10 @@ public class OAuth20DetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public ResponseEntity delete( - @RequestParam("ids") String ids, + @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); - for (String id : StringUtils.split(ids, ",")){ + for (String id : ids){ oauth20JdbcClientDetailsService.removeClientDetails(id); } if (appsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java index 8a993407..7053d109 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.security.KeyStore; import java.security.cert.X509Certificate; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; @@ -132,7 +133,7 @@ public class SAML20DetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public ResponseEntity delete( - @RequestParam("ids") String ids, + @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (saml20DetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { @@ -148,7 +149,7 @@ public class SAML20DetailsController extends BaseAppContorller { if(StringUtils.isNotBlank(samlDetails.getMetaFileId())) { bArrayInputStream = new ByteArrayInputStream( fileUploadService.get(samlDetails.getMetaFileId()).getUploaded()); - fileUploadService.remove(samlDetails.getMetaFileId()); + fileUploadService.delete(samlDetails.getMetaFileId()); } if(StringUtils.isNotBlank(samlDetails.getFileType())){ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java index 4434e9e7..3a41e130 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.apps.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; @@ -106,7 +108,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public ResponseEntity delete( - @RequestParam("ids") String ids, + @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (tokenBasedDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java index 417b99f1..ab22f9e4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.config.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.AccountsStrategy; import org.dromara.maxkey.entity.Message; @@ -105,7 +107,7 @@ public class AccountsStrategyController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (accountsStrategyService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java index 4f1120f4..c8c440be 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.config.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; @@ -95,7 +97,7 @@ public class AdaptersController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsAdaptersService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java index b8a7b544..b3e65ab0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.config.contorller; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; @@ -93,7 +95,7 @@ public class ConnectorsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (connectorsService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java index b4155993..e0d9503f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.config.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Message; @@ -103,7 +105,7 @@ public class SocialsProviderController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsProviderService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java index 941a09b7..6e7a7ca8 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java @@ -91,7 +91,7 @@ public class SynchronizersController { @ResponseBody @RequestMapping(value = {"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids) { + public ResponseEntity delete(@RequestParam("ids") List ids) { logger.debug("-delete ids : {} ", ids); if (synchronizersService.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java index 0a50adb5..554e894c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsAct; @@ -160,7 +162,7 @@ public class AccountsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { _logger.debug("-delete ids : {} " , ids); if (accountsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java index 19300a7c..76a3f6c3 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java @@ -17,6 +17,8 @@ package org.dromara.maxkey.web.idm.contorller; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.GroupMember; @@ -188,7 +190,7 @@ public class GroupMemberController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (service.deleteBatch(ids)) { return new Message(Message.SUCCESS).buildResponse(); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java index 7f31131c..bf63a496 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java @@ -17,6 +17,9 @@ package org.dromara.maxkey.web.idm.contorller; +import java.util.Arrays; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsAct; @@ -131,9 +134,9 @@ public class GroupsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); - ids = ids.replaceAll("ROLE_ALL_USER", "-1").replaceAll("ROLE_ADMINISTRATORS", "-1"); + ids.removeAll(Arrays.asList("ROLE_ALL_USER","ROLE_ADMINISTRATORS","-1")); if (service.deleteBatch(ids)) { systemLog.insert( ConstsEntryType.ROLE, diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java index 1cb83501..aeee328d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java @@ -135,7 +135,7 @@ public class OrganizationsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (organizationsService.deleteBatch(ids)) { systemLog.insert( diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java index 5344ce94..b9a655ad 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java @@ -128,7 +128,7 @@ public class UserInfoController { userInfo.setInstId(currentUser.getInstId()); if(StringUtils.isNotBlank(userInfo.getPictureId())) { userInfo.setPicture(fileUploadService.get(userInfo.getPictureId()).getUploaded()); - fileUploadService.remove(userInfo.getPictureId()); + fileUploadService.delete(userInfo.getPictureId()); } if (userInfoService.insert(userInfo)) { systemLog.insert( @@ -156,7 +156,7 @@ public class UserInfoController { userInfo.setInstId(currentUser.getInstId()); if(StringUtils.isNotBlank(userInfo.getPictureId())) { userInfo.setPicture(fileUploadService.get(userInfo.getPictureId()).getUploaded()); - fileUploadService.remove(userInfo.getPictureId()); + fileUploadService.delete(userInfo.getPictureId()); } if (userInfoService.update(userInfo)) { systemLog.insert( @@ -173,7 +173,7 @@ public class UserInfoController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (userInfoService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index 28cbcd28..9aa92990 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java @@ -123,7 +123,7 @@ public class ResourcesController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (resourcesService.deleteBatch(ids)) { systemLog.insert(