From c6224f9f9d69d5132fe89d1ffb0ee228c39c4685 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 26 Jul 2025 21:48:06 +0800 Subject: [PATCH] rename maxkey-core and maxkey-common maxkey-core to maxkey-entity maxkey-common to maxkey-commons\maxkey-common --- .gitignore | 3 ++- .../maxkey-authentication-core/build.gradle | 4 ++-- .../maxkey-authentication-provider-mgt/build.gradle | 4 ++-- .../maxkey-authentication-provider/build.gradle | 4 ++-- .../maxkey-common}/build.gradle | 0 .../src/main/java/META-INF/MANIFEST.MF | 0 .../maxkey/adapter/LocalDateTimeAdapter.java | 0 .../java/org/dromara/maxkey/crypto/Base32Utils.java | 0 .../java/org/dromara/maxkey/crypto/Base64Utils.java | 0 .../java/org/dromara/maxkey/crypto/BytesUtils.java | 0 .../java/org/dromara/maxkey/crypto/DigestUtils.java | 0 .../java/org/dromara/maxkey/crypto/HexUtils.java | 0 .../java/org/dromara/maxkey/crypto/KeyPairSize.java | 0 .../java/org/dromara/maxkey/crypto/KeyPairType.java | 0 .../java/org/dromara/maxkey/crypto/KeyPairUtil.java | 0 .../main/java/org/dromara/maxkey/crypto/Md5Sum.java | 0 .../java/org/dromara/maxkey/crypto/RSAUtils.java | 0 .../org/dromara/maxkey/crypto/ReciprocalUtils.java | 0 .../main/java/org/dromara/maxkey/crypto/SM3.java | 0 .../org/dromara/maxkey/crypto/cert/CertCrypto.java | 0 .../org/dromara/maxkey/crypto/cert/CertSigner.java | 0 .../dromara/maxkey/crypto/cert/CryptoException.java | 0 .../org/dromara/maxkey/crypto/cert/NetUtil.java | 0 .../dromara/maxkey/crypto/cert/SignatureType.java | 0 .../org/dromara/maxkey/crypto/cert/StringUtil.java | 0 .../dromara/maxkey/crypto/cert/X509CertUtils.java | 0 .../dromara/maxkey/crypto/cert/X509V3CertGen.java | 0 .../maxkey/crypto/jose/JWEAlgorithmEmbed.java | 0 .../crypto/jose/JWEEncryptionMethodEmbed.java | 0 .../maxkey/crypto/jose/JWSAlgorithmEmbed.java | 0 .../maxkey/crypto/jose/keystore/JWKSetKeyStore.java | 0 .../dromara/maxkey/crypto/jwt/Hmac512Service.java | 0 .../service/JwtEncryptionAndDecryptionService.java | 0 .../DefaultJwtEncryptionAndDecryptionService.java | 0 ...entJwtEncryptionAndDecryptionServiceBuilder.java | 0 .../service/JwtSigningAndValidationService.java | 0 .../impl/DefaultJwtSigningAndValidationService.java | 0 .../jwt/signer/service/impl/JWKSetCacheService.java | 0 .../signer/service/impl/SymmetricCacheService.java | 0 ...SymmetricSigningAndValidationServiceBuilder.java | 0 .../maxkey/crypto/keystore/KeyStoreLoader.java | 0 .../maxkey/crypto/keystore/KeyStoreType.java | 0 .../maxkey/crypto/keystore/KeyStoreUtil.java | 0 .../maxkey/crypto/password/DesedeEncoder.java | 0 .../dromara/maxkey/crypto/password/Digester.java | 0 .../crypto/password/LdapShaPasswordEncoder.java | 0 .../org/dromara/maxkey/crypto/password/Md4.java | 0 .../maxkey/crypto/password/Md4PasswordEncoder.java | 0 .../password/MessageDigestPasswordEncoder.java | 0 .../maxkey/crypto/password/NoOpPasswordEncoder.java | 0 .../crypto/password/PasswordEncoderUtils.java | 0 .../dromara/maxkey/crypto/password/PasswordGen.java | 0 .../maxkey/crypto/password/PasswordReciprocal.java | 0 .../maxkey/crypto/password/SM3PasswordEncoder.java | 0 .../crypto/password/StandardPasswordEncoder.java | 0 .../dromara/maxkey/crypto/signature/DsaSigner.java | 0 .../dromara/maxkey/crypto/signature/ISigner.java | 0 .../dromara/maxkey/crypto/signature/RsaSigner.java | 0 .../org/dromara/maxkey/entity/DbTableColumn.java | 0 .../org/dromara/maxkey/entity/DbTableMetaData.java | 0 .../java/org/dromara/maxkey/entity/Message.java | 0 .../org/dromara/maxkey/entity/TreeAttributes.java | 0 .../java/org/dromara/maxkey/entity/TreeNode.java | 0 .../dromara/maxkey/json/JsonDateDeserializer.java | 0 .../org/dromara/maxkey/json/JsonDateSerializer.java | 0 .../maxkey/json/JsonDateTimeDeserializer.java | 0 .../dromara/maxkey/json/JsonDateTimeSerializer.java | 0 .../maxkey/json/JsonISODateDeserializer.java | 0 .../dromara/maxkey/json/JsonISODateSerializer.java | 0 .../java/org/dromara/maxkey/ldap/LdapUtils.java | 0 .../ldap/activedirectory/ActiveDirectoryUtils.java | 0 .../constants/ActiveDirectoryUser.java | 0 .../ActiveDirectoryUserAccountControl.java | 0 .../dromara/maxkey/ldap/constants/GroupOfNames.java | 0 .../maxkey/ldap/constants/GroupOfUniqueNames.java | 0 .../maxkey/ldap/constants/InetOrgPerson.java | 0 .../dromara/maxkey/ldap/constants/Organization.java | 0 .../maxkey/ldap/constants/OrganizationalUnit.java | 0 .../main/java/org/dromara/maxkey/pretty/Pretty.java | 0 .../org/dromara/maxkey/pretty/PrettyFactory.java | 0 .../org/dromara/maxkey/pretty/impl/JsonPretty.java | 0 .../org/dromara/maxkey/pretty/impl/SqlPretty.java | 0 .../org/dromara/maxkey/pretty/impl/XMLHelper.java | 0 .../org/dromara/maxkey/pretty/impl/XmlPretty.java | 0 .../dromara/maxkey/pretty/impl/package-info.java | 0 .../dromara/maxkey/util/AuthorizationHeader.java | 0 .../maxkey/util/AuthorizationHeaderUtils.java | 0 .../java/org/dromara/maxkey/util/BeanConvert.java | 0 .../main/java/org/dromara/maxkey/util/BeanUtil.java | 0 .../java/org/dromara/maxkey/util/DateUtils.java | 0 .../main/java/org/dromara/maxkey/util/DynaBean.java | 0 .../org/dromara/maxkey/util/EthernetAddress.java | 0 .../java/org/dromara/maxkey/util/ExcelUtils.java | 0 .../java/org/dromara/maxkey/util/HttpEncoder.java | 0 .../java/org/dromara/maxkey/util/HttpsTrusts.java | 0 .../java/org/dromara/maxkey/util/IdGenerator.java | 0 .../java/org/dromara/maxkey/util/IdSequence.java | 0 .../main/java/org/dromara/maxkey/util/Instance.java | 0 .../java/org/dromara/maxkey/util/JdbcUtils.java | 0 .../java/org/dromara/maxkey/util/JsonUtils.java | 0 .../java/org/dromara/maxkey/util/MacAddress.java | 0 .../java/org/dromara/maxkey/util/MethodInvoke.java | 0 .../org/dromara/maxkey/util/ObjectTransformer.java | 0 .../java/org/dromara/maxkey/util/PathUtils.java | 0 .../java/org/dromara/maxkey/util/Preconditions.java | 0 .../main/java/org/dromara/maxkey/util/QRCode.java | 0 .../java/org/dromara/maxkey/util/QRCodeConfig.java | 0 .../java/org/dromara/maxkey/util/QRCodeUtils.java | 0 .../org/dromara/maxkey/util/RequestTokenUtils.java | 0 .../org/dromara/maxkey/util/SerializationUtils.java | 0 .../java/org/dromara/maxkey/util/SnowFlakeId.java | 0 .../main/java/org/dromara/maxkey/util/StrUtils.java | 0 .../java/org/dromara/maxkey/util/StreamUtils.java | 0 .../org/dromara/maxkey/util/StringGenerator.java | 0 .../java/org/dromara/maxkey/util/TimeJsonUtils.java | 0 .../java/org/dromara/maxkey/util/UUIDGenerator.java | 0 .../java/org/dromara/maxkey/uuid/NodeIDGetter.java | 0 .../dromara/maxkey/uuid/TimestampUUIDGenerator.java | 0 .../src/main/java/org/dromara/maxkey/uuid/UUID.java | 0 .../java/org/dromara/maxkey/uuid/UUIDGenerator.java | 0 .../org/dromara/maxkey/uuid/UUIDRandomness.java | 0 .../uuid/UnsynchronizedTimestampUUIDGenerator.java | 0 .../maxkey-common}/src/main/resources/banner.txt | 0 .../test/java/org/maxkey/DateExpirationTest.java | 0 .../src/test/java/org/maxkey/Integer2LongTest.java | 0 .../java/org/maxkey/crypto/Base64UtilsTest.java | 0 .../java/org/maxkey/crypto/DigestUtilsTest.java | 0 .../src/test/java/org/maxkey/crypto/KeyGen.java | 0 .../src/test/java/org/maxkey/crypto/Md5SumTest.java | 0 .../java/org/maxkey/crypto/PasswordGenTest.java | 0 .../test/java/org/maxkey/crypto/RSAUtilsTest.java | 0 .../java/org/maxkey/crypto/ReciprocalUtilsTest.java | 0 .../src/test/java/org/maxkey/crypto/RsaMessage.java | 0 .../maxkey/crypto/SCryptPasswordEncoderTest.java | 0 .../org/maxkey/crypto/cert/X509CertUtilsTest.java | 0 .../org/maxkey/crypto/cert/X509V3CertGenTest.java | 0 .../crypto/password/PasswordReciprocalTest.java | 0 .../crypto/password/SM3PasswordEncoderTest.java | 0 .../crypto/password/SM4PasswordEncoderTest.java | 0 .../password/StandardPasswordEncoderTest.java | 0 .../org/maxkey/crypto/signature/DsaSignerTest.java | 0 .../maxkey/crypto/signature/HMAC512ServiceTest.java | 0 .../maxkey/crypto/signature/HS512SignerTest.java | 0 .../org/maxkey/crypto/signature/RSAKeyTest.java | 0 .../org/maxkey/crypto/signature/RsaSignerTest.java | 0 .../src/test/java/org/maxkey/mail/MailTest.java | 0 .../java/org/maxkey/otp/algorithm/QRcodeTest.java | 0 .../src/test/java/org/maxkey/package-info.java | 0 .../org/maxkey/rest/AuthorizationHeaderTest.java | 0 .../test/java/org/maxkey/util/DateUtilsTest.java | 0 .../java/org/maxkey/util/EthernetAddressTest.java | 0 .../test/java/org/maxkey/util/IdSequenceTest.java | 0 .../src/test/java/org/maxkey/util/InstanceTest.java | 0 .../test/java/org/maxkey/util/MacAddressTest.java | 0 .../java/org/maxkey/util/ObjectTransformerTest.java | 0 .../test/java/org/maxkey/util/PathUtilsTest.java | 0 .../test/java/org/maxkey/util/SonwFlakeIdTest.java | 0 .../test/java/org/maxkey/util/SqlPrettyTest.java | 0 .../java/org/maxkey/util/StringGeneratorTest.java | 0 .../java/org/maxkey/util/UUIDGeneratorTest.java | 0 .../test/java/org/maxkey/util/XMLHelperTest.java | 0 .../test/java/org/maxkey/word/CharacterCase.java | 0 .../src/test/java/org/maxkey/word/RunJavaEnvs.java | 0 .../src/test/java/org/maxkey/word/SubStr.java | 0 .../maxkey-common}/src/test/resources/log4j2.xml | 0 maxkey-core/.gitignore | 1 - {maxkey-core => maxkey-entity}/build.gradle | 4 ++-- .../src/main/java/META-INF/MANIFEST.MF | 0 .../maxkey/configuration/ApplicationConfig.java | 0 .../dromara/maxkey/configuration/AuthJwkConfig.java | 0 .../configuration/CharacterEncodingConfig.java | 0 .../dromara/maxkey/configuration/EmailConfig.java | 0 .../dromara/maxkey/configuration/LoginConfig.java | 0 .../configuration/oidc/OIDCProviderMetadata.java | 0 .../oidc/OIDCProviderMetadataDetails.java | 0 .../org/dromara/maxkey/constants/ConstsAct.java | 0 .../dromara/maxkey/constants/ConstsActResult.java | 0 .../org/dromara/maxkey/constants/ConstsBoolean.java | 0 .../dromara/maxkey/constants/ConstsDatabase.java | 0 .../dromara/maxkey/constants/ConstsEntryType.java | 0 .../dromara/maxkey/constants/ConstsLoginType.java | 0 .../maxkey/constants/ConstsPasswordSetType.java | 0 .../dromara/maxkey/constants/ConstsPersistence.java | 0 .../maxkey/constants/ConstsPlatformRole.java | 0 .../dromara/maxkey/constants/ConstsProperties.java | 0 .../dromara/maxkey/constants/ConstsProtocols.java | 0 .../org/dromara/maxkey/constants/ConstsRegex.java | 0 .../org/dromara/maxkey/constants/ConstsRoles.java | 0 .../maxkey/constants/ConstsServiceMessage.java | 0 .../org/dromara/maxkey/constants/ConstsStatus.java | 0 .../maxkey/constants/ConstsTimeInterval.java | 0 .../org/dromara/maxkey/constants/ContentType.java | 0 .../main/java/org/dromara/maxkey/entity/Access.java | 0 .../java/org/dromara/maxkey/entity/Accounts.java | 0 .../org/dromara/maxkey/entity/AccountsStrategy.java | 0 .../org/dromara/maxkey/entity/ChangePassword.java | 0 .../java/org/dromara/maxkey/entity/Connectors.java | 0 .../java/org/dromara/maxkey/entity/ExcelImport.java | 0 .../java/org/dromara/maxkey/entity/ExtraAttr.java | 0 .../java/org/dromara/maxkey/entity/ExtraAttrs.java | 0 .../java/org/dromara/maxkey/entity/FileUpload.java | 0 .../org/dromara/maxkey/entity/Institutions.java | 0 .../dromara/maxkey/entity/OrganizationsCast.java | 0 .../java/org/dromara/maxkey/entity/Register.java | 0 .../org/dromara/maxkey/entity/Saml20Metadata.java | 0 .../org/dromara/maxkey/entity/SocialsAssociate.java | 0 .../org/dromara/maxkey/entity/SocialsProvider.java | 0 .../dromara/maxkey/entity/SocialsProviderLogin.java | 0 .../dromara/maxkey/entity/SyncJobConfigField.java | 0 .../org/dromara/maxkey/entity/SynchroRelated.java | 0 .../org/dromara/maxkey/entity/Synchronizers.java | 0 .../java/org/dromara/maxkey/entity/apps/Apps.java | 0 .../dromara/maxkey/entity/apps/AppsAdapters.java | 0 .../dromara/maxkey/entity/apps/AppsCasDetails.java | 0 .../maxkey/entity/apps/AppsExtendApiDetails.java | 0 .../maxkey/entity/apps/AppsFormBasedDetails.java | 0 .../dromara/maxkey/entity/apps/AppsJwtDetails.java | 0 .../maxkey/entity/apps/AppsOAuth20Details.java | 0 .../maxkey/entity/apps/AppsSAML20Details.java | 0 .../maxkey/entity/apps/AppsTokenBasedDetails.java | 0 .../org/dromara/maxkey/entity/apps/UserApps.java | 0 .../entity/apps/oauth2/provider/ClientDetails.java | 0 .../oauth2/provider/client/BaseClientDetails.java | 0 .../client/Jackson2ArrayOrStringDeserializer.java | 0 .../maxkey/entity/authz/QueryAppResourceDto.java | 0 .../maxkey/entity/authz/QueryGroupMembersDto.java | 0 .../maxkey/entity/authz/QueryRoleMembersDto.java | 0 .../maxkey/entity/authz/vo/AppResourcesVo.java | 0 .../dromara/maxkey/entity/cnf/CnfEmailSenders.java | 0 .../dromara/maxkey/entity/cnf/CnfLdapContext.java | 0 .../maxkey/entity/cnf/CnfPasswordPolicy.java | 0 .../dromara/maxkey/entity/cnf/CnfSmsProvider.java | 0 .../org/dromara/maxkey/entity/dto/TimeBasedDto.java | 0 .../maxkey/entity/history/HistoryConnector.java | 0 .../dromara/maxkey/entity/history/HistoryLogin.java | 0 .../maxkey/entity/history/HistoryLoginApps.java | 0 .../maxkey/entity/history/HistorySynchronizer.java | 0 .../maxkey/entity/history/HistorySystemLogs.java | 0 .../org/dromara/maxkey/entity/idm/GroupMember.java | 0 .../java/org/dromara/maxkey/entity/idm/Groups.java | 0 .../dromara/maxkey/entity/idm/Organizations.java | 0 .../org/dromara/maxkey/entity/idm/UserInfo.java | 0 .../maxkey/entity/permissions/Permission.java | 0 .../maxkey/entity/permissions/PermissionRole.java | 0 .../maxkey/entity/permissions/Resources.java | 0 .../maxkey/entity/permissions/RoleMember.java | 0 .../dromara/maxkey/entity/permissions/Roles.java | 0 .../maxkey/entity/userinfo/ContactEntity.java | 0 .../maxkey/entity/userinfo/EnterpriseEntity.java | 0 .../dromara/maxkey/entity/userinfo/ImsEntity.java | 0 .../dromara/maxkey/entity/userinfo/NameEntity.java | 0 .../org/dromara/maxkey/entity/xml/UserInfoXML.java | 0 .../dromara/maxkey/exception/BusinessException.java | 0 .../org/dromara/maxkey/exception/NameException.java | 0 .../maxkey/exception/OperaterSqlException.java | 0 .../maxkey/exception/PasswordPolicyException.java | 0 .../persistence/cache/InMemoryMomentaryService.java | 0 .../maxkey/persistence/cache/MomentaryService.java | 0 .../persistence/cache/RedisMomentaryService.java | 0 .../maxkey/persistence/cache/package-info.java | 0 .../dromara/maxkey/persistence/package-info.java | 0 .../maxkey/persistence/redis/RedisConnection.java | 0 .../persistence/redis/RedisConnectionFactory.java | 0 .../maxkey/persistence/redis/package-info.java | 0 .../dromara/maxkey/schedule/ScheduleAdapter.java | 0 .../maxkey/schedule/ScheduleAdapterBuilder.java | 0 .../dromara/maxkey/web/ConfigurerFreeMarker.java | 0 .../org/dromara/maxkey/web/ExceptionEndpoint.java | 0 .../dromara/maxkey/web/GlobalExceptionHandler.java | 0 .../org/dromara/maxkey/web/HttpRequestAdapter.java | 0 .../org/dromara/maxkey/web/HttpResponseAdapter.java | 0 .../dromara/maxkey/web/HttpResponseConstants.java | 0 .../org/dromara/maxkey/web/InitializeContext.java | 0 .../org/dromara/maxkey/web/MetadataEndpoint.java | 0 .../org/dromara/maxkey/web/ProductEnvironment.java | 0 .../dromara/maxkey/web/ProductVersionEndpoint.java | 0 .../java/org/dromara/maxkey/web/WebConstants.java | 0 .../java/org/dromara/maxkey/web/WebContext.java | 0 .../maxkey/web/tag/BasePathTagDirective.java | 0 .../dromara/maxkey/web/tag/BaseTagDirective.java | 0 .../dromara/maxkey/web/tag/BrowserTagDirective.java | 0 .../org/dromara/maxkey/web/tag/FreemarkerTag.java | 0 .../dromara/maxkey/web/tag/LocaleTagDirective.java | 0 .../src/main/resources/favicon.ico | Bin .../messages/passwordpolicy_message.properties | 0 .../messages/passwordpolicy_message_en.properties | 0 .../passwordpolicy_message_zh_CN.properties | 0 .../src/main/resources/top_weak_password.txt | 0 .../java/org/dromara/maxkey/EscapeHtml4Test.java | 0 .../test/java/org/dromara/maxkey/package-info.java | 0 .../dromara/maxkey/persistence/derby/DerbyTest.java | 0 .../persistence/ldap/ActiveDirectoryUtilsTest.java | 0 .../src/test/resources/log4j2.xml | 0 maxkey-persistence/build.gradle | 4 ++-- .../maxkey-protocol-authorize/build.gradle | 4 ++-- maxkey-protocols/maxkey-protocol-cas/build.gradle | 4 ++-- .../maxkey-protocol-extendapi/build.gradle | 4 ++-- .../maxkey-protocol-formbased/build.gradle | 4 ++-- maxkey-protocols/maxkey-protocol-jwt/build.gradle | 4 ++-- .../maxkey-protocol-oauth-2.0/build.gradle | 4 ++-- .../maxkey-protocol-saml-2.0/build.gradle | 4 ++-- .../maxkey-protocol-tokenbased/build.gradle | 4 ++-- maxkey-starter/maxkey-starter-captcha/build.gradle | 4 ++-- .../maxkey-starter-ip2location/build.gradle | 4 ++-- maxkey-starter/maxkey-starter-otp/build.gradle | 4 ++-- maxkey-starter/maxkey-starter-sms/build.gradle | 4 ++-- maxkey-starter/maxkey-starter-social/build.gradle | 4 ++-- maxkey-starter/maxkey-starter-web/build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../maxkey-synchronizer-dingtalk/build.gradle | 4 ++-- .../maxkey-synchronizer-feishu/build.gradle | 4 ++-- .../maxkey-synchronizer-jdbc/build.gradle | 4 ++-- .../maxkey-synchronizer-ldap/build.gradle | 4 ++-- .../maxkey-synchronizer-workweixin/build.gradle | 4 ++-- .../maxkey-synchronizer/build.gradle | 4 ++-- maxkey-web-apis/maxkey-web-api-rest/build.gradle | 4 ++-- maxkey-web-apis/maxkey-web-api-scim/build.gradle | 4 ++-- maxkey-webs/maxkey-gataway/build.gradle | 2 +- maxkey-webs/maxkey-web-maxkey/build.gradle | 4 ++-- maxkey-webs/maxkey-web-mgt/build.gradle | 4 ++-- maxkey-webs/maxkey-web-openapi/build.gradle | 4 ++-- settings.gradle | 6 +++--- 322 files changed, 68 insertions(+), 68 deletions(-) rename {maxkey-common => maxkey-commons/maxkey-common}/build.gradle (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/META-INF/MANIFEST.MF (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/adapter/LocalDateTimeAdapter.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/HexUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/SM3.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/Digester.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/Md4.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/entity/Message.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/entity/TreeNode.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/Pretty.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/BeanConvert.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/BeanUtil.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/DateUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/DynaBean.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/EthernetAddress.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/ExcelUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/HttpEncoder.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/IdGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/IdSequence.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/Instance.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/JdbcUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/JsonUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/MacAddress.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/MethodInvoke.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/PathUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/Preconditions.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/QRCode.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/QRCodeUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/SerializationUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/StrUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/StreamUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/StringGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/TimeJsonUtils.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/UUID.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/main/resources/banner.txt (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/DateExpirationTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/Integer2LongTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/Base64UtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/DigestUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/KeyGen.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/Md5SumTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/PasswordGenTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/RSAUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/RsaMessage.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/mail/MailTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/package-info.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/DateUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/EthernetAddressTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/IdSequenceTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/InstanceTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/MacAddressTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/ObjectTransformerTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/PathUtilsTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/SonwFlakeIdTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/SqlPrettyTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/StringGeneratorTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/UUIDGeneratorTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/util/XMLHelperTest.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/word/CharacterCase.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/word/RunJavaEnvs.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/java/org/maxkey/word/SubStr.java (100%) rename {maxkey-common => maxkey-commons/maxkey-common}/src/test/resources/log4j2.xml (100%) delete mode 100644 maxkey-core/.gitignore rename {maxkey-core => maxkey-entity}/build.gradle (53%) rename {maxkey-core => maxkey-entity}/src/main/java/META-INF/MANIFEST.MF (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsAct.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/constants/ContentType.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Access.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Accounts.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/ChangePassword.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Connectors.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/ExcelImport.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/FileUpload.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Institutions.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Register.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/SyncJobConfigField.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/Synchronizers.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/Apps.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/authz/QueryAppResourceDto.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/authz/QueryGroupMembersDto.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/authz/QueryRoleMembersDto.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/authz/vo/AppResourcesVo.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/cnf/CnfEmailSenders.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/cnf/CnfLdapContext.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/cnf/CnfSmsProvider.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/dto/TimeBasedDto.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/history/HistoryConnector.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/history/HistoryLoginApps.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/history/HistorySynchronizer.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/history/HistorySystemLogs.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/idm/GroupMember.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/idm/Groups.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/idm/Organizations.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/permissions/Resources.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/permissions/RoleMember.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/exception/BusinessException.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/exception/NameException.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/package-info.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/InitializeContext.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/WebConstants.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/WebContext.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java (100%) rename {maxkey-core => maxkey-entity}/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java (100%) rename {maxkey-core => maxkey-entity}/src/main/resources/favicon.ico (100%) rename {maxkey-core => maxkey-entity}/src/main/resources/messages/passwordpolicy_message.properties (100%) rename {maxkey-core => maxkey-entity}/src/main/resources/messages/passwordpolicy_message_en.properties (100%) rename {maxkey-core => maxkey-entity}/src/main/resources/messages/passwordpolicy_message_zh_CN.properties (100%) rename {maxkey-core => maxkey-entity}/src/main/resources/top_weak_password.txt (100%) rename {maxkey-core => maxkey-entity}/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java (100%) rename {maxkey-core => maxkey-entity}/src/test/java/org/dromara/maxkey/package-info.java (100%) rename {maxkey-core => maxkey-entity}/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java (100%) rename {maxkey-core => maxkey-entity}/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java (100%) rename {maxkey-core => maxkey-entity}/src/test/resources/log4j2.xml (100%) diff --git a/.gitignore b/.gitignore index 1ce3985d3..a93547505 100644 --- a/.gitignore +++ b/.gitignore @@ -54,4 +54,5 @@ maxkey-web-frontend/maxkey-web-app/.angular/ maxkey-web-frontend/maxkey-web-app/yarn.lock maxkey-web-frontend/maxkey-web-app/dist -**/out/* \ No newline at end of file +**/out/* +/.sonarlint diff --git a/maxkey-authentications/maxkey-authentication-core/build.gradle b/maxkey-authentications/maxkey-authentication-core/build.gradle index 5334d4b83..272da562a 100644 --- a/maxkey-authentications/maxkey-authentication-core/build.gradle +++ b/maxkey-authentications/maxkey-authentication-core/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-otp") diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle b/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle index a98d1270c..9e18bbc64 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-ip2location") diff --git a/maxkey-authentications/maxkey-authentication-provider/build.gradle b/maxkey-authentications/maxkey-authentication-provider/build.gradle index 5e019e9f3..c736ada4c 100644 --- a/maxkey-authentications/maxkey-authentication-provider/build.gradle +++ b/maxkey-authentications/maxkey-authentication-provider/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-ip2location") diff --git a/maxkey-common/build.gradle b/maxkey-commons/maxkey-common/build.gradle similarity index 100% rename from maxkey-common/build.gradle rename to maxkey-commons/maxkey-common/build.gradle diff --git a/maxkey-common/src/main/java/META-INF/MANIFEST.MF b/maxkey-commons/maxkey-common/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-common/src/main/java/META-INF/MANIFEST.MF rename to maxkey-commons/maxkey-common/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/adapter/LocalDateTimeAdapter.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/adapter/LocalDateTimeAdapter.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/adapter/LocalDateTimeAdapter.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/adapter/LocalDateTimeAdapter.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/Hmac512Service.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/LdapUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfNames.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/GroupOfUniqueNames.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/InetOrgPerson.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/Organization.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/OrganizationalUnit.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java diff --git a/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 similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/TimeJsonUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/TimeJsonUtils.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/TimeJsonUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/TimeJsonUtils.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java similarity index 100% rename from maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java diff --git a/maxkey-common/src/main/resources/banner.txt b/maxkey-commons/maxkey-common/src/main/resources/banner.txt similarity index 100% rename from maxkey-common/src/main/resources/banner.txt rename to maxkey-commons/maxkey-common/src/main/resources/banner.txt diff --git a/maxkey-common/src/test/java/org/maxkey/DateExpirationTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/DateExpirationTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/DateExpirationTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/DateExpirationTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/KeyGen.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/RsaMessage.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/HS512SignerTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/mail/MailTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/package-info.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/package-info.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/package-info.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/package-info.java diff --git a/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/PathUtilsTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/PathUtilsTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/PathUtilsTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/PathUtilsTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java diff --git a/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java diff --git a/maxkey-common/src/test/java/org/maxkey/word/RunJavaEnvs.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/RunJavaEnvs.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/word/RunJavaEnvs.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/RunJavaEnvs.java diff --git a/maxkey-common/src/test/java/org/maxkey/word/SubStr.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/SubStr.java similarity index 100% rename from maxkey-common/src/test/java/org/maxkey/word/SubStr.java rename to maxkey-commons/maxkey-common/src/test/java/org/maxkey/word/SubStr.java diff --git a/maxkey-common/src/test/resources/log4j2.xml b/maxkey-commons/maxkey-common/src/test/resources/log4j2.xml similarity index 100% rename from maxkey-common/src/test/resources/log4j2.xml rename to maxkey-commons/maxkey-common/src/test/resources/log4j2.xml diff --git a/maxkey-core/.gitignore b/maxkey-core/.gitignore deleted file mode 100644 index 84c048a73..000000000 --- a/maxkey-core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build/ diff --git a/maxkey-core/build.gradle b/maxkey-entity/build.gradle similarity index 53% rename from maxkey-core/build.gradle rename to maxkey-entity/build.gradle index 7b892b29a..829f119f3 100644 --- a/maxkey-core/build.gradle +++ b/maxkey-entity/build.gradle @@ -1,7 +1,7 @@ -description = "maxkey-core" +description = "maxkey-entity" dependencies { - implementation project(":maxkey-common") + implementation project(":maxkey-commons:maxkey-common") //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') diff --git a/maxkey-core/src/main/java/META-INF/MANIFEST.MF b/maxkey-entity/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-core/src/main/java/META-INF/MANIFEST.MF rename to maxkey-entity/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsAct.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsAct.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsAct.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsAct.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRegex.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ContentType.java b/maxkey-entity/src/main/java/org/dromara/maxkey/constants/ContentType.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ContentType.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/constants/ContentType.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Access.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Access.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Access.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Access.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Accounts.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Accounts.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/ChangePassword.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/ChangePassword.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Connectors.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Connectors.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExcelImport.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExcelImport.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/FileUpload.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/FileUpload.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Institutions.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Institutions.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Register.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Register.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SyncJobConfigField.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/SyncJobConfigField.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/SyncJobConfigField.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/SyncJobConfigField.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/Synchronizers.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/Synchronizers.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/Apps.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/Apps.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryAppResourceDto.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryAppResourceDto.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryAppResourceDto.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryAppResourceDto.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryGroupMembersDto.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryGroupMembersDto.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryGroupMembersDto.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryGroupMembersDto.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryRoleMembersDto.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryRoleMembersDto.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/QueryRoleMembersDto.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/QueryRoleMembersDto.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/vo/AppResourcesVo.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/vo/AppResourcesVo.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/authz/vo/AppResourcesVo.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/authz/vo/AppResourcesVo.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfEmailSenders.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfEmailSenders.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfEmailSenders.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfEmailSenders.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfLdapContext.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfLdapContext.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfLdapContext.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfLdapContext.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfPasswordPolicy.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfSmsProvider.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfSmsProvider.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/cnf/CnfSmsProvider.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/cnf/CnfSmsProvider.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/dto/TimeBasedDto.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/dto/TimeBasedDto.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/dto/TimeBasedDto.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/dto/TimeBasedDto.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryConnector.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryConnector.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryConnector.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryConnector.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLoginApps.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryLoginApps.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLoginApps.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistoryLoginApps.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistorySynchronizer.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistorySynchronizer.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistorySynchronizer.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistorySynchronizer.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistorySystemLogs.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistorySystemLogs.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistorySystemLogs.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/history/HistorySystemLogs.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/GroupMember.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/GroupMember.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/GroupMember.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/GroupMember.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/Groups.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/Groups.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/Groups.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/Groups.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/Organizations.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/Organizations.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/Organizations.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/Organizations.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Permission.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/PermissionRole.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Resources.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Resources.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Resources.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Resources.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/RoleMember.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/RoleMember.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/RoleMember.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/RoleMember.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java b/maxkey-entity/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java b/maxkey-entity/src/main/java/org/dromara/maxkey/exception/BusinessException.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/exception/BusinessException.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java b/maxkey-entity/src/main/java/org/dromara/maxkey/exception/NameException.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/exception/NameException.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java b/maxkey-entity/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java b/maxkey-entity/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/package-info.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/package-info.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/package-info.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/package-info.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java b/maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java b/maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapter.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java b/maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/schedule/ScheduleAdapterBuilder.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/GlobalExceptionHandler.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/InitializeContext.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/InitializeContext.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/ProductVersionEndpoint.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/WebConstants.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/WebConstants.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/WebContext.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/WebContext.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java b/maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java rename to maxkey-entity/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java diff --git a/maxkey-core/src/main/resources/favicon.ico b/maxkey-entity/src/main/resources/favicon.ico similarity index 100% rename from maxkey-core/src/main/resources/favicon.ico rename to maxkey-entity/src/main/resources/favicon.ico diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message.properties b/maxkey-entity/src/main/resources/messages/passwordpolicy_message.properties similarity index 100% rename from maxkey-core/src/main/resources/messages/passwordpolicy_message.properties rename to maxkey-entity/src/main/resources/messages/passwordpolicy_message.properties diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties b/maxkey-entity/src/main/resources/messages/passwordpolicy_message_en.properties similarity index 100% rename from maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties rename to maxkey-entity/src/main/resources/messages/passwordpolicy_message_en.properties diff --git a/maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties b/maxkey-entity/src/main/resources/messages/passwordpolicy_message_zh_CN.properties similarity index 100% rename from maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties rename to maxkey-entity/src/main/resources/messages/passwordpolicy_message_zh_CN.properties diff --git a/maxkey-core/src/main/resources/top_weak_password.txt b/maxkey-entity/src/main/resources/top_weak_password.txt similarity index 100% rename from maxkey-core/src/main/resources/top_weak_password.txt rename to maxkey-entity/src/main/resources/top_weak_password.txt diff --git a/maxkey-core/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java b/maxkey-entity/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java similarity index 100% rename from maxkey-core/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java rename to maxkey-entity/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java diff --git a/maxkey-core/src/test/java/org/dromara/maxkey/package-info.java b/maxkey-entity/src/test/java/org/dromara/maxkey/package-info.java similarity index 100% rename from maxkey-core/src/test/java/org/dromara/maxkey/package-info.java rename to maxkey-entity/src/test/java/org/dromara/maxkey/package-info.java diff --git a/maxkey-core/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java b/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java similarity index 100% rename from maxkey-core/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java rename to maxkey-entity/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java diff --git a/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-entity/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java similarity index 100% rename from maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java rename to maxkey-entity/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java diff --git a/maxkey-core/src/test/resources/log4j2.xml b/maxkey-entity/src/test/resources/log4j2.xml similarity index 100% rename from maxkey-core/src/test/resources/log4j2.xml rename to maxkey-entity/src/test/resources/log4j2.xml diff --git a/maxkey-persistence/build.gradle b/maxkey-persistence/build.gradle index 7eba0a042..71e414521 100644 --- a/maxkey-persistence/build.gradle +++ b/maxkey-persistence/build.gradle @@ -4,6 +4,6 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") } \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-authorize/build.gradle b/maxkey-protocols/maxkey-protocol-authorize/build.gradle index dae3fb79b..a9612a939 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/build.gradle +++ b/maxkey-protocols/maxkey-protocol-authorize/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + 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 0296a4ee3..b3bf59e80 100644 --- a/maxkey-protocols/maxkey-protocol-cas/build.gradle +++ b/maxkey-protocols/maxkey-protocol-cas/build.gradle @@ -10,8 +10,8 @@ dependencies { // https://mvnrepository.com/artifact/org.pac4j/pac4j-cas testImplementation group: 'org.pac4j', name: 'pac4j-cas', version: '3.8.3' - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle index b6e00db16..83b85a68f 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle +++ b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-formbased/build.gradle b/maxkey-protocols/maxkey-protocol-formbased/build.gradle index 26cee3b5c..ac02154ef 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/build.gradle +++ b/maxkey-protocols/maxkey-protocol-formbased/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-jwt/build.gradle b/maxkey-protocols/maxkey-protocol-jwt/build.gradle index afc177347..f83912ce4 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/build.gradle +++ b/maxkey-protocols/maxkey-protocol-jwt/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle index 3c851c37a..8e2c571ae 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle @@ -4,8 +4,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle index a38d3dd08..dd362e38d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle @@ -4,8 +4,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-provider") diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle index 77676a02f..b02d6e03b 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle +++ b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-starter/maxkey-starter-captcha/build.gradle b/maxkey-starter/maxkey-starter-captcha/build.gradle index 5ceea3ed4..6902af9f8 100644 --- a/maxkey-starter/maxkey-starter-captcha/build.gradle +++ b/maxkey-starter/maxkey-starter-captcha/build.gradle @@ -3,8 +3,8 @@ description = "maxkey-starter-captcha" dependencies { - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-authentications:maxkey-authentication-core") //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') diff --git a/maxkey-starter/maxkey-starter-ip2location/build.gradle b/maxkey-starter/maxkey-starter-ip2location/build.gradle index c48dc51d3..0010a86e7 100644 --- a/maxkey-starter/maxkey-starter-ip2location/build.gradle +++ b/maxkey-starter/maxkey-starter-ip2location/build.gradle @@ -6,7 +6,7 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") } \ No newline at end of file diff --git a/maxkey-starter/maxkey-starter-otp/build.gradle b/maxkey-starter/maxkey-starter-otp/build.gradle index f0a4aefce..979231844 100644 --- a/maxkey-starter/maxkey-starter-otp/build.gradle +++ b/maxkey-starter/maxkey-starter-otp/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") } \ No newline at end of file diff --git a/maxkey-starter/maxkey-starter-sms/build.gradle b/maxkey-starter/maxkey-starter-sms/build.gradle index 12ce57fd7..fac98ffa0 100644 --- a/maxkey-starter/maxkey-starter-sms/build.gradle +++ b/maxkey-starter/maxkey-starter-sms/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + 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 0513d731e..fb6cbeb6d 100644 --- a/maxkey-starter/maxkey-starter-social/build.gradle +++ b/maxkey-starter/maxkey-starter-social/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-provider") diff --git a/maxkey-starter/maxkey-starter-web/build.gradle b/maxkey-starter/maxkey-starter-web/build.gradle index 039ef4e12..61812667e 100644 --- a/maxkey-starter/maxkey-starter-web/build.gradle +++ b/maxkey-starter/maxkey-starter-web/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") } \ No newline at end of file diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle index 92b63ca7d..f1cd0b72d 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle index 0ac780723..a7011cef2 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + 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 de15554f5..857c6d1cb 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-jdbc/build.gradle index 98d8a507b..a3481c23c 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle index 9fd15f1fc..450b944db 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + 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 a76b42b9c..759d2ce79 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-synchronizers/maxkey-synchronizer/build.gradle b/maxkey-synchronizers/maxkey-synchronizer/build.gradle index b2a79f7b1..d9f8638e0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") } \ No newline at end of file diff --git a/maxkey-web-apis/maxkey-web-api-rest/build.gradle b/maxkey-web-apis/maxkey-web-api-rest/build.gradle index b198249c2..e22f51b93 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/build.gradle +++ b/maxkey-web-apis/maxkey-web-api-rest/build.gradle @@ -8,8 +8,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-authentications:maxkey-authentication-core") diff --git a/maxkey-web-apis/maxkey-web-api-scim/build.gradle b/maxkey-web-apis/maxkey-web-api-scim/build.gradle index a387dbf13..e2fedbf6b 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/build.gradle +++ b/maxkey-web-apis/maxkey-web-api-scim/build.gradle @@ -6,8 +6,8 @@ dependencies { //local jars implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") } \ No newline at end of file diff --git a/maxkey-webs/maxkey-gataway/build.gradle b/maxkey-webs/maxkey-gataway/build.gradle index 5e3c056ee..29ca8c11d 100644 --- a/maxkey-webs/maxkey-gataway/build.gradle +++ b/maxkey-webs/maxkey-gataway/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'java' dependencies { - implementation project(":maxkey-common") + implementation project(":maxkey-commons:maxkey-common") //spring-cloud gateway server implementation group: 'org.springframework.cloud', name: 'spring-cloud-gateway-server', version: "${springcloudVersion}" diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index 428c42caa..703f1565c 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -35,8 +35,8 @@ bootJar { } dependencies { - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-captcha") diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index c058fafe5..39ea279c8 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -40,8 +40,8 @@ bootJar { } dependencies { - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-captcha") diff --git a/maxkey-webs/maxkey-web-openapi/build.gradle b/maxkey-webs/maxkey-web-openapi/build.gradle index e58734b4e..87e6df6c3 100644 --- a/maxkey-webs/maxkey-web-openapi/build.gradle +++ b/maxkey-webs/maxkey-web-openapi/build.gradle @@ -40,8 +40,8 @@ bootJar { } dependencies { - implementation project(":maxkey-common") - implementation project(":maxkey-core") + implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-entity") implementation project(":maxkey-persistence") implementation project(":maxkey-starter:maxkey-starter-captcha") diff --git a/settings.gradle b/settings.gradle index c1c583de7..711ed951e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,9 +20,9 @@ rootProject.name = 'MaxKey' -//Common -include ('maxkey-common') -include ('maxkey-core') +//Commons +include ('maxkey-commons:maxkey-common') +include ('maxkey-entity') include ('maxkey-persistence') //maxkey-starter