diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java b/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java index e050d47f68807a1cfa4a28d69cea38785f4375ad..de99e1f93c720af4da64a5661e8913355d30a100 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java +++ b/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java @@ -40,9 +40,11 @@ public class JsonPretty implements Pretty{ * @return String */ public String jacksonFormat(Object bean){ - String prettyJson=""; + String prettyJson = ""; try { - prettyJson= (new ObjectMapper()).writerWithDefaultPrettyPrinter().writeValueAsString(bean); + prettyJson = (new ObjectMapper()) + .writerWithDefaultPrettyPrinter() + .writeValueAsString(bean); } catch (JsonGenerationException e) { e.printStackTrace(); } catch (JsonMappingException e) { @@ -59,7 +61,9 @@ public class JsonPretty implements Pretty{ * @return String */ public String format(Object bean){ - Gson gson = new GsonBuilder().setPrettyPrinting().create(); + Gson gson = new GsonBuilder() + .setPrettyPrinting() + .create(); String json = gson.toJson(bean); return json; } diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java b/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java index 73d75d56f18da031e5eee89305ea051c8a6cd601..84617492ed6e02fb0688f5bd79b127841bdd1ccb 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java +++ b/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java @@ -26,13 +26,17 @@ import java.util.StringTokenizer; import org.maxkey.pretty.Pretty; public class SqlPretty implements Pretty{ - public static final String WHITESPACE = " \n\r\f\t"; - private static final Set BEGIN_CLAUSES = new HashSet(); - private static final Set END_CLAUSES = new HashSet(); - private static final Set LOGICAL = new HashSet(); - private static final Set QUANTIFIERS = new HashSet(); - private static final Set DML = new HashSet(); - private static final Set MISC = new HashSet(); + + public static final String WHITESPACE = " \n\r\f\t"; + private static final Set BEGIN_CLAUSES = new HashSet(); + private static final Set END_CLAUSES = new HashSet(); + private static final Set LOGICAL = new HashSet(); + private static final Set QUANTIFIERS = new HashSet(); + private static final Set DML = new HashSet(); + private static final Set MISC = new HashSet(); + private static final String INDENT_STRING = " "; + //mhshi modify + private static final String INITIAL = "";//System.lineSeparator() + INDENT_STRING; static { BEGIN_CLAUSES.add( "left" ); @@ -72,10 +76,6 @@ public class SqlPretty implements Pretty{ MISC.add( "on" ); } - private static final String INDENT_STRING = " "; - //mhshi modify - private static final String INITIAL = "";//System.lineSeparator() + INDENT_STRING; - public SqlPretty() { } @@ -95,8 +95,8 @@ public class SqlPretty implements Pretty{ boolean afterInsert; int inFunction; int parensSinceSelect; - private LinkedList parenCounts = new LinkedList(); - private LinkedList afterByOrFromOrSelects = new LinkedList(); + private LinkedList parenCounts = new LinkedList(); + private LinkedList afterByOrFromOrSelects = new LinkedList(); //mhshi modify int indent = 0;//1; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/Boolean.java b/maxkey-core/src/main/java/org/maxkey/constants/Boolean.java index 80eba979b884550cb3bf2ec1a3859bec80da2c98..e30c2bec90c8f94e5321432e2d7f987790554ae9 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/Boolean.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/Boolean.java @@ -25,11 +25,11 @@ package org.maxkey.constants; */ public class Boolean { - public static final int FALSE = 0; + public static final int FALSE = 0; - public static final int TRUE = 1; + public static final int TRUE = 1; - private int value = FALSE; + private int value = FALSE; public Boolean() { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsDatabase.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsDatabase.java index 1c40a942cd2cab39e743fb1c417635ef77128948..4b52e28f8194266d59485812145858038bba90a1 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsDatabase.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsDatabase.java @@ -21,15 +21,15 @@ import org.maxkey.configuration.ApplicationConfig; public class ConstantsDatabase { - public static String MYSQL = "MySQL"; + public static String MYSQL = "MySQL"; - public static String POSTGRESQL = "PostgreSQL"; + public static String POSTGRESQL = "PostgreSQL"; - public static String ORACLE = "Oracle"; + public static String ORACLE = "Oracle"; - public static String MSSQLSERVER = "SQL Server"; + public static String MSSQLSERVER = "SQL Server"; - public static String DB2 = "db2"; + public static String DB2 = "db2"; public static boolean compare(String databaseProduct) { if(databaseProduct.equalsIgnoreCase(ApplicationConfig.databaseProduct)) { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsEntryType.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsEntryType.java index 69d7d091445c16440d9e1d4bc763e18d6bad02f2..4fa9b9cf92019d23a832da64a594213fe8e71eac 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsEntryType.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsEntryType.java @@ -19,11 +19,16 @@ package org.maxkey.constants; public class ConstantsEntryType { - public static int USERINFO_TYPE = 1; - public static int ORG_TYPE = 2; - public static int GROUP_TYPE = 3; - public static int PASSWORD_TYPE = 4; - public static int RESOURCES_TYPE = 5; - public static int PERMISSIONS_TYPE = 6; + public static int USERINFO_TYPE = 1; + + public static int ORGANIZATION_TYPE = 2; + + public static int GROUP_TYPE = 3; + + public static int PASSWORD_TYPE = 4; + + public static int RESOURCES_TYPE = 5; + + public static int PERMISSIONS_TYPE = 6; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsLoginType.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsLoginType.java index c0fae461ed2fc919c6fc4bcc267fc5076f412b9c..2a7dc9ada5fdaed8b4e4aee7b0e64ed089da3f80 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsLoginType.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsLoginType.java @@ -19,19 +19,28 @@ package org.maxkey.constants; public class ConstantsLoginType { - public static final String LOCAL = "Local Login"; - public static final String BASIC = "Basic"; - public static final String SOCIALSIGNON = "Social Sign On"; - public static final String REMEBER_ME = "RemeberMe"; - public static final String DESKTOP = "Desktop"; - public static final String KERBEROS = "Kerberos"; - public static final String SAMLTRUST = "SAML v2.0 Trust"; - public static final String MSADTRUST = "MS AD Trust"; - public static final String CAS = "CAS"; - public static final String WSFEDERATION = "WsFederation"; + public static final String LOCAL = "Local Login"; + + public static final String BASIC = "Basic"; + + public static final String SOCIALSIGNON = "Social Sign On"; + + public static final String REMEBER_ME = "RemeberMe"; + + public static final String DESKTOP = "Desktop"; + + public static final String KERBEROS = "Kerberos"; + + public static final String SAMLTRUST = "SAML v2.0 Trust"; + + public static final String MSADTRUST = "MS AD Trust"; + + public static final String CAS = "CAS"; + + public static final String WSFEDERATION = "WsFederation"; - public static final String JWT = "Jwt"; + public static final String JWT = "Jwt"; - public static final String HTTPHEADER = "HttpHeader"; + public static final String HTTPHEADER = "HttpHeader"; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateAction.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateAction.java index 75a994eced1d466e864cdd505b8049da43d08902..1a274aca1f20fa6b99eec6ed7ab1b9ddf948d71c 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateAction.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateAction.java @@ -19,18 +19,18 @@ package org.maxkey.constants; public final class ConstantsOperateAction { - public static final int CREATE_ACTION = 1; + public static final int CREATE_ACTION = 1; - public static final int DELETE_ACTION = 2; + public static final int DELETE_ACTION = 2; - public static final int UPDATE_ACTION = 3; + public static final int UPDATE_ACTION = 3; - public static final int CHANGE_PASSWORD_ACTION = 4; + public static final int CHANGE_PASSWORD_ACTION = 4; - public static final int ADD_MEMBER_ACTION = 5; + public static final int ADD_MEMBER_ACTION = 5; - public static final int DELETE_MEMBER_ACTION = 6; + public static final int DELETE_MEMBER_ACTION = 6; - public static final int VIEW_ACTION = 7; + public static final int VIEW_ACTION = 7; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java index d97641b9f6912f423604daf88e3cd7a6f95a4008..ebd6c141edc5f30aa8d7901d515a9bfb59fd1ad2 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java @@ -19,13 +19,13 @@ package org.maxkey.constants; public final class ConstantsOperateMessage { - public static final String INSERT_SUCCESS = "message.action.insert.success"; - public static final String INSERT_ERROR = "message.action.insert.error"; + public static final String INSERT_SUCCESS = "message.action.insert.success"; + public static final String INSERT_ERROR = "message.action.insert.error"; - public static final String UPDATE_SUCCESS = "message.action.update.success"; - public static final String UPDATE_ERROR = "message.action.update.error"; + public static final String UPDATE_SUCCESS = "message.action.update.success"; + public static final String UPDATE_ERROR = "message.action.update.error"; - public static final String DELETE_SUCCESS = "message.action.delete.success"; - public static final String DELETE_ERROR = "message.action.delete.error"; + public static final String DELETE_SUCCESS = "message.action.delete.success"; + public static final String DELETE_ERROR = "message.action.delete.error"; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPasswordSetType.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPasswordSetType.java index 9bb709ea1bbf1c2d939720d96abd73d2431879c4..f99aae2ddd5a2e5b6b82ef7af3687c883bb4bfce 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPasswordSetType.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPasswordSetType.java @@ -24,12 +24,12 @@ package org.maxkey.constants; */ public final class ConstantsPasswordSetType { - public static final int PASSWORD_NORMAL = 0; + public static final int PASSWORD_NORMAL = 0; - public static final int INITIAL_PASSWORD = 1; + public static final int INITIAL_PASSWORD = 1; - public static final int MANAGER_CHANGED_PASSWORD = 2; - - public static final int PASSWORD_EXPIRED = 3; + public static final int PASSWORD_EXPIRED = 3; + + public static final int MANAGER_CHANGED_PASSWORD = 2; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPersistence.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPersistence.java index 3a40a943b280774e31eeaf79ff3c5959b85869cb..959b95388a1025f03259bda9c1532eebcde67f9a 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPersistence.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPersistence.java @@ -24,10 +24,10 @@ package org.maxkey.constants; */ public final class ConstantsPersistence { - public static final int INMEMORY = 0; + public static final int INMEMORY = 0; - public static final int JDBC = 1; + public static final int JDBC = 1; - public static final int REDIS = 2; + public static final int REDIS = 2; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPlatformRole.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPlatformRole.java index ea5b30bdb84cc0411a5b4f642db905b47fb36a22..92c37a3a50b198d25497a2c91955d26bfd549a69 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPlatformRole.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsPlatformRole.java @@ -19,9 +19,9 @@ package org.maxkey.constants; public final class ConstantsPlatformRole { - public static final String PLATFORM_ADMIN = "PLATFORM_ADMIN"; + public static final String PLATFORM_ADMIN = "PLATFORM_ADMIN"; - public static final String TANANT_ADMIN = "TANANT_ADMIN"; + public static final String TANANT_ADMIN = "TANANT_ADMIN"; - public static final String ORDINARY_USER = "ORDINARY_USER"; + public static final String ORDINARY_USER = "ORDINARY_USER"; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProtocols.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProtocols.java index 6e471d20454988178c1de1ee88d73fb4eedc6ff5..1d8c2cbf4357ff83c306ca920e3ae5d2bd928477 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProtocols.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProtocols.java @@ -24,26 +24,26 @@ package org.maxkey.constants; */ public final class ConstantsProtocols { - public static final String BASIC = "Basic"; + public static final String BASIC = "Basic"; - public static final String EXTEND_API = "Extend_API"; + public static final String EXTEND_API = "Extend_API"; - public static final String FORMBASED = "Form_Based"; + public static final String FORMBASED = "Form_Based"; - public static final String TOKENBASED = "Token_Based"; - - // OAuth - public static final String OAUTH20 = "OAuth_v2.0"; - - public static final String OAUTH21 = "OAuth_v2.1"; + public static final String TOKENBASED = "Token_Based"; // SAML - public static final String SAML20 = "SAML_v2.0"; - - public static final String OPEN_ID_CONNECT10 = "OpenID_Connect_v1.0"; - - public static final String CAS = "CAS"; + public static final String SAML20 = "SAML_v2.0"; + + public static final String CAS = "CAS"; + + public static final String JWT = "JWT"; + + // OAuth + public static final String OAUTH20 = "OAuth_v2.0"; + + public static final String OAUTH21 = "OAuth_v2.1"; - public static final String JWT = "JWT"; + public static final String OPEN_ID_CONNECT10 = "OpenID_Connect_v1.0"; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsStatus.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsStatus.java index 4151f80f705007c5261a1a48e2e705bbd833eda2..1359b5d184ef9aee90972244408d233c09648f0f 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsStatus.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsStatus.java @@ -19,34 +19,34 @@ package org.maxkey.constants; public final class ConstantsStatus { - public static final int ACTIVE = 1; + public static final int ACTIVE = 1; - public static final int INACTIVE = 2; + public static final int INACTIVE = 2; - public static final int ENABLED = 3; + public static final int ENABLED = 3; - public static final int DISABLED = 4; + public static final int DISABLED = 4; - public static final int LOCK = 5; + public static final int LOCK = 5; - public static final int UNLOCK = 6; + public static final int UNLOCK = 6; - public static final int INVALID = 7; + public static final int INVALID = 7; - public static final int EXPIRED = 8; + public static final int EXPIRED = 8; - public static final int DELETE = 9; + public static final int DELETE = 9; - public static final int VALIDATED = 10; + public static final int VALIDATED = 10; - public static final int START = 11; + public static final int START = 11; - public static final int STOP = 12; + public static final int STOP = 12; - public static final int APPLY = 13; + public static final int APPLY = 13; - public static final int APPROVED = 14; + public static final int APPROVED = 14; - public static final int QUITED = 15; + public static final int QUITED = 15; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsTimeInterval.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsTimeInterval.java index f142b2a072e6e4cce39b0f64aaaf80f56616d8ce..1cf90d0b7c4e0949083c6611d3af8fd49e951d84 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsTimeInterval.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsTimeInterval.java @@ -19,22 +19,22 @@ package org.maxkey.constants; public final class ConstantsTimeInterval { - public static final Integer ONE_MINUTE = 60; // 1 minutes + public static final Integer ONE_MINUTE = 60; // 1 minutes - public static final Integer ONE_HOUR = 60 * 60; // 1 hour + public static final Integer ONE_HOUR = 60 * 60; // 1 hour - public static final Integer ONE_DAY = 60 * 60 * 24; // 1 day + public static final Integer ONE_DAY = 60 * 60 * 24; // 1 day - public static final Integer ONE_WEEK = ONE_DAY * 7; // 1 week + public static final Integer ONE_WEEK = ONE_DAY * 7; // 1 week - public static final Integer TWO_WEEK = ONE_DAY * 14; // 2 week + public static final Integer TWO_WEEK = ONE_DAY * 14; // 2 week - public static final Integer ONE_MONTH = ONE_DAY * 30; // 1 month + public static final Integer ONE_MONTH = ONE_DAY * 30; // 1 month - public static final Integer TWO_MONTH = ONE_DAY * 60; // 2 month + public static final Integer TWO_MONTH = ONE_DAY * 60; // 2 month /** * The number of seconds in one year (= 60 * 60 * 24 * 365). */ - public static final Integer ONE_YEAR = 60 * 60 * 24 * 365; + public static final Integer ONE_YEAR = 60 * 60 * 24 * 365; } diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java b/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java index a953766102278c1793fd1ac02a7dd5f9459fb03e..72c31cb5b8ea7964d183dd73ff143292334fd2d9 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java @@ -19,32 +19,30 @@ package org.maxkey.constants; public class ContentType { - public static final String TEXT_PLAIN = "text/plain"; + public static final String TEXT_PLAIN = "text/plain"; - public static final String TEXT_PLAIN_UTF8 = "text/plain;charset=UTF-8"; + public static final String TEXT_PLAIN_UTF8 = "text/plain;charset=UTF-8"; - public static final String TEXT_XML = "text/xml"; + public static final String TEXT_XML = "text/xml"; - public static final String TEXT_XML_UTF8 = "text/xml;charset=UTF-8"; + public static final String TEXT_XML_UTF8 = "text/xml;charset=UTF-8"; - public static final String APPLICATION_JSON = "application/json"; + public static final String APPLICATION_JSON = "application/json"; - public static final String APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8"; + public static final String APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8"; - public static final String APPLICATION_JWT = "application/jwt"; + public static final String APPLICATION_JWT = "application/jwt"; - public static final String APPLICATION_JWT_UTF8 = "application/jwt;charset=UTF-8"; + public static final String APPLICATION_JWT_UTF8 = "application/jwt;charset=UTF-8"; - public static final String APPLICATION_XML = "application/xml"; + public static final String APPLICATION_XML = "application/xml"; - public static final String APPLICATION_XML_UTF8 = "application/xml;charset=UTF-8"; + public static final String APPLICATION_XML_UTF8 = "application/xml;charset=UTF-8"; - public static final String IMAGE_GIF = "image/gif"; + public static final String IMAGE_GIF = "image/gif"; - public static final String IMAGE_JPEG = "image/jpeg"; + public static final String IMAGE_JPEG = "image/jpeg"; - public static final String IMAGE_PNG = "image/png"; - - + public static final String IMAGE_PNG = "image/png"; } diff --git a/maxkey-lib/mybatis-jpa-extra-2.6.jar b/maxkey-lib/mybatis-jpa-extra-2.7.jar similarity index 81% rename from maxkey-lib/mybatis-jpa-extra-2.6.jar rename to maxkey-lib/mybatis-jpa-extra-2.7.jar index 17b0569db69da84cc82da591b40f1ccbf02d1cfb..ab3d87f68e325afc1a8e754bb3413ff240a346b2 100644 Binary files a/maxkey-lib/mybatis-jpa-extra-2.6.jar and b/maxkey-lib/mybatis-jpa-extra-2.7.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.6.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.7.jar similarity index 72% rename from maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.6.jar rename to maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.7.jar index 56723d433346cda33e532a03f6ad71ace814d448..0ec187801bb6ee5195daf9f7e1da9a86640274b7 100644 Binary files a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.6.jar and b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.7.jar differ 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 2fea3bb404639f816fb4e8acf3aa377d0d5c09a1..09250527ae8f2aa222732facd27c928eff108087 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 @@ -86,7 +86,7 @@ public class FormBasedDetailsServiceTest { idList.add("ab7422e9-a91a-4840-9e59-9d911257c918"); idList.add("12b6ceb8-573b-4f01-ad85-cfb24cfa007c"); idList.add("dafd5ba4-d2e3-4656-bd42-178841e610fe"); - service.batchDelete(idList); + service.deleteBatch(idList); } @Test diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index fd7e005991b320bfcc0cb688305a6c084788a3a8..d2e8f1ade78825a1124ab2f86dcf70134ad5eb83 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -76,19 +76,17 @@ public class AuthorizeBaseEndpoint { Accounts account=new Accounts(); UserInfo userInfo=WebContext.getUserInfo(); Apps loadApp = getApp(app.getId()); - if(loadApp.getCredential()==Apps.CREDENTIALS.USER_DEFINED){ - - account=accountsService.load(new Accounts(userInfo.getId(),loadApp.getId())); - if(account!=null){ + if(loadApp.getCredential() == Apps.CREDENTIALS.USER_DEFINED){ + account = accountsService.load(new Accounts(userInfo.getId(),loadApp.getId())); + if(account != null){ account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(account.getRelatedPassword())); } - }else if(loadApp.getCredential()==Apps.CREDENTIALS.SHARED){ + }else if(loadApp.getCredential() == Apps.CREDENTIALS.SHARED){ account.setRelatedUsername(loadApp.getSharedUsername()); - account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(loadApp.getSharedPassword())); - - }else if(loadApp.getCredential()==Apps.CREDENTIALS.SYSTEM){ - + account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(loadApp.getSharedPassword())); + + }else if(loadApp.getCredential() == Apps.CREDENTIALS.SYSTEM){ if(loadApp.getSystemUserAttr().equalsIgnoreCase("userId")){ account.setUsername(userInfo.getId()); }else if(loadApp.getSystemUserAttr().equalsIgnoreCase("username")){ @@ -104,7 +102,6 @@ public class AuthorizeBaseEndpoint { account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(WebContext.getUserInfo().getDecipherable())); }else if(loadApp.getCredential()==Apps.CREDENTIALS.NONE){ - account.setUsername(userInfo.getUsername()); account.setRelatedPassword(userInfo.getUsername()); diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineTicketEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineTicketEndpoint.java index d823893fc6675207daa59c63bf36806605a1a3c3..b1d8f959df05371d681a2a242a96bedefcdffcd0 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineTicketEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineTicketEndpoint.java @@ -44,6 +44,6 @@ public class OnlineTicketEndpoint { public String ticketValidate( @RequestParam(value ="ticket",required = true) String ticket) { OnlineTicket onlineTicket = onlineTicketServices.get(ticket); - return onlineTicket == null ? "" :onlineTicket.getTicketId(); + return onlineTicket == null ? "" : onlineTicket.getTicketId(); } } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java index 5891b916f5b3ae1016274d2a0060f3b5c81bcf2e..65242bf2b089cf3b48a055a057ed3e7498639e33 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java @@ -21,117 +21,117 @@ package org.maxkey.authz.cas.endpoint.ticket; public class CasConstants { /* CAS Protocol Parameters. **/ public static final class PARAMETER{ - public final static String ENDPOINT_CAS_DETAILS="CAS_AUTHORIZE_ENDPOINT_CAS_DETAILS"; + public final static String ENDPOINT_CAS_DETAILS = "CAS_AUTHORIZE_ENDPOINT_CAS_DETAILS"; - public final static String PARAMETER_MAP="CAS_AUTHORIZE_ENDPOINT_PARAMETER_MAP"; + public final static String PARAMETER_MAP = "CAS_AUTHORIZE_ENDPOINT_PARAMETER_MAP"; /** Constant representing the ticket parameter in the request. */ - public final static String TICKET="ticket"; + public final static String TICKET = "ticket"; /** Constant representing the service parameter in the request. */ - public static final String SERVICE = "service"; + public static final String SERVICE = "service"; /** Constant representing the targetService parameter in the request. */ - public static final String TARGET_SERVICE = "targetService"; + public static final String TARGET_SERVICE = "targetService"; /** Constant representing the method parameter in the request. */ - public static final String METHOD = "method"; + public static final String METHOD = "method"; /** Constant representing the proxy callback url parameter in the request. */ - public static final String PROXY_CALLBACK_URL = "pgtUrl"; + public static final String PROXY_CALLBACK_URL = "pgtUrl"; /** Constant representing the renew parameter in the request. */ - public static final String RENEW = "renew"; + public static final String RENEW = "renew"; /** Constant representing the gateway parameter in the request. */ - public static final String GATEWAY = "gateway"; + public static final String GATEWAY = "gateway"; /** Constant representing the format parameter in the request. */ - public static final String FORMAT = "format"; + public static final String FORMAT = "format"; /** Constant representing the pgtId parameter in the request. */ - public static final String PROXY_GRANTING_TICKET_ID = "pgtId"; + public static final String PROXY_GRANTING_TICKET_ID = "pgtId"; /** Constant representing the pgt parameter in the request. */ - public static final String PROXY_GRANTING_TICKET = "pgt"; + public static final String PROXY_GRANTING_TICKET = "pgt"; /** Constant representing the pgtIou parameter in the request. */ - public static final String PROXY_GRANTING_TICKET_IOU = "pgtIou"; + public static final String PROXY_GRANTING_TICKET_IOU = "pgtIou"; - public static final String REST_USERNAME = "username"; + public static final String REST_USERNAME = "username"; - public static final String REST_PASSWORD = "password"; + public static final String REST_PASSWORD = "password"; } /* CAS Protocol PREFIX */ public static final class PREFIX{ /** Proxy ticket prefix applied to unique ids. */ - public static final String PROXY_TICKET_PREFIX = "PT"; + public static final String PROXY_TICKET_PREFIX = "PT"; /** * Prefix generally applied to unique ids generated * by UniqueTicketIdGenerator. */ - public static final String SERVICE_TICKET_PREFIX = "ST"; + public static final String SERVICE_TICKET_PREFIX = "ST"; /** The prefix to use when generating an id for a Proxy Granting Ticket. */ - public static final String PROXY_GRANTING_TICKET_PREFIX = "PGT"; + public static final String PROXY_GRANTING_TICKET_PREFIX = "PGT"; /** The prefix to use when generating an id for a Proxy Granting Ticket IOU. */ public static final String PROXY_GRANTING_TICKET_IOU_PREFIX = "PGTIOU"; - public static final String TICKET_GRANTING_TICKET_PREFIX = "TGT"; + public static final String TICKET_GRANTING_TICKET_PREFIX = "TGT"; } /* CAS Protocol Error Codes. **/ public static class ERROR_CODE{ /** Constant representing an invalid request for validation. */ - public static String INVALID_REQUEST = "INVALID_REQUEST"; + public static String INVALID_REQUEST = "INVALID_REQUEST"; /** Constant representing an invalid pgt request. */ - public static String INVALID_REQUEST_PROXY = "INVALID_REQUEST_PROXY"; - public static String INVALID_TICKET_SPEC = "INVALID_TICKET_SPEC"; + public static String INVALID_REQUEST_PROXY = "INVALID_REQUEST_PROXY"; + public static String INVALID_TICKET_SPEC = "INVALID_TICKET_SPEC"; /** Constant representing an invalid proxy callback for validation. */ - public static String INVALID_PROXY_CALLBACK = "INVALID_PROXY_CALLBACK"; + public static String INVALID_PROXY_CALLBACK = "INVALID_PROXY_CALLBACK"; /** Constant representing an invalid ticket for validation. */ - public static String INVALID_TICKET = "INVALID_TICKET"; - public static String INVALID_SERVICE = "INVALID_SERVICE"; - public static String INTERNAL_ERROR = "INTERNAL_ERROR"; + public static String INVALID_TICKET = "INVALID_TICKET"; + public static String INVALID_SERVICE = "INVALID_SERVICE"; + public static String INTERNAL_ERROR = "INTERNAL_ERROR"; /** Constant representing an invalid service proxy request. */ - public static String UNAUTHORIZED_SERVICE_PROXY = "UNAUTHORIZED_SERVICE_PROXY"; + public static String UNAUTHORIZED_SERVICE_PROXY = "UNAUTHORIZED_SERVICE_PROXY"; /** Constant representing an invalid service request. */ - public static String UNAUTHORIZED_SERVICE = "UNAUTHORIZED_SERVICE"; + public static String UNAUTHORIZED_SERVICE = "UNAUTHORIZED_SERVICE"; } /* CAS Protocol endpoint. **/ public static class ENDPOINT{ - public static final String ENDPOINT_BASE = "/authz/cas"; + public static final String ENDPOINT_BASE = "/authz/cas"; /** * Constant representing login. */ - public static final String ENDPOINT_LOGIN = ENDPOINT_BASE + "/login"; + public static final String ENDPOINT_LOGIN = ENDPOINT_BASE + "/login"; /** * Constant representing logout. */ - public static final String ENDPOINT_LOGOUT = ENDPOINT_BASE + "/logout"; + public static final String ENDPOINT_LOGOUT = ENDPOINT_BASE + "/logout"; /** * Constant representing proxy validate. */ - public static final String ENDPOINT_PROXY_VALIDATE = ENDPOINT_BASE + "/proxyValidate"; + public static final String ENDPOINT_PROXY_VALIDATE = ENDPOINT_BASE + "/proxyValidate"; /** * Constant representing v3 proxy validate. */ - public static final String ENDPOINT_PROXY_VALIDATE_V3 = ENDPOINT_BASE + "/p3/proxyValidate"; + public static final String ENDPOINT_PROXY_VALIDATE_V3 = ENDPOINT_BASE + "/p3/proxyValidate"; /** * Constant representing legacy validate. */ - public static final String ENDPOINT_VALIDATE = ENDPOINT_BASE + "/validate"; + public static final String ENDPOINT_VALIDATE = ENDPOINT_BASE + "/validate"; /** * Constant representing service validate. */ - public static final String ENDPOINT_SERVICE_VALIDATE = ENDPOINT_BASE + "/serviceValidate"; + public static final String ENDPOINT_SERVICE_VALIDATE = ENDPOINT_BASE + "/serviceValidate"; /** * Constant representing v3 service validate. @@ -141,18 +141,18 @@ public class CasConstants { /** * Constant representing proxy endpoint. */ - public static final String ENDPOINT_PROXY = ENDPOINT_BASE + "/proxy"; + public static final String ENDPOINT_PROXY = ENDPOINT_BASE + "/proxy"; /** * Constant representing v3 proxy endpoint. */ - public static final String ENDPOINT_PROXY_V3 = ENDPOINT_BASE + "/p3/proxy"; + public static final String ENDPOINT_PROXY_V3 = ENDPOINT_BASE + "/p3/proxy"; public static final String ENDPOINT_SERVICE_TICKET_GRANTING = ENDPOINT_BASE + "/granting"; - public static final String ENDPOINT_REST_TICKET_V1 = ENDPOINT_BASE + "/v1/tickets"; + public static final String ENDPOINT_REST_TICKET_V1 = ENDPOINT_BASE + "/v1/tickets"; - public static final String ENDPOINT_REST_USERS_V1 = ENDPOINT_BASE + "/v1/users"; + public static final String ENDPOINT_REST_USERS_V1 = ENDPOINT_BASE + "/v1/users"; } 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 95647b5dc35b14ce08b0f3b950f83fe0f270db37..c48a6f07a4b63c9d0a94fd09ff75017df88263f0 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.batchDelete(appsAdapter.getId())) { + if (appsAdaptersService.deleteBatch(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 018425beb80e7e023eb0b80fbc2870d7e7429125..6477e87ec29c58d027e4b0b159b661aa38347690 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 @@ -166,7 +166,7 @@ public class ApplicationsController extends BaseAppContorller { @RequestMapping(value={"/delete"}) public Message delete(@ModelAttribute("application") Apps application) { _logger.debug("-delete application :" + application); - if (appsService.batchDelete(application.getId())) { + if (appsService.deleteBatch(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 b1c10533ab97f18b23878658d79db500e95af82b..73e0c60e7bec1308bdf8016e12a6648451d229d5 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 @@ -144,7 +144,7 @@ public class AccountsController { _logger.debug("-delete AppAccounts :" + appAccounts); - accountsService.batchDelete(appAccounts.getId()); + accountsService.deleteBatch(appAccounts.getId()); return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java index 1650e1ff614652a2365858c658dda8678ca4d398..8ce860becde8e3faeef764524974eefea2aabb85 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java @@ -157,7 +157,7 @@ public class GroupMemberController { return new Message("传入参数为空",MessageType.error); } - if(groupMemberService.batchDelete(groupMember.getId())) { + if(groupMemberService.deleteBatch(groupMember.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.info); } return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR),MessageType.error); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java index 3eb5eb54893ce03abd704a3b5c57f338051403af..96e59eb15ae00de9e75d94a78b838cbf92acb669 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java @@ -129,7 +129,7 @@ public class GroupPrivilegesController { return new Message("传入参数为空",MessageType.error); } - if(groupPrivilegesService.batchDelete(groupApp.getId())) { + if(groupPrivilegesService.deleteBatch(groupApp.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.info); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java index d45d0d56f6af9de350c2de31e723116391ddb2bd..187ec5fa29c9117949195fae15623e61e9a354b0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java @@ -131,7 +131,7 @@ public class NoticesController { public Message delete(@ModelAttribute("notice")Notices notice) { _logger.debug("-delete notice :" + notice); - if (noticesService.batchDelete(notice.getId())) { + if (noticesService.deleteBatch(notice.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/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java index 098a48064b41c211a40c74a3fcf78c34077b6a11..f5b442d03eebbb78bb54e631bc75a0acff9f8f57 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -175,7 +175,7 @@ public class OrganizationsController { @RequestMapping({"/delete"}) public Message delete(@ModelAttribute("org") Organizations org) { _logger.debug("-delete organization :" + org); - if (this.organizationsService.batchDelete(org.getId())) { + if (this.organizationsService.deleteBatch(org.getId())) { return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.success); } @@ -208,7 +208,7 @@ public class OrganizationsController { // 数据去重 if(!CollectionUtils.isEmpty(orgsList)){ orgsList = orgsList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getId()))), ArrayList::new)); - if(organizationsService.batchInsert(orgsList)) { + if(organizationsService.insertBatch(orgsList)) { new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS), null, MessageType.success, OperateType.add, MessageScope.DB); }else { new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR), MessageType.error); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java index 6de51371e05945b7725148f66795c9aa2fa9be13..c0c0323c225cf95bec585487106515a801cf137e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java @@ -144,7 +144,7 @@ public class ResourcesController { public Message delete(@ModelAttribute("resource") Resources resource) { _logger.debug("-delete resource :" + resource); - if (resourcesService.batchDelete(resource.getId())) { + if (resourcesService.deleteBatch(resource.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/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java index ff14119cfafdd95d32d8449e424ca147d671c0b2..de56accaf9783bfa04c35a906cf9ae1d98d712d4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java @@ -144,7 +144,7 @@ public class RoleMemberController { return new Message("传入参数为空",MessageType.error); } - if(roleMemberService.batchDelete(roleMember.getId())) { + if(roleMemberService.deleteBatch(roleMember.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.info); } return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR),MessageType.error); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/SocialsProviderController.java index 1d8f1dc77540c08fd023260c9c8e833e9f748646..ba24d1a3e5c5192f0c0b4b450b02f46d3434fc1c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/SocialsProviderController.java @@ -133,7 +133,7 @@ public class SocialsProviderController { public Message delete(@ModelAttribute("socialsProvider") SocialsProvider socialsProvider) { _logger.debug("-delete socialsProvider :" + socialsProvider); - if (socialsProviderService.batchDelete(socialsProvider.getId())) { + if (socialsProviderService.deleteBatch(socialsProvider.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/UserAdjointController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java index ab4b81c4efbe5ed1697c66bf9239d0a39a229668..74d1142758c425d03acb7c23fd501c4b2bebdb56 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java @@ -136,7 +136,7 @@ public class UserAdjointController { public Message delete(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { _logger.debug("-delete group :" + userInfoAdjoint); - if (userInfoAdjointService.batchDelete(userInfoAdjoint.getId())) { + if (userInfoAdjointService.deleteBatch(userInfoAdjoint.getId())) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); } else { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.error); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java index 5dcde105b959076c95d82feeed9cb3c04122cbde..d20fc4bad641d1dc4a3f4f2a389691fc66a8e141 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java @@ -217,7 +217,7 @@ public class UserInfoController { @RequestMapping(value="/batchDelete") public Message batchDeleteUsers(@RequestParam("id")String id) { _logger.debug(id); - if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) { + if(userInfoService.deleteBatch(StringUtils.string2List(id, ","))) { return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); } else { @@ -235,7 +235,7 @@ public class UserInfoController { @RequestMapping(value="/delete") public Message deleteUsersById(@RequestParam("id") String id) { _logger.debug(id); - if(userInfoService.batchDelete(id)) { + if(userInfoService.deleteBatch(id)) { //provisioningPrepare.prepare(userInfo, OPERATEACTION.DELETE_ACTION); return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); } else { @@ -313,7 +313,7 @@ public class UserInfoController { // 数据去重 if(!CollectionUtils.isEmpty(userInfoList)){ userInfoList = userInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUsername()))), ArrayList::new)); - if( userInfoService.batchInsert(userInfoList)) { + if( userInfoService.insertBatch(userInfoList)) { new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS), null, MessageType.success, OperateType.add, MessageScope.DB); }else { new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR), MessageType.error);