admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

update mybatis-jpa-extra-3.3.0

Browse Source
This commit is contained in:
MaxKey 2024-07-09 20:35:42 +08:00
parent 0199445c51
commit 451c6fc92e
41 changed files with 76 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
maxkey-lib/mybatis-jpa-extra-3.2.2.jar
View File

Binary file not shown.

BIN
maxkey-lib/mybatis-jpa-extra-3.3.0.jar Normal file
View File

Binary file not shown.

BIN
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.2.jar
View File

Binary file not shown.

BIN
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.3.0.jar Normal file
View File

Binary file not shown.

3
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java
View File

@ -114,10 +114,9 @@ public class AccountsService extends JpaService<Accounts>{
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());

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java
View File

@ -60,7 +60,7 @@ public class AccountsStrategyService extends JpaService<AccountsStrategy> imple
}
public boolean deleteById(String groupId) {
this.remove(groupId);
this.delete(groupId);
//groupMemberService.deleteByGroupId(groupId);
return true;
}

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java
View File

@ -63,7 +63,7 @@ public class GroupMemberService extends JpaService<GroupMember>{
public JpaPageResults<Groups> noMember(GroupMember entity) {
entity.setPageResultSelectUUID(entity.generateId());
entity.setPageSelectId(entity.generateId());
entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize()));
entity.setPageable(true);

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java
View File

@ -70,7 +70,7 @@ public class GroupsService extends JpaService<Groups> implements Serializable {
}
public boolean deleteById(String groupId) {
this.remove(groupId);
this.delete(groupId);
groupMemberService.deleteByGroupId(groupId);
return true;
}

3
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java
View File

@ -92,9 +92,8 @@ public class OrganizationsService extends JpaService<Organizations>{
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;

3
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java
View File

@ -130,14 +130,13 @@ public class UserInfoService extends JpaService<UserInfo> {
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,

4
maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java
View File

@ -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());
}

2
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java
View File

@ -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()));

2
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java
View File

@ -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);
}

2
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java
View File

@ -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})

2
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java
View File

@ -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)

2
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java
View File

@ -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)

2
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java
View File

@ -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)

4
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java
View File

@ -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());

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java
View File

@ -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) {

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (socialsAssociatesService.deleteBatch(ids)) {
return new Message<Apps>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/GroupPermissionsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {}" , ids);
if (groupPermissionssService.deleteBatch(ids)) {
return new Message<GroupPermissions>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsService.deleteBatch(ids)) {
return new Message<Apps>(Message.SUCCESS).buildResponse();

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java
View File

@ -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());
}
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
return new Message<AppsCasDetails>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java
View File

@ -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<String> ids,
@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsService.deleteBatch(ids)) {

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java
View File

@ -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<String> ids,
@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (formBasedDetailsService.deleteBatch(ids)

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (jwtDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
return new Message<AppsJwtDetails>(Message.SUCCESS).buildResponse();

6
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java
View File

@ -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<String> 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)) {

5
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java
View File

@ -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<String> 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())){

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java
View File

@ -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<String> ids,
@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (tokenBasedDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (accountsStrategyService.deleteBatch(ids)) {
return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsAdaptersService.deleteBatch(ids)) {
return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (connectorsService.deleteBatch(ids)) {
return new Message<Connectors>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (socialsProviderService.deleteBatch(ids)) {
return new Message<SocialsProvider>(Message.SUCCESS).buildResponse();

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java
View File

@ -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<String> ids) {
logger.debug("-delete ids : {} ", ids);
if (synchronizersService.deleteBatch(ids)) {
return new Message<Connectors>(Message.SUCCESS).buildResponse();

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
_logger.debug("-delete ids : {} " , ids);
if (accountsService.deleteBatch(ids)) {

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {}" , ids);
if (service.deleteBatch(ids)) {
return new Message<GroupMember>(Message.SUCCESS).buildResponse();

7
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java
View File

@ -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<String> 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,

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (organizationsService.deleteBatch(ids)) {
systemLog.insert(

6
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (userInfoService.deleteBatch(ids)) {

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
View File

@ -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<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (resourcesService.deleteBatch(ids)) {
systemLog.insert(