domain ->entity,SQL -> lowercase

domain ->entity,SQL -> lowercase

domain ->entity,SQL -> lowercase
5f21d813 · MaxKey · b4d7911a · 5f21d813 · 5f21d813 · 5f21d813
272 changed file
--- 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;

--- 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;

--- 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;


--- 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{

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

 /**

--- 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;

--- 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;

--- 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;

--- 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 {

--- 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;

 /**

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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 {
    

--- 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;

--- 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;

--- 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;
    }
    

--- a/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;


--- a/maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java
@@ -18,7 +18,7 @@
 /**
 * 
 */
-package org.maxkey.domain;
+package org.maxkey.entity;

 /**
 * @author Administrator

--- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.util.ArrayList;
 import java.util.HashMap;

--- a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;


--- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;


 /*

--- a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Groups.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;


--- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import javax.persistence.Column;
 import javax.persistence.Entity;

--- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/Navigations.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Navigations.java
@@ -18,7 +18,7 @@
 /**
 * 
 */
-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.util.ArrayList;


--- a/maxkey-core/src/main/java/org/maxkey/domain/Notices.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Notices.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;


--- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import javax.persistence.Column;
 import javax.persistence.Entity;

--- a/maxkey-core/src/main/java/org/maxkey/domain/Registration.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Registration.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;


--- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/Roles.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/Roles.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import java.io.Serializable;
 import javax.persistence.Column;

--- a/maxkey-core/src/main/java/org/maxkey/domain/Saml20Metadata.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.IOException;

--- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain;
+package org.maxkey.entity;

 import javax.persistence.Column;
 import javax.persistence.Entity;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsAdapters.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;

 import java.security.cert.X509Certificate;


--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;

 /**
 * UserApps .

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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

--- a/maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/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;

--- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;

 public class ContactEntity {
 	private String country;

--- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;

 public class EnterpriseEntity {
 	private String employeeNumber;

--- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;

 public class ImsEntity{
 	private String aim;

--- a/maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;

 public class NameEntity{
 	private String givenName;

--- a/maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java
@@ -15,7 +15,7 @@
 */
 

-package org.maxkey.domain.xml;
+package org.maxkey.entity.xml;

 import javax.xml.bind.annotation.XmlRootElement;


--- 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;

--- 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;

--- 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;

--- 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;

--- 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"));

--- 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;

--- 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;

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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<Organizations> {


--- 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

--- 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

--- 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

--- 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

--- 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

--- 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;


 /**

--- 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;


 /**

--- 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;


--- 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;


--- 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;


--- 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;


--- 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;


--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupMemberService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLogsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java
+++ b/maxkey-web-manage/src/main/java/org/maxkey/jobs/DynamicGroupsJob.java
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/maxkey-web-manage/src/main/resources/application.properties
+++ b/maxkey-web-manage/src/main/resources/application.properties
--- a/maxkey-web-manage/src/main/resources/templates/views/main.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/main.ftl
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/maxkey-web-maxkey/src/main/resources/application-http.properties
+++ b/maxkey-web-maxkey/src/main/resources/application-http.properties
--- a/maxkey-web-maxkey/src/main/resources/application-https.properties
+++ b/maxkey-web-maxkey/src/main/resources/application-https.properties