From 5f21d813462bc281b5ca3d5378c4f6bf3cbd2272 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 19 Apr 2021 20:03:30 +0800 Subject: [PATCH] domain ->entity,SQL -> lowercase domain ->entity,SQL -> lowercase --- .../authn/AbstractAuthenticationProvider.java | 2 +- .../authn/RealmAuthenticationProvider.java | 2 +- .../org/maxkey/authn/SigninPrincipal.java | 2 +- .../org/maxkey/authn/online/OnlineTicket.java | 2 +- .../realm/AbstractAuthenticationRealm.java | 4 +- .../ActiveDirectoryAuthenticationRealm.java | 2 +- .../jdbc/DefaultJdbcAuthenticationRealm.java | 2 +- .../realm/ldap/LdapAuthenticationRealm.java | 2 +- .../password/onetimepwd/AbstractOtpAuthn.java | 2 +- .../password/onetimepwd/impl/CapOtpAuthn.java | 2 +- .../onetimepwd/impl/CounterBasedOtpAuthn.java | 2 +- .../onetimepwd/impl/HotpOtpAuthn.java | 2 +- .../onetimepwd/impl/MailOtpAuthn.java | 2 +- .../onetimepwd/impl/MobileOtpAuthn.java | 2 +- .../password/onetimepwd/impl/RsaOtpAuthn.java | 2 +- .../password/onetimepwd/impl/SmsOtpAuthn.java | 2 +- .../onetimepwd/impl/TimeBasedOtpAuthn.java | 2 +- .../impl/sms/SmsOtpAuthnAliyun.java | 2 +- .../impl/sms/SmsOtpAuthnTencentCloud.java | 2 +- .../impl/sms/SmsOtpAuthnYunxin.java | 2 +- .../token/AbstractOtpTokenStore.java | 2 +- .../token/InMemoryOtpTokenStore.java | 2 +- .../onetimepwd/token/RedisOtpTokenStore.java | 2 +- .../autoconfigure/MvcAutoConfiguration.java | 2 +- .../maxkey/{domain => entity}/Accounts.java | 2 +- .../{domain => entity}/ChangePassword.java | 2 +- .../{domain => entity}/ExcelImport.java | 2 +- .../maxkey/{domain => entity}/ExtraAttr.java | 2 +- .../maxkey/{domain => entity}/ExtraAttrs.java | 2 +- .../{domain => entity}/GroupMember.java | 2 +- .../{domain => entity}/GroupPrivileges.java | 4 +- .../org/maxkey/{domain => entity}/Groups.java | 2 +- .../{domain => entity}/HistoryLogin.java | 2 +- .../{domain => entity}/HistoryLoginApps.java | 2 +- .../{domain => entity}/HistoryLogs.java | 2 +- .../{domain => entity}/Navigations.java | 2 +- .../maxkey/{domain => entity}/Notices.java | 2 +- .../{domain => entity}/Organizations.java | 2 +- .../{domain => entity}/PasswordPolicy.java | 2 +- .../{domain => entity}/Registration.java | 2 +- .../maxkey/{domain => entity}/Resources.java | 2 +- .../maxkey/{domain => entity}/RoleMember.java | 2 +- .../{domain => entity}/RolePermissions.java | 2 +- .../org/maxkey/{domain => entity}/Roles.java | 2 +- .../{domain => entity}/Saml20Metadata.java | 2 +- .../maxkey/{domain => entity}/UserInfo.java | 2 +- .../{domain => entity}/UserInfoAdjoint.java | 2 +- .../maxkey/{domain => entity}/apps/Apps.java | 4 +- .../{domain => entity}/apps/AppsAdapters.java | 2 +- .../apps/AppsCasDetails.java | 2 +- .../apps/AppsExtendApiDetails.java | 2 +- .../apps/AppsFormBasedDetails.java | 2 +- .../apps/AppsJwtDetails.java | 2 +- .../apps/AppsOAuth20Details.java | 4 +- .../apps/AppsSAML20Details.java | 2 +- .../apps/AppsTokenBasedDetails.java | 2 +- .../{domain => entity}/apps/UserApps.java | 2 +- .../apps/oauth2/provider/ClientDetails.java | 2 +- .../provider/client/BaseClientDetails.java | 6 +- .../Jackson2ArrayOrStringDeserializer.java | 2 +- .../userinfo/ContactEntity.java | 2 +- .../userinfo/EnterpriseEntity.java | 2 +- .../userinfo/ImsEntity.java | 2 +- .../userinfo/NameEntity.java | 2 +- .../{domain => entity}/xml/UserInfoXML.java | 2 +- .../persistence/db/LoginHistoryService.java | 2 +- .../maxkey/persistence/db/LoginService.java | 4 +- .../db/PasswordPolicyValidator.java | 4 +- .../main/java/org/maxkey/web/WebContext.java | 2 +- .../maxkey/persistence/derby/DerbyTest.java | 2 +- .../rest/RestOrganizationController.java | 2 +- .../identity/rest/RestUserInfoController.java | 2 +- .../persistence/mapper/AccountsMapper.java | 2 +- .../mapper/AppsAdaptersMapper.java | 2 +- .../mapper/AppsCasDetailsMapper.java | 2 +- .../mapper/AppsFormBasedDetailsMapper.java | 2 +- .../mapper/AppsJwtDetailsMapper.java | 2 +- .../maxkey/persistence/mapper/AppsMapper.java | 4 +- .../mapper/AppsSaml20DetailsMapper.java | 2 +- .../mapper/AppsTokenBasedDetailsMapper.java | 2 +- .../persistence/mapper/GroupMemberMapper.java | 4 +- .../mapper/GroupPrivilegesMapper.java | 2 +- .../persistence/mapper/GroupsMapper.java | 2 +- .../mapper/HistoryLoginAppsMapper.java | 2 +- .../mapper/HistoryLoginMapper.java | 2 +- .../persistence/mapper/HistoryLogsMapper.java | 2 +- .../persistence/mapper/NoticesMapper.java | 2 +- .../mapper/OrganizationsMapper.java | 2 +- .../mapper/PasswordPolicyMapper.java | 2 +- .../mapper/RegistrationMapper.java | 4 +- .../persistence/mapper/ResourcesMapper.java | 2 +- .../persistence/mapper/RoleMemberMapper.java | 4 +- .../persistence/mapper/RolesMapper.java | 4 +- .../mapper/UserInfoAdjointMapper.java | 2 +- .../persistence/mapper/UserInfoMapper.java | 2 +- .../persistence/service/AccountsService.java | 2 +- .../service/AppsAdaptersService.java | 2 +- .../service/AppsCasDetailsService.java | 2 +- .../service/AppsFormBasedDetailsService.java | 2 +- .../service/AppsJwtDetailsService.java | 2 +- .../service/AppsSaml20DetailsService.java | 2 +- .../persistence/service/AppsService.java | 4 +- .../service/AppsTokenBasedDetailsService.java | 2 +- .../service/GroupMemberService.java | 4 +- .../service/GroupPrivilegesService.java | 2 +- .../persistence/service/GroupsService.java | 2 +- .../service/HistoryLoginAppsService.java | 2 +- .../service/HistoryLoginService.java | 2 +- .../service/HistoryLogsService.java | 2 +- .../persistence/service/NoticesService.java | 2 +- .../service/OrganizationsService.java | 2 +- .../service/PasswordPolicyService.java | 2 +- .../service/RegistrationService.java | 4 +- .../persistence/service/ResourcesService.java | 2 +- .../service/RoleMemberService.java | 4 +- .../persistence/service/RolesService.java | 4 +- .../service/UserInfoAdjointService.java | 2 +- .../persistence/service/UserInfoService.java | 4 +- .../mapper/xml/mysql/AccountsMapper.xml | 16 +- .../mapper/xml/mysql/AppsAdaptersMapper.xml | 16 +- .../mapper/xml/mysql/AppsCasDetailsMapper.xml | 20 +- .../xml/mysql/AppsFormBasedDetailsMapper.xml | 18 +- .../mapper/xml/mysql/AppsJwtDetailsMapper.xml | 18 +- .../mapper/xml/mysql/AppsMapper.xml | 176 ++++----- .../xml/mysql/AppsSaml20DetailsMapper.xml | 52 +-- .../xml/mysql/AppsTokenBasedDetailsMapper.xml | 18 +- .../mapper/xml/mysql/GroupMemberMapper.xml | 334 +++++++++--------- .../xml/mysql/GroupPrivilegesMapper.xml | 66 ++-- .../mapper/xml/mysql/GroupsMapper.xml | 34 +- .../xml/mysql/HistoryLoginAppsMapper.xml | 42 +-- .../mapper/xml/mysql/HistoryLoginMapper.xml | 68 ++-- .../mapper/xml/mysql/HistoryLogsMapper.xml | 48 +-- .../mapper/xml/mysql/NoticesMapper.xml | 24 +- .../mapper/xml/mysql/OrganizationsMapper.xml | 26 +- .../mapper/xml/mysql/RegistrationMapper.xml | 30 +- .../mapper/xml/mysql/ReportMapper.xml | 91 ++--- .../mapper/xml/mysql/ResourcesMapper.xml | 34 +- .../mapper/xml/mysql/RoleMemberMapper.xml | 330 ++++++++--------- .../mapper/xml/mysql/RolesMapper.xml | 56 +-- .../xml/mysql/UserInfoAdjointMapper.xml | 24 +- .../mapper/xml/mysql/UserInfoMapper.xml | 298 ++++++++-------- .../mybatis/jpa/test/AccountsServiceTest.java | 2 +- .../mybatis/jpa/test/AppsServiceTest.java | 2 +- .../jpa/test/FormBasedDetailsServiceTest.java | 2 +- .../authz/endpoint/AuthorizeBaseEndpoint.java | 6 +- .../endpoint/AuthorizeCredentialEndpoint.java | 4 +- .../authz/endpoint/AuthorizeEndpoint.java | 2 +- .../endpoint/AuthorizeProtectedEndpoint.java | 2 +- .../adapter/AbstractAuthorizeAdapter.java | 4 +- .../singlelogout/DefaultSingleLogout.java | 2 +- .../authz/singlelogout/SamlSingleLogout.java | 2 +- .../authz/singlelogout/SingleLogout.java | 3 +- .../cas/endpoint/Cas20AuthorizeEndpoint.java | 2 +- .../cas/endpoint/Cas30AuthorizeEndpoint.java | 2 +- .../cas/endpoint/CasAuthorizeEndpoint.java | 2 +- .../authz/cas/endpoint/CasRestV1Endpoint.java | 4 +- .../endpoint/adapter/CasDefaultAdapter.java | 2 +- .../cas/endpoint/ticket/AbstractTicket.java | 2 +- .../ticket/ProxyGrantingTicketIOUImpl.java | 2 +- .../ticket/ProxyGrantingTicketImpl.java | 2 +- .../cas/endpoint/ticket/ProxyTicketImpl.java | 2 +- .../endpoint/ticket/ServiceTicketImpl.java | 2 +- .../authz/cas/endpoint/ticket/Ticket.java | 2 +- .../endpoint/ticket/TicketGrantingTicket.java | 2 +- .../ticket/TicketGrantingTicketImpl.java | 2 +- .../endpoint/ExtendApiAuthorizeEndpoint.java | 4 +- .../adapter/ExtendApiCndnsApiMailAdapter.java | 6 +- .../adapter/ExtendApiQQExmailAdapter.java | 6 +- .../ExtendApiTimestampSignAdapter.java | 6 +- .../adapter/ExtendApiZentaoAdapter.java | 6 +- .../endpoint/FormBasedAuthorizeEndpoint.java | 6 +- .../adapter/FormBasedDefaultAdapter.java | 4 +- .../FormBasedNetease163EmailAdapter.java | 4 +- .../FormBasedNeteaseNoteYoudaoAdapter.java | 4 +- .../adapter/FormBasedRedirectAdapter.java | 4 +- .../jwt/endpoint/adapter/JwtAdapter.java | 6 +- .../endpoint/adapter/JwtDefaultAdapter.java | 4 +- .../jwt/endpoint/adapter/JwtHS256Adapter.java | 6 +- .../token/endpoint/JwtAuthorizeEndpoint.java | 4 +- .../oauth2/provider/AuthorizationRequest.java | 2 +- .../oauth2/provider/ClientDetailsService.java | 2 +- .../provider/ClientRegistrationService.java | 2 +- .../oauth2/provider/OAuth2RequestFactory.java | 2 +- .../provider/OAuth2RequestValidator.java | 2 +- .../provider/OAuth2UserDetailsService.java | 2 +- .../authz/oauth2/provider/TokenRequest.java | 2 +- .../ApprovalStoreUserApprovalHandler.java | 2 +- .../TokenStoreUserApprovalHandler.java | 2 +- .../OAuth20AccessConfirmationController.java | 4 +- .../OAuth20UserApprovalHandler.java | 2 +- .../ClientDetailsUserDetailsService.java | 2 +- .../client/InMemoryClientDetailsService.java | 2 +- .../client/JdbcClientDetailsService.java | 4 +- .../code/AuthorizationCodeTokenGranter.java | 2 +- .../endpoint/AuthorizationEndpoint.java | 2 +- .../endpoint/DefaultRedirectResolver.java | 2 +- .../provider/endpoint/RedirectResolver.java | 2 +- .../provider/endpoint/TokenEndpoint.java | 2 +- .../implicit/ImplicitTokenGranter.java | 2 +- .../ResourceOwnerPasswordTokenGranter.java | 2 +- .../provider/refresh/RefreshTokenGranter.java | 2 +- .../request/DefaultOAuth2RequestFactory.java | 2 +- .../DefaultOAuth2RequestValidator.java | 2 +- .../provider/token/AbstractTokenGranter.java | 2 +- .../provider/token/DefaultTokenServices.java | 2 +- .../endpoint/OAuthDefaultUserInfoAdapter.java | 2 +- .../OpenIdConnectUserInfoEndpoint.java | 4 +- .../userinfo/endpoint/UserInfoEndpoint.java | 4 +- .../oidc/idtoken/OIDCIdTokenEnhancer.java | 2 +- .../authz/saml20/binding/BindingAdapter.java | 2 +- .../saml20/binding/ExtractBindingAdapter.java | 2 +- .../impl/ExtractPostBindingAdapter.java | 2 +- .../binding/impl/PostBindingAdapter.java | 2 +- .../consumer/endpoint/ConsumerEndpoint.java | 2 +- .../authz/saml20/jit/ProvisioningAdapter.java | 2 +- .../metadata/endpoint/MetadataEndpoint.java | 2 +- .../provider/endpoint/AssertionEndpoint.java | 2 +- .../provider/endpoint/IdpInitEndpoint.java | 2 +- .../endpoint/SingleSignOnEndpoint.java | 2 +- .../provider/xml/AssertionGenerator.java | 2 +- .../xml/AttributeStatementGenerator.java | 6 +- .../provider/xml/AuthnResponseGenerator.java | 2 +- .../saml20/provider/xml/SubjectGenerator.java | 4 +- .../Saml20AutoConfiguration.java | 2 +- .../endpoint/TokenBasedAuthorizeEndpoint.java | 4 +- .../adapter/TokenBasedDefaultAdapter.java | 4 +- .../adapter/TokenBasedSimpleAdapter.java | 4 +- .../org/maxkey/jobs/DynamicGroupsJob.java | 2 +- .../endpoint/RestTimeBasedOtpController.java | 2 +- .../apps/contorller/AdaptersController.java | 2 +- .../contorller/ApplicationsController.java | 6 +- .../apps/contorller/BaseAppContorller.java | 2 +- .../contorller/BasicDetailsController.java | 2 +- .../apps/contorller/CasDetailsController.java | 2 +- .../ExtendApiDetailsController.java | 4 +- .../FormBasedDetailsController.java | 2 +- .../apps/contorller/JwtDetailsController.java | 2 +- .../contorller/OAuth20DetailsController.java | 6 +- .../contorller/SAML20DetailsController.java | 2 +- .../TokenBasedDetailsController.java | 2 +- .../web/contorller/AccountsController.java | 2 +- .../web/contorller/GroupMemberController.java | 6 +- .../contorller/GroupPrivilegesController.java | 4 +- .../web/contorller/GroupsController.java | 2 +- .../maxkey/web/contorller/LogsController.java | 6 +- .../web/contorller/NoticesController.java | 2 +- .../contorller/OrganizationsController.java | 4 +- .../contorller/PasswordPolicyController.java | 2 +- .../web/contorller/PermissionsController.java | 2 +- .../web/contorller/ResourcesController.java | 2 +- .../web/contorller/RoleMemberController.java | 4 +- .../web/contorller/RolesController.java | 2 +- .../web/contorller/UserAdjointController.java | 2 +- .../web/contorller/UserInfoController.java | 4 +- .../web/interceptor/HistoryLogsAdapter.java | 4 +- .../interceptor/RestApiPermissionAdapter.java | 2 +- .../src/main/resources/application.properties | 2 +- .../main/resources/templates/views/main.ftl | 12 +- .../web/contorller/AppListController.java | 8 +- .../contorller/ForgotPasswordContorller.java | 2 +- .../web/contorller/HistorysController.java | 6 +- .../contorller/OneTimePasswordController.java | 2 +- .../web/contorller/ProfileController.java | 2 +- .../contorller/RegistrationController.java | 4 +- .../maxkey/web/contorller/SafeController.java | 2 +- .../maxkey/web/endpoint/LoginEndpoint.java | 2 +- .../maxkey/web/endpoint/LogoutEndpoint.java | 2 +- .../interceptor/HistoryLoginAppAdapter.java | 6 +- .../web/interceptor/HistoryLogsAdapter.java | 4 +- .../web/interceptor/PreLoginAppAdapter.java | 3 +- .../resources/application-http.properties | 2 +- .../resources/application-https.properties | 2 +- 272 files changed, 1259 insertions(+), 1246 deletions(-) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Accounts.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/ChangePassword.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/ExcelImport.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/ExtraAttr.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/ExtraAttrs.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/GroupMember.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/GroupPrivileges.java (97%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Groups.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/HistoryLogin.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/HistoryLoginApps.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/HistoryLogs.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Navigations.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Notices.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Organizations.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/PasswordPolicy.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Registration.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Resources.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/RoleMember.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/RolePermissions.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Roles.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/Saml20Metadata.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/UserInfo.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/UserInfoAdjoint.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/Apps.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsAdapters.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsCasDetails.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsExtendApiDetails.java (96%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsFormBasedDetails.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsJwtDetails.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsOAuth20Details.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsSAML20Details.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/AppsTokenBasedDetails.java (99%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/UserApps.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/oauth2/provider/ClientDetails.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/oauth2/provider/client/BaseClientDetails.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java (97%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/userinfo/ContactEntity.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/userinfo/EnterpriseEntity.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/userinfo/ImsEntity.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/userinfo/NameEntity.java (98%) rename maxkey-core/src/main/java/org/maxkey/{domain => entity}/xml/UserInfoXML.java (97%) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java index ed0f9f1f4..3f1566cde 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java @@ -25,7 +25,7 @@ import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsLoginType; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java index cd7c18e04..e20c92f1c 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java @@ -24,7 +24,7 @@ import org.maxkey.authn.online.OnlineTicketServices; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SigninPrincipal.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SigninPrincipal.java index c5420911c..e25501aed 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SigninPrincipal.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SigninPrincipal.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import org.maxkey.authn.online.OnlineTicket; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/OnlineTicket.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/OnlineTicket.java index 280847c53..e2a0f3eb8 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/OnlineTicket.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/OnlineTicket.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.time.LocalTime; import java.util.HashMap; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.springframework.security.core.Authentication; public class OnlineTicket implements Serializable{ diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java index d240253f4..92d8580b0 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; -import org.maxkey.domain.Groups; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Groups; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.PasswordPolicyValidator; import org.maxkey.persistence.db.LoginService; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java index f4dc48aca..be4a2a7da 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java @@ -24,7 +24,7 @@ import javax.validation.constraints.Size; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/DefaultJdbcAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/DefaultJdbcAuthenticationRealm.java index 68e74addb..92bc0e65b 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/DefaultJdbcAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/DefaultJdbcAuthenticationRealm.java @@ -20,7 +20,7 @@ package org.maxkey.authn.realm.jdbc; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java index fdc5a5e13..e3da505f2 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java @@ -24,7 +24,7 @@ import javax.validation.constraints.Size; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java index de6843e3f..5d9e282c8 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java @@ -17,7 +17,7 @@ package org.maxkey.password.onetimepwd; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.token.AbstractOtpTokenStore; import org.maxkey.password.onetimepwd.token.InMemoryOtpTokenStore; import org.maxkey.util.StringGenerator; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java index 0470b1bb9..fcb99f031 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java @@ -17,7 +17,7 @@ package org.maxkey.password.onetimepwd.impl; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; /** diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java index 3ab1f342d..6db37670b 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -19,7 +19,7 @@ package org.maxkey.password.onetimepwd.impl; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java index d1989c6fe..17c2f1008 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java @@ -21,7 +21,7 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import org.maxkey.crypto.Base32Utils; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.password.onetimepwd.algorithm.HOTP; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java index f187bce4a..22f4f28bf 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java @@ -22,7 +22,7 @@ import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.Email; import org.apache.commons.mail.SimpleEmail; import org.maxkey.configuration.EmailConfig; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java index 9b2b6e966..46fecdfa3 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java @@ -17,7 +17,7 @@ package org.maxkey.password.onetimepwd.impl; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; public class MobileOtpAuthn extends AbstractOtpAuthn { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java index 05c80edda..4d33edd3d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java @@ -17,7 +17,7 @@ package org.maxkey.password.onetimepwd.impl; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; /** diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java index 890036b84..bc7c82c11 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Properties; import org.maxkey.constants.ConstantsProperties; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java index 5c38eaca8..37eb46702 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java @@ -24,7 +24,7 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java index ae0c086a8..29013c77c 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java @@ -26,7 +26,7 @@ import com.aliyuncs.profile.DefaultProfile; import java.io.IOException; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java index f7660ba46..09d109fc0 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java @@ -26,7 +26,7 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; import java.io.IOException; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index 42204b412..8b5763ff9 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -29,7 +29,7 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java index f72aba001..46ba9e26e 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java @@ -17,7 +17,7 @@ package org.maxkey.password.onetimepwd.token; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; public abstract class AbstractOtpTokenStore { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java index 6f56f4f0d..5a836ac26 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java @@ -24,7 +24,7 @@ import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; import org.maxkey.constants.ConstantsTimeInterval; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.OneTimePassword; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java index 25ae7a1fe..e3faadbe2 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java @@ -19,7 +19,7 @@ package org.maxkey.password.onetimepwd.token; import org.joda.time.DateTime; import org.maxkey.constants.ConstantsTimeInterval; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.OneTimePassword; import org.maxkey.persistence.redis.RedisConnection; import org.maxkey.persistence.redis.RedisConnectionFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java index f6f36f8c1..9a1b16956 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -142,7 +142,7 @@ public class MvcAutoConfiguration implements InitializingBean { @Bean (name = "jaxb2Marshaller") public Jaxb2Marshaller jaxb2Marshaller() { Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller(); - jaxb2Marshaller.setClassesToBeBound(org.maxkey.domain.xml.UserInfoXML.class);; + jaxb2Marshaller.setClassesToBeBound(org.maxkey.entity.xml.UserInfoXML.class);; return jaxb2Marshaller; } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Accounts.java rename to maxkey-core/src/main/java/org/maxkey/entity/Accounts.java index 12441940d..a78b297e5 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java rename to maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java index 524753987..54f3a244f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java b/maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java rename to maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java index 9fd5e68ee..16f891525 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java rename to maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java index 8d611817c..a0e76a0b9 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.domain; +package org.maxkey.entity; /** * @author Administrator diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java rename to maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java index 23d087d7b..18f914ae9 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.util.ArrayList; import java.util.HashMap; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java b/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java rename to maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java index 096d1d297..b0917d435 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java b/maxkey-core/src/main/java/org/maxkey/entity/GroupPrivileges.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java rename to maxkey-core/src/main/java/org/maxkey/entity/GroupPrivileges.java index 4d52b667f..8b3797981 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/GroupPrivileges.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; @@ -26,7 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; /* diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java b/maxkey-core/src/main/java/org/maxkey/entity/Groups.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Groups.java rename to maxkey-core/src/main/java/org/maxkey/entity/Groups.java index a69789d72..236e8a453 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Groups.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java rename to maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java index 6779749f9..e1900e23b 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java rename to maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java index fc35e6df8..49104b923 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogs.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java rename to maxkey-core/src/main/java/org/maxkey/entity/HistoryLogs.java index 3c9feb7c9..6d146a152 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogs.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Navigations.java b/maxkey-core/src/main/java/org/maxkey/entity/Navigations.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Navigations.java rename to maxkey-core/src/main/java/org/maxkey/entity/Navigations.java index 103225b7a..fd3beeaa0 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Navigations.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Navigations.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.domain; +package org.maxkey.entity; import java.util.ArrayList; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Notices.java b/maxkey-core/src/main/java/org/maxkey/entity/Notices.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Notices.java rename to maxkey-core/src/main/java/org/maxkey/entity/Notices.java index 9dcfeac99..5bf6e10c3 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Notices.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Notices.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java b/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Organizations.java rename to maxkey-core/src/main/java/org/maxkey/entity/Organizations.java index 007e0d2c9..0f4b5e60d 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java b/maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java rename to maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java index cdcdacdd3..86104833f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Registration.java b/maxkey-core/src/main/java/org/maxkey/entity/Registration.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Registration.java rename to maxkey-core/src/main/java/org/maxkey/entity/Registration.java index bb478b07c..791b3a721 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Registration.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Registration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java b/maxkey-core/src/main/java/org/maxkey/entity/Resources.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Resources.java rename to maxkey-core/src/main/java/org/maxkey/entity/Resources.java index 137eb6487..55692b291 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Resources.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java rename to maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java index 6bf236075..13d095f5c 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java b/maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java rename to maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java index 095b5ce87..51620b052 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Roles.java b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Roles.java rename to maxkey-core/src/main/java/org/maxkey/entity/Roles.java index 4bbaa0895..d9e21364d 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Roles.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Saml20Metadata.java b/maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/Saml20Metadata.java rename to maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java index c19ffbeac..e02b7d108 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Saml20Metadata.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import java.io.Serializable; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java rename to maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java index d28dde144..8269add3a 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.IOException; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java b/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java rename to maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java index 6dadd607b..09fbe5ee5 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain; +package org.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java index 4e7779368..17456d848 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import java.io.Serializable; import java.util.Arrays; @@ -29,7 +29,7 @@ import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; import org.maxkey.constants.Boolean; -import org.maxkey.domain.Accounts; +import org.maxkey.entity.Accounts; import org.springframework.web.multipart.MultipartFile; @Entity diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsAdapters.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsAdapters.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java index 44d0c605e..afb593135 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsAdapters.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java index 27bb47cc0..cac7164a9 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java index 7645f9425..e86304f7b 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java index 423174a3e..5d8a72240 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java index 99ed44d6d..c50a87e06 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java index 413a4f393..eb41b4175 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java @@ -15,12 +15,12 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Entity; import javax.persistence.Table; -import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails; +import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.springframework.util.StringUtils; @Entity diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java index 821e3ae5e..ab082b879 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import java.security.cert.X509Certificate; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java index a6ba058fb..1b76494ca 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java index db6a0bc39..48ecd855d 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps; +package org.maxkey.entity.apps; /** * UserApps . diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java index f40158ecc..e05de374f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps.oauth2.provider; +package org.maxkey.entity.apps.oauth2.provider; import java.io.Serializable; import java.util.Collection; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java index cbe7328a7..dcad19c7a 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps.oauth2.provider.client; +package org.maxkey.entity.apps.oauth2.provider.client; import java.util.ArrayList; import java.util.Arrays; @@ -28,14 +28,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.util.StringUtils; /** * Base implementation of - * {@link org.maxkey.domain.apps.oauth2.provider.ClientDetails}. + * {@link org.maxkey.entity.apps.oauth2.provider.ClientDetails}. * * @author Ryan Heaton * @author Dave Syer diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java rename to maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java index 5499a1945..57a6338d7 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.apps.oauth2.provider.client; +package org.maxkey.entity.apps.oauth2.provider.client; import java.io.IOException; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java rename to maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java index fe3a7173d..ef1b9b661 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.userinfo; +package org.maxkey.entity.userinfo; public class ContactEntity { private String country; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java rename to maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java index 5f9d247e2..d06360d12 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.userinfo; +package org.maxkey.entity.userinfo; public class EnterpriseEntity { private String employeeNumber; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java rename to maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java index 221013320..bfc0f4253 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.userinfo; +package org.maxkey.entity.userinfo; public class ImsEntity{ private String aim; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java rename to maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java index f811fa4fc..d0dc7fb51 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.userinfo; +package org.maxkey.entity.userinfo; public class NameEntity{ private String givenName; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java b/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java rename to maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java index 035495296..0c2ee9257 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java @@ -15,7 +15,7 @@ */ -package org.maxkey.domain.xml; +package org.maxkey.entity.xml; import javax.xml.bind.annotation.XmlRootElement; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java index f1c3a8e81..4f443704e 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java @@ -19,7 +19,7 @@ package org.maxkey.persistence.db; import java.sql.Types; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java index 19f3a0bb4..29aeecf45 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java @@ -25,8 +25,8 @@ import java.util.Date; import java.util.List; import org.maxkey.constants.ConstantsStatus; -import org.maxkey.domain.Groups; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Groups; +import org.maxkey.entity.UserInfo; import org.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java index af9b711d2..6dfbb55a0 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java @@ -35,8 +35,8 @@ import org.maxkey.constants.ConstantsProperties; import org.maxkey.constants.ConstantsStatus; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.crypto.password.PasswordGen; -import org.maxkey.domain.PasswordPolicy; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.PasswordPolicy; +import org.maxkey.entity.UserInfo; import org.maxkey.util.StringUtils; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java index df717b535..985f18d31 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.logging.LogFactory; import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.util.DateUtils; import org.maxkey.util.IdGenerator; import org.maxkey.web.message.Message; diff --git a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java index fb136224b..78d7115fd 100644 --- a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java +++ b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java @@ -55,7 +55,7 @@ public class DerbyTest { /*interact with Derby*/ Statement s = conn.createStatement(); - ResultSet rs = s.executeQuery("SELECT * FROM SECONDTABLE"); + ResultSet rs = s.executeQuery("select * from secondtable"); while(rs.next()){ System.out.println("key : "+rs.getInt("ID")+" ,name : "+rs.getString("NAME")); diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java index fb8d264c9..0c787b389 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java @@ -19,7 +19,7 @@ package org.maxkey.identity.rest; import java.io.IOException; -import org.maxkey.domain.Organizations; +import org.maxkey.entity.Organizations; import org.maxkey.persistence.service.OrganizationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java index ba0d25847..ebaaf373e 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java @@ -19,7 +19,7 @@ package org.maxkey.identity.rest; import java.io.IOException; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java index da2856df2..463f7bc15 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Accounts; +import org.maxkey.entity.Accounts; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java index 6fe8440d1..f7db89f0a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsAdapters; +import org.maxkey.entity.apps.AppsAdapters; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java index c355f22a3..068bb498e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java index c5a000701..59a33d461 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.apps.AppsFormBasedDetails; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java index 586eae8f2..1ed3cbafc 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.apps.AppsJwtDetails; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java index 3475f1f25..f54d0a1f1 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.UserApps; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.UserApps; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java index 5f705f9ef..bccfaf911 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java index e395fb999..2a5842e5e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.apps.AppsTokenBasedDetails; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java index 4f4519f7d..368ada9a3 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java @@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; +import org.maxkey.entity.GroupMember; +import org.maxkey.entity.Groups; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java index 0bfa2f02e..b617821cf 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java @@ -23,7 +23,7 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.GroupPrivileges; +import org.maxkey.entity.GroupPrivileges; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java index 16b6e009a..ffde5f0ca 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java @@ -23,7 +23,7 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Groups; +import org.maxkey.entity.Groups; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java index 7e32a9eac..1e9a7e7e9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.HistoryLoginApps; +import org.maxkey.entity.HistoryLoginApps; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java index a96cedb6c..5ccafe330 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java @@ -19,7 +19,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.HistoryLogin; +import org.maxkey.entity.HistoryLogin; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java index 9ee7a26dc..5f801a214 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.HistoryLogs; +import org.maxkey.entity.HistoryLogs; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/NoticesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/NoticesMapper.java index 6d23e1f50..dafd6bf9a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/NoticesMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/NoticesMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Notices; +import org.maxkey.entity.Notices; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java index 650122234..d1bfe7930 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java @@ -17,7 +17,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Organizations; +import org.maxkey.entity.Organizations; public interface OrganizationsMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java index 4a390c736..b1dd6c845 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.PasswordPolicy; +import org.maxkey.entity.PasswordPolicy; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java index 91f65624b..0d0e59664 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java @@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Registration; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Registration; +import org.maxkey.entity.UserInfo; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java index d9e76f977..04ff86c42 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java @@ -21,7 +21,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Resources; +import org.maxkey.entity.Resources; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java index 7336fbc52..3a5fb143f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java @@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.RoleMember; -import org.maxkey.domain.Roles; +import org.maxkey.entity.RoleMember; +import org.maxkey.entity.Roles; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java index 72e1cf19c..a844ee83c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java @@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.RolePermissions; -import org.maxkey.domain.Roles; +import org.maxkey.entity.RolePermissions; +import org.maxkey.entity.Roles; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java index edfe6ed8e..d8fdf1b62 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.UserInfoAdjoint; +import org.maxkey.entity.UserInfoAdjoint; /** diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java index f04effb26..a53ee88ee 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java @@ -19,7 +19,7 @@ package org.maxkey.persistence.mapper; import org.apache.ibatis.annotations.Select; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; /** diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index fe05236c4..8c4f0d4ee 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.Accounts; +import org.maxkey.entity.Accounts; import org.maxkey.persistence.mapper.AccountsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java index f5a94ed91..9adf5a9b8 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsAdapters; +import org.maxkey.entity.apps.AppsAdapters; import org.maxkey.persistence.mapper.AppsAdaptersMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java index 5d9f3eb61..975de1f3f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.maxkey.persistence.mapper.AppsCasDetailsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java index 7a6085e12..230a7a4f9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java index d6f84c0d0..622ae9ca0 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.persistence.mapper.AppsJwtDetailsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java index 636d5e2b6..1f2572d0c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.persistence.mapper.AppsSaml20DetailsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java index 18ff7de73..f113e86e9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java @@ -24,8 +24,8 @@ import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.ehcache.UserManagedCache; import org.ehcache.config.builders.ExpiryPolicyBuilder; import org.ehcache.config.builders.UserManagedCacheBuilder; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.UserApps; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.UserApps; import org.maxkey.persistence.mapper.AppsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java index bac32a06d..02484669a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.apps.AppsTokenBasedDetails; import org.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java index b0a2a740a..0ffa48310 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java @@ -18,8 +18,8 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; +import org.maxkey.entity.GroupMember; +import org.maxkey.entity.Groups; import org.maxkey.persistence.mapper.GroupMemberMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java index 3ef32ef1a..650783338 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.GroupPrivileges; +import org.maxkey.entity.GroupPrivileges; import org.maxkey.persistence.mapper.GroupPrivilegesMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java index d71f35908..14a7acaae 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java @@ -22,7 +22,7 @@ import java.time.LocalTime; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.Groups; +import org.maxkey.entity.Groups; import org.maxkey.persistence.mapper.GroupsMapper; import org.maxkey.util.StringUtils; import org.slf4j.Logger; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java index 19094c6eb..501200e0f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.HistoryLoginApps; +import org.maxkey.entity.HistoryLoginApps; import org.maxkey.persistence.mapper.HistoryLoginAppsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java index cde7fe323..c633cca7d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.HistoryLogin; +import org.maxkey.entity.HistoryLogin; import org.maxkey.persistence.mapper.HistoryLoginMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java index e6e78cda6..833b3a7f0 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.HistoryLogs; +import org.maxkey.entity.HistoryLogs; import org.maxkey.persistence.mapper.HistoryLogsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java index ad20497f9..ad0af8f76 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.Notices; +import org.maxkey.entity.Notices; import org.maxkey.persistence.mapper.NoticesMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java index a981981af..eb0e45015 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java @@ -33,7 +33,7 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.maxkey.domain.Organizations; +import org.maxkey.entity.Organizations; import org.maxkey.persistence.kafka.KafkaIdentityAction; import org.maxkey.persistence.kafka.KafkaIdentityTopic; import org.maxkey.persistence.kafka.KafkaPersistService; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java index 8e78aef2c..2468542e2 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.PasswordPolicy; +import org.maxkey.entity.PasswordPolicy; import org.maxkey.persistence.mapper.PasswordPolicyMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java index cdd546f59..e3667f65e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java @@ -20,8 +20,8 @@ package org.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.Registration; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Registration; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.mapper.RegistrationMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java index d964071c7..657b16378 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java @@ -20,7 +20,7 @@ package org.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.Resources; +import org.maxkey.entity.Resources; import org.maxkey.persistence.mapper.ResourcesMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java index 598ba3072..cfca5246b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java @@ -18,8 +18,8 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.RoleMember; -import org.maxkey.domain.Roles; +import org.maxkey.entity.RoleMember; +import org.maxkey.entity.Roles; import org.maxkey.persistence.mapper.RoleMemberMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java index d44d2955e..26f881300 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java @@ -20,8 +20,8 @@ package org.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.RolePermissions; -import org.maxkey.domain.Roles; +import org.maxkey.entity.RolePermissions; +import org.maxkey.entity.Roles; import org.maxkey.persistence.mapper.RolesMapper; import org.maxkey.util.StringUtils; import org.slf4j.Logger; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java index 1505cd0ba..dbdb317d1 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java @@ -18,7 +18,7 @@ package org.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.UserInfoAdjoint; +import org.maxkey.entity.UserInfoAdjoint; import org.maxkey.persistence.mapper.UserInfoAdjointMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java index 43e64dc95..5c9c9515e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java @@ -38,8 +38,8 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.maxkey.constants.ConstantsStatus; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.ChangePassword; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.ChangePassword; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.db.PasswordPolicyValidator; import org.maxkey.persistence.kafka.KafkaIdentityAction; import org.maxkey.persistence.kafka.KafkaIdentityTopic; diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml index 2a8e1817e..89d889d9a 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml @@ -4,27 +4,27 @@ - AND ID = #{id} + and id = #{id} - AND APPID = #{appId} + and appid = #{appId} - AND USERNAME = #{username} + and username = #{username} - AND RELATEDUSERNAME = #{relatedUsername} + and relatedusername = #{relatedUsername} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml index 7912a1668..34526218d 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml @@ -4,27 +4,27 @@ - AND ID = #{id} + and id = #{id} - AND NAME LIKE '%${name}%' + and name like '%${name}%' - AND PROTOCOL = #{protocol} + and protocol = #{protocol} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml index 3599326ae..8663052b6 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml @@ -2,17 +2,17 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml index f8f4c7fd3..fc53b7d1c 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml @@ -3,15 +3,15 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml index 2d14d1fb7..a67202759 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml @@ -3,16 +3,16 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml index cbcb78b34..26895f410 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml @@ -4,77 +4,77 @@ - AND ID = #{id} + and id = #{id} - AND NAME LIKE '%${name}%' + and name like '%${name}%' - AND PROTOCOL = #{protocol} + and protocol = #{protocol} - AND CREDENTIAL = #{credential} + and credential = #{credential} - AND CATEGORY = #{category} + and category = #{category} - AND VENDOR = #{vendor} + and vendor = #{vendor} - INSERT INTO MXK_APPS( - ID, - NAME, - ICON, - LOGINURL, - PROTOCOL, - CATEGORY, - SECRET, - DESCRIPTION, - VENDOR, - VENDORURL, + insert into mxk_apps( + id, + name, + icon, + loginurl, + protocol, + category, + secret, + description, + vendor, + vendorurl, - CREDENTIAL, - SHAREDUSERNAME, - SHAREDPASSWORD, - SYSTEMUSERATTR, + credential, + sharedusername, + sharedpassword, + systemuserattr, - ISEXTENDATTR, - EXTENDATTR, - USERPROPERTYS, + isextendattr, + extendattr, + userpropertys, - ISSIGNATURE, + issignature, - ISADAPTER, - ADAPTER, + isadapter, + adapter, - PRINCIPAL, - CREDENTIALS, + principal, + credentials, - VISIBLE, + visible, - SORTINDEX, + sortindex, - CREATEDBY, - CREATEDDATE, + createdby, + createddate, - STATUS - )VALUES( + status + )values( #{id}, #{name}, #{icon}, @@ -114,75 +114,75 @@ - UPDATE MXK_APPS SET - NAME = #{name}, + update mxk_apps set + name = #{name}, - ICON = #{icon}, + icon = #{icon}, - LOGINURL = #{loginUrl}, - PROTOCOL = #{protocol}, - CATEGORY = #{category}, - SECRET = #{secret}, - DESCRIPTION = #{description}, - VENDOR = #{vendor}, - VENDORURL = #{vendorUrl}, + loginurl = #{loginUrl}, + protocol = #{protocol}, + category = #{category}, + secret = #{secret}, + description = #{description}, + vendor = #{vendor}, + vendorurl = #{vendorUrl}, - CREDENTIAL = #{credential}, - SHAREDUSERNAME = #{sharedUsername}, - SHAREDPASSWORD = #{sharedPassword}, - SYSTEMUSERATTR = #{systemUserAttr}, + credential = #{credential}, + sharedusername = #{sharedUsername}, + sharedpassword = #{sharedPassword}, + systemuserattr = #{systemUserAttr}, - USERPROPERTYS = #{userPropertys}, - ISSIGNATURE = #{isSignature}, + userpropertys = #{userPropertys}, + issignature = #{isSignature}, - ISADAPTER = #{isAdapter}, - ADAPTER = #{adapter}, + isadapter = #{isAdapter}, + adapter = #{adapter}, - PRINCIPAL = #{principal}, - CREDENTIALS = #{credentials}, - VISIBLE = #{visible}, - SORTINDEX = #{sortIndex}, + principal = #{principal}, + credentials = #{credentials}, + visible = #{visible}, + sortindex = #{sortIndex}, - MODIFIEDBY = #{modifiedBy}, - MODIFIEDDATE = #{modifiedDate}, + modifiedby = #{modifiedBy}, + modifieddate = #{modifiedDate}, - STATUS = #{status} - WHERE + status = #{status} + where ID = #{id} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml index 968f0c4f1..c0c6e8582 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml @@ -3,32 +3,32 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml index 7dbed1c8e..d2dc02ac3 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml @@ -3,16 +3,16 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml index 5a2643152..3c8f8e84c 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml @@ -4,257 +4,257 @@ - AND ID = #{id} + and id = #{id} - AND NAME = #{name} + and name = #{name} - INSERT INTO MXK_GROUP_MEMBER( - ID, - GROUPID, - MEMBERID, - TYPE + insert into mxk_group_member( + id, + groupid, + memberid, + type ) - SELECT - CONCAT_WS('-','UD','${id}',U.ID) ID, - '${id}' GROUPID, - U.ID MEMBERID, + select + concat_ws('-','UD','${id}',u.id) id, + '${id}' groupid, + u.id memberid, 'USER-DYNAMIC' TYPE - FROM MXK_USERINFO U - WHERE NOT EXISTS( - SELECT 1 FROM MXK_GROUP_MEMBER GM - WHERE GM.GROUPID=#{id} - AND GM.MEMBERID=U.ID - AND GM.TYPE='USER-DYNAMIC' + from mxk_userinfo u + where not exists( + select 1 from mxk_group_member gm + where gm.groupid=#{id} + and gm.memberid=u.id + and gm.type='USER-DYNAMIC' ) - AND (${filters}) + and (${filters}) - AND U.DEPARTMENTID IN( ${orgIdsList}) + and u.departmentid in( ${orgIdsList}) - DELETE FROM MXK_GROUP_MEMBER GM - WHERE TYPE = 'USER-DYNAMIC' - AND GM.GROUPID=#{id} - AND NOT EXISTS( - SELECT 1 - FROM MXK_USERINFO U - WHERE 1 = 1 - AND U.ID=GM.MEMBERID + delete from mxk_group_member gm + where type = 'user-dynamic' + and gm.groupid=#{id} + and not exists( + select 1 + from mxk_userinfo u + where 1 = 1 + and u.id=gm.memberid - AND (${filters}) + and (${filters}) - AND U.DEPARTMENTID IN ( ${orgIdsList}) + and u.departmentid in ( ${orgIdsList}) ) - DELETE FROM MXK_GROUP_MEMBER GM - WHERE GM.GROUPID=#{value} + delete from mxk_group_member gm + where gm.groupid=#{value} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml index e2b9ae67e..e5e7bc0b7 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml @@ -4,56 +4,56 @@ - AND APPS.ID = #{id} + and apps.id = #{id} - AND APPS.NAME LIKE '%${name}%' + and apps.name like '%${name}%' - AND APPS.PROTOCOL = #{protocol} + and apps.protocol = #{protocol} - AND APPS.CATEGORY = #{category} + and apps.category = #{category} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml index 4b99abf6c..9d238e2ed 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml @@ -4,51 +4,51 @@ - AND ID = #{id} + and id = #{id} - AND NAME LIKE '%${name}%' + and name like '%${name}%' - UPDATE `MXK_GROUPS` SET - STATUS = '2' - WHERE 1 = 1 + update `mxk_groups` set + status = '2' + where 1 = 1 - AND ID = #{id} + and id = #{id} - ADN NAME = #{name} + and name = #{name} - UPDATE `MXK_GROUPS` SET STATUS='2' WHERE ID IN + update `mxk_groups` set status='2' where id in #{item} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml index 1363b3ec3..dbb1da347 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml @@ -4,51 +4,51 @@ - AND ID = #{id} + and id = #{id} - AND SESSIONID = #{sessionId} + and sessionid = #{sessionId} - AND APPID = #{appId} + and appid = #{appId} - AND APPNAME LIKE CONCAT('%',#{appName},'%') + and appname like concat('%',#{appName},'%') - AND UID = #{uid} + and uid = #{uid} - AND USERNAME LIKE CONCAT('%',#{username},'%') + and username like concat('%',#{username},'%') - AND DISPLAYNAME LIKE CONCAT('%',#{displayName},'%') + and displayname like concat('%',#{displayName},'%') - AND LOGINTIME >= #{startDate} + and logintime >= #{startDate} - AND #{endDate} >= LOGINTIME + and #{endDate} >= logintime diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml index 4ca32ef28..95847cdd4 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml @@ -4,69 +4,69 @@ - AND ID = #{id} + and id = #{id} - AND UID = #{uid} + and uid = #{uid} - AND LOWER(USERNAME) LIKE LOWER(CONCAT('%',#{username},'%')) + and lower(username) like lower(concat('%',#{username},'%')) - AND LOWER(MESSAGE) LIKE LOWER(CONCAT('%',#{message},'%')) + and lower(message) like lower(concat('%',#{message},'%')) - AND LOWER(DISPLAYNAME) LIKE LOWER(CONCAT('%',#{displayName},'%')) + and lower(displayname) like lower(concat('%',#{displayName},'%')) - AND LOGINTIME >= #{startDate} + and logintime >= #{startDate} - AND #{endDate} >= LOGINTIME + and #{endDate} >= logintime - AND SESSIONID = #{sessionId} + and sessionid = #{sessionId} - AND LOGINTYPE = #{loginType} + and logintype = #{loginType} - AND SOURCEIP = #{sourceIp} + and sourceip = #{sourceIp} - UPDATE MXK_HISTORY_LOGIN SET - LOGOUTTIME = current_timestamp() - WHERE - SESSIONID = #{value} + update mxk_history_login set + logouttime = current_timestamp() + where + sessionid = #{value} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml index 9d493e704..350d4da18 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml @@ -4,52 +4,52 @@ - AND ID = #{id} + and id = #{id} - AND LOWER(SERVICENAME) LIKE LOWER(CONCAT('%',#{serviceName},'%')) + and lower(servicename) like lower(concat('%',#{serviceName},'%')) - AND LOWER(MESSAGE) LIKE LOWER(CONCAT('%',#{message},'%')) + and lower(message) like lower(concat('%',#{message},'%')) - AND CREATEDDATE BETWEEN #{startDate} AND #{endDate} + and createddate between #{startDate} and #{endDate} - AND CREATEDBY = #{createdBy} + and createdby = #{createdBy} - AND LOWER(USERNAME) LIKE LOWER(CONCAT('%',#{username},'%')) + and lower(username) like lower(concat('%',#{username},'%')) - AND MESSAGETYPE = #{messageType} + and messagetype = #{messageType} - AND OPERATETYPE = #{operateType} + and operatetype = #{operateType} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/NoticesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/NoticesMapper.xml index 01ad829ce..1606c52d1 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/NoticesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/NoticesMapper.xml @@ -4,33 +4,33 @@ - AND ID = #{id} + and id = #{id} - AND TITLE LIKE '%${title}%' + and title like '%${title}%' \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml index 78a5eb9ac..2b6ca69be 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml @@ -4,16 +4,16 @@ - AND ID = #{id} + and id = #{id} - AND NAME like '%#{name}%' + and name like '%#{name}%' - AND PARENTID = #{parentId} + and parentid = #{parentId} - AND PARENTNAME like '%#{parentName}%' + and parentname like '%#{parentName}%' @@ -21,28 +21,28 @@ - UPDATE MXK_ORGANIZATIONS SET STATUS = '2' - WHERE 1 = 1 + update mxk_organizations set status = '2' + where 1 = 1 - AND ID = #{id} + and id = #{id} - ADN NAME = #{name} + and name = #{name} - ADN STATUS = '1' + and status = '1' - ADN CODEPATH = #{codePath} + and codepath = #{codePath} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml index 6bb43c4a8..84a5378a5 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml @@ -3,21 +3,21 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index 74cd5733b..5a88017ef 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -3,70 +3,81 @@ \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml index 74dcdd4cc..c99475f9e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml @@ -4,48 +4,48 @@ - AND RES.ID = #{id} + and res.id = #{id} - AND RES.APPID = #{appId} + and res.appid = #{appId} - AND RES.PARENTID = #{parentId} + and res.parentid = #{parentId} - AND RES.NAME LIKE '%${name}%' + and res.name like '%${name}%' - UPDATE MXK_RESOURCES SET - STATUS = '2' - WHERE 1 = 1 + update mxk_resources set + status = '2' + where 1 = 1 - AND ID = #{id} + and id = #{id} - ADN NAME = #{name} + and name = #{name} - UPDATE MXK_RESOURCES SET STATUS='2' WHERE ID IN + update mxk_resources set status='2' where id in #{item} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml index af8864f09..9b45878ef 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml @@ -4,258 +4,258 @@ - AND ID = #{id} + and id = #{id} - AND NAME = #{name} + and name = #{name} - INSERT INTO MXK_ROLE_MEMBER( - ID, - ROLEID, - MEMBERID, - TYPE + insert into mxk_role_member( + id, + roleid, + memberid, + type ) - SELECT - CONCAT_WS('-','UD','${id}',U.ID) ID, + select + concat_ws('-','UD','${id}',u.id) id, '${id}' ROLEID, - U.ID MEMBERID, - 'USER-DYNAMIC' TYPE - FROM MXK_USERINFO U - WHERE NOT EXISTS( - SELECT 1 FROM MXK_ROLE_MEMBER RM - WHERE RM.ROLEID=#{id} - AND RM.MEMBERID=U.ID - AND RM.TYPE='USER-DYNAMIC' + u.id memberid, + 'USER-DYNAMIC' type + from mxk_userinfo u + where not exists( + select 1 from mxk_role_member rm + where rm.roleid=#{id} + and rm.memberid=u.id + and rm.type='USER-DYNAMIC' ) ${filters} - AND U.DEPARTMENTID IN( ${orgIdsList}) + and u.departmentid in( ${orgIdsList}) - DELETE FROM MXK_ROLE_MEMBER RM - WHERE TYPE = 'USER-DYNAMIC' - AND RM.ROLEID=#{id} - AND NOT EXISTS( - SELECT 1 - FROM MXK_USERINFO U - WHERE 1 = 1 - AND U.ID=RM.MEMBERID + delete from mxk_role_member rm + where type = 'USER-DYNAMIC' + and rm.roleid = #{id} + and not exists( + select 1 + from mxk_userinfo u + where 1 = 1 + and u.id=rm.memberid ${filters} - AND U.DEPARTMENTID IN( ${orgIdsList}) + and u.departmentid in( ${orgIdsList}) ) - DELETE FROM MXK_ROLE_MEMBER RM - WHERE RM.ROLEID=#{value} + delete from mxk_role_member rm + where rm.roleid=#{value} \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml index 77739b759..8f5918a88 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml @@ -4,49 +4,49 @@ - AND ID = #{id} + and id = #{id} - AND NAME LIKE '%${name}%' + and name like '%${name}%' - UPDATE MXK_ROLES SET - STATUS = '2' - WHERE 1 = 1 + update mxk_roles set + status = '2' + where 1 = 1 - AND ID = #{id} + and id = #{id} - ADN NAME = #{name} + and name = #{name} - UPDATE MXK_ROLES SET STATUS='2' WHERE ID IN + update mxk_roles set status='2' where id in #{item} @@ -54,34 +54,34 @@ - UPDATE MXK_ROLE_PERMISSIONS SET STATUS=9 WHERE ID IN + update mxk_role_permissions set status=9 where id in #{item.id} - INSERT INTO MXK_ROLE_PERMISSIONS ( ID,APPID,ROLEID,RESOURCEID,STATUS) - VALUES + insert into mxk_role_permissions ( id,appid,roleid,resourceid,status) + values (#{item.id},#{item.appId},#{item.roleId},#{item.resourceId},#{item.status}) diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml index cc03ce866..827c97352 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml @@ -4,41 +4,41 @@ - AND ID = #{id} + and id = #{id} - AND USERID = #{userId} + and userid = #{userId} - UPDATE MXK_USERINFO_ADJUNCT SET - STATUS = '2' - WHERE 1 = 1 + update mxk_userinfo_adjunct set + status = '2' + where 1 = 1 - AND ID = #{id} + and id = #{id} - ADN NAME = #{name} + and NAME = #{name} - UPDATE MXK_USERINFO_ADJUNCT SET STATUS='2' WHERE ID IN + update mxk_userinfo_adjunct set status='2' where id in #{item} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml index 14749698f..7bcea1efc 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml @@ -3,250 +3,250 @@ - UPDATE MXK_USERINFO SET + update mxk_userinfo set - ISLOCKED = #{isLocked}, + islocked = #{isLocked}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - ISLOCKED = #{isLocked}, - BADPWDCOUNT = 0, + islocked = #{isLocked}, + badpwdcount = 0, - UNLOCKDATE = current_timestamp, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + unlockdate = current_timestamp, + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - PASSWORD = #{password}, - DECIPHERABLE = #{decipherable}, + password = #{password}, + decipherable = #{decipherable}, - PASSWORDSETTYPE = 0, - PASSWORDLASTSETTIME = current_timestamp - WHERE - ID = #{id} + passwordsettype = 0, + passwordlastsettime = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - SHAREDSECRET = #{sharedSecret}, - SHAREDCOUNTER = #{sharedCounter}, + sharedsecret = #{sharedSecret}, + sharedcounter = #{sharedCounter}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - APPLOGINPASSWORD = #{appLoginPassword}, + apploginpassword = #{appLoginPassword}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - PROTECTEDAPPS = #{protectedApps}, + protectedapps = #{protectedApps}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - PASSWORDQUESTION = #{passwordQuestion}, - PASSWORDANSWER = #{passwordAnswer}, + passwordquestion = #{passwordQuestion}, + passwordanswer = #{passwordAnswer}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - AUTHNTYPE = #{authnType}, + authntype = #{authnType}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - EMAIL = #{email}, + email = #{email}, - EMAILVERIFIED = #{emailVerified}, + emailverified = #{emailVerified}, - THEME = #{theme}, + theme = #{theme}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET + update mxk_userinfo set - MOBILE = #{mobile}, + mobile = #{mobile}, - MOBILEVERIFIED = #{mobileVerified}, + mobileverified = #{mobileVerified}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifieddate = current_timestamp + where + id = #{id} - UPDATE MXK_USERINFO SET STATUS='2' WHERE ID IN + update mxk_userinfo set status='2' where id in #{item} - UPDATE MXK_USERINFO SET - DISPLAYNAME = #{displayName}, - NICKNAME = #{nickName}, - NAMEZHSPELL = #{nameZhSpell}, - NAMEZHSHORTSPELL= #{nameZhShortSpell}, - GIVENNAME = #{givenName}, - MIDDLENAME = #{middleName}, - FAMILYNAME = #{familyName}, - HONORIFICPREFIX = #{honorificPrefix}, - HONORIFICSUFFIX = #{honorificSuffix}, - FORMATTEDNAME = #{formattedName} , - MARRIED = #{married}, - GENDER = #{gender}, - BIRTHDATE = #{birthDate}, + update mxk_userinfo set + displayname = #{displayName}, + nickname = #{nickName}, + namezhspell = #{nameZhSpell}, + namezhshortspell= #{nameZhShortSpell}, + givenname = #{givenName}, + middlename = #{middleName}, + familyname = #{familyName}, + honorificprefix = #{honorificPrefix}, + honorificsuffix = #{honorificSuffix}, + formattedname = #{formattedName} , + married = #{married}, + gender = #{gender}, + birthdate = #{birthDate}, - PICTURE = #{picture}, + picture = #{picture}, - IDTYPE = #{idType}, - IDCARDNO = #{idCardNo}, - WEBSITE = #{webSite}, + idtype = #{idType}, + idcardno = #{idCardNo}, + website = #{webSite}, - LOCALE = #{locale}, - TIMEZONE = #{timeZone}, - PREFERREDLANGUAGE= #{preferredLanguage}, + locale = #{locale}, + timezone = #{timeZone}, + preferredlanguage= #{preferredLanguage}, - WINDOWSACCOUNT = #{windowsAccount}, + windowsaccount = #{windowsAccount}, - WORKCOUNTRY = #{workCountry}, - WORKREGION = #{workRegion}, - WORKLOCALITY = #{workLocality}, - WORKSTREETADDRESS= #{workStreetAddress}, - WORKADDRESSFORMATTED= #{workAddressFormatted}, - WORKEMAIL = #{workEmail}, - WORKPHONENUMBER = #{workPhoneNumber}, - WORKPOSTALCODE = #{workPostalCode}, - WORKFAX = #{workFax}, + workcountry = #{workCountry}, + workregion = #{workRegion}, + worklocality = #{workLocality}, + workstreetaddress= #{workStreetAddress}, + workaddressformatted= #{workAddressFormatted}, + workemail = #{workEmail}, + workphonenumber = #{workPhoneNumber}, + workpostalcode = #{workPostalCode}, + workfax = #{workFax}, - HOMECOUNTRY = #{homeCountry}, - HOMEREGION = #{homeRegion}, - HOMELOCALITY = #{homeLocality}, - HOMESTREETADDRESS= #{homeStreetAddress}, - HOMEADDRESSFORMATTED= #{homeAddressFormatted}, - HOMEEMAIL = #{homeEmail}, - HOMEPHONENUMBER= #{homePhoneNumber}, - HOMEPOSTALCODE = #{homePostalCode}, - HOMEFAX = #{homeFax}, + homecountry = #{homeCountry}, + homeregion = #{homeRegion}, + homelocality = #{homeLocality}, + homestreetaddress= #{homeStreetAddress}, + homeaddressformatted= #{homeAddressFormatted}, + homeemail = #{homeEmail}, + homephonenumber= #{homePhoneNumber}, + homepostalcode = #{homePostalCode}, + homefax = #{homeFax}, - EXTRAATTRIBUTE = #{extraAttribute}, + extraattribute = #{extraAttribute}, - MODIFIEDBY = #{modifiedBy}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} + modifiedby = #{modifiedBy}, + modifieddate = current_timestamp + where + id = #{id} \ No newline at end of file diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java index e186094f4..93f0b3a7b 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java @@ -22,7 +22,7 @@ import java.util.Date; import org.apache.mybatis.jpa.util.WebContext; import org.junit.Before; import org.junit.Test; -import org.maxkey.domain.Accounts; +import org.maxkey.entity.Accounts; import org.maxkey.persistence.service.AccountsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java index 5bfb6955c..34c0af12b 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java @@ -22,7 +22,7 @@ import java.util.Date; import org.apache.mybatis.jpa.util.WebContext; import org.junit.Before; import org.junit.Test; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java index c060dd520..ec965a158 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.mybatis.jpa.util.WebContext; import org.junit.Before; import org.junit.Test; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.maxkey.persistence.service.AppsFormBasedDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index 95f739f12..b303f5a13 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -22,9 +22,9 @@ package org.maxkey.authz.endpoint; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.Accounts; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AccountsService; import org.maxkey.persistence.service.AppsService; import org.maxkey.web.WebConstants; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java index a1e617e92..d666b3d2c 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java @@ -23,8 +23,8 @@ package org.maxkey.authz.endpoint; import javax.servlet.http.HttpServletRequest; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Accounts; +import org.maxkey.entity.UserInfo; import org.maxkey.util.StringUtils; import org.maxkey.web.WebContext; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java index eacbb108f..52489a9f1 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import org.maxkey.constants.ConstantsProtocols; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsCasDetailsService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java index a1ddeec74..005e58522 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java @@ -23,7 +23,7 @@ package org.maxkey.authz.endpoint; import javax.servlet.http.HttpServletRequest; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java index 723bf1678..e000f8ec2 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java @@ -26,8 +26,8 @@ import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.cert.CertSigner; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/DefaultSingleLogout.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/DefaultSingleLogout.java index 191732c9f..16a977c26 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/DefaultSingleLogout.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/DefaultSingleLogout.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.UUID; import org.maxkey.authn.SigninPrincipal; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.util.DateUtils; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SamlSingleLogout.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SamlSingleLogout.java index 10d3f1490..35bd470a7 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SamlSingleLogout.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SamlSingleLogout.java @@ -20,7 +20,7 @@ package org.maxkey.authz.singlelogout; import java.util.HashMap; import java.util.UUID; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.util.DateUtils; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SingleLogout.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SingleLogout.java index a992818a1..1accbec26 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SingleLogout.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SingleLogout.java @@ -18,7 +18,8 @@ package org.maxkey.authz.singlelogout; import java.util.Map; -import org.maxkey.domain.apps.Apps; + +import org.maxkey.entity.apps.Apps; import org.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 889b407b9..8c5b03399 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -32,7 +32,7 @@ import org.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.util.Instance; import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 8b9bdfec2..8a5d1b228 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -33,7 +33,7 @@ import org.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.util.Instance; import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 0c1c04c9b..09a72d90a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -31,7 +31,7 @@ import org.maxkey.authn.online.OnlineTicket; import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; import org.maxkey.authz.singlelogout.LogoutType; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index 3f4ad0a34..86e3bd033 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -29,8 +29,8 @@ import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicketImpl; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsCasDetails; import org.maxkey.web.HttpResponseConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java index 6b10e7ff3..de417377e 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java @@ -23,7 +23,7 @@ import org.apache.commons.codec.binary.Base64; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebConstants; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java index a8346e34e..b42219d47 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java @@ -18,7 +18,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java index 2e24e8864..92ba8221d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java @@ -17,7 +17,7 @@ package org.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java index edee8f7fe..1949053da 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java @@ -17,7 +17,7 @@ package org.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java index 2fd034f87..e3bec39bc 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java @@ -17,7 +17,7 @@ package org.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java index 27115dcbf..c80870b30 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java @@ -19,7 +19,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.EqualsBuilder; import org.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; import javax.persistence.Column; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java index 870aa0b80..31e439de0 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java @@ -20,7 +20,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import java.io.Serializable; import java.time.ZonedDateTime; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java index 1528969dc..8be01b6f6 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java index ba6066d29..d54f4c422 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.springframework.lang.NonNull; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java index 5ed4e1a7b..7ae567b3d 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.Accounts; +import org.maxkey.entity.apps.Apps; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java index da25677c7..3fa8c62f6 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java @@ -26,11 +26,11 @@ import org.maxkey.client.http.HttpVerb; import org.maxkey.client.oauth.OAuthClient; import org.maxkey.client.oauth.model.Token; import org.maxkey.crypto.DigestUtils; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.util.HttpsTrusts; import org.maxkey.util.JsonUtils; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java index af157e4b7..495889728 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java @@ -23,11 +23,11 @@ import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.client.oauth.OAuthClient; import org.maxkey.client.oauth.model.Token; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.util.HttpsTrusts; import org.maxkey.util.JsonUtils; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java index 02c99f287..c63ee5d56 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java @@ -21,9 +21,9 @@ import java.time.Instant; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.DigestUtils; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java index 97af8c0b0..7bcf525a6 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java @@ -21,9 +21,9 @@ import java.time.Instant; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.DigestUtils; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 21f6d6c7d..08ce99fd1 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -26,9 +26,9 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.formbased.endpoint.adapter.FormBasedDefaultAdapter; import org.maxkey.constants.Boolean; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.Accounts; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.maxkey.persistence.service.AppsFormBasedDetailsService; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java index a98458c9c..1bb6798c3 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java @@ -21,8 +21,8 @@ import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; import org.maxkey.crypto.DigestUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedDefaultAdapter extends AbstractAuthorizeAdapter { diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java index 31211e230..5f0b9a786 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java @@ -20,8 +20,8 @@ package org.maxkey.authz.formbased.endpoint.adapter; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedNetease163EmailAdapter extends AbstractAuthorizeAdapter { diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java index 48c648710..6212edd48 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java @@ -22,8 +22,8 @@ import java.util.Date; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.DigestUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter { diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java index 8cc6a7d00..df406fe1f 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java @@ -21,8 +21,8 @@ import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; import org.maxkey.crypto.DigestUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.maxkey.web.WebContext; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java index 5f252cee0..f81693c61 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java @@ -26,9 +26,9 @@ import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtDefaultAdapter.java index 53282b565..cce6280d9 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtDefaultAdapter.java @@ -26,8 +26,8 @@ import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtHS256Adapter.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtHS256Adapter.java index e699d03d5..f831e6d70 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtHS256Adapter.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtHS256Adapter.java @@ -28,9 +28,9 @@ import org.maxkey.configuration.oidc.OIDCProviderMetadata; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index 9854b96d4..8d4879108 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -30,8 +30,8 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.jwt.endpoint.adapter.JwtDefaultAdapter; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.Boolean; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.persistence.service.AppsJwtDetailsService; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/AuthorizationRequest.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/AuthorizationRequest.java index 4056c9d1f..b9e3c77b1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/AuthorizationRequest.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/AuthorizationRequest.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.GrantedAuthority; import org.springframework.web.bind.annotation.SessionAttributes; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientDetailsService.java index 77a7ea5c6..f751ae7ac 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientDetailsService.java @@ -16,7 +16,7 @@ package org.maxkey.authz.oauth2.provider; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * A service that provides the details about an OAuth2 client. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationService.java index 96b5b2a34..6b87c1586 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationService.java @@ -17,7 +17,7 @@ package org.maxkey.authz.oauth2.provider; import java.util.List; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Interface for client registration, handling add, update and remove of {@link ClientDetails} from an Authorization diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java index 5071f2bad..b5a97c403 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java @@ -15,7 +15,7 @@ package org.maxkey.authz.oauth2.provider; import java.util.Map; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Strategy for managing OAuth2 requests: {@link AuthorizationRequest}, {@link TokenRequest}, {@link OAuth2Request}. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java index 0043649a2..4dccd950f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java @@ -20,7 +20,7 @@ package org.maxkey.authz.oauth2.provider; import org.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; import org.maxkey.authz.oauth2.provider.endpoint.AuthorizationEndpoint; import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpoint; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Validation interface for OAuth2 requests to the {@link AuthorizationEndpoint} and {@link TokenEndpoint}. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java index ddb217667..beab3c915 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authn.online.OnlineTicket; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.db.LoginService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenRequest.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenRequest.java index c123d321f..c926649fd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenRequest.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenRequest.java @@ -24,7 +24,7 @@ import java.util.Map; import org.maxkey.authz.oauth2.common.util.OAuth2Utils; import org.maxkey.authz.oauth2.provider.endpoint.AuthorizationEndpoint; import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpoint; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Represents an OAuth2 token request, made at the {@link TokenEndpoint}. The requestParameters map should contain the diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java index 15a617c36..1e5ef6b37 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java @@ -33,7 +33,7 @@ import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.ClientRegistrationException; import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java index f7038a586..2521f0c8c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java @@ -31,7 +31,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20AccessConfirmationController.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20AccessConfirmationController.java index 866f8595a..82504df03 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20AccessConfirmationController.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20AccessConfirmationController.java @@ -28,9 +28,9 @@ import org.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.approval.Approval; import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.maxkey.authz.oauth2.provider.approval.ApprovalStore; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; import org.maxkey.persistence.service.AppsService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20UserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20UserApprovalHandler.java index cd6dbc179..ac144abf1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20UserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/controller/OAuth20UserApprovalHandler.java @@ -22,7 +22,7 @@ import org.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.ClientRegistrationException; import org.maxkey.authz.oauth2.provider.approval.ApprovalStoreUserApprovalHandler; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java index c7119672b..8aad9fa2b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java @@ -15,7 +15,7 @@ package org.maxkey.authz.oauth2.provider.client; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.NoSuchClientException; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/InMemoryClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/InMemoryClientDetailsService.java index d122ed4e9..fad750647 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/InMemoryClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/InMemoryClientDetailsService.java @@ -22,7 +22,7 @@ import java.util.Map; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.ClientRegistrationException; import org.maxkey.authz.oauth2.provider.NoSuchClientException; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Basic, in-memory implementation of the client details service. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index 7d823d2da..260d21da7 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java @@ -35,8 +35,8 @@ import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.ClientRegistrationService; import org.maxkey.authz.oauth2.provider.NoSuchClientException; import org.maxkey.crypto.password.NoOpPasswordEncoder; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; -import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java index 9731af855..95fc848f2 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java @@ -32,7 +32,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.TokenRequest; import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index 92922f37e..bc593ed31 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -46,7 +46,7 @@ import org.maxkey.authz.oauth2.provider.implicit.ImplicitTokenRequest; import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; import org.maxkey.util.HttpEncoder; import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java index 46563ab7c..066c467b2 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java @@ -26,7 +26,7 @@ import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; import org.maxkey.authz.oauth2.common.exceptions.InvalidRequestException; import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; import org.maxkey.authz.oauth2.common.exceptions.RedirectMismatchException; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java index f2030c2cc..fe9dc0ea9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java @@ -18,7 +18,7 @@ package org.maxkey.authz.oauth2.provider.endpoint; import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Basic interface for determining the redirect URI for a user agent. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java index 0f5d165a3..ff761a6a6 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java @@ -36,7 +36,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.OAuth2RequestValidator; import org.maxkey.authz.oauth2.provider.TokenRequest; import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.maxkey.util.StringGenerator; import org.maxkey.web.WebContext; import org.springframework.http.HttpHeaders; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java index 8ffd0890e..ba6dffa58 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java @@ -24,7 +24,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.TokenRequest; import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java index e948d04e8..77a1c3a61 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java @@ -27,7 +27,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.TokenRequest; import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.authentication.AccountStatusException; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java index 67202c599..8bfbe7e74 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java @@ -22,7 +22,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.TokenRequest; import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java index 5f2c1586a..7e4b80b61 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java @@ -26,7 +26,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.SecurityContextAccessor; import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.security.core.authority.AuthorityUtils; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java index c11bb451e..48549dd2c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java @@ -23,7 +23,7 @@ import org.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; import org.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.maxkey.authz.oauth2.provider.OAuth2RequestValidator; import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * Default implementation of {@link OAuth2RequestValidator}. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java index 378e3cd83..6b58c5e91 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java @@ -24,7 +24,7 @@ import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; import org.maxkey.authz.oauth2.provider.TokenGranter; import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java index 6da624f9a..2fe7a1dbb 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java @@ -31,7 +31,7 @@ import org.maxkey.authz.oauth2.provider.ClientRegistrationException; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index 8e9a68a3f..7aae02b1c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -21,7 +21,7 @@ import java.util.HashMap; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; import org.maxkey.web.WebConstants; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java index 2eb6f1363..5499289d9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java @@ -36,8 +36,8 @@ import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionServic import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.JsonUtils; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index 43d1eb7ac..5cfe9b0d4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -33,8 +33,8 @@ import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionServic import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.AuthorizationHeaderUtils; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java index ecd1764da..3401d6193 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java @@ -39,7 +39,7 @@ import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionServic import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; -import org.maxkey.domain.apps.oauth2.provider.ClientDetails; +import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.maxkey.web.WebContext; import com.nimbusds.jose.util.Base64URL; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/BindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/BindingAdapter.java index 409c76dc3..9955768c3 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/BindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/BindingAdapter.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.authz.saml.common.AuthnRequestInfo; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.SignableSAMLObject; import org.opensaml.saml2.metadata.Endpoint; import org.opensaml.ws.message.encoder.MessageEncodingException; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/ExtractBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/ExtractBindingAdapter.java index 39b2f3f4e..f06a311b8 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/ExtractBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/ExtractBindingAdapter.java @@ -23,7 +23,7 @@ import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.ws.message.decoder.MessageDecodingException; import org.opensaml.ws.security.SecurityPolicyResolver; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java index eb0c77789..1aa423dd4 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils; import org.maxkey.authz.saml.common.TrustResolver; import org.maxkey.authz.saml20.binding.ExtractBindingAdapter; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.binding.BasicSAMLMessageContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.common.binding.decoding.SAMLMessageDecoder; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java index 759836a8e..221096fa2 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java @@ -30,7 +30,7 @@ import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.binding.ExtractBindingAdapter; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.SignableSAMLObject; import org.opensaml.common.binding.BasicSAMLMessageContext; import org.opensaml.common.binding.decoding.SAMLMessageDecoder; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index 2c84807dc..066a8f413 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -43,7 +43,7 @@ import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.persistence.service.AppsSaml20DetailsService; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.common.binding.security.IssueInstantRule; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java index 44fb3def9..a49d027e1 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java @@ -21,7 +21,7 @@ package org.maxkey.authz.saml20.jit; import java.util.HashMap; import java.util.List; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; public interface ProvisioningAdapter { diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java index 25196ed6b..df0d4a042 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java @@ -25,7 +25,7 @@ import org.maxkey.authz.saml.common.TrustResolver; import org.maxkey.authz.saml20.metadata.MetadataGenerator; import org.maxkey.constants.ContentType; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.Saml20Metadata; +import org.maxkey.entity.Saml20Metadata; import org.maxkey.web.WebContext; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.core.NameIDType; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java index 35aff0491..223ff8668 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java @@ -27,7 +27,7 @@ import org.maxkey.authz.saml.common.AuthnRequestInfo; import org.maxkey.authz.saml.common.EndpointGenerator; import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.opensaml.saml2.core.Response; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java index ae6d06348..94a5486d4 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java @@ -26,7 +26,7 @@ import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.binding.ExtractBindingAdapter; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.persistence.service.AppsSaml20DetailsService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java index 23f60756a..4d45d7949 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java @@ -26,7 +26,7 @@ import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.binding.ExtractBindingAdapter; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.persistence.service.AppsSaml20DetailsService; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AssertionGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AssertionGenerator.java index 2a0076c2f..666ddab48 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AssertionGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AssertionGenerator.java @@ -25,7 +25,7 @@ import org.maxkey.authz.saml.service.IDService; import org.maxkey.authz.saml.service.TimeService; import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.xml.IssuerGenerator; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.opensaml.Configuration; import org.opensaml.saml2.core.Assertion; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java index 7af4f97ad..2821c7df9 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Map.Entry; import org.maxkey.constants.Boolean; -import org.maxkey.domain.ExtraAttr; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.ExtraAttr; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.Configuration; import org.opensaml.saml2.core.Attribute; import org.opensaml.saml2.core.AttributeStatement; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java index 8043a3ddb..d257cae89 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java @@ -26,7 +26,7 @@ import org.maxkey.authz.saml.service.TimeService; import org.maxkey.authz.saml20.binding.BindingAdapter; import org.maxkey.authz.saml20.xml.IssuerGenerator; import org.maxkey.constants.Boolean; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.Configuration; import org.opensaml.saml2.core.Assertion; import org.opensaml.saml2.core.EncryptedAssertion; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/SubjectGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/SubjectGenerator.java index cf23e5965..f97890447 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/SubjectGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/SubjectGenerator.java @@ -21,8 +21,8 @@ package org.maxkey.authz.saml20.provider.xml; import org.apache.commons.lang3.StringUtils; import org.maxkey.authz.saml.service.TimeService; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.opensaml.saml2.core.NameID; import org.opensaml.saml2.core.NameIDType; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java index 243250666..28ab9b896 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -36,7 +36,7 @@ import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.Saml20Metadata; +import org.maxkey.entity.Saml20Metadata; import org.opensaml.common.binding.security.IssueInstantRule; import org.opensaml.common.binding.security.MessageReplayRule; import org.opensaml.util.storage.MapBasedStorageService; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index 9e293b32c..68b965dc6 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -30,8 +30,8 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.Boolean; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsTokenBasedDetails; import org.maxkey.persistence.service.AppsTokenBasedDetailsService; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java index ffb0f36cc..536e20957 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java @@ -22,8 +22,8 @@ import java.util.HashMap; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsTokenBasedDetails; import org.maxkey.util.DateUtils; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java index 5dfaa6b91..ce68aeaa7 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java @@ -21,8 +21,8 @@ import java.util.Date; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.AppsTokenBasedDetails; import org.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java b/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java index bcd2d90f9..0cbb12fa2 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java @@ -19,7 +19,7 @@ package org.maxkey.jobs; import java.util.List; -import org.maxkey.domain.Groups; +import org.maxkey.entity.Groups; import org.maxkey.persistence.service.GroupsService; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java index 0387a6899..fbf5bd78a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java @@ -18,7 +18,7 @@ package org.maxkey.web.api.endpoint; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java index b0092a080..29ffa9130 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java @@ -19,7 +19,7 @@ package org.maxkey.web.apps.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.apps.AppsAdapters; +import org.maxkey.entity.apps.AppsAdapters; import org.maxkey.persistence.service.AppsAdaptersService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java index 8f13b96a7..d29b9216f 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java @@ -21,9 +21,9 @@ package org.maxkey.web.apps.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.ExtraAttr; -import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.ExtraAttr; +import org.maxkey.entity.ExtraAttrs; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java index ee9c544e8..aa746e4e2 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsService; import org.maxkey.util.StringUtils; import org.slf4j.Logger; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java index 81f89f5f3..74e574d30 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java @@ -22,7 +22,7 @@ import java.util.List; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java index 0628c247e..dc01b70c0 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java @@ -20,7 +20,7 @@ package org.maxkey.web.apps.contorller; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.entity.apps.AppsCasDetails; import org.maxkey.persistence.service.AppsCasDetailsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java index 2574e764b..d8cf57a05 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java @@ -22,8 +22,8 @@ import java.util.List; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsExtendApiDetails; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsExtendApiDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java index fc4212cab..925835596 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java @@ -22,7 +22,7 @@ import java.util.List; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.entity.apps.AppsFormBasedDetails; import org.maxkey.persistence.service.AppsFormBasedDetailsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java index b1d19048c..b320124fa 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java @@ -20,7 +20,7 @@ package org.maxkey.web.apps.contorller; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.AppsJwtDetails; +import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.persistence.service.AppsJwtDetailsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java index 463f600c2..881274377 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java @@ -23,9 +23,9 @@ import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsOAuth20Details; -import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.AppsOAuth20Details; +import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java index 7cb8a810e..06e911a85 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -34,7 +34,7 @@ import org.maxkey.crypto.cert.NameUtil; import org.maxkey.crypto.cert.X509CertUtils; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.domain.apps.AppsSAML20Details; +import org.maxkey.entity.apps.AppsSAML20Details; import org.maxkey.persistence.service.AppsSaml20DetailsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java index 5c82143c4..89a241e8c 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java @@ -20,7 +20,7 @@ package org.maxkey.web.apps.contorller; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.maxkey.entity.apps.AppsTokenBasedDetails; import org.maxkey.persistence.service.AppsTokenBasedDetailsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java index b1351b965..d50b9838a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java @@ -20,7 +20,7 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.Accounts; +import org.maxkey.entity.Accounts; import org.maxkey.persistence.service.AccountsService; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.UserInfoService; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java index 60d3891dd..78dc64ee3 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java @@ -19,9 +19,9 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.GroupMember; +import org.maxkey.entity.Groups; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.GroupMemberService; import org.maxkey.persistence.service.GroupsService; import org.maxkey.web.WebContext; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java index 04315078d..65842137b 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java @@ -19,8 +19,8 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.GroupPrivileges; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.GroupPrivileges; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.GroupPrivilegesService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java index 998cde2f0..056e36350 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java @@ -19,7 +19,7 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.Groups; +import org.maxkey.entity.Groups; import org.maxkey.persistence.service.GroupsService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java index bdee13db7..ccdd26037 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java @@ -21,9 +21,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.domain.HistoryLoginApps; -import org.maxkey.domain.HistoryLogin; -import org.maxkey.domain.HistoryLogs; +import org.maxkey.entity.HistoryLogin; +import org.maxkey.entity.HistoryLoginApps; +import org.maxkey.entity.HistoryLogs; import org.maxkey.persistence.service.HistoryLoginAppsService; import org.maxkey.persistence.service.HistoryLoginService; import org.maxkey.persistence.service.HistoryLogsService; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/NoticesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/NoticesController.java index 8464491b1..f0768b096 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/NoticesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/NoticesController.java @@ -19,7 +19,7 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.Notices; +import org.maxkey.entity.Notices; import org.maxkey.persistence.service.NoticesService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java index 689a4e914..c9fa85d08 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -22,8 +22,8 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.ExcelImport; -import org.maxkey.domain.Organizations; +import org.maxkey.entity.ExcelImport; +import org.maxkey.entity.Organizations; import org.maxkey.persistence.service.OrganizationsService; import org.maxkey.web.WebContext; import org.maxkey.web.component.TreeNode; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PasswordPolicyController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PasswordPolicyController.java index b47a3c43f..6a381cb6f 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PasswordPolicyController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PasswordPolicyController.java @@ -20,7 +20,7 @@ package org.maxkey.web.contorller; import javax.validation.Valid; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.PasswordPolicy; +import org.maxkey.entity.PasswordPolicy; import org.maxkey.persistence.service.PasswordPolicyService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PermissionsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PermissionsController.java index 818394b90..b16c0d625 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PermissionsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/PermissionsController.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.RolePermissions; +import org.maxkey.entity.RolePermissions; import org.maxkey.persistence.service.RolesService; import org.maxkey.util.StringUtils; import org.maxkey.web.WebContext; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java index 109d162dd..b46f0ccc9 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ResourcesController.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.Resources; +import org.maxkey.entity.Resources; import org.maxkey.persistence.service.ResourcesService; import org.maxkey.web.WebContext; import org.maxkey.web.component.TreeNode; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RoleMemberController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RoleMemberController.java index cc8eea840..308065493 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RoleMemberController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RoleMemberController.java @@ -19,8 +19,8 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.RoleMember; -import org.maxkey.domain.Roles; +import org.maxkey.entity.RoleMember; +import org.maxkey.entity.Roles; import org.maxkey.persistence.service.RoleMemberService; import org.maxkey.persistence.service.RolesService; import org.maxkey.web.WebContext; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RolesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RolesController.java index ca5692b98..36058ff3a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RolesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/RolesController.java @@ -19,7 +19,7 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.Roles; +import org.maxkey.entity.Roles; import org.maxkey.persistence.service.RolesService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java index 3290afdf4..356952218 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java @@ -19,7 +19,7 @@ package org.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.UserInfoAdjoint; +import org.maxkey.entity.UserInfoAdjoint; import org.maxkey.persistence.service.UserInfoAdjointService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java index e4e9c8870..08c730c4a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java @@ -28,8 +28,8 @@ import javax.validation.Valid; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.ExcelImport; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.ExcelImport; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringUtils; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index f52bf2ba2..5edb8cc22 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -20,8 +20,8 @@ package org.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.domain.HistoryLogs; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.HistoryLogs; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.HistoryLogsService; import org.maxkey.util.JsonUtils; import org.maxkey.web.WebContext; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java index 18493f9b9..834a17295 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -28,7 +28,7 @@ import org.ehcache.config.builders.ExpiryPolicyBuilder; import org.ehcache.config.builders.UserManagedCacheBuilder; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsService; import org.maxkey.util.AuthorizationHeaderCredential; import org.maxkey.util.AuthorizationHeaderUtils; diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index ecfc1fa2e..98d6f95af 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -42,7 +42,7 @@ spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&character spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource #mybatis -mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps, +mybatis.type-aliases-package=org.maxkey.entity,org.maxkey.entity.apps, mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml mybatis.table-column-snowflake-datacenter-id=1 mybatis.table-column-snowflake-machine-id=1 diff --git a/maxkey-web-manage/src/main/resources/templates/views/main.ftl b/maxkey-web-manage/src/main/resources/templates/views/main.ftl index e66af222b..042e69c78 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/main.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/main.ftl @@ -149,7 +149,7 @@
- <#list rptApp as apps> + <#list rptApp as apps>
<@locale code="main.rpt.app"/><@locale code="main.rpt.count"/>
${apps.APPNAME}${apps.REPORTCOUNT}
${apps.appname}${apps.reportcount}
@@ -174,7 +174,7 @@
- <#list rptBrowser as browser> + <#list rptBrowser as browser>
<@locale code="main.rpt.browser"/><@locale code="main.rpt.count"/>
${browser.REPORTSTRING}${browser.REPORTCOUNT}
${browser.reportstring}${browser.reportcount}
@@ -185,13 +185,13 @@ var configMonth = { type: 'line', data: { - labels: [<#list rptMonth as month>'${month.REPORTSTRING}',], + labels: [<#list rptMonth as month>'${month.reportstring}',], datasets: [{ label:'<@locale code="main.rpt.count"/>', backgroundColor: 'rgb(75, 192, 192)', borderColor: 'rgb(75, 192, 192)', fill: false, - data: [<#list rptMonth as month>${month.REPORTCOUNT},], + data: [<#list rptMonth as month>${month.reportcount},], }] }, options: { @@ -214,13 +214,13 @@ var configDayHour = { type: 'line', data: { - labels: [<#list rptDayHour as dayHour>'${dayHour.REPORTSTRING}',], + labels: [<#list rptDayHour as dayHour>'${dayHour.reportstring}',], datasets: [{ label:'<@locale code="main.rpt.count"/>', backgroundColor: 'rgb(178 ,34, 34)', borderColor: 'rgb(178 ,34, 34)', fill: false, - data: [<#list rptDayHour as dayHour>${dayHour.REPORTCOUNT},], + data: [<#list rptDayHour as dayHour>${dayHour.reportcount},], }] }, options: { diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index 8e8d65029..cb4563811 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -24,10 +24,10 @@ import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.UserApps; +import org.maxkey.entity.Accounts; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; +import org.maxkey.entity.apps.UserApps; import org.maxkey.persistence.service.AccountsService; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.UserInfoService; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java index c7886cfca..d0cdcb2e1 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java @@ -20,7 +20,7 @@ package org.maxkey.web.contorller; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebConstants; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java index b850d8741..5ae3c77f5 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java @@ -20,9 +20,9 @@ package org.maxkey.web.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.domain.HistoryLogin; -import org.maxkey.domain.HistoryLoginApps; -import org.maxkey.domain.HistoryLogs; +import org.maxkey.entity.HistoryLogin; +import org.maxkey.entity.HistoryLoginApps; +import org.maxkey.entity.HistoryLogs; import org.maxkey.persistence.service.HistoryLoginAppsService; import org.maxkey.persistence.service.HistoryLoginService; import org.maxkey.persistence.service.HistoryLogsService; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java index eed6c3fec..1880e6dbb 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java @@ -22,7 +22,7 @@ import java.util.UUID; import org.apache.commons.codec.binary.Hex; import org.maxkey.crypto.Base32Utils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.algorithm.KeyUriFormat; import org.maxkey.password.onetimepwd.algorithm.OtpSecret; import org.maxkey.persistence.service.UserInfoService; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java index 7c3a9b500..b4b1cedb6 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java @@ -19,7 +19,7 @@ package org.maxkey.web.contorller; import javax.validation.Valid; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java index 3772f0502..d65655275 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java @@ -27,8 +27,8 @@ import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsStatus; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.domain.Registration; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.Registration; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.RegistrationService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.DateUtils; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java index 197c8ff1a..00e44a671 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java @@ -24,7 +24,7 @@ import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsPasswordSetType; import org.maxkey.constants.ConstantsTimeInterval; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.db.PasswordPolicyValidator; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.StringUtils; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 2afc8d829..f396a3e20 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -27,7 +27,7 @@ import org.maxkey.authn.LoginCredential; import org.maxkey.authn.support.kerberos.KerberosService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.UserInfo; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebConstants; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java index 68c315093..fcc319204 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java @@ -34,7 +34,7 @@ import org.maxkey.authz.singlelogout.LogoutType; import org.maxkey.authz.singlelogout.SingleLogout; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsProtocols; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.apps.Apps; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java index b96b72fce..43c540454 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java @@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.SigninPrincipal; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.domain.HistoryLoginApps; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; +import org.maxkey.entity.HistoryLoginApps; +import org.maxkey.entity.UserInfo; +import org.maxkey.entity.apps.Apps; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.HistoryLoginAppsService; import org.maxkey.web.WebConstants; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index 02a850985..7cd774657 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -20,8 +20,8 @@ package org.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.domain.HistoryLogs; -import org.maxkey.domain.UserInfo; +import org.maxkey.entity.HistoryLogs; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.HistoryLogsService; import org.maxkey.util.JsonUtils; import org.maxkey.web.WebContext; diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java index b3d9e0905..03c0fe72e 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PreLoginAppAdapter.java @@ -19,7 +19,8 @@ package org.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.domain.UserInfo; + +import org.maxkey.entity.UserInfo; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-web-maxkey/src/main/resources/application-http.properties index fcdbbe030..85e5b9f4b 100644 --- a/maxkey-web-maxkey/src/main/resources/application-http.properties +++ b/maxkey-web-maxkey/src/main/resources/application-http.properties @@ -47,7 +47,7 @@ spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&character spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource #mybatis -mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps, +mybatis.type-aliases-package=org.maxkey.entity,org.maxkey.entity.apps, mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml mybatis.table-column-snowflake-datacenter-id=1 mybatis.table-column-snowflake-machine-id=1 diff --git a/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-web-maxkey/src/main/resources/application-https.properties index 83b07c71b..0174495bd 100644 --- a/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -47,7 +47,7 @@ spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&character spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource #mybatis -mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps, +mybatis.type-aliases-package=org.maxkey.entity,org.maxkey.entity.apps, mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml mybatis.table-column-snowflake-datacenter-id=1 mybatis.table-column-snowflake-machine-id=1