diff --git a/maxkey-authentications/maxkey-authentication-core/build.gradle b/maxkey-authentications/maxkey-authentication-core/build.gradle index 272da562a..884b6a4f3 100644 --- a/maxkey-authentications/maxkey-authentication-core/build.gradle +++ b/maxkey-authentications/maxkey-authentication-core/build.gradle @@ -6,9 +6,14 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") + implementation project(":maxkey-starter:maxkey-starter-otp") } \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle b/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle index 9e18bbc64..4f685fd6e 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle @@ -6,7 +6,12 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-authentications/maxkey-authentication-provider/build.gradle b/maxkey-authentications/maxkey-authentication-provider/build.gradle index c736ada4c..2ca0b5d8f 100644 --- a/maxkey-authentications/maxkey-authentication-provider/build.gradle +++ b/maxkey-authentications/maxkey-authentication-provider/build.gradle @@ -6,7 +6,12 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-commons/maxkey-cache/build.gradle b/maxkey-commons/maxkey-cache/build.gradle new file mode 100644 index 000000000..52c63fd8c --- /dev/null +++ b/maxkey-commons/maxkey-cache/build.gradle @@ -0,0 +1,10 @@ +description = "maxkey-cache" + +dependencies { + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + + //local jars + implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + +} \ No newline at end of file diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/package-info.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/package-info.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/package-info.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/package-info.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java b/maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java rename to maxkey-commons/maxkey-cache/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java diff --git a/maxkey-entity/src/test/resources/log4j2.xml b/maxkey-commons/maxkey-cache/src/test/resources/log4j2.xml similarity index 100% rename from maxkey-entity/src/test/resources/log4j2.xml rename to maxkey-commons/maxkey-cache/src/test/resources/log4j2.xml diff --git a/maxkey-commons/maxkey-common/build.gradle b/maxkey-commons/maxkey-common/build.gradle index 531a2f3dd..aa4c94696 100644 --- a/maxkey-commons/maxkey-common/build.gradle +++ b/maxkey-commons/maxkey-common/build.gradle @@ -1,6 +1,8 @@ description = "maxkey-common" dependencies { + implementation project(":maxkey-commons:maxkey-crypto") + //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsAct.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsAct.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsAct.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsAct.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java similarity index 82% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java index 8cfbc8457..db9e37cbc 100644 --- a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java +++ b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.constants; -import org.dromara.maxkey.configuration.ApplicationConfig; - public class ConstsDatabase { public static final String MYSQL = "MySQL"; @@ -30,9 +28,6 @@ public class ConstsDatabase { public static final String MSSQLSERVER = "SQL Server"; public static final String DB2 = "db2"; - - public static boolean compare(String databaseProduct) { - return databaseProduct.equalsIgnoreCase(ApplicationConfig.getDatabaseProduct()); - } + } diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ContentType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ContentType.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/constants/ContentType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/constants/ContentType.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java index 7a45fd02f..6ce283a6d 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java +++ b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java @@ -26,6 +26,7 @@ import java.util.Random; import java.util.UUID; import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.ReciprocalUtils.Algorithm; public class StringGenerator { @@ -169,4 +170,22 @@ public class StringGenerator { return uuidString.matches(uuidRegex); } + /** + * generate Key for DES , AES , Blowfish and DESede ,default is unique string + * @param algorithm + * @return + */ + public static String generateKey(String algorithm) { + if (algorithm.equals(Algorithm.DES)) { + return (new StringGenerator(8)).randomGenerate(); + } else if (algorithm.equals(Algorithm.AES)) { + return (new StringGenerator(16)).randomGenerate(); + } else if (algorithm.equals(Algorithm.Blowfish)) { + return (new StringGenerator(16)).randomGenerate(); + } else if (algorithm.equals(Algorithm.DESede)) { + return (new StringGenerator(24)).randomGenerate(); + } else { + return (new StringGenerator()).uniqueGenerate(); + } + } } diff --git a/maxkey-commons/maxkey-core/build.gradle b/maxkey-commons/maxkey-core/build.gradle new file mode 100644 index 000000000..a825bf94b --- /dev/null +++ b/maxkey-commons/maxkey-core/build.gradle @@ -0,0 +1,12 @@ +description = "maxkey-core" + +dependencies { + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + + implementation project(":maxkey-entity") + + //local jars + implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + +} \ No newline at end of file diff --git a/maxkey-commons/maxkey-core/src/main/java/META-INF/MANIFEST.MF b/maxkey-commons/maxkey-core/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-commons/maxkey-core/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/exception/BusinessException.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/exception/BusinessException.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/exception/NameException.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/exception/NameException.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/InitializeContext.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/InitializeContext.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/WebConstants.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/WebConstants.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/WebContext.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java similarity index 99% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/WebContext.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java index 925aef8d5..dc2c6f527 100644 --- a/maxkey-entity/src/main/java/org/dromara/maxkey/web/WebContext.java +++ b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java @@ -537,6 +537,10 @@ public final class WebContext { return new ModelAndView("forward:" + forwardUrl); } + public static boolean compare(String databaseProduct) { + return databaseProduct.equalsIgnoreCase(ApplicationConfig.getDatabaseProduct()); + } + public static String version() { StringBuffer version = new StringBuffer(); version.append("-----------------------------------------------------------"); diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java b/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java similarity index 100% rename from maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java rename to maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java diff --git a/maxkey-entity/src/main/resources/favicon.ico b/maxkey-commons/maxkey-core/src/main/resources/favicon.ico similarity index 100% rename from maxkey-entity/src/main/resources/favicon.ico rename to maxkey-commons/maxkey-core/src/main/resources/favicon.ico diff --git a/maxkey-entity/src/main/resources/messages/passwordpolicy_message.properties b/maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties similarity index 100% rename from maxkey-entity/src/main/resources/messages/passwordpolicy_message.properties rename to maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties diff --git a/maxkey-entity/src/main/resources/messages/passwordpolicy_message_en.properties b/maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties similarity index 100% rename from maxkey-entity/src/main/resources/messages/passwordpolicy_message_en.properties rename to maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties diff --git a/maxkey-entity/src/main/resources/messages/passwordpolicy_message_zh_CN.properties b/maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties similarity index 100% rename from maxkey-entity/src/main/resources/messages/passwordpolicy_message_zh_CN.properties rename to maxkey-commons/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties diff --git a/maxkey-entity/src/main/resources/top_weak_password.txt b/maxkey-commons/maxkey-core/src/main/resources/top_weak_password.txt similarity index 100% rename from maxkey-entity/src/main/resources/top_weak_password.txt rename to maxkey-commons/maxkey-core/src/main/resources/top_weak_password.txt diff --git a/maxkey-commons/maxkey-core/src/test/resources/log4j2.xml b/maxkey-commons/maxkey-core/src/test/resources/log4j2.xml new file mode 100644 index 000000000..dfb480698 --- /dev/null +++ b/maxkey-commons/maxkey-core/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maxkey-commons/maxkey-crypto/build.gradle b/maxkey-commons/maxkey-crypto/build.gradle new file mode 100644 index 000000000..2ac492e0c --- /dev/null +++ b/maxkey-commons/maxkey-crypto/build.gradle @@ -0,0 +1,8 @@ +description = "maxkey-crypto" + +dependencies { + //local jars + implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + + +} diff --git a/maxkey-commons/maxkey-crypto/src/main/java/META-INF/MANIFEST.MF b/maxkey-commons/maxkey-crypto/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/HexUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/HexUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java similarity index 90% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java index f289b1f7a..6b05e4edd 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java +++ b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java @@ -21,6 +21,7 @@ package org.dromara.maxkey.crypto; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Constructor; import java.security.Provider; import java.security.Security; @@ -30,8 +31,6 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; -import org.dromara.maxkey.util.Instance; -import org.dromara.maxkey.util.StringGenerator; /** * Reciprocal cipher or Symmetric-key algorithm @@ -59,7 +58,7 @@ public final class ReciprocalUtils { static { if(System.getProperty("java.version").startsWith("1.8")) { try { - Security.addProvider((Provider)Instance.newInstance("com.sun.crypto.provider.SunJCE")); + Security.addProvider((Provider)newInstance("com.sun.crypto.provider.SunJCE")); }catch (Exception e) { e.printStackTrace(); } @@ -234,18 +233,17 @@ public final class ReciprocalUtils { public static String aesDecoder(String ciphers, String secretKey) { return decoderHex(ciphers, secretKey, Algorithm.AES); } + + public static Object newInstance(String className) { + Class cls; + try { + cls = Class.forName(className); + Constructor constructor = cls.getConstructor(); + return constructor.newInstance(); + } catch (Exception e) { + e.printStackTrace(); + } + return null; - public static String generateKey(String algorithm) { - if (algorithm.equals(Algorithm.DES)) { - return (new StringGenerator(8)).randomGenerate(); - } else if (algorithm.equals(Algorithm.AES)) { - return (new StringGenerator(16)).randomGenerate(); - } else if (algorithm.equals(Algorithm.Blowfish)) { - return (new StringGenerator(16)).randomGenerate(); - } else if (algorithm.equals(Algorithm.DESede)) { - return (new StringGenerator(24)).randomGenerate(); - } else { - return (new StringGenerator()).uniqueGenerate(); - } - } + } } diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/SM3.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/SM3.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java similarity index 93% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java index 616ace84c..f22844fb7 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java +++ b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java @@ -17,6 +17,9 @@ package org.dromara.maxkey.crypto.jose.keystore; ******************************************************************************/ import com.google.common.io.CharStreams; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParser; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.JWKSet; @@ -31,7 +34,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.crypto.RSAUtils; -import org.dromara.maxkey.pretty.PrettyFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; @@ -184,12 +186,21 @@ public class JWKSetKeyStore { }else { //RSA Only - metaDataString.append(PrettyFactory.getJsonPretty().format( - jwkSet.toPublicJWKSet().toString())); + metaDataString.append(format(jwkSet.toPublicJWKSet().toString())); } }else { metaDataString.append("RSA Only"); } return metaDataString.toString(); } + + /** + * + * @param jsonString + * @return formated json string + */ + public String format(String jsonString){ + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + return gson.toJson(JsonParser.parseString(jsonString)); + } } diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Digester.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Digester.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Md4.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Md4.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java b/maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java rename to maxkey-commons/maxkey-crypto/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java diff --git a/maxkey-commons/maxkey-common/src/main/resources/banner.txt b/maxkey-commons/maxkey-crypto/src/main/resources/banner.txt similarity index 100% rename from maxkey-commons/maxkey-common/src/main/resources/banner.txt rename to maxkey-commons/maxkey-crypto/src/main/resources/banner.txt diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/Integer2LongTest.java similarity index 50% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/Integer2LongTest.java index 67a65bef8..530fbd32a 100644 --- a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/Integer2LongTest.java @@ -15,28 +15,15 @@ */ -package org.maxkey.util; +package org.maxkey; -import java.security.Provider; -import java.security.Security; - -import org.dromara.maxkey.crypto.password.PasswordReciprocal; -import org.dromara.maxkey.util.Instance; - - -public class InstanceTest { +public class Integer2LongTest { public static void main(String[] args) { - if(System.getProperty("java.version").startsWith("1.8")) { - System.out.println("1.8"); - Security.addProvider((Provider)Instance.newInstance("com.sun.crypto.provider.SunJCE")); - System.out.println(PasswordReciprocal.getInstance().encode("ddddd")); - - System.out.println(PasswordReciprocal.getInstance().encode("ddfs")); - }else { - System.out.println("other"); - } - + Integer intValue =20000; + Long v=Integer.toUnsignedLong(intValue); + System.out.println(v); + System.out.println(v.getClass()); } } diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/Base64UtilsTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/Base64UtilsTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/DigestUtilsTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/DigestUtilsTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/KeyGen.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/KeyGen.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/Md5SumTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/Md5SumTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/PasswordGenTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/PasswordGenTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/RSAUtilsTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/RSAUtilsTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/RsaMessage.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/RsaMessage.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java similarity index 100% rename from maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java diff --git a/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/mail/MailTest.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/mail/MailTest.java new file mode 100644 index 000000000..8dd7d9cda --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/mail/MailTest.java @@ -0,0 +1,44 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.mail; + + +public class MailTest { + + //@Test + public void test() throws Exception { + String username="test@connsec.com"; + String password="3&8Ujbnm5hkjhFD"; + String smtpHost="smtp.exmail.qq.com"; + int port=465; + boolean ssl=true; + String senderMail="test@connsec.com"; + /* + Email email = new SimpleEmail(); + email.setHostName(smtpHost); + email.setSmtpPort(port); + email.setAuthenticator(new DefaultAuthenticator(username, password)); + email.setSSLOnConnect(ssl); + email.setFrom(senderMail); + email.setSubject("One Time PassWord"); + email.setMsg("You Token is "+111+" , it validity in "+5 +" minutes"); + email.addTo("shimingxy@qq.com"); + email.send(); + */ + } +} diff --git a/maxkey-entity/src/test/java/org/dromara/maxkey/package-info.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/package-info.java similarity index 95% rename from maxkey-entity/src/test/java/org/dromara/maxkey/package-info.java rename to maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/package-info.java index 10a971339..ab406d82c 100644 --- a/maxkey-entity/src/test/java/org/dromara/maxkey/package-info.java +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/package-info.java @@ -15,4 +15,4 @@ */ -package org.dromara.maxkey; +package org.maxkey; diff --git a/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/CharacterCase.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/CharacterCase.java new file mode 100644 index 000000000..2462c938c --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/CharacterCase.java @@ -0,0 +1,32 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.word; + +public class CharacterCase { + + /** + * @param args + */ + public static void main(String[] args) { + String word="partner "; + + System.out.println(word.toUpperCase()); + System.out.println(word.toLowerCase()); + } + +} diff --git a/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/RunJavaEnvs.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/RunJavaEnvs.java new file mode 100644 index 000000000..8646d50aa --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/RunJavaEnvs.java @@ -0,0 +1,88 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.word; + +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; + +import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.ArchUtils; + +public class RunJavaEnvs { + + public static void main(String[] args) { + Map map = System.getenv(); + for(Iterator itr = map.keySet().iterator();itr.hasNext();){ + String key = itr.next(); + System.out.println(key + "=" + map.get(key)); + } + + System.out.println(SystemUtils.JAVA_VENDOR); + System.out.println(SystemUtils.JAVA_COMPILER); + System.out.println(SystemUtils.JAVA_VERSION); + System.out.println(SystemUtils.JAVA_HOME); + + System.out.println("JAVA_CLASS_VERSION :"+SystemUtils.JAVA_CLASS_VERSION); + + System.out.println(SystemUtils.JAVA_SPECIFICATION_VERSION); + System.out.println(SystemUtils.JAVA_SPECIFICATION_NAME); + System.out.println(SystemUtils.JAVA_SPECIFICATION_VENDOR); + + System.out.println("JAVA_VM_INFO :"+SystemUtils.JAVA_VM_INFO); + System.out.println(SystemUtils.JAVA_VM_INFO); + System.out.println(SystemUtils.JAVA_VM_NAME); + System.out.println(SystemUtils.JAVA_VM_VENDOR); + System.out.println(SystemUtils.JAVA_VM_VERSION); + + System.out.println(SystemUtils.OS_NAME); + System.out.println(SystemUtils.OS_ARCH); + System.out.println(SystemUtils.OS_VERSION); + + System.out.println("OS : "+SystemUtils.OS_NAME +"("+SystemUtils.OS_ARCH+" " +ArchUtils.getProcessor().getType()+"), version " +SystemUtils.OS_VERSION+""); + System.out.println("JAVA : "+SystemUtils.JAVA_VENDOR+" java version "+SystemUtils.JAVA_VERSION +", class "+SystemUtils.JAVA_CLASS_VERSION); + System.out.println("JAVA_VM : "+SystemUtils.JAVA_VM_NAME+" (build "+SystemUtils.JAVA_VM_VERSION +", "+ SystemUtils.JAVA_VM_INFO+")"); + + Properties props=System.getProperties(); + System.out.println("Java的运行环境版本："+props.getProperty("java.version")); + System.out.println("Java的运行环境供应商："+props.getProperty("java.vendor")); + System.out.println("Java供应商的URL："+props.getProperty("java.vendor.url")); + System.out.println("Java的安装路径："+props.getProperty("java.home")); + System.out.println("Java的虚拟机规范版本："+props.getProperty("java.vm.specification.version")); + System.out.println("Java的虚拟机规范供应商："+props.getProperty("java.vm.specification.vendor")); + System.out.println("Java的虚拟机规范名称："+props.getProperty("java.vm.specification.name")); + System.out.println("Java的虚拟机实现版本："+props.getProperty("java.vm.version")); + System.out.println("Java的虚拟机实现供应商："+props.getProperty("java.vm.vendor")); + System.out.println("Java的虚拟机实现名称："+props.getProperty("java.vm.name")); + System.out.println("Java运行时环境规范版本："+props.getProperty("java.specification.version")); + System.out.println("Java运行时环境规范供应商："+props.getProperty("java.specification.vender")); + System.out.println("Java运行时环境规范名称："+props.getProperty("java.specification.name")); + System.out.println("Java的类格式版本号："+props.getProperty("java.class.version")); + System.out.println("Java的类路径："+props.getProperty("java.class.path")); + System.out.println("加载库时搜索的路径列表："+props.getProperty("java.library.path")); + System.out.println("默认的临时文件路径："+props.getProperty("java.io.tmpdir")); + System.out.println("一个或多个扩展目录的路径："+props.getProperty("java.ext.dirs")); + System.out.println("操作系统的名称："+props.getProperty("os.name")); + System.out.println("操作系统的构架："+props.getProperty("os.arch")); + System.out.println("操作系统的版本："+props.getProperty("os.version")); + System.out.println("文件分隔符："+props.getProperty("file.separator"));//在 unix 系统中是＂／＂ System.out.println("路径分隔符："+props.getProperty("path.separator"));//在 unix 系统中是＂:＂ System.out.println("行分隔符："+props.getProperty("line.separator"));//在 unix 系统中是＂/n＂ System.out.println("用户的账户名称："+props.getProperty("user.name")); + System.out.println("用户的主目录："+props.getProperty("user.home")); + System.out.println("用户的当前工作目录："+props.getProperty("user.dir")); + } + +} diff --git a/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/SubStr.java b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/SubStr.java new file mode 100644 index 000000000..25cff791d --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/word/SubStr.java @@ -0,0 +1,32 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.word; + +public class SubStr { + + /** + * @param args + */ + public static void main(String[] args) { + String browser="Chrome/44.0.2369.0"; + System.out.println(browser.indexOf('.')); + String passwordAlgorithm = "MD5-HEX"; + System.out.println(passwordAlgorithm.substring(0,passwordAlgorithm.indexOf("-HEX"))); + } + +} diff --git a/maxkey-commons/maxkey-crypto/src/test/resources/log4j2.xml b/maxkey-commons/maxkey-crypto/src/test/resources/log4j2.xml new file mode 100644 index 000000000..dfb480698 --- /dev/null +++ b/maxkey-commons/maxkey-crypto/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maxkey-commons/maxkey-ldap/build.gradle b/maxkey-commons/maxkey-ldap/build.gradle new file mode 100644 index 000000000..3549aea6e --- /dev/null +++ b/maxkey-commons/maxkey-ldap/build.gradle @@ -0,0 +1,8 @@ +description = "maxkey-ldap" + +dependencies { + //local jars + implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + + +} diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java b/maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java similarity index 100% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java rename to maxkey-commons/maxkey-ldap/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java diff --git a/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-commons/maxkey-ldap/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java similarity index 100% rename from maxkey-entity/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java rename to maxkey-commons/maxkey-ldap/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java diff --git a/maxkey-commons/maxkey-ldap/src/test/resources/log4j2.xml b/maxkey-commons/maxkey-ldap/src/test/resources/log4j2.xml new file mode 100644 index 000000000..dfb480698 --- /dev/null +++ b/maxkey-commons/maxkey-ldap/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maxkey-entity/build.gradle b/maxkey-entity/build.gradle index 829f119f3..1a91812ac 100644 --- a/maxkey-entity/build.gradle +++ b/maxkey-entity/build.gradle @@ -2,6 +2,9 @@ description = "maxkey-entity" dependencies { implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + + implementation project(":maxkey-entity") //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java index 2f23bca95..ced1786f2 100644 --- a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java +++ b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java @@ -26,11 +26,6 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; -import org.dromara.maxkey.constants.ConstsServiceMessage; -import org.dromara.maxkey.exception.PasswordPolicyException; -import org.dromara.maxkey.web.WebContext; - -import java.util.ArrayList; import java.util.List; /** @@ -132,60 +127,6 @@ public class CnfPasswordPolicy extends JpaEntity implements java.io.Serializable List policMessageList; - public void buildMessage(){ - if(policMessageList==null){ - policMessageList = new ArrayList<>(); - } - String msg; - if (minLength != 0) { - // msg = "新密码长度为"+minLength+"-"+maxLength+"位"; - msg = WebContext.getI18nValue("PasswordPolicy.TOO_SHORT", - new Object[]{minLength}); - policMessageList.add(msg); - } - if (maxLength != 0) { - // msg = "新密码长度为"+minLength+"-"+maxLength+"位"; - msg = WebContext.getI18nValue("PasswordPolicy.TOO_LONG", - new Object[]{maxLength}); - policMessageList.add(msg); - } - - if (lowerCase > 0) { - //msg = "新密码至少需要包含"+lowerCase+"位【a-z】小写字母"; - msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_LOWERCASE", - new Object[]{lowerCase}); - policMessageList.add(msg); - } - - if (upperCase > 0) { - //msg = "新密码至少需要包含"+upperCase+"位【A-Z】大写字母"; - msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_UPPERCASE", - new Object[]{upperCase}); - policMessageList.add(msg); - } - - if (digits > 0) { - //msg = "新密码至少需要包含"+digits+"位【0-9】阿拉伯数字"; - msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_DIGIT", - new Object[]{digits}); - policMessageList.add(msg); - } - - if (specialChar > 0) { - //msg = "新密码至少需要包含"+specialChar+"位特殊字符"; - msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_SPECIAL", - new Object[]{specialChar}); - policMessageList.add(msg); - } - - if (expiration > 0) { - //msg = "新密码有效期为"+expiration+"天"; - msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_EXPIRES_DAY", - new Object[]{expiration}); - policMessageList.add(msg); - } - } - public List getPolicMessageList() { return policMessageList; } @@ -409,51 +350,6 @@ public class CnfPasswordPolicy extends JpaEntity implements java.io.Serializable this.randomPasswordLength = randomPasswordLength; } - public void check(String username, String newPassword, String oldPassword) throws PasswordPolicyException { - if ((1 == this.getUsername()) && newPassword.toLowerCase().contains(username.toLowerCase())) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000001); - } - if (oldPassword != null && newPassword.equalsIgnoreCase(oldPassword)) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000002); - } - if (newPassword.length() < this.getMinLength()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000003, this.getMinLength()); - } - if (newPassword.length() > this.getMaxLength()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000004, this.getMaxLength()); - } - int numCount = 0, upperCount = 0, lowerCount = 0, spacil = 0; - char[] chPwd = newPassword.toCharArray(); - for (int i = 0; i < chPwd.length; i++) { - char ch = chPwd[i]; - if (Character.isDigit(ch)) { - numCount++; - continue; - } - if (Character.isLowerCase(ch)) { - lowerCount++; - continue; - } - if (Character.isUpperCase(ch)) { - upperCount++; - continue; - } - spacil++; - } - if (numCount < this.getDigits()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000005, this.getDigits()); - } - if (lowerCount < this.getLowerCase()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000006, this.getLowerCase()); - } - if (upperCount < this.getUpperCase()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000007, this.getUpperCase()); - } - if (spacil < this.getSpecialChar()) { - throw new PasswordPolicyException(ConstsServiceMessage.PASSWORDPOLICY.XW00000008, this.getSpecialChar()); - } - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java index ad771539d..8129d4dbc 100644 --- a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java +++ b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java @@ -26,7 +26,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; import org.dromara.maxkey.constants.ConstsStatus; -import org.dromara.maxkey.web.WebContext; @Entity @Table(name = "MXK_PERMISSION") @@ -65,8 +64,8 @@ public class Permission extends JpaEntity implements Serializable { * @param groupId String * @param resourceId String */ - public Permission(String appId, String groupId, String resourceId , String instId) { - this.id = WebContext.genId(); + public Permission(String id,String appId, String groupId, String resourceId , String instId) { + this.id = id; this.appId = appId; this.groupId = groupId; this.resourceId = resourceId; diff --git a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java index 919ecbabe..fbbb6eebb 100644 --- a/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java +++ b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java @@ -22,7 +22,6 @@ package org.dromara.maxkey.entity.permissions; import java.io.Serializable; import org.dromara.maxkey.constants.ConstsStatus; -import org.dromara.maxkey.web.WebContext; import org.dromara.mybatis.jpa.entity.JpaEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -71,8 +70,8 @@ public class PermissionRole extends JpaEntity implements Serializable { * @param roleId String * @param resourceId String */ - public PermissionRole(String appId, String roleId, String resourceId , String createdBy,String instId) { - this.id = WebContext.genId(); + public PermissionRole(String id,String appId, String roleId, String resourceId , String createdBy,String instId) { + this.id = id; this.appId = appId; this.roleId = roleId; this.resourceId = resourceId; diff --git a/maxkey-entity/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java b/maxkey-entity/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java deleted file mode 100644 index faeed9f0d..000000000 --- a/maxkey-entity/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright [2021] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.dromara.maxkey; - -import java.sql.SQLException; - -import org.apache.commons.text.StringEscapeUtils; -import org.springframework.boot.actuate.endpoint.ApiVersion; - -public class EscapeHtml4Test { - public static void main(String[] args) throws SQLException { - String value=">"; - System.out.println(StringEscapeUtils.escapeHtml4(value)); - System.out.println(StringEscapeUtils.escapeEcmaScript(value)); - System.out.println(ApiVersion.V2.getProducedMimeType().toString()); - } -} diff --git a/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java b/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java deleted file mode 100644 index e7af3e791..000000000 --- a/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.dromara.maxkey.persistence.derby; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - - -public class DerbyTest { -/** - * 1. - * first SET JAVA_HOME,DERBY_HOME,PATH - * set PATH=%DERBY_HOME%\bin;%PATH% - * 2. - * startNetworkServer Start Derby Database - * 3. - * create db seconddb1 , user is tquist - * CONNECT 'jdbc:derby://localhost:1527/seconddb1;create=true;user=tquist'; - * 4. - * Configuring NATIVE authentication - * call SYSCS_UTIL.SYSCS_CREATE_USER( 'tquist', 'tquist' ); - * 5. - * then restart derby database - */ - /** - * @param args - * @throws SQLException - */ - public static void main(String[] args) throws SQLException { - String nsURL="jdbc:derby://localhost:1527/seconddb1"; - java.util.Properties props = new java.util.Properties(); - props.setProperty("user","tquist"); - props.setProperty("password","tquist"); - - Connection conn = DriverManager.getConnection(nsURL, props); - - /*interact with Derby*/ - Statement s = conn.createStatement(); - - ResultSet rs = s.executeQuery("select * from secondtable"); - - while(rs.next()){ - System.out.println("key : "+rs.getInt("ID")+" ,name : "+rs.getString("NAME")); - } - } - -} diff --git a/maxkey-persistence/build.gradle b/maxkey-persistence/build.gradle index 71e414521..a55ed8d4a 100644 --- a/maxkey-persistence/build.gradle +++ b/maxkey-persistence/build.gradle @@ -5,5 +5,8 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") } \ No newline at end of file diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java index 1c79d8de6..a3fe19f2c 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java @@ -28,4 +28,6 @@ public interface CnfPasswordPolicyService extends IJpaService getPasswordPolicyRuleList(); + + public void buildTipMessage(CnfPasswordPolicy passwordPolicy); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java index c8683acc8..ab0b5c750 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java @@ -26,6 +26,7 @@ import org.dromara.maxkey.constants.ConstsProperties; import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy; import org.dromara.maxkey.persistence.mapper.CnfPasswordPolicyMapper; import org.dromara.maxkey.persistence.service.CnfPasswordPolicyService; +import org.dromara.maxkey.web.WebContext; import org.dromara.mybatis.jpa.query.LambdaQuery; import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl; import org.passay.CharacterOccurrencesRule; @@ -151,5 +152,61 @@ public class CnfPasswordPolicyServiceImpl extends JpaServiceImpl policMessageList = new ArrayList<>(); + + String msg; + if (passwordPolicy.getMinLength() != 0) { + // msg = "新密码长度为"+minLength+"-"+maxLength+"位"; + msg = WebContext.getI18nValue("PasswordPolicy.TOO_SHORT", + new Object[]{passwordPolicy.getMinLength()}); + policMessageList.add(msg); + } + if (passwordPolicy.getMaxLength() != 0) { + // msg = "新密码长度为"+minLength+"-"+maxLength+"位"; + msg = WebContext.getI18nValue("PasswordPolicy.TOO_LONG", + new Object[]{passwordPolicy.getMaxLength()}); + policMessageList.add(msg); + } + + if (passwordPolicy.getLowerCase() > 0) { + //msg = "新密码至少需要包含"+lowerCase+"位【a-z】小写字母"; + msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_LOWERCASE", + new Object[]{passwordPolicy.getLowerCase()}); + policMessageList.add(msg); + } + + if (passwordPolicy.getUpperCase() > 0) { + //msg = "新密码至少需要包含"+upperCase+"位【A-Z】大写字母"; + msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_UPPERCASE", + new Object[]{passwordPolicy.getUpperCase()}); + policMessageList.add(msg); + } + + if (passwordPolicy.getDigits() > 0) { + //msg = "新密码至少需要包含"+digits+"位【0-9】阿拉伯数字"; + msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_DIGIT", + new Object[]{passwordPolicy.getDigits()}); + policMessageList.add(msg); + } + + if (passwordPolicy.getSpecialChar() > 0) { + //msg = "新密码至少需要包含"+specialChar+"位特殊字符"; + msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_SPECIAL", + new Object[]{passwordPolicy.getSpecialChar()}); + policMessageList.add(msg); + } + + if (passwordPolicy.getExpiration() > 0) { + //msg = "新密码有效期为"+expiration+"天"; + msg = WebContext.getI18nValue("PasswordPolicy.INSUFFICIENT_EXPIRES_DAY", + new Object[]{passwordPolicy.getExpiration()}); + policMessageList.add(msg); + } + + passwordPolicy.setPolicMessageList(policMessageList); + } } diff --git a/maxkey-protocols/maxkey-protocol-authorize/build.gradle b/maxkey-protocols/maxkey-protocol-authorize/build.gradle index a9612a939..2bf8c89a4 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/build.gradle +++ b/maxkey-protocols/maxkey-protocol-authorize/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-cas/build.gradle b/maxkey-protocols/maxkey-protocol-cas/build.gradle index b3bf59e80..98d75ebde 100644 --- a/maxkey-protocols/maxkey-protocol-cas/build.gradle +++ b/maxkey-protocols/maxkey-protocol-cas/build.gradle @@ -10,7 +10,11 @@ dependencies { // https://mvnrepository.com/artifact/org.pac4j/pac4j-cas testImplementation group: 'org.pac4j', name: 'pac4j-cas', version: '3.8.3' + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle index 83b85a68f..6b5edb35c 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle +++ b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-formbased/build.gradle b/maxkey-protocols/maxkey-protocol-formbased/build.gradle index ac02154ef..075799532 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/build.gradle +++ b/maxkey-protocols/maxkey-protocol-formbased/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-jwt/build.gradle b/maxkey-protocols/maxkey-protocol-jwt/build.gradle index f83912ce4..a344714f5 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/build.gradle +++ b/maxkey-protocols/maxkey-protocol-jwt/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle index 8e2c571ae..4fcb73347 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle @@ -4,7 +4,11 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle index dd362e38d..ecd63f19e 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle @@ -5,6 +5,10 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle index b02d6e03b..2da09823a 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle +++ b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-starter/maxkey-starter-captcha/build.gradle b/maxkey-starter/maxkey-starter-captcha/build.gradle index 6902af9f8..c56fb1fc3 100644 --- a/maxkey-starter/maxkey-starter-captcha/build.gradle +++ b/maxkey-starter/maxkey-starter-captcha/build.gradle @@ -3,7 +3,10 @@ description = "maxkey-starter-captcha" dependencies { + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-authentications:maxkey-authentication-core") //local jars diff --git a/maxkey-starter/maxkey-starter-otp/build.gradle b/maxkey-starter/maxkey-starter-otp/build.gradle index 979231844..7317de4b4 100644 --- a/maxkey-starter/maxkey-starter-otp/build.gradle +++ b/maxkey-starter/maxkey-starter-otp/build.gradle @@ -6,7 +6,11 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-starter/maxkey-starter-sms/build.gradle b/maxkey-starter/maxkey-starter-sms/build.gradle index fac98ffa0..ba8ce46ba 100644 --- a/maxkey-starter/maxkey-starter-sms/build.gradle +++ b/maxkey-starter/maxkey-starter-sms/build.gradle @@ -6,7 +6,11 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-otp") diff --git a/maxkey-starter/maxkey-starter-social/build.gradle b/maxkey-starter/maxkey-starter-social/build.gradle index fb6cbeb6d..55ac87a5c 100644 --- a/maxkey-starter/maxkey-starter-social/build.gradle +++ b/maxkey-starter/maxkey-starter-social/build.gradle @@ -6,7 +6,11 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java index 77557b212..e7545a3ef 100644 --- a/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java +++ b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java @@ -25,6 +25,7 @@ import java.util.List; import org.dromara.maxkey.constants.ConstsDatabase; import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; @@ -55,7 +56,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ public boolean insert(SocialsAssociate socialsAssociate) { socialsAssociate.setId(socialsAssociate.generateId()); jdbcTemplate.update( - ConstsDatabase.compare(ConstsDatabase.ORACLE)? + WebContext.compare(ConstsDatabase.ORACLE)? DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE:DEFAULT_DEFAULT_INSERT_STATEMENT, new Object[] { socialsAssociate.getId(), diff --git a/maxkey-starter/maxkey-starter-web/build.gradle b/maxkey-starter/maxkey-starter-web/build.gradle index 61812667e..e5312d66f 100644 --- a/maxkey-starter/maxkey-starter-web/build.gradle +++ b/maxkey-starter/maxkey-starter-web/build.gradle @@ -6,7 +6,11 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle index f1cd0b72d..ac5ab955e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle index 857c6d1cb..f157af0e0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle @@ -7,8 +7,11 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle index 450b944db..55de88dde 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle index 759d2ce79..8ec4be24b 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle @@ -7,8 +7,11 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-synchronizers/maxkey-synchronizer/build.gradle b/maxkey-synchronizers/maxkey-synchronizer/build.gradle index d9f8638e0..0ff9b41ff 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer/build.gradle @@ -7,6 +7,9 @@ dependencies { implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml index 80e32fc32..bc7bc4f6f 100644 --- a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml +++ b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml @@ -1,7 +1,7 @@ #端口号 application: name: maxkey-gateway-server - formatted-version: v4.1.7 GA + formatted-version: v4.1.8 GA server: port: 9000 spring: diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index 703f1565c..3f9898e34 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -35,7 +35,12 @@ bootJar { } dependencies { + + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java index 67ffa1420..98190e987 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java @@ -54,7 +54,7 @@ public class ChangePasswodController { public Message passwordpolicy(@CurrentUser UserInfo currentUser){ CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(currentUser.getInstId()); //构建密码强度说明 - passwordPolicy.buildMessage(); + passwordPolicyService.buildTipMessage(passwordPolicy); return new Message<>(passwordPolicy); } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java index a1cd91c43..3c61a674a 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java @@ -84,7 +84,7 @@ public class ForgotPasswordContorller { public Message passwordpolicy(){ CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(WebContext.getInst().getId()); //构建密码强度说明 - passwordPolicy.buildMessage(); + passwordPolicyService.buildTipMessage(passwordPolicy); return new Message<>(passwordPolicy); } diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 39ea279c8..73635ad38 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -40,7 +40,13 @@ bootJar { } dependencies { + + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-commons:maxkey-ldap") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") 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 11e1cb453..da867ea30 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 @@ -27,6 +27,7 @@ import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.entity.idm.UserInfo; +import org.dromara.maxkey.util.StringGenerator; import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ public class ApplicationsController extends BaseAppContorller { Apps app=new Apps(); app.setId(app.generateId()); app.setProtocol(ConstsProtocols.BASIC); - app.setSecret(ReciprocalUtils.generateKey("")); + app.setSecret(StringGenerator.generateKey("")); return new Message<>(app); } @@ -138,13 +139,13 @@ public class ApplicationsController extends BaseAppContorller { String secret=""; type=type.toLowerCase(); if(type.equals("des")){ - secret=ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.DES); + secret=StringGenerator.generateKey(ReciprocalUtils.Algorithm.DES); }else if(type.equals("desede")){ - secret=ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.DESede); + secret=StringGenerator.generateKey(ReciprocalUtils.Algorithm.DESede); }else if(type.equals("aes")){ - secret=ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.AES); + secret=StringGenerator.generateKey(ReciprocalUtils.Algorithm.AES); }else if(type.equals("blowfish")){ - secret=ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.Blowfish); + secret=StringGenerator.generateKey(ReciprocalUtils.Algorithm.Blowfish); }else if(type.equalsIgnoreCase("RS256") ||type.equalsIgnoreCase("RS384") ||type.equalsIgnoreCase("RS512")) { @@ -186,7 +187,7 @@ public class ApplicationsController extends BaseAppContorller { .generate(); secret = octKey.toJSONString(); }else{ - secret=ReciprocalUtils.generateKey(""); + secret=StringGenerator.generateKey(""); } return new Message<>(Message.SUCCESS,secret); 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 adaa36cee..f2b451a5e 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 @@ -21,11 +21,11 @@ import java.util.List; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.AppsCasDetailsService; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -46,7 +46,7 @@ public class CasDetailsController extends BaseAppContorller { AppsCasDetails casDetails =new AppsCasDetails(); casDetails.setId(casDetails.generateId()); casDetails.setProtocol(ConstsProtocols.CAS); - casDetails.setSecret(ReciprocalUtils.generateKey("")); + casDetails.setSecret(StringGenerator.generateKey("")); return new Message<>(casDetails); } 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 eb79d009f..e2050337d 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 @@ -21,11 +21,11 @@ import java.util.List; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.entity.apps.AppsExtendApiDetails; import org.dromara.maxkey.entity.idm.UserInfo; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -43,7 +43,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); extendApiDetails.setId(extendApiDetails.generateId()); extendApiDetails.setProtocol(ConstsProtocols.EXTEND_API); - extendApiDetails.setSecret(ReciprocalUtils.generateKey("")); + extendApiDetails.setSecret(StringGenerator.generateKey("")); return new Message<>(extendApiDetails); } 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 6aff0612c..3f50642e1 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 @@ -21,11 +21,11 @@ import java.util.List; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +51,7 @@ public class FormBasedDetailsController extends BaseAppContorller { AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setId(formBasedDetails.generateId()); formBasedDetails.setProtocol(ConstsProtocols.FORMBASED); - formBasedDetails.setSecret(ReciprocalUtils.generateKey("")); + formBasedDetails.setSecret(StringGenerator.generateKey("")); return new Message(formBasedDetails); } 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 78db8a462..315f54fa0 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 @@ -21,11 +21,11 @@ import java.util.List; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.AppsJwtDetails; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.AppsJwtDetailsService; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +51,7 @@ public class JwtDetailsController extends BaseAppContorller { AppsJwtDetails jwtDetails =new AppsJwtDetails(); jwtDetails.setId(jwtDetails.generateId()); jwtDetails.setProtocol(ConstsProtocols.JWT); - jwtDetails.setSecret(ReciprocalUtils.generateKey("")); + jwtDetails.setSecret(StringGenerator.generateKey("")); jwtDetails.setUserPropertys("userPropertys"); return new Message(jwtDetails); } 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 b5e4a3f82..89102380f 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 @@ -23,12 +23,12 @@ import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.entity.apps.AppsOAuth20Details; import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.dromara.maxkey.entity.idm.UserInfo; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +53,7 @@ public class OAuth20DetailsController extends BaseAppContorller { public Message init() { AppsOAuth20Details oauth20Details=new AppsOAuth20Details(); oauth20Details.setId(oauth20Details.generateId()); - oauth20Details.setSecret(ReciprocalUtils.generateKey("")); + oauth20Details.setSecret(StringGenerator.generateKey("")); oauth20Details.setClientId(oauth20Details.getId()); oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20Details.setProtocol(ConstsProtocols.OAUTH20); 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 41cb0fe38..f153c5e8a 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 @@ -33,7 +33,6 @@ import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authz.saml20.metadata.MetadataDescriptorUtil; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.constants.ConstsProtocols; -import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.crypto.cert.X509CertUtils; import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; @@ -41,6 +40,7 @@ import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.apps.AppsSAML20Details; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService; +import org.dromara.maxkey.util.StringGenerator; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.metadata.EntityDescriptor; import org.opensaml.saml2.metadata.SPSSODescriptor; @@ -73,7 +73,7 @@ public class SAML20DetailsController extends BaseAppContorller { @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message init() { AppsSAML20Details saml20Details=new AppsSAML20Details(); - saml20Details.setSecret(ReciprocalUtils.generateKey("")); + saml20Details.setSecret(StringGenerator.generateKey("")); saml20Details.setProtocol(ConstsProtocols.SAML20); saml20Details.setId(saml20Details.generateId()); return new Message(saml20Details); 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 008baa8fe..53e172fef 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 @@ -27,6 +27,7 @@ import org.dromara.maxkey.entity.apps.AppsJwtDetails; import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.AppsTokenBasedDetailsService; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +53,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { AppsTokenBasedDetails tokenBasedDetails =new AppsTokenBasedDetails(); tokenBasedDetails.setId(tokenBasedDetails.generateId()); tokenBasedDetails.setProtocol(ConstsProtocols.TOKENBASED); - tokenBasedDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.AES)); + tokenBasedDetails.setSecret(StringGenerator.generateKey(ReciprocalUtils.Algorithm.AES)); tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret()); tokenBasedDetails.setUserPropertys("userPropertys"); return new Message(tokenBasedDetails); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java index 9928f64c7..47cf31ac5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java @@ -26,6 +26,7 @@ import org.dromara.maxkey.entity.permissions.Permission; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.PermissionService; import org.dromara.maxkey.util.StrUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -72,6 +73,7 @@ public class PermissionController { HashMapnewPrivilegesMap =new HashMap(); for(String resourceId : resourceIds) { Permission newGroupPrivilege=new Permission( + WebContext.genId(), groupPrivileges.getAppId(), groupPrivileges.getGroupId(), resourceId, diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionRoleController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionRoleController.java index b6be6dd4d..14730580d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionRoleController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionRoleController.java @@ -30,6 +30,7 @@ import org.dromara.maxkey.entity.permissions.PermissionRole; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.PermissionRoleService; import org.dromara.maxkey.util.StrUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -76,6 +77,7 @@ public class PermissionRoleController { HashMapnewPermissionRolesMap =new HashMap<>(); for(String resourceId : resourceIds) { PermissionRole newPermissionRole =new PermissionRole( + WebContext.genId(), permissionRole.getAppId(), permissionRole.getRoleId(), resourceId, diff --git a/maxkey-webs/maxkey-web-openapi/build.gradle b/maxkey-webs/maxkey-web-openapi/build.gradle index 87e6df6c3..658513460 100644 --- a/maxkey-webs/maxkey-web-openapi/build.gradle +++ b/maxkey-webs/maxkey-web-openapi/build.gradle @@ -40,7 +40,12 @@ bootJar { } dependencies { + + implementation project(":maxkey-commons:maxkey-cache") implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-commons:maxkey-core") + implementation project(":maxkey-commons:maxkey-crypto") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") diff --git a/settings.gradle b/settings.gradle index 711ed951e..bfbe243c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,12 @@ rootProject.name = 'MaxKey' //Commons +include ('maxkey-commons:maxkey-cache') include ('maxkey-commons:maxkey-common') +include ('maxkey-commons:maxkey-core') +include ('maxkey-commons:maxkey-crypto') +include ('maxkey-commons:maxkey-ldap') + include ('maxkey-entity') include ('maxkey-persistence')