LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

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(