diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java index c5f8f981..cde01944 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.impl.DefaultKaptcha; diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptcha.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptcha.java rename to maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java index 40d2ce94..539a6acc 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptcha.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; public class ImageCaptcha { diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java rename to maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java index 991edb57..1c8155d0 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import com.google.code.kaptcha.Producer; import java.awt.image.BufferedImage; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.entity.Message; -import org.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.persistence.cache.MomentaryService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/LoginCredential.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/LoginCredential.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/LoginCredential.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/LoginCredential.java index f4feeb90..97784794 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/LoginCredential.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/LoginCredential.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authn; +package org.dromara.maxkey.authn; import java.util.ArrayList; import java.util.Collection; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebConstants; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/SignPrincipal.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/SignPrincipal.java index ae7558dc..dd841c85 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/SignPrincipal.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authn; +package org.dromara.maxkey.authn; import java.util.ArrayList; import java.util.Collection; -import org.maxkey.authn.session.Session; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.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/annotation/CurrentUser.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/annotation/CurrentUser.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/annotation/CurrentUser.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/annotation/CurrentUser.java index 4360f9de..08c068dd 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/annotation/CurrentUser.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/annotation/CurrentUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.annotation; +package org.dromara.maxkey.authn.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwt.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwt.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwt.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwt.java index 157ad4c1..1b5ae771 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwt.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwt.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.SignPrincipal; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwtService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwtService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java index 8ed09927..d33a4b2a 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthJwtService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; import java.text.ParseException; import java.util.Date; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.crypto.jwt.HMAC512Service; -import org.maxkey.entity.UserInfo; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthRefreshTokenService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthRefreshTokenService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java index 865184f9..21040c04 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthRefreshTokenService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthRefreshTokenService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; -import org.maxkey.configuration.AuthJwkConfig; -import org.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.configuration.AuthJwkConfig; +import org.dromara.maxkey.crypto.jwt.HMAC512Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthTokenService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthTokenService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java index 0329ef87..0112fca0 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/AuthTokenService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthTokenService.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; import java.text.ParseException; import org.apache.commons.lang3.StringUtils; -import org.maxkey.configuration.AuthJwkConfig; -import org.maxkey.crypto.jwt.HMAC512Service; -import org.maxkey.persistence.cache.MomentaryService; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.configuration.AuthJwkConfig; +import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/CongressService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/CongressService.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/CongressService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/CongressService.java index 4d5cc4f3..e0a62f50 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/CongressService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/CongressService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; public interface CongressService { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/InMemoryCongressService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/InMemoryCongressService.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/InMemoryCongressService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/InMemoryCongressService.java index 9ff95e94..b4028d3c 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/InMemoryCongressService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/InMemoryCongressService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; import java.util.concurrent.TimeUnit; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/RedisCongressService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/RedisCongressService.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/RedisCongressService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/RedisCongressService.java index b6a112e2..ee60de3c 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/jwt/RedisCongressService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/RedisCongressService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.jwt; +package org.dromara.maxkey.authn.jwt; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/InMemorySessionManager.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/InMemorySessionManager.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/InMemorySessionManager.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/InMemorySessionManager.java index 970a7c94..0fd7a2d6 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/InMemorySessionManager.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/InMemorySessionManager.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authn.session; +package org.dromara.maxkey.authn.session; import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.TimeUnit; -import org.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.HistoryLogin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/RedisSessionManager.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/RedisSessionManager.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/RedisSessionManager.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/RedisSessionManager.java index 006b44ed..85507c68 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/RedisSessionManager.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/RedisSessionManager.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authn.session; +package org.dromara.maxkey.authn.session; import java.time.LocalDateTime; import java.util.List; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/Session.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/Session.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/Session.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/Session.java index 030a029e..a4020809 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/Session.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/Session.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authn.session; +package org.dromara.maxkey.authn.session; import java.io.Serializable; import java.time.LocalDateTime; import java.util.HashMap; -import org.maxkey.entity.apps.Apps; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.web.WebContext; import org.springframework.security.core.Authentication; public class Session implements Serializable{ diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManager.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManager.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManager.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManager.java index c2f9ce7c..f359adb7 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManager.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManager.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authn.session; +package org.dromara.maxkey.authn.session; import java.time.LocalDateTime; import java.util.List; -import org.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.HistoryLogin; public interface SessionManager { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManagerFactory.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManagerFactory.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManagerFactory.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManagerFactory.java index 95cc0db6..47bc55b9 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/session/SessionManagerFactory.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManagerFactory.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.session; +package org.dromara.maxkey.authn.session; import java.sql.ResultSet; import java.sql.SQLException; @@ -24,11 +24,11 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthTokenRefreshPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java similarity index 86% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthTokenRefreshPoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java index 012c0ade..e3319bea 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthTokenRefreshPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java @@ -15,18 +15,18 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.authn.jwt.AuthRefreshTokenService; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.Message; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthorizationUtils.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthorizationUtils.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java index 75f77513..87de83a8 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/AuthorizationUtils.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java @@ -15,21 +15,21 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import java.text.ParseException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.UserInfo; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/CurrentUserMethodArgumentResolver.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/CurrentUserMethodArgumentResolver.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/CurrentUserMethodArgumentResolver.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/CurrentUserMethodArgumentResolver.java index d17b208b..fb73f71b 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/CurrentUserMethodArgumentResolver.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/CurrentUserMethodArgumentResolver.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.web.WebConstants; import org.springframework.core.MethodParameter; import org.springframework.security.core.Authentication; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/FileUploadEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/FileUploadEndpoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java index 1ecbbc67..0d0f5bbe 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/FileUploadEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java @@ -15,18 +15,18 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.FileUpload; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.FileUploadService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.FileUpload; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.FileUploadService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java index 169dace1..de2c133e 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import java.util.Date; @@ -22,9 +22,9 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.util.DateUtils; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java index fccccbea..70b466a4 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.Message; -import org.maxkey.persistence.repository.InstitutionsRepository; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.persistence.repository.InstitutionsRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java index 5f54e5ea..86b22577 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SessionSecurityContextHolderStrategy.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SessionSecurityContextHolderStrategy.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SessionSecurityContextHolderStrategy.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SessionSecurityContextHolderStrategy.java index 8729204b..3a1dd667 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/SessionSecurityContextHolderStrategy.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SessionSecurityContextHolderStrategy.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/UnauthorizedEntryPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/UnauthorizedEntryPoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java index 5d307f11..02d6c713 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/UnauthorizedEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.web; +package org.dromara.maxkey.authn.web; import java.io.IOException; import java.util.HashMap; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/interceptor/PermissionInterceptor.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/interceptor/PermissionInterceptor.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java index 03319625..fb5aa976 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/interceptor/PermissionInterceptor.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authn.web.interceptor; +package org.dromara.maxkey.authn.web.interceptor; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java index 24c41b23..68926ad9 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java @@ -17,11 +17,11 @@ package org.maxkey.autoconfigure; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authn.session.SessionManagerFactory; -import org.maxkey.authn.web.HttpSessionListenerAdapter; -import org.maxkey.authn.web.SavedRequestAwareAuthenticationSuccessHandler; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.session.SessionManagerFactory; +import org.dromara.maxkey.authn.web.HttpSessionListenerAdapter; +import org.dromara.maxkey.authn.web.SavedRequestAwareAuthenticationSuccessHandler; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java index 5acc268b..2b20995c 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java @@ -17,15 +17,15 @@ package org.maxkey.autoconfigure; -import org.maxkey.authn.jwt.AuthRefreshTokenService; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.jwt.CongressService; -import org.maxkey.authn.jwt.InMemoryCongressService; -import org.maxkey.authn.jwt.RedisCongressService; -import org.maxkey.configuration.AuthJwkConfig; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.cache.MomentaryService; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.jwt.CongressService; +import org.dromara.maxkey.authn.jwt.InMemoryCongressService; +import org.dromara.maxkey.authn.jwt.RedisCongressService; +import org.dromara.maxkey.configuration.AuthJwkConfig; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java similarity index 84% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java index 9feac9db..9f9843fb 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java @@ -15,13 +15,13 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.password.onetimepwd.MailOtpAuthnService; -import org.maxkey.password.onetimepwd.token.RedisOtpTokenStore; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.service.EmailSendersService; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.password.onetimepwd.MailOtpAuthnService; +import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.service.EmailSendersService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; 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/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java index 7fa0ba7a..98245622 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/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java @@ -15,12 +15,12 @@ */ -package org.maxkey.password.onetimepwd; +package org.dromara.maxkey.password.onetimepwd; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.token.AbstractOtpTokenStore; -import org.maxkey.password.onetimepwd.token.InMemoryOtpTokenStore; -import org.maxkey.util.StringGenerator; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.token.AbstractOtpTokenStore; +import org.dromara.maxkey.password.onetimepwd.token.InMemoryOtpTokenStore; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/MailOtpAuthnService.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java similarity index 84% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/MailOtpAuthnService.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java index 60e8d3b1..14643c75 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/MailOtpAuthnService.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java @@ -15,18 +15,18 @@ */ -package org.maxkey.password.onetimepwd; +package org.dromara.maxkey.password.onetimepwd; import java.sql.Types; import java.util.concurrent.TimeUnit; -import org.maxkey.configuration.EmailConfig; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.EmailSenders; -import org.maxkey.password.onetimepwd.impl.MailOtpAuthn; -import org.maxkey.password.onetimepwd.token.RedisOtpTokenStore; -import org.maxkey.persistence.service.EmailSendersService; +import org.dromara.maxkey.configuration.EmailConfig; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.EmailSenders; +import org.dromara.maxkey.password.onetimepwd.impl.MailOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; +import org.dromara.maxkey.persistence.service.EmailSendersService; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java index 4015fcc3..2a174453 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/OneTimePassword.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd; +package org.dromara.maxkey.password.onetimepwd; import java.io.Serializable; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java index 68d0147c..d2cbc914 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd.algorithm; +package org.dromara.maxkey.password.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java index 82527fef..f5ea3a1a 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/HmacOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd.algorithm; +package org.dromara.maxkey.password.onetimepwd.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java index 705dea30..c3f16803 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd.algorithm; +package org.dromara.maxkey.password.onetimepwd.algorithm; public class OtpKeyUriFormat { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java index 527a189e..622cff24 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/OtpSecret.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd.algorithm; +package org.dromara.maxkey.password.onetimepwd.algorithm; import java.util.Arrays; import java.util.Random; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java index 323e7a91..b4384a38 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.onetimepwd.algorithm; +package org.dromara.maxkey.password.onetimepwd.algorithm; import java.lang.reflect.UndeclaredThrowableException; import java.math.BigInteger; 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/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java index 48701b03..df52cb7f 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/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; /** * Chip Authentication Program EMV stands for Europay, MasterCard and Visa, a 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/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java index 6db37670..ba6882aa 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/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java @@ -15,13 +15,13 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; import org.apache.commons.codec.binary.Hex; -import org.maxkey.crypto.Base32Utils; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java index 17c2f100..6e278e2a 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/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java @@ -15,15 +15,15 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import org.maxkey.crypto.Base32Utils; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.algorithm.HOTP; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.algorithm.HOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java index 1002487a..df1141f4 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/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java @@ -15,15 +15,15 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; import java.text.MessageFormat; import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.Email; import org.apache.commons.mail.HtmlEmail; -import org.maxkey.configuration.EmailConfig; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.configuration.EmailConfig; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.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/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java similarity index 85% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java index d95a6ffb..d91205b2 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/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.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/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java index bba74773..2da02308 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/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java @@ -15,10 +15,10 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; /** * Chip Authentication Program EMV stands for Europay, MasterCard and Visa, a 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/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java index c3d48bc0..08199100 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/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java @@ -15,18 +15,18 @@ */ -package org.maxkey.password.onetimepwd.impl; +package org.dromara.maxkey.password.onetimepwd.impl; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; 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.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java index 46ba9e26..dd763a01 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/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java @@ -15,9 +15,9 @@ */ -package org.maxkey.password.onetimepwd.token; +package org.dromara.maxkey.password.onetimepwd.token; -import org.maxkey.entity.UserInfo; +import org.dromara.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/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java index ff57b63b..8db6d97b 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/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java @@ -15,15 +15,15 @@ */ -package org.maxkey.password.onetimepwd.token; +package org.dromara.maxkey.password.onetimepwd.token; import java.util.concurrent.TimeUnit; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.OneTimePassword; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; -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/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java similarity index 86% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java rename to maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java index 79852edd..01314374 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/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java @@ -15,14 +15,14 @@ */ -package org.maxkey.password.onetimepwd.token; +package org.dromara.maxkey.password.onetimepwd.token; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.OneTimePassword; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.joda.time.DateTime; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.OneTimePassword; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; public class RedisOtpTokenStore extends AbstractOtpTokenStore { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java index 9728d051..cea4a95d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java @@ -21,9 +21,9 @@ package org.maxkey.otp.algorithm; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import org.maxkey.crypto.Base32Utils; -import org.maxkey.password.onetimepwd.algorithm.HOTP; -import org.maxkey.password.onetimepwd.algorithm.HmacOTP; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.password.onetimepwd.algorithm.HOTP; +import org.dromara.maxkey.password.onetimepwd.algorithm.HmacOTP; public class HmacOTPTest { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java index e2e8427d..88bb09bb 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java @@ -19,8 +19,8 @@ package org.maxkey.otp.algorithm; import java.io.File; -import org.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; -import org.maxkey.util.QRCode; +import org.dromara.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; +import org.dromara.maxkey.util.QRCode; import com.google.zxing.BarcodeFormat; import com.google.zxing.MultiFormatWriter; diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java index 7682a9d5..e584abec 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java @@ -24,9 +24,9 @@ import java.util.Date; import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; -import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.HexUtils; -import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.crypto.HexUtils; +import org.dromara.maxkey.password.onetimepwd.algorithm.TimeBasedOTP; /** * goole * @author Crystal.Sea diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AbstractAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AbstractAuthenticationProvider.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java index 61e24a6e..dcce6994 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AbstractAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java @@ -15,25 +15,25 @@ */ -package org.maxkey.authn.provider; +package org.dromara.maxkey.authn.provider; import java.util.ArrayList; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.MailOtpAuthnService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.MailOtpAuthnService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AuthenticationProviderFactory.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AuthenticationProviderFactory.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AuthenticationProviderFactory.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AuthenticationProviderFactory.java index e31b6629..70683132 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/AuthenticationProviderFactory.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AuthenticationProviderFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authn.provider; +package org.dromara.maxkey.authn.provider; import java.util.concurrent.ConcurrentHashMap; -import org.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.LoginCredential; import org.springframework.security.core.Authentication; public class AuthenticationProviderFactory extends AbstractAuthenticationProvider { diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MfaAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MfaAuthenticationProvider.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java index 3344da38..8c6989b6 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MfaAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java @@ -15,19 +15,19 @@ */ -package org.maxkey.authn.provider.impl; +package org.dromara.maxkey.authn.provider.impl; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MobileAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MobileAuthenticationProvider.java similarity index 88% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MobileAuthenticationProvider.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MobileAuthenticationProvider.java index ab80942c..6209bac2 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/MobileAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MobileAuthenticationProvider.java @@ -15,19 +15,19 @@ */ -package org.maxkey.authn.provider.impl; +package org.dromara.maxkey.authn.provider.impl; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/NormalAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/NormalAuthenticationProvider.java similarity index 88% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/NormalAuthenticationProvider.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/NormalAuthenticationProvider.java index 1e8f57e6..eda07181 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/NormalAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/NormalAuthenticationProvider.java @@ -15,21 +15,21 @@ */ -package org.maxkey.authn.provider.impl; +package org.dromara.maxkey.authn.provider.impl; import java.text.ParseException; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java similarity index 87% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java index 18ac6c9f..357684de 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.provider.impl; +package org.dromara.maxkey.authn.provider.impl; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.BadCredentialsException; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java index c78300ae..3f7bab92 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -15,24 +15,24 @@ */ -package org.maxkey.authn.realm; +package org.dromara.maxkey.authn.realm; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; -import org.maxkey.entity.Roles; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.DateUtils; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/IAuthenticationServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/IAuthenticationServer.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/IAuthenticationServer.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/IAuthenticationServer.java index ee7ef338..156cab65 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/IAuthenticationServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/IAuthenticationServer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.realm; +package org.dromara.maxkey.authn.realm; /** * IAuthenticationServer . diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java similarity index 85% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java index 30af7c88..8184835a 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java @@ -15,22 +15,22 @@ */ -package org.maxkey.authn.realm.jdbc; +package org.dromara.maxkey.authn.realm.jdbc; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.realm.ldap.LdapAuthenticationRealm; -import org.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.PasswordPolicy; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.realm.ldap.LdapAuthenticationRealm; +import org.dromara.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/ActiveDirectoryServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/ActiveDirectoryServer.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java index 6fdc936e..1c45c2d9 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/ActiveDirectoryServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.authn.realm.ldap; +package org.dromara.maxkey.authn.realm.ldap; -import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.authn.realm.IAuthenticationServer; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java index f00a70d8..292524c6 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java @@ -15,16 +15,16 @@ */ -package org.maxkey.authn.realm.ldap; +package org.dromara.maxkey.authn.realm.ldap; import java.util.List; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.realm.IAuthenticationServer; +import org.dromara.maxkey.entity.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java index d058c7bb..11789dfe 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authn.realm.ldap; +package org.dromara.maxkey.authn.realm.ldap; import java.sql.Types; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.LdapContext; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.persistence.service.LdapContextService; +import org.dromara.maxkey.authn.realm.IAuthenticationServer; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.LdapContext; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.persistence.service.LdapContextService; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/StandardLdapServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/StandardLdapServer.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java index 790dc29f..540d4630 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/realm/ldap/StandardLdapServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java @@ -18,15 +18,15 @@ /** * */ -package org.maxkey.authn.realm.ldap; +package org.dromara.maxkey.authn.realm.ldap; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.maxkey.authn.realm.IAuthenticationServer; -import org.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.authn.realm.IAuthenticationServer; +import org.dromara.maxkey.persistence.ldap.LdapUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java index a5dda181..96937390 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java @@ -15,16 +15,16 @@ */ -package org.maxkey.authn.support.basic; +package org.dromara.maxkey.authn.support.basic; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.util.AuthorizationHeader; -import org.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.util.AuthorizationHeader; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/certs/HttpCertsEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java similarity index 94% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/certs/HttpCertsEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java index 986c2468..c1521ad6 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/certs/HttpCertsEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.support.certs; +package org.dromara.maxkey.authn.support.certs; import java.security.cert.X509Certificate; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java index 6321536d..7c955040 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authn.support.httpheader; +package org.dromara.maxkey.authn.support.httpheader; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.constants.ConstsLoginType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/HttpJwtEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java similarity index 89% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/HttpJwtEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java index 8341f204..d5243a9f 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/HttpJwtEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.maxkey.authn.support.jwt; +package org.dromara.maxkey.authn.support.jwt; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.Message; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/JwtLoginService.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/JwtLoginService.java index 5f3421b4..f1c4a2da 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/JwtLoginService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.jwt; +package org.dromara.maxkey.authn.support.jwt; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; @@ -28,9 +28,10 @@ import com.nimbusds.jwt.PlainJWT; import com.nimbusds.jwt.SignedJWT; import java.util.Date; import java.util.UUID; + +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; -import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java index 06e3dec2..560535dc 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java @@ -15,20 +15,21 @@ */ -package org.maxkey.authn.support.kerberos; +package org.dromara.maxkey.authn.support.kerberos; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.WebConstants; import org.joda.time.DateTime; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.util.DateUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosProxy.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosProxy.java index d10430b0..ea0ceca8 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosProxy.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.kerberos; +package org.dromara.maxkey.authn.support.kerberos; public class KerberosProxy { diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosService.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosService.java index a73143d1..665a84ac 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.kerberos; +package org.dromara.maxkey.authn.support.kerberos; import java.util.List; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosToken.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosToken.java index 528dd158..803b15d6 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/KerberosToken.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.kerberos; +package org.dromara.maxkey.authn.support.kerberos; public class KerberosToken { diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/RemoteKerberosService.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/RemoteKerberosService.java index 6c7120dd..d137c7ed 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/RemoteKerberosService.java @@ -15,13 +15,14 @@ */ -package org.maxkey.authn.support.kerberos; +package org.dromara.maxkey.authn.support.kerberos; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.maxkey.util.JsonUtils; + +import org.dromara.maxkey.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java index 3f587f65..5a5c544e 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java @@ -15,21 +15,21 @@ */ -package org.maxkey.authn.support.rememberme; +package org.dromara.maxkey.authn.support.rememberme; import java.text.ParseException; import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.crypto.jwt.HMAC512Service; -import org.maxkey.entity.UserInfo; -import org.maxkey.util.DateUtils; -import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java index 8ea4ee6d..0efc2af2 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/InMemoryRemeberMeManager.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authn.support.rememberme; +package org.dromara.maxkey.authn.support.rememberme; import java.util.concurrent.TimeUnit; -import org.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.constants.ConstsTimeInterval; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java index 2afc41fc..d775dcd0 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authn.support.rememberme; +package org.dromara.maxkey.authn.support.rememberme; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.List; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMe.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMe.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMe.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMe.java index efc0aaca..3f9b64b7 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMe.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMe.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.rememberme; +package org.dromara.maxkey.authn.support.rememberme; import java.io.Serializable; import java.util.Date; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java index 2a08dd08..9c0f2057 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/RemeberMeManagerFactory.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authn.support.rememberme; +package org.dromara.maxkey.authn.support.rememberme; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java index f64c9168..7ccdf533 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.util.StringUtils; import org.opensaml.saml1.core.impl.AssertionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java index c1da9c0e..94d3901b 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import java.util.Map; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java index 6329bc52..1190a64c 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java @@ -16,7 +16,7 @@ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import java.util.Map; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java index 6824cb72..3cddc24d 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java @@ -16,7 +16,7 @@ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import org.opensaml.xml.security.x509.BasicX509Credential; import org.springframework.core.io.Resource; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConstants.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConstants.java index 782b10df..ddb7d158 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConstants.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; public class WsFederationConstants { public static final String LOCALE = "locale"; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationCredential.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationCredential.java index 26d09d80..89823fbe 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationCredential.java @@ -16,7 +16,7 @@ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import org.joda.time.DateTime; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationService.java similarity index 93% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationService.java index 7e626a36..598458b4 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; public interface WsFederationService { public WsFederationConfiguration getWsFederationConfiguration(); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java index 8ac0c6fd..add3858e 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationUtils.java similarity index 99% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationUtils.java index fa540e6e..a65185ce 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationUtils.java @@ -16,7 +16,7 @@ -package org.maxkey.authn.support.wsfederation; +package org.dromara.maxkey.authn.support.wsfederation; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java similarity index 81% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java index 6b2e3767..4aa515d2 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java @@ -15,23 +15,23 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.provider.AuthenticationProviderFactory; -import org.maxkey.authn.provider.impl.MobileAuthenticationProvider; -import org.maxkey.authn.provider.impl.NormalAuthenticationProvider; -import org.maxkey.authn.provider.impl.TrustedAuthenticationProvider; -import org.maxkey.authn.realm.AbstractAuthenticationRealm; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authn.support.rememberme.AbstractRemeberMeManager; -import org.maxkey.authn.support.rememberme.JdbcRemeberMeManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.provider.AuthenticationProviderFactory; +import org.dromara.maxkey.authn.provider.impl.MobileAuthenticationProvider; +import org.dromara.maxkey.authn.provider.impl.NormalAuthenticationProvider; +import org.dromara.maxkey.authn.provider.impl.TrustedAuthenticationProvider; +import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.support.rememberme.AbstractRemeberMeManager; +import org.dromara.maxkey.authn.support.rememberme.JdbcRemeberMeManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java similarity index 92% rename from maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index a2a7fd29..cfc03542 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -15,15 +15,15 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import com.nimbusds.jose.JOSEException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; -import org.maxkey.authn.support.jwt.JwtLoginService; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.authn.support.jwt.JwtLoginService; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/autoconfigure/SmsAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java similarity index 82% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/autoconfigure/SmsAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java index 4b2669d6..f7a5fd2e 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/autoconfigure/SmsAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java @@ -15,14 +15,14 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.password.onetimepwd.token.RedisOtpTokenStore; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.service.EmailSendersService; -import org.maxkey.persistence.service.SmsProviderService; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.service.EmailSendersService; +import org.dromara.maxkey.persistence.service.SmsProviderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthn.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java index a32f124c..081d281e 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java @@ -15,12 +15,12 @@ */ -package org.maxkey.password.sms; +package org.dromara.maxkey.password.sms; import java.io.IOException; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.StandardEnvironment; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java similarity index 84% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java index 825438e9..2516ebba 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java @@ -15,24 +15,24 @@ */ -package org.maxkey.password.sms; +package org.dromara.maxkey.password.sms; import java.sql.Types; import java.util.concurrent.TimeUnit; -import org.maxkey.configuration.EmailConfig; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.EmailSenders; -import org.maxkey.entity.SmsProvider; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.impl.MailOtpAuthn; -import org.maxkey.password.onetimepwd.token.RedisOtpTokenStore; -import org.maxkey.password.sms.impl.SmsOtpAuthnAliyun; -import org.maxkey.password.sms.impl.SmsOtpAuthnTencentCloud; -import org.maxkey.password.sms.impl.SmsOtpAuthnYunxin; -import org.maxkey.persistence.service.EmailSendersService; -import org.maxkey.persistence.service.SmsProviderService; +import org.dromara.maxkey.configuration.EmailConfig; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.EmailSenders; +import org.dromara.maxkey.entity.SmsProvider; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.impl.MailOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; +import org.dromara.maxkey.password.sms.impl.SmsOtpAuthnAliyun; +import org.dromara.maxkey.password.sms.impl.SmsOtpAuthnTencentCloud; +import org.dromara.maxkey.password.sms.impl.SmsOtpAuthnYunxin; +import org.dromara.maxkey.persistence.service.EmailSendersService; +import org.dromara.maxkey.persistence.service.SmsProviderService; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java index b030028e..bd7b5483 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.sms.impl; +package org.dromara.maxkey.password.sms.impl; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -24,8 +24,8 @@ import com.aliyuncs.IAcsClient; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.sms.SmsOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.sms.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java index 8eb0417b..eb900be2 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.sms.impl; +package org.dromara.maxkey.password.sms.impl; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; @@ -24,8 +24,8 @@ import com.tencentcloudapi.sms.v20190711.SmsClient; import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest; import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.sms.SmsOtpAuthn; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.sms.SmsOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java rename to maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java index ecc3c2be..79502088 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.password.sms.impl; +package org.dromara.maxkey.password.sms.impl; import java.security.MessageDigest; import java.util.ArrayList; @@ -29,10 +29,10 @@ 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.entity.UserInfo; -import org.maxkey.password.sms.SmsOtpAuthn; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringGenerator; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.sms.SmsOtpAuthn; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.StringGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java similarity index 87% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java index 3a414569..c81977ee 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java @@ -18,16 +18,16 @@ /** * */ -package org.maxkey.authn.support.socialsignon; +package org.dromara.maxkey.authn.support.socialsignon; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; -import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; +import org.dromara.maxkey.authn.support.socialsignon.service.SocialsAssociateService; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java similarity index 95% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index 1ca6aeda..47b2f70d 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -18,22 +18,22 @@ /** * */ -package org.maxkey.authn.support.socialsignon; +package org.dromara.maxkey.authn.support.socialsignon; import javax.servlet.http.HttpServletRequest; import me.zhyd.oauth.request.AuthMaxkeyRequest; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.Message; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.entity.UserInfo; -import org.maxkey.uuid.UUID; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.uuid.UUID; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java similarity index 97% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java index dee9a68e..713b11e8 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.socialsignon.service; +package org.dromara.maxkey.authn.support.socialsignon.service; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,8 +23,8 @@ import java.sql.Types; import java.util.Date; import java.util.List; -import org.maxkey.constants.ConstsDatabase; -import org.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.constants.ConstsDatabase; +import org.dromara.maxkey.entity.SocialsAssociate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java index 106c307c..20b4ab67 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authn.support.socialsignon.service; +package org.dromara.maxkey.authn.support.socialsignon.service; import java.sql.ResultSet; import java.sql.SQLException; @@ -24,11 +24,11 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.TimeUnit; -import org.maxkey.authn.support.socialsignon.token.RedisTokenStore; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.entity.SocialsProviderLogin; +import org.dromara.maxkey.authn.support.socialsignon.token.RedisTokenStore; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.entity.SocialsProviderLogin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java similarity index 90% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java index 02c180e3..2c3fe0d2 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authn.support.socialsignon.service; +package org.dromara.maxkey.authn.support.socialsignon.service; import java.util.List; -import org.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.SocialsAssociate; public interface SocialsAssociateService{ diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java similarity index 91% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java index 891f2081..86f4c067 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authn.support.socialsignon.token; +package org.dromara.maxkey.authn.support.socialsignon.token; import org.apache.commons.lang3.StringUtils; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.joda.time.DateTime; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; import java.util.concurrent.ConcurrentHashMap; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java similarity index 85% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index a100d59d..bc054433 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -15,15 +15,16 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.io.IOException; -import org.maxkey.authn.support.socialsignon.service.JdbcSocialsAssociateService; -import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; -import org.maxkey.authn.support.socialsignon.token.RedisTokenStore; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.persistence.redis.RedisConnectionFactory; + +import org.dromara.maxkey.authn.support.socialsignon.service.JdbcSocialsAssociateService; +import org.dromara.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; +import org.dromara.maxkey.authn.support.socialsignon.token.RedisTokenStore; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/Base32Utils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/Base32Utils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java index 07a8129d..343bcf9f 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/Base32Utils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base32Utils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import org.apache.commons.codec.binary.Base32; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/Base64Utils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/Base64Utils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java index b323c1a8..3579e491 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/Base64Utils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Base64Utils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/BytesUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/BytesUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java index c946089f..13b0401e 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/BytesUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/BytesUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/DigestUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/DigestUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java index 71601c26..dcc271bd 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/DigestUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/DigestUtils.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/HexUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/HexUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java index e154fbf9..4ee95c68 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/HexUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.io.UnsupportedEncodingException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairSize.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java similarity index 95% rename from maxkey-common/src/main/java/org/maxkey/crypto/KeyPairSize.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java index 384f8e08..d1237832 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairSize.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairSize.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; public class KeyPairSize { diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairType.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/KeyPairType.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java index 71058a02..e957625c 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairType.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairType.java @@ -19,7 +19,7 @@ * KeyPairType.java */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; /** * Key pair type. Enum constant names are compatible with JCA standard names. diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java index bb5d02e6..59759e22 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/KeyPairUtil.java @@ -19,7 +19,7 @@ * KeyPairUtil.java */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.security.InvalidParameterException; @@ -47,7 +47,7 @@ import org.bouncycastle.crypto.params.DHKeyParameters; import org.bouncycastle.crypto.params.DSAKeyParameters; import org.bouncycastle.crypto.params.ECKeyParameters; import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.maxkey.crypto.cert.CryptoException; +import org.dromara.maxkey.crypto.cert.CryptoException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/Md5Sum.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/Md5Sum.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java index e4d74b07..143a859e 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/Md5Sum.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/Md5Sum.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.io.File; import java.io.FileInputStream; @@ -28,7 +28,7 @@ import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.security.MessageDigest; -import org.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.springframework.core.io.ClassPathResource; /** diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/RSAUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/RSAUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java index 7ceecd56..3bb59c58 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/RSAUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/RSAUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.security.Key; import java.security.KeyFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java index e676b24f..9fecff70 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.io.UnsupportedEncodingException; import java.security.Provider; @@ -29,9 +29,9 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import org.apache.commons.logging.LogFactory; -import org.maxkey.util.Instance; -import org.maxkey.util.StringGenerator; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.util.StringGenerator; +import org.dromara.maxkey.util.StringUtils; /** * Reciprocal cipher or Symmetric-key algorithm diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/SM3.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/SM3.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java index 852985e6..267f20c9 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/SM3.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/SM3.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto; +package org.dromara.maxkey.crypto; import java.util.Arrays; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CertCrypto.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/CertCrypto.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java index 272d2041..a4cc8e66 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CertCrypto.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertCrypto.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,8 +31,8 @@ import java.security.PublicKey; import java.security.cert.Certificate; import javax.crypto.Cipher; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; /** *//** diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CertSigner.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/CertSigner.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java index 2a1dddf4..f64f1d77 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CertSigner.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CertSigner.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.security.KeyStore; import java.security.PrivateKey; @@ -25,8 +25,8 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Date; -import org.maxkey.crypto.HexUtils; -import org.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.maxkey.crypto.HexUtils; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; /** *//** diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CryptoException.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/CryptoException.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java index f78036f0..9b80dfb8 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/CryptoException.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/CryptoException.java @@ -19,7 +19,7 @@ * CryptoException.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; /** * Represents a cryptographic exception. diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java index 07bac7db..f8e89418 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/NetUtil.java @@ -19,7 +19,7 @@ * NetUtil.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.io.BufferedOutputStream; import java.io.File; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/SignatureType.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/SignatureType.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java index c4d5f580..0124463b 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/SignatureType.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/SignatureType.java @@ -19,7 +19,7 @@ * SignatureType.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.util.Collection; import java.util.Collections; @@ -32,7 +32,7 @@ import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; -import org.maxkey.crypto.KeyPairType; +import org.dromara.maxkey.crypto.KeyPairType; /** diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/StringUtil.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/StringUtil.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java index 6cceceda..431939de 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/StringUtil.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/StringUtil.java @@ -19,7 +19,7 @@ * StringUtil.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java index 86b6c97f..a484f348 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509CertUtils.java @@ -19,7 +19,7 @@ * X509CertUtil.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/X509V3CertGen.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/cert/X509V3CertGen.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java index d9dfc5be..d428cbdf 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/X509V3CertGen.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java @@ -19,7 +19,7 @@ * X509V3CertGen.java */ -package org.maxkey.crypto.cert; +package org.dromara.maxkey.crypto.cert; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -38,8 +38,8 @@ import org.bouncycastle.cert.X509v3CertificateBuilder; import org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.maxkey.crypto.KeyPairType; -import org.maxkey.crypto.KeyPairUtil; +import org.dromara.maxkey.crypto.KeyPairType; +import org.dromara.maxkey.crypto.KeyPairUtil; /** diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java index 0a9e6165..355174bd 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEAlgorithmEmbed.java @@ -17,7 +17,7 @@ /** * */ -package org.maxkey.crypto.jose; +package org.dromara.maxkey.crypto.jose; import com.google.common.base.Strings; import com.nimbusds.jose.JWEAlgorithm; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java index 5a7bce96..1f46ef56 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java @@ -17,7 +17,7 @@ /** * */ -package org.maxkey.crypto.jose; +package org.dromara.maxkey.crypto.jose; import com.google.common.base.Strings; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java index a0002877..cfe1b119 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/JWSAlgorithmEmbed.java @@ -17,7 +17,7 @@ /** * */ -package org.maxkey.crypto.jose; +package org.dromara.maxkey.crypto.jose; import com.google.common.base.Strings; import com.nimbusds.jose.JWSAlgorithm; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jose/keystore/JWKSetKeyStore.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/jose/keystore/JWKSetKeyStore.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java index ddc198b0..67a29ba1 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jose/keystore/JWKSetKeyStore.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java @@ -1,4 +1,4 @@ -package org.maxkey.crypto.jose.keystore; +package org.dromara.maxkey.crypto.jose.keystore; /******************************************************************************* * Copyright 2014 The MITRE Corporation * and the MIT Kerberos and Internet Trust Consortium @@ -30,8 +30,8 @@ import java.text.ParseException; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.maxkey.crypto.RSAUtils; -import org.maxkey.pretty.PrettyFactory; +import org.dromara.maxkey.crypto.RSAUtils; +import org.dromara.maxkey.pretty.PrettyFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/HMAC512Service.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/HMAC512Service.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java index b8b32fc9..3f69d59c 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/HMAC512Service.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.jwt; +package org.dromara.maxkey.crypto.jwt; import java.text.ParseException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java index 61100f9d..4abe1dbf 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ******************************************************************************/ -package org.maxkey.crypto.jwt.encryption.service; +package org.dromara.maxkey.crypto.jwt.encryption.service; import java.util.Collection; import java.util.Map; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java index bb887d1a..a3e7d213 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ******************************************************************************/ -package org.maxkey.crypto.jwt.encryption.service.impl; +package org.dromara.maxkey.crypto.jwt.encryption.service.impl; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -26,8 +26,8 @@ import java.util.Set; import javax.annotation.PostConstruct; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java similarity index 91% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java index 45f13302..8aaaccba 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java @@ -18,13 +18,14 @@ /** * */ -package org.maxkey.crypto.jwt.encryption.service.impl; +package org.dromara.maxkey.crypto.jwt.encryption.service.impl; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.text.ParseException; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; + +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java index 45293485..cb5b661d 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ******************************************************************************/ -package org.maxkey.crypto.jwt.signer.service; +package org.dromara.maxkey.crypto.jwt.signer.service; import java.security.NoSuchAlgorithmException; import java.util.Collection; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java index 7c7c4e41..96c5c071 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ******************************************************************************/ -package org.maxkey.crypto.jwt.signer.service.impl; +package org.dromara.maxkey.crypto.jwt.signer.service.impl; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java similarity index 92% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java index 8e3b5227..73be776f 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java @@ -17,17 +17,17 @@ /** * */ -package org.maxkey.crypto.jwt.signer.service.impl; +package org.dromara.maxkey.crypto.jwt.signer.service.impl; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java index 05d22a62..52ec1e4a 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ -package org.maxkey.crypto.jwt.signer.service.impl; +package org.dromara.maxkey.crypto.jwt.signer.service.impl; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; +import org.dromara.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java similarity index 94% rename from maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java index 8f161401..79c2cd11 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java @@ -18,13 +18,13 @@ /** * */ -package org.maxkey.crypto.jwt.signer.service.impl; +package org.dromara.maxkey.crypto.jwt.signer.service.impl; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.util.Map; -import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; +import org.dromara.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreLoader.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreLoader.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java index b6757d7c..d1983bcb 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreLoader.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreLoader.java @@ -19,7 +19,7 @@ * */ -package org.maxkey.crypto.keystore; +package org.dromara.maxkey.crypto.keystore; import java.security.KeyStore; import java.util.Enumeration; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreType.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreType.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java index 93fd78d5..6c84bbea 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreType.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreType.java @@ -19,7 +19,7 @@ * KeyStoreType.java */ -package org.maxkey.crypto.keystore; +package org.dromara.maxkey.crypto.keystore; import java.util.Collections; import java.util.HashSet; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java index 9b53b23a..17ac69f3 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/keystore/KeyStoreUtil.java @@ -19,7 +19,7 @@ * KeyStoreUtil.java */ -package org.maxkey.crypto.keystore; +package org.dromara.maxkey.crypto.keystore; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -51,11 +51,11 @@ import java.util.LinkedHashSet; import org.apache.commons.codec.binary.Base64; import org.bouncycastle.openssl.PEMParser; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.cert.CryptoException; +import org.dromara.maxkey.crypto.cert.X509CertUtils; +import org.dromara.maxkey.crypto.cert.X509V3CertGen; import org.joda.time.DateTime; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.crypto.cert.CryptoException; -import org.maxkey.crypto.cert.X509CertUtils; -import org.maxkey.crypto.cert.X509V3CertGen; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/Digester.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/Digester.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java index 07cd7d6e..651a3197 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/Digester.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Digester.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/LdapShaPasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/LdapShaPasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java index 1c198550..021f9e9c 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/LdapShaPasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; /* * Copyright 2002-2018 the original author or authors. * diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/Md4.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/Md4.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java index f477193c..f75f8456 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/Md4.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; /* * Copyright 2002-2017 the original author or authors. diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/Md4PasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/Md4PasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java index b22fe1e8..8561d55c 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/Md4PasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; /* * Copyright 2002-2018 the original author or authors. diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/MessageDigestPasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/MessageDigestPasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java index f7a77229..ef5bf5db 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/MessageDigestPasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; /* * Copyright 2002-2018 the original author or authors. diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/NoOpPasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/NoOpPasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java index f5c585f8..aec860d5 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/NoOpPasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordEncoderUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordEncoderUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java index cb981a73..d3568a05 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordEncoderUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordEncoderUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; import org.springframework.security.crypto.codec.Utf8; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordGen.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordGen.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java index 9940363e..193160b4 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordGen.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordGen.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; import java.util.ArrayList; import java.util.Collections; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordReciprocal.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordReciprocal.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java index abcac1e9..d69fdcb0 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/PasswordReciprocal.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java @@ -15,9 +15,9 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; -import org.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.crypto.ReciprocalUtils; import org.springframework.security.crypto.bcrypt.BCrypt; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/SM3PasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java similarity index 93% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/SM3PasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java index 096f4cee..181a7292 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/SM3PasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/SM3PasswordEncoder.java @@ -15,11 +15,11 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; +import org.dromara.maxkey.crypto.*; import org.springframework.security.crypto.codec.Hex; import org.springframework.security.crypto.password.PasswordEncoder; -import org.maxkey.crypto.*; public class SM3PasswordEncoder implements PasswordEncoder { diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/password/StandardPasswordEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/crypto/password/StandardPasswordEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java index b89a8e77..4e362225 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/password/StandardPasswordEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.password; +package org.dromara.maxkey.crypto.password; import static org.springframework.security.crypto.util.EncodingUtils.concatenate; import static org.springframework.security.crypto.util.EncodingUtils.subArray; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/signature/DsaSigner.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java similarity index 95% rename from maxkey-common/src/main/java/org/maxkey/crypto/signature/DsaSigner.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java index fef6b713..892943f9 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/signature/DsaSigner.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.signature; +package org.dromara.maxkey.crypto.signature; import java.security.KeyFactory; import java.security.PrivateKey; @@ -24,8 +24,8 @@ import java.security.Signature; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.crypto.KeyPairType; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.KeyPairType; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/signature/ISigner.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/signature/ISigner.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java index 4aef073b..ed84d7be 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/signature/ISigner.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/ISigner.java @@ -15,7 +15,7 @@ */ -package org.maxkey.crypto.signature; +package org.dromara.maxkey.crypto.signature; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/signature/RsaSigner.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/crypto/signature/RsaSigner.java rename to maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java index df255dc9..c2861aa8 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/signature/RsaSigner.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.crypto.signature; +package org.dromara.maxkey.crypto.signature; import java.security.KeyFactory; import java.security.PrivateKey; @@ -27,8 +27,8 @@ import java.security.Signature; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.crypto.KeyPairType; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.KeyPairType; /** * RSA Digital signature diff --git a/maxkey-common/src/main/java/org/maxkey/entity/DbTableColumn.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/entity/DbTableColumn.java rename to maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java index 9c9cce04..de318580 100644 --- a/maxkey-common/src/main/java/org/maxkey/entity/DbTableColumn.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableColumn.java @@ -24,7 +24,7 @@ * information or have any questions. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; public class DbTableColumn { String column; diff --git a/maxkey-common/src/main/java/org/maxkey/entity/DbTableMetaData.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/entity/DbTableMetaData.java rename to maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java index ee4f27ff..38d89a84 100644 --- a/maxkey-common/src/main/java/org/maxkey/entity/DbTableMetaData.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/DbTableMetaData.java @@ -24,7 +24,7 @@ * information or have any questions. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.util.ArrayList; import java.util.HashMap; diff --git a/maxkey-common/src/main/java/org/maxkey/entity/Message.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/entity/Message.java rename to maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java index dbe74819..0e5257a0 100644 --- a/maxkey-common/src/main/java/org/maxkey/entity/Message.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import org.springframework.http.ResponseEntity; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonDateDeserializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/json/JsonDateDeserializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java index b5cc38df..29144135 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonDateDeserializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateDeserializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonDateSerializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/json/JsonDateSerializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java index 5f10d3d7..c0c3d060 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonDateSerializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateSerializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java index cb37bf10..911dfbd3 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeDeserializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java index 62465ffe..315320c7 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonDateTimeSerializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonISODateDeserializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/json/JsonISODateDeserializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java index 281e6bd9..fa489f25 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonISODateDeserializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateDeserializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/maxkey-common/src/main/java/org/maxkey/json/JsonISODateSerializer.java b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/json/JsonISODateSerializer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java index 317e17ae..7386e1bc 100644 --- a/maxkey-common/src/main/java/org/maxkey/json/JsonISODateSerializer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/json/JsonISODateSerializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.json; +package org.dromara.maxkey.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/Pretty.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java similarity index 95% rename from maxkey-common/src/main/java/org/maxkey/pretty/Pretty.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java index 3cfa71c8..2660a351 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/Pretty.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java @@ -15,7 +15,7 @@ */ -package org.maxkey.pretty; +package org.dromara.maxkey.pretty; public interface Pretty { public final static String LINE_BREAK = "\n"; diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/PrettyFactory.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java similarity index 87% rename from maxkey-common/src/main/java/org/maxkey/pretty/PrettyFactory.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java index 8ab383d0..e8665dae 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/PrettyFactory.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/PrettyFactory.java @@ -15,10 +15,10 @@ */ -package org.maxkey.pretty; +package org.dromara.maxkey.pretty; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.pretty.impl.XmlPretty; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.pretty.impl.XmlPretty; public class PrettyFactory { diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java index 9e6a8456..77fdbc99 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/JsonPretty.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java @@ -15,11 +15,11 @@ */ -package org.maxkey.pretty.impl; +package org.dromara.maxkey.pretty.impl; import java.io.IOException; -import org.maxkey.pretty.Pretty; +import org.dromara.maxkey.pretty.Pretty; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java index 8395286c..bf6f0c2c 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/SqlPretty.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/SqlPretty.java @@ -15,7 +15,7 @@ */ -package org.maxkey.pretty.impl; +package org.dromara.maxkey.pretty.impl; import java.util.HashSet; import java.util.LinkedList; @@ -23,7 +23,7 @@ import java.util.Locale; import java.util.Set; import java.util.StringTokenizer; -import org.maxkey.pretty.Pretty; +import org.dromara.maxkey.pretty.Pretty; public class SqlPretty implements Pretty{ diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/XMLHelper.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/pretty/impl/XMLHelper.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java index ac2da14d..b7a4a95a 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/XMLHelper.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java @@ -15,7 +15,7 @@ */ -package org.maxkey.pretty.impl; +package org.dromara.maxkey.pretty.impl; import java.io.OutputStream; import java.io.StringReader; diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/XmlPretty.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java similarity index 95% rename from maxkey-common/src/main/java/org/maxkey/pretty/impl/XmlPretty.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java index 0ee8b966..6058fe7d 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/XmlPretty.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XmlPretty.java @@ -15,14 +15,14 @@ */ -package org.maxkey.pretty.impl; +package org.dromara.maxkey.pretty.impl; import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.maxkey.pretty.Pretty; +import org.dromara.maxkey.pretty.Pretty; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; diff --git a/maxkey-common/src/main/java/org/maxkey/pretty/impl/package-info.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java similarity index 94% rename from maxkey-common/src/main/java/org/maxkey/pretty/impl/package-info.java rename to maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java index cef79aaf..ca143fa5 100644 --- a/maxkey-common/src/main/java/org/maxkey/pretty/impl/package-info.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/package-info.java @@ -19,4 +19,4 @@ * @author mhshi * */ -package org.maxkey.pretty.impl; +package org.dromara.maxkey.pretty.impl; diff --git a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java index 951b85a4..7592a017 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.util; +package org.dromara.maxkey.util; public class AuthorizationHeader { diff --git a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java index bc51d765..f974ff7e 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java @@ -15,11 +15,11 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import javax.servlet.http.HttpServletRequest; -import org.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.Base64Utils; /** * @author Crystal.Sea diff --git a/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java index 69c24aec..0e93f380 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.reflect.Field; import java.text.ParseException; diff --git a/maxkey-common/src/main/java/org/maxkey/util/BeanUtil.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/BeanUtil.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java index d73fbb3e..e9f06f24 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/BeanUtil.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/maxkey-common/src/main/java/org/maxkey/util/DateUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/DateUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java index d88d0a83..a4653381 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/DateUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java @@ -16,7 +16,7 @@ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/maxkey-common/src/main/java/org/maxkey/util/DynaBean.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/DynaBean.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java index e412a59d..932bad17 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/DynaBean.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/DynaBean.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.util.HashMap; import java.util.Iterator; diff --git a/maxkey-common/src/main/java/org/maxkey/util/EthernetAddress.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/EthernetAddress.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java index bfd0e6b7..eea30385 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/EthernetAddress.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.IOException; import java.io.Serializable; import java.net.InetSocketAddress; diff --git a/maxkey-common/src/main/java/org/maxkey/util/ExcelUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/ExcelUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java index 7dd04902..791be7bd 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/ExcelUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/ExcelUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.text.DecimalFormat; import java.text.SimpleDateFormat; diff --git a/maxkey-common/src/main/java/org/maxkey/util/HttpEncoder.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/HttpEncoder.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java index d8664f47..34bcae4b 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/HttpEncoder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.*; import java.net.*; diff --git a/maxkey-common/src/main/java/org/maxkey/util/HttpsTrusts.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/HttpsTrusts.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java index a94cd5e7..4489daf2 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/HttpsTrusts.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; diff --git a/maxkey-common/src/main/java/org/maxkey/util/IdGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/IdGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java index b90041ed..a7546122 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/IdGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/IdGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; public class IdGenerator { diff --git a/maxkey-common/src/main/java/org/maxkey/util/IdSequence.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/IdSequence.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java index 99e6e6a0..856f5834 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/IdSequence.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/IdSequence.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.util.Date; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/maxkey/util/Instance.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/Instance.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java index 10dc650f..77473bad 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/Instance.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/Instance.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.reflect.Constructor; diff --git a/maxkey-common/src/main/java/org/maxkey/util/JdbcUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/util/JdbcUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java index 3c2f3f3f..c99d83fb 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/JdbcUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,8 +24,8 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; -import org.maxkey.entity.DbTableColumn; -import org.maxkey.entity.DbTableMetaData; +import org.dromara.maxkey.entity.DbTableColumn; +import org.dromara.maxkey.entity.DbTableMetaData; public class JdbcUtils { diff --git a/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java index f6ebd2ec..186be70f 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonParseException; diff --git a/maxkey-common/src/main/java/org/maxkey/util/MacAddress.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/MacAddress.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java index 789f7ef2..5ece170d 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/MacAddress.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/MacAddress.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/maxkey-common/src/main/java/org/maxkey/util/MethodInvoke.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/MethodInvoke.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java index 4f80ec3a..796f3c93 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/MethodInvoke.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/MethodInvoke.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.reflect.Method; diff --git a/maxkey-common/src/main/java/org/maxkey/util/ObjectTransformer.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java similarity index 94% rename from maxkey-common/src/main/java/org/maxkey/util/ObjectTransformer.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java index 3a0606cf..5246f40b 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/ObjectTransformer.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/ObjectTransformer.java @@ -18,11 +18,11 @@ /** * */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.Serializable; -import org.maxkey.crypto.HexUtils; +import org.dromara.maxkey.crypto.HexUtils; /** * ObjectTransformer
diff --git a/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/PathUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java index 28eb030a..960f71a4 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.UnsupportedEncodingException; import org.slf4j.Logger; diff --git a/maxkey-common/src/main/java/org/maxkey/util/Preconditions.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/Preconditions.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java index 5e88f65e..b3e68438 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/Preconditions.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/Preconditions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.util.Locale; diff --git a/maxkey-common/src/main/java/org/maxkey/util/QRCode.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/QRCode.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java index 9953b18e..757bf729 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/QRCode.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.util; +package org.dromara.maxkey.util; import com.google.zxing.common.BitMatrix; diff --git a/maxkey-common/src/main/java/org/maxkey/util/QRCodeConfig.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/QRCodeConfig.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java index 125d4f77..7b6b2bd0 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/QRCodeConfig.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/QRCodeConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.awt.image.BufferedImage; diff --git a/maxkey-common/src/main/java/org/maxkey/util/RQCodeUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/RQCodeUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/RQCodeUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/RQCodeUtils.java index 0023c6a9..bf92e250 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/RQCodeUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/RQCodeUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.awt.image.BufferedImage; import java.io.File; diff --git a/maxkey-common/src/main/java/org/maxkey/util/RequestTokenUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java similarity index 97% rename from maxkey-common/src/main/java/org/maxkey/util/RequestTokenUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java index e17e92ad..b07abd3f 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/RequestTokenUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java @@ -1,4 +1,4 @@ -package org.maxkey.util; +package org.dromara.maxkey.util; import javax.servlet.http.HttpServletRequest; diff --git a/maxkey-common/src/main/java/org/maxkey/util/SerializationUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/SerializationUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java index 1ea0b910..967822ee 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/SerializationUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/SerializationUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.*; diff --git a/maxkey-common/src/main/java/org/maxkey/util/SnowFlakeId.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/SnowFlakeId.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java index 3172553c..4256d0b5 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/SnowFlakeId.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.util.Calendar; import java.util.Date; diff --git a/maxkey-common/src/main/java/org/maxkey/util/StreamUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/StreamUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java index cae544c8..150aecf6 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/StreamUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/StreamUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.IOException; import java.io.InputStream; diff --git a/maxkey-common/src/main/java/org/maxkey/util/StringGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/util/StringGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java index cc4db3ee..7a45fd02 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/StringGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/StringGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.management.ManagementFactory; import java.security.SecureRandom; @@ -24,7 +24,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; import java.util.UUID; -import org.maxkey.crypto.Base64Utils; + +import org.dromara.maxkey.crypto.Base64Utils; public class StringGenerator { diff --git a/maxkey-common/src/main/java/org/maxkey/util/StringUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/StringUtils.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/StringUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/StringUtils.java index 62361c73..ac49fc49 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/StringUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/StringUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/maxkey-common/src/main/java/org/maxkey/util/UUIDGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/util/UUIDGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java index c5c10d42..ea70971a 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/UUIDGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.util; +package org.dromara.maxkey.util; import java.lang.management.ManagementFactory; import java.security.MessageDigest; @@ -368,7 +368,7 @@ public final class UUIDGenerator { } - public static void version(org.maxkey.util.UUIDGenerator generated){ + public static void version(org.dromara.maxkey.util.UUIDGenerator generated){ System.out.println("UUID : " + generated.toString()); System.out.println("raw bytes : " + Arrays.toString(generated.getBytes())); System.out.println("process id : " + generated.getProcessId()); diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/NodeIDGetter.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/uuid/NodeIDGetter.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java index 383fccd0..db8c01cc 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/NodeIDGetter.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/NodeIDGetter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; //$Id$ // diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/TimestampUUIDGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/uuid/TimestampUUIDGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java index 89e3431d..876023fe 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/TimestampUUIDGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; //$Id$ // diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/UUID.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/uuid/UUID.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java index 33a21fb4..4e68b75d 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/UUID.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java @@ -15,7 +15,7 @@ */ -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; //$Id$ diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/UUIDGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java similarity index 96% rename from maxkey-common/src/main/java/org/maxkey/uuid/UUIDGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java index beafccd3..4ba4a6c9 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/UUIDGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; /** * An interface representing an object that generates UUIDs. diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/UUIDRandomness.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java similarity index 98% rename from maxkey-common/src/main/java/org/maxkey/uuid/UUIDRandomness.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java index 91ce97cf..23f05ba7 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/UUIDRandomness.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java @@ -33,7 +33,7 @@ // such third party rights. // -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; import java.security.*; diff --git a/maxkey-common/src/main/java/org/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java similarity index 99% rename from maxkey-common/src/main/java/org/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java rename to maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java index a9f996d9..b84a8942 100644 --- a/maxkey-common/src/main/java/org/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.uuid; +package org.dromara.maxkey.uuid; //$Id$ diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java index e2b329ad..ac1840bf 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java @@ -17,6 +17,8 @@ package org.maxkey.crypto; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.DigestUtils; import org.junit.Test; public class Base64UtilsTest { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java index 3802a150..b4c318b1 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/DigestUtilsTest.java @@ -18,6 +18,8 @@ package org.maxkey.crypto; import java.time.Instant; + +import org.dromara.maxkey.crypto.DigestUtils; import org.junit.Test; public class DigestUtilsTest { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java index a00e7d00..654a2daf 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java @@ -20,6 +20,8 @@ package org.maxkey.crypto; import java.io.File; import java.io.FileNotFoundException; +import org.dromara.maxkey.crypto.Md5Sum; + public class Md5SumTest { public Md5SumTest() { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java index 88394527..3334b8a2 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java @@ -17,7 +17,7 @@ package org.maxkey.crypto; -import org.maxkey.crypto.password.PasswordGen; +import org.dromara.maxkey.crypto.password.PasswordGen; public class PasswordGenTest { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java index 4b23cee8..e012805f 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/RSAUtilsTest.java @@ -18,6 +18,10 @@ package org.maxkey.crypto; import java.security.KeyPair; + +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.HexUtils; +import org.dromara.maxkey.crypto.RSAUtils; import org.junit.Test; diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java index edba7b81..8acbf583 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java @@ -19,8 +19,8 @@ package org.maxkey.crypto; import java.io.UnsupportedEncodingException; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.junit.Test; -import org.maxkey.crypto.password.PasswordReciprocal; public class ReciprocalUtilsTest { @Test diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java index 6d11e80f..16aa8e95 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java @@ -24,6 +24,7 @@ import java.security.Security; import java.security.cert.X509Certificate; import java.util.Date; +import org.dromara.maxkey.crypto.cert.X509V3CertGen; import org.joda.time.DateTime; import org.junit.Test; diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java index 3e58d590..d90f6575 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java @@ -17,6 +17,7 @@ package org.maxkey.crypto.password; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; public class PasswordReciprocalTest { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java index 5178e1ba..51f75562 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java @@ -17,6 +17,8 @@ package org.maxkey.crypto.password; +import org.dromara.maxkey.crypto.password.SM3PasswordEncoder; + public class SM3PasswordEncoderTest { public static void main(String[] args) { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java index bc4b1571..71c9b539 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM4PasswordEncoderTest.java @@ -17,6 +17,8 @@ package org.maxkey.crypto.password; +import org.dromara.maxkey.crypto.password.Md4PasswordEncoder; + public class SM4PasswordEncoderTest { public static void main(String[] args) { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java index 2ba7a4f4..1fac60a1 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/StandardPasswordEncoderTest.java @@ -17,6 +17,8 @@ package org.maxkey.crypto.password; +import org.dromara.maxkey.crypto.password.StandardPasswordEncoder; + public class StandardPasswordEncoderTest { public static void main(String[] args) { diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java index 3e60794f..6328b171 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java @@ -19,8 +19,9 @@ package org.maxkey.crypto.signature; import java.util.Map; +import org.dromara.maxkey.crypto.KeyPairUtil; +import org.dromara.maxkey.crypto.signature.DsaSigner; import org.junit.Test; -import org.maxkey.crypto.KeyPairUtil; public final class DsaSignerTest { @Test diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java index 9a0bd8b8..d43055ce 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/signature/HMAC512ServiceTest.java @@ -17,7 +17,7 @@ package org.maxkey.crypto.signature; -import org.maxkey.crypto.jwt.HMAC512Service; +import org.dromara.maxkey.crypto.jwt.HMAC512Service; import com.nimbusds.jose.JOSEException; diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java index 9d8c8afc..f19e58f2 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/signature/RSAKeyTest.java @@ -19,7 +19,7 @@ package org.maxkey.crypto.signature; import java.security.SecureRandom; -import org.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.Base64Utils; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java index 986124a8..e3877121 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java @@ -22,8 +22,9 @@ package org.maxkey.crypto.signature; import java.util.Map; +import org.dromara.maxkey.crypto.KeyPairUtil; +import org.dromara.maxkey.crypto.signature.RsaSigner; import org.junit.Test; -import org.maxkey.crypto.KeyPairUtil; public final class RsaSignerTest { diff --git a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java b/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java index 261f2a04..26dc927e 100644 --- a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java +++ b/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java @@ -19,7 +19,7 @@ package org.maxkey.otp.algorithm; import java.io.File; -import org.maxkey.util.QRCode; +import org.dromara.maxkey.util.QRCode; import com.google.zxing.BarcodeFormat; import com.google.zxing.MultiFormatWriter; diff --git a/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java b/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java index c34c0a0f..d68055af 100644 --- a/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java @@ -17,9 +17,9 @@ package org.maxkey.rest; +import org.dromara.maxkey.util.AuthorizationHeader; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; import org.junit.Test; -import org.maxkey.util.AuthorizationHeader; -import org.maxkey.util.AuthorizationHeaderUtils; public class AuthorizationHeaderTest { diff --git a/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java b/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java index 20751c3c..dc362239 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/DateUtilsTest.java @@ -19,6 +19,8 @@ package org.maxkey.util; import java.util.Date; +import org.dromara.maxkey.util.DateUtils; + public class DateUtilsTest { /** diff --git a/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java b/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java index b4e1e0df..1e0748c5 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/EthernetAddressTest.java @@ -17,6 +17,8 @@ package org.maxkey.util; +import org.dromara.maxkey.util.EthernetAddress; + public class EthernetAddressTest { public static void main(String[] args) { diff --git a/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java b/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java index 4ed6a3b2..67a65bef 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java @@ -20,7 +20,8 @@ package org.maxkey.util; import java.security.Provider; import java.security.Security; -import org.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.util.Instance; public class InstanceTest { diff --git a/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java b/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java index 0aed441c..be7a61c1 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java @@ -17,6 +17,8 @@ package org.maxkey.util; +import org.dromara.maxkey.util.MacAddress; + public class MacAddressTest { public static void main(String[] args) { diff --git a/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java b/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java index c6816aad..e29f07d1 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java @@ -19,6 +19,8 @@ package org.maxkey.util; import java.util.HashMap; +import org.dromara.maxkey.util.ObjectTransformer; + public class ObjectTransformerTest { /** diff --git a/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java b/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java index 85834498..47ab5059 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java @@ -17,6 +17,7 @@ package org.maxkey.util; +import org.dromara.maxkey.util.SnowFlakeId; import org.joda.time.DateTime; import org.junit.Test; diff --git a/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java b/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java index c666a18f..a1690d60 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java @@ -17,8 +17,8 @@ package org.maxkey.util; +import org.dromara.maxkey.pretty.PrettyFactory; import org.junit.Test; -import org.maxkey.pretty.PrettyFactory; public class SqlPrettyTest { diff --git a/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java b/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java index 3b7a1a9e..88f02dfe 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java @@ -19,6 +19,7 @@ package org.maxkey.util; import java.util.UUID; +import org.dromara.maxkey.util.StringGenerator; import org.junit.Test; public class StringGeneratorTest { diff --git a/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java b/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java index 21546359..e5863052 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java @@ -20,7 +20,8 @@ package org.maxkey.util; import java.util.Date; //import java.util.UUID; -import org.maxkey.uuid.UUID; +import org.dromara.maxkey.util.UUIDGenerator; +import org.dromara.maxkey.uuid.UUID; import org.junit.Test; public class UUIDGeneratorTest { diff --git a/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java b/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java index 19b34b10..49406dac 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java @@ -17,8 +17,8 @@ package org.maxkey.util; +import org.dromara.maxkey.pretty.impl.XMLHelper; import org.junit.Test; -import org.maxkey.pretty.impl.XMLHelper; public class XMLHelperTest { diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java similarity index 85% rename from maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java index 44272545..b9ff0934 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -15,30 +15,30 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.HashMap; import java.util.Map; import javax.sql.DataSource; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.crypto.password.LdapShaPasswordEncoder; -import org.maxkey.crypto.password.Md4PasswordEncoder; -import org.maxkey.crypto.password.NoOpPasswordEncoder; -import org.maxkey.crypto.password.MessageDigestPasswordEncoder; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.crypto.password.SM3PasswordEncoder; -import org.maxkey.crypto.password.StandardPasswordEncoder; -import org.maxkey.persistence.cache.InMemoryMomentaryService; -import org.maxkey.persistence.cache.MomentaryService; -import org.maxkey.persistence.cache.RedisMomentaryService; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.repository.InstitutionsRepository; -import org.maxkey.persistence.repository.LocalizationRepository; -import org.maxkey.util.IdGenerator; -import org.maxkey.util.SnowFlakeId; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.crypto.password.LdapShaPasswordEncoder; +import org.dromara.maxkey.crypto.password.Md4PasswordEncoder; +import org.dromara.maxkey.crypto.password.MessageDigestPasswordEncoder; +import org.dromara.maxkey.crypto.password.NoOpPasswordEncoder; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.crypto.password.SM3PasswordEncoder; +import org.dromara.maxkey.crypto.password.StandardPasswordEncoder; +import org.dromara.maxkey.persistence.cache.InMemoryMomentaryService; +import org.dromara.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.persistence.cache.RedisMomentaryService; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.repository.InstitutionsRepository; +import org.dromara.maxkey.persistence.repository.LocalizationRepository; +import org.dromara.maxkey.util.IdGenerator; +import org.dromara.maxkey.util.SnowFlakeId; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java index 535f138b..074c6a7e 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.ArrayList; import java.util.Collections; @@ -23,11 +23,11 @@ import java.util.List; import javax.servlet.Filter; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.persistence.repository.InstitutionsRepository; -import org.maxkey.web.WebXssRequestFilter; -import org.maxkey.web.WebInstRequestFilter; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.persistence.repository.InstitutionsRepository; +import org.dromara.maxkey.web.WebInstRequestFilter; +import org.dromara.maxkey.web.WebXssRequestFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -132,7 +132,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer @Bean (name = "jaxb2Marshaller") public Jaxb2Marshaller jaxb2Marshaller() { Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller(); - jaxb2Marshaller.setClassesToBeBound(org.maxkey.entity.xml.UserInfoXML.class);; + jaxb2Marshaller.setClassesToBeBound(org.dromara.maxkey.entity.xml.UserInfoXML.class);; return jaxb2Marshaller; } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java index 0f05886f..f737e8ea 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java @@ -15,9 +15,9 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java index 3bb8fd45..c0aa57b3 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java @@ -1,4 +1,4 @@ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.HashMap; import java.util.Map; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java index 9b5494fe..0800f80d 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration; +package org.dromara.maxkey.configuration; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/AuthJwkConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/configuration/AuthJwkConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java index 00a2d121..b6df4d30 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/AuthJwkConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration; +package org.dromara.maxkey.configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java index 8fb68074..3227dac0 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/CharacterEncodingConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/CharacterEncodingConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration; +package org.dromara.maxkey.configuration; import java.io.UnsupportedEncodingException; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java index 0789d574..cb491197 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/EmailConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/EmailConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration; +package org.dromara.maxkey.configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java index 39957188..27714f64 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/LoginConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration; +package org.dromara.maxkey.configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java index 27a24331..e1a132b5 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadata.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadata.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration.oidc; +package org.dromara.maxkey.configuration.oidc; import java.net.URI; import java.util.Set; diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java index 1e39f323..31e5b24d 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.configuration.oidc; +package org.dromara.maxkey.configuration.oidc; import java.net.URI; import java.util.Collection; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsBoolean.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsBoolean.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java index 50b1c861..ef28a2a3 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsBoolean.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsBoolean.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; /** * Define int for boolean 0 false 1 true. diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsDatabase.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java similarity index 92% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsDatabase.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java index 6f83750a..b4004d17 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsDatabase.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsDatabase.java @@ -15,9 +15,9 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; -import org.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.configuration.ApplicationConfig; public class ConstsDatabase { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsEntryType.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsEntryType.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java index 8f3f045b..d2efe2eb 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsEntryType.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsEntryType.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public class ConstsEntryType { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsLoginType.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsLoginType.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java index e227a82c..1a2f2eaf 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsLoginType.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsLoginType.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public class ConstsLoginType { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateAction.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateAction.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java index ac696c53..3a273d25 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateAction.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; import java.util.concurrent.ConcurrentHashMap; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateResult.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateResult.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java index 1573ac36..1f4957bf 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateResult.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public final class ConstsOperateResult { public static final String SUCCESS = "success"; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPasswordSetType.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsPasswordSetType.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java index d60d3bca..58f537f6 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPasswordSetType.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPasswordSetType.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; /** * PASSWORDSETTYPE. diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPersistence.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsPersistence.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java index 0bf881ee..efedd238 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPersistence.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPersistence.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; /** * PROTOCOLS. diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPlatformRole.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsPlatformRole.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java index 0eb40602..95f3b8ef 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsPlatformRole.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsPlatformRole.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public final class ConstsPlatformRole { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsProperties.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsProperties.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java index 0eaf7213..ad948b00 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsProperties.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProperties.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public class ConstsProperties { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsProtocols.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsProtocols.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java index 08651b85..3d90ab63 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsProtocols.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsProtocols.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; /** * PROTOCOLS. diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsRoles.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsRoles.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java index 5ec4bfbc..c8646374 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsRoles.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsRoles.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsServiceMessage.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsServiceMessage.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java index 30aeebd9..364edc75 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsServiceMessage.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsServiceMessage.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public final class ConstsServiceMessage { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsStatus.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsStatus.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java index ceddc9b4..766c2a0b 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsStatus.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsStatus.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public final class ConstsStatus { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstsTimeInterval.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ConstsTimeInterval.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java index 7206b08d..ecb0302a 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ConstsTimeInterval.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsTimeInterval.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public final class ConstsTimeInterval { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ContentType.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/constants/ContentType.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ContentType.java index 99a263c8..d602f0e3 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ContentType.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ContentType.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants; +package org.dromara.maxkey.constants; public class ContentType { diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/ActiveDirectoryUser.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/ActiveDirectoryUser.java index 8ac46cd1..2b43b1b2 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/ActiveDirectoryUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfNames.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfNames.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfNames.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfNames.java index 8f486d68..ac25b4e8 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfNames.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfNames.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.util.ArrayList; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfUniqueNames.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfUniqueNames.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfUniqueNames.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfUniqueNames.java index 851ef3b2..86e4bc73 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/GroupOfUniqueNames.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/GroupOfUniqueNames.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.util.ArrayList; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/InetOrgPerson.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/InetOrgPerson.java index 60194217..75c4c56f 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/InetOrgPerson.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.util.ArrayList; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/Organization.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/Organization.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/Organization.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/Organization.java index e21e1966..23b553d2 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/Organization.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/Organization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.util.ArrayList; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/OrganizationalUnit.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/OrganizationalUnit.java index 02a94ccb..c9a1fd33 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ldap/OrganizationalUnit.java @@ -15,7 +15,7 @@ */ -package org.maxkey.constants.ldap; +package org.dromara.maxkey.constants.ldap; import java.util.ArrayList; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Accounts.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java index b9bf8fc3..f28ec851 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import java.util.HashMap; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java index 88bc0c84..1555d63f 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import java.util.Base64; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java index 81dc8b55..96fd67ae 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Connectors.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/Connectors.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java index e604abf3..d72369d4 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Connectors.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; @@ -24,7 +24,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.pretty.impl.JsonPretty; @Entity @Table(name = "MXK_CONNECTORS") diff --git a/maxkey-core/src/main/java/org/maxkey/entity/EmailSenders.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/EmailSenders.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java index 56f61274..58a33e57 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/EmailSenders.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java index d131a4da..7ea3a340 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java index a0e76a0b..012171d5 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttr.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; /** * @author Administrator diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java index bd8657da..e87b7451 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java @@ -15,13 +15,13 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.util.ArrayList; import java.util.HashMap; import java.util.Properties; -import org.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/FileUpload.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/FileUpload.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java index 402af3b7..9aac27e5 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/FileUpload.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryConnector.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/HistoryConnector.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java index 58c56dd5..54061f46 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryConnector.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java index 5ca172fc..ad2c67eb 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java index 526f854c..05a02e82 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistorySynchronizer.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/HistorySynchronizer.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java index a16f1797..91087918 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistorySynchronizer.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistorySystemLogs.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/HistorySystemLogs.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java index 0411a7fb..2fb5e359 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistorySystemLogs.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Institutions.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java index 8523e312..1e276f5a 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/LdapContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/LdapContext.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java index 0e239177..32606179 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/LdapContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Localization.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/Localization.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java index e77a39aa..4a44ff06 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Localization.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Organizations.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java index b45bb672..c23ae06e 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Organizations.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/OrganizationsCast.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/OrganizationsCast.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java index d1775ddc..3b0876a8 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/OrganizationsCast.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java index 6fa6de3d..ac33ceef 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,9 +25,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.NotNull; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.constants.ConstsServiceMessage; -import org.maxkey.exception.PasswordPolicyException; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.constants.ConstsServiceMessage; +import org.dromara.maxkey.exception.PasswordPolicyException; +import org.dromara.maxkey.web.WebContext; import java.util.ArrayList; import java.util.List; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Register.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Register.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java index b8a30f92..bc171ec8 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Register.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Resources.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Resources.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java index 0059e5bf..867f3243 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Resources.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java index c31b57a6..6fd8f626 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java index 09cb04db..fe105955 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.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.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.Apps; /* diff --git a/maxkey-core/src/main/java/org/maxkey/entity/RolePrivileges.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/entity/RolePrivileges.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java index 4438f234..13748439 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/RolePrivileges.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; @@ -25,8 +25,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.web.WebContext; @Entity @Table(name = "MXK_ROLE_PRIVILEGES") diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Roles.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java index 46bba660..69c52ecb 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java index 26d00a87..04041d29 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SmsProvider.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/SmsProvider.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java index fa3efefe..af0fb43f 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SmsProvider.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsAssociate.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/SocialsAssociate.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java index 86a70370..7841a69f 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SocialsAssociate.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java index b3a007af..a67e97c6 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java index 16b6e786..64629d70 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProviderLogin.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProviderLogin.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import java.util.ArrayList; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SynchroRelated.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/SynchroRelated.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java index 3b2896c0..04be9202 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SynchroRelated.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.util.Date; @@ -26,7 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.util.DateUtils; /** * . diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java index 3be8be47..c0180a26 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Synchronizers.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java index e695117b..ad22cc3a 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.HashMap; @@ -28,8 +28,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.util.StringUtils; /** * . diff --git a/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java index 195a8296..c3a7de36 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity; +package org.dromara.maxkey.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java index c035fc2a..abcbdbad 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import java.io.Serializable; @@ -27,8 +27,8 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.Base64Utils; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java index 749740a6..43df85a6 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import java.io.Serializable; import javax.persistence.Column; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java index ad5bc84f..ebae8c39 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java index e86304f7..0f1ababc 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java index 8704a939..251c768d 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java index 1baeb883..550be879 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java index c1c6e017..2487cc20 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java @@ -15,12 +15,12 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Entity; import javax.persistence.Table; -import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; +import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.springframework.util.StringUtils; @Entity diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java index d6c4b4a7..1433dfc1 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import java.security.cert.X509Certificate; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java index 01465fc6..3c9eb252 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java index 48ecd855..6f67ec0c 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/UserApps.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps; +package org.dromara.maxkey.entity.apps; /** * UserApps . diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java index 30f199df..0fa6719c 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/ClientDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps.oauth2.provider; +package org.dromara.maxkey.entity.apps.oauth2.provider; import java.io.Serializable; import java.util.Collection; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java index 176bb785..20ae0973 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps.oauth2.provider.client; +package org.dromara.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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.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.entity.apps.oauth2.provider.ClientDetails}. + * {@link org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails}. * * @author Ryan Heaton * @author Dave Syer diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java index 57a6338d..84224152 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.apps.oauth2.provider.client; +package org.dromara.maxkey.entity.apps.oauth2.provider.client; import java.io.IOException; import java.util.Arrays; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java index ef1b9b66..80d509c0 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ContactEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.userinfo; +package org.dromara.maxkey.entity.userinfo; public class ContactEntity { private String country; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java index d06360d1..443b837c 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/EnterpriseEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.userinfo; +package org.dromara.maxkey.entity.userinfo; public class EnterpriseEntity { private String employeeNumber; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java index bfc0f425..db657965 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/ImsEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.userinfo; +package org.dromara.maxkey.entity.userinfo; public class ImsEntity{ private String aim; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java index d0dc7fb5..cada72e9 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/userinfo/NameEntity.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.userinfo; +package org.dromara.maxkey.entity.userinfo; public class NameEntity{ private String givenName; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java rename to maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java index 2530b5ef..9a0d2b22 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java @@ -15,7 +15,7 @@ */ -package org.maxkey.entity.xml; +package org.dromara.maxkey.entity.xml; import javax.xml.bind.annotation.XmlRootElement; diff --git a/maxkey-core/src/main/java/org/maxkey/exception/NameException.java b/maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/exception/NameException.java rename to maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java index 7362bc6d..7b513725 100644 --- a/maxkey-core/src/main/java/org/maxkey/exception/NameException.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/exception/NameException.java @@ -15,9 +15,9 @@ */ -package org.maxkey.exception; +package org.dromara.maxkey.exception; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebContext; /** * 定义自定义异常 * 异常包括三个属性，分别是对应在异常中，出现异常的属性field，和对于提示错误消息对应的属性文件的KEY。以及属性的错误数据value diff --git a/maxkey-core/src/main/java/org/maxkey/exception/OperaterSqlException.java b/maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/exception/OperaterSqlException.java rename to maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java index b0f60ecc..6fbd8250 100644 --- a/maxkey-core/src/main/java/org/maxkey/exception/OperaterSqlException.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/exception/OperaterSqlException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.exception; +package org.dromara.maxkey.exception; public class OperaterSqlException extends Exception { diff --git a/maxkey-core/src/main/java/org/maxkey/exception/PasswordPolicyException.java b/maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java similarity index 94% rename from maxkey-core/src/main/java/org/maxkey/exception/PasswordPolicyException.java rename to maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java index cb1ff67a..0a77446a 100644 --- a/maxkey-core/src/main/java/org/maxkey/exception/PasswordPolicyException.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/exception/PasswordPolicyException.java @@ -15,9 +15,9 @@ */ -package org.maxkey.exception; +package org.dromara.maxkey.exception; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebContext; public class PasswordPolicyException extends Exception { diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/cache/InMemoryMomentaryService.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/persistence/cache/InMemoryMomentaryService.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java index 31c82116..9e354b40 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/cache/InMemoryMomentaryService.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/InMemoryMomentaryService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.cache; +package org.dromara.maxkey.persistence.cache; import java.util.concurrent.TimeUnit; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/cache/MomentaryService.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java similarity index 94% rename from maxkey-core/src/main/java/org/maxkey/persistence/cache/MomentaryService.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java index 1b4e993f..a0dff829 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/cache/MomentaryService.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/MomentaryService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.cache; +package org.dromara.maxkey.persistence.cache; public interface MomentaryService { diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/cache/RedisMomentaryService.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java similarity index 93% rename from maxkey-core/src/main/java/org/maxkey/persistence/cache/RedisMomentaryService.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java index 77e78675..43e11dc3 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/cache/RedisMomentaryService.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/RedisMomentaryService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.persistence.cache; +package org.dromara.maxkey.persistence.cache; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/package-info.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/package-info.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java index 46a87ed9..04ff4711 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/package-info.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/cache/package-info.java @@ -22,4 +22,4 @@ * @author Administrator * */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.persistence.cache; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtils.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtils.java index cd6cde7c..35148b5c 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.ldap; +package org.dromara.maxkey.persistence.ldap; import java.util.Properties; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/LdapUtils.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/LdapUtils.java index b9a73306..0fa944ff 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/ldap/LdapUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.ldap; +package org.dromara.maxkey.persistence.ldap; import java.util.HashMap; import java.util.Properties; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/cache/package-info.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/package-info.java similarity index 94% rename from maxkey-core/src/main/java/org/maxkey/persistence/cache/package-info.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/package-info.java index fa98cc30..e9f8a630 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/cache/package-info.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/package-info.java @@ -22,4 +22,4 @@ * @author Administrator * */ -package org.maxkey.persistence.cache; +package org.dromara.maxkey.persistence; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnection.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnection.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java index a745980f..c37319f6 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnection.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnection.java @@ -15,12 +15,12 @@ */ -package org.maxkey.persistence.redis; +package org.dromara.maxkey.persistence.redis; import java.io.Serializable; import java.util.List; -import org.maxkey.util.ObjectTransformer; +import org.dromara.maxkey.util.ObjectTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnectionFactory.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnectionFactory.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java index 9764d5df..40ee4af2 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/redis/RedisConnectionFactory.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/RedisConnectionFactory.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.redis; +package org.dromara.maxkey.persistence.redis; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/redis/package-info.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java similarity index 93% rename from maxkey-core/src/main/java/org/maxkey/persistence/redis/package-info.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java index c2345c9b..92c540ed 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/redis/package-info.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/redis/package-info.java @@ -22,4 +22,4 @@ * @author redis * */ -package org.maxkey.persistence.redis; +package org.dromara.maxkey.persistence.redis; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java index c1f5624f..42410451 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,7 +23,7 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.Institutions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LocalizationRepository.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/LocalizationRepository.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java index 6e4064f6..f80d25c1 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LocalizationRepository.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,8 +23,8 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.entity.Localization; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.entity.Localization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginHistoryRepository.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginHistoryRepository.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java index 482b5ad5..5ed949aa 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginHistoryRepository.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java @@ -15,11 +15,12 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.sql.Types; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.web.WebContext; + +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginRepository.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginRepository.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java index bc578e29..21b5cf32 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/LoginRepository.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.sql.ResultSet; import java.sql.SQLException; @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.constants.ConstsRoles; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Roles; -import org.maxkey.entity.UserInfo; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.constants.ConstsRoles; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyMessageResolver.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyMessageResolver.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java index c5d92f04..d464b635 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyMessageResolver.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.util.Locale; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyRepository.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyRepository.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java index 7bcd8660..10fca538 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyRepository.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.io.InputStreamReader; import java.sql.ResultSet; @@ -23,8 +23,8 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.concurrent.TimeUnit; -import org.maxkey.constants.ConstsProperties; -import org.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.constants.ConstsProperties; +import org.dromara.maxkey.entity.PasswordPolicy; import org.passay.CharacterOccurrencesRule; import org.passay.CharacterRule; import org.passay.DictionaryRule; diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyValidator.java b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyValidator.java rename to maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java index 9d0721b6..ed2acc1b 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/PasswordPolicyValidator.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java @@ -15,22 +15,23 @@ */ -package org.maxkey.persistence.repository; +package org.dromara.maxkey.persistence.repository; import java.sql.Types; import java.util.Date; + +import org.dromara.maxkey.constants.ConstsPasswordSetType; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordGen; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; -import org.maxkey.constants.ConstsPasswordSetType; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordGen; -import org.maxkey.entity.ChangePassword; -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; import org.passay.PasswordData; import org.passay.PasswordValidator; import org.passay.RuleResult; diff --git a/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java index 7ab6150a..f3d2f5e2 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/ConfigurerFreeMarker.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.IOException; import java.util.Map; import javax.annotation.PostConstruct; -import org.maxkey.web.tag.FreemarkerTag; +import org.dromara.maxkey.web.tag.FreemarkerTag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java index bd4dc00c..e7bbea23 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java index b6d8d02f..c56b4a54 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -42,9 +42,9 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; -import org.maxkey.constants.ContentType; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.util.JsonUtils; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java index 7b189d00..f0adaf2a 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java @@ -15,12 +15,13 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.IOException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.maxkey.constants.ContentType; + +import org.dromara.maxkey.constants.ContentType; import org.springframework.stereotype.Component; @Component diff --git a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java index d9f1fdfd..54f9dd17 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; public class HttpResponseConstants { diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java index 37672f48..6e72589c 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang3.ArchUtils; import org.apache.commons.lang3.arch.Processor; import org.apache.mybatis.jpa.util.JpaWebContext; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.crypto.Md5Sum; +import org.dromara.maxkey.util.PathUtils; import org.joda.time.DateTime; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.crypto.Md5Sum; -import org.maxkey.util.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/maxkey-core/src/main/java/org/maxkey/web/MetadataEndpoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java similarity index 94% rename from maxkey-core/src/main/java/org/maxkey/web/MetadataEndpoint.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java index f4315bc8..be123ae5 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/MetadataEndpoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java @@ -15,13 +15,13 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.constants.ContentType; import org.apache.mybatis.jpa.util.JpaWebContext; +import org.dromara.maxkey.constants.ContentType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/WebConstants.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java index e72387b5..d6278f29 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebConstants.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; /** * Web Application Constants define. diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/WebContext.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java index d8041679..074c8787 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.logging.LogFactory; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.Institutions; -import org.maxkey.util.DateUtils; -import org.maxkey.util.IdGenerator; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.IdGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java similarity index 93% rename from maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java index 45a94a71..e2426454 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebInstRequestFilter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.IOException; @@ -26,9 +26,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.Institutions; -import org.maxkey.persistence.repository.InstitutionsRepository; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.persistence.repository.InstitutionsRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.filter.GenericFilterBean; diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebXssRequestFilter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java similarity index 99% rename from maxkey-core/src/main/java/org/maxkey/web/WebXssRequestFilter.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java index b3812f7f..9e427f94 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebXssRequestFilter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web; +package org.dromara.maxkey.web; import java.io.IOException; import java.util.Enumeration; diff --git a/maxkey-core/src/main/java/org/maxkey/web/component/TreeAttributes.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/web/component/TreeAttributes.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java index f4c394be..897d0f60 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/component/TreeAttributes.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.web.component; +package org.dromara.maxkey.web.component; import java.util.ArrayList; diff --git a/maxkey-core/src/main/java/org/maxkey/web/component/TreeNode.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java similarity index 98% rename from maxkey-core/src/main/java/org/maxkey/web/component/TreeNode.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java index 24224056..e641fb07 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/component/TreeNode.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.component; +package org.dromara.maxkey.web.component; /** * 数控件的节点 使用HashMap attr存储节点数据. diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java index e4a675d8..eebe4144 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.tag; +package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebContext; import org.springframework.beans.factory.annotation.Autowired; import freemarker.core.Environment; diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java index 287809da..17c51f25 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.tag; +package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java index 7ee95a4f..b1bac94a 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.tag; +package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java index e4989c17..e4455058 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/FreemarkerTag.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.tag; +package org.dromara.maxkey.web.tag; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java similarity index 95% rename from maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java rename to maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java index 75bfbb00..729231d0 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.tag; +package org.dromara.maxkey.web.tag; import freemarker.core.Environment; import freemarker.template.TemplateDirectiveBody; @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.maxkey.persistence.repository.LocalizationRepository; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.persistence.repository.LocalizationRepository; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-core/src/test/java/org/maxkey/EscapeHtml4Test.java b/maxkey-core/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java similarity index 97% rename from maxkey-core/src/test/java/org/maxkey/EscapeHtml4Test.java rename to maxkey-core/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java index 5510981b..faeed9f0 100644 --- a/maxkey-core/src/test/java/org/maxkey/EscapeHtml4Test.java +++ b/maxkey-core/src/test/java/org/dromara/maxkey/EscapeHtml4Test.java @@ -15,7 +15,7 @@ */ -package org.maxkey; +package org.dromara.maxkey; import java.sql.SQLException; diff --git a/maxkey-core/src/test/java/org/maxkey/package-info.java b/maxkey-core/src/test/java/org/dromara/maxkey/package-info.java similarity index 95% rename from maxkey-core/src/test/java/org/maxkey/package-info.java rename to maxkey-core/src/test/java/org/dromara/maxkey/package-info.java index ab406d82..10a97133 100644 --- a/maxkey-core/src/test/java/org/maxkey/package-info.java +++ b/maxkey-core/src/test/java/org/dromara/maxkey/package-info.java @@ -15,4 +15,4 @@ */ -package org.maxkey; +package org.dromara.maxkey; diff --git a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java similarity index 97% rename from maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java rename to maxkey-core/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java index 3d154cc3..e7af3e79 100644 --- a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java +++ b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/derby/DerbyTest.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.derby; +package org.dromara.maxkey.persistence.derby; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; diff --git a/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java similarity index 94% rename from maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java rename to maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java index a0a99ac7..06028d7a 100644 --- a/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java +++ b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java @@ -15,11 +15,13 @@ */ -package org.maxkey.persistence.ldap; +package org.dromara.maxkey.persistence.ldap; import javax.naming.NamingException; import javax.naming.directory.DirContext; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; + public class ActiveDirectoryUtilsTest { public static void main(String[] args) throws Exception { String trustStore="D:/JavaIDE/jdk1.6.0_30/jre/lib/security/cacerts"; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java index 5f26d3ec..ac7e9035 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; @@ -26,9 +26,9 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.UserInfo; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsStrategyMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsStrategyMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java index af8a246d..198719ed 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsStrategyMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java @@ -18,13 +18,13 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.Roles; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.Roles; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java index f7db89f0..62edaa5a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsAdapters; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java index 068bb498..a842b033 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java index 59a33d46..f5b8f18e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java index 1ed3cbaf..594a123e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java index 8ff483b5..cec07410 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java @@ -18,14 +18,14 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.UserApps; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java index bccfaf91..b918ade2 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.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/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java index 2a5842e5..363db9c6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ConnectorsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ConnectorsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java index 0ce73cbd..25c9cab9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ConnectorsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Connectors; +import org.dromara.maxkey.entity.Connectors; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/EmailSendersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/EmailSendersMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java index 230dc7d0..3d23f172 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/EmailSendersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java @@ -15,9 +15,9 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.EmailSenders; +import org.dromara.maxkey.entity.EmailSenders; public interface EmailSendersMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/FileUploadMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/FileUploadMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java index b017e98b..c7614a0c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/FileUploadMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.FileUpload; +import org.dromara.maxkey.entity.FileUpload; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryConnectorMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryConnectorMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java index 83d0ee27..371da20d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryConnectorMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.HistoryConnector; +import org.dromara.maxkey.entity.HistoryConnector; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java index 1e9a7e7e..80e1d5da 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java @@ -15,10 +15,10 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.HistoryLoginApps; +import org.dromara.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/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java similarity index 90% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java index 13f386a9..06e9b696 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.HistoryLogin; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySynchronizerMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySynchronizerMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java index daa64828..0be3a9e5 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySynchronizerMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.HistorySynchronizer; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySystemLogsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySystemLogsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java index 5f57d017..e5c72675 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistorySystemLogsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.HistorySystemLogs; +import org.dromara.maxkey.entity.HistorySystemLogs; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java index d957981a..1c7984ae 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.ibatis.annotations.Select; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Institutions; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Institutions; public interface InstitutionsMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/LdapContextMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/LdapContextMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java index 5023090a..27940bb0 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/LdapContextMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java @@ -15,9 +15,9 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.LdapContext; +import org.dromara.maxkey.entity.LdapContext; public interface LdapContextMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsCastMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsCastMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java index bedebb74..a9d11d2d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsCastMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java @@ -15,12 +15,12 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.OrganizationsCast; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.OrganizationsCast; public interface OrganizationsCastMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java similarity index 90% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java index 62397861..063dde54 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Organizations; +import org.dromara.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/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java index b1dd6c84..f2b5d4e3 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.PasswordPolicy; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegisterMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegisterMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java index c42408c1..c60de7fe 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegisterMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java @@ -18,13 +18,13 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Register; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.Register; +import org.dromara.maxkey.entity.UserInfo; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ReportMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java similarity index 97% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ReportMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java index 8529e84b..7b1764cc 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ReportMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.HashMap; import java.util.List; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java index 04ff86c4..81500f70 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Resources; +import org.dromara.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/dromara/maxkey/persistence/mapper/RoleMemberMapper.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java index dc5b7ce4..38d01670 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java @@ -18,14 +18,14 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.RoleMember; -import org.maxkey.entity.Roles; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.RoleMember; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePermissionsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePermissionsMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java index 204f2c88..9a6f8eb8 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePermissionsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java @@ -18,12 +18,12 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.RolePermissions; +import org.dromara.maxkey.entity.RolePermissions; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePrivilegesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java similarity index 92% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePrivilegesMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java index 6efadbd9..f707e09f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolePrivilegesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java @@ -18,12 +18,12 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.RolePrivileges; +import org.dromara.maxkey.entity.RolePrivileges; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java index b7a26027..f40b03ef 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java @@ -18,12 +18,12 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Roles; +import org.dromara.maxkey.entity.Roles; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SmsProviderMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SmsProviderMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java index 135afc27..98e485e6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SmsProviderMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java @@ -15,9 +15,9 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.SmsProvider; +import org.dromara.maxkey.entity.SmsProvider; public interface SmsProviderMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsAssociateMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java similarity index 85% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsAssociateMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java index f0e3a49e..43487e3f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsAssociateMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java @@ -15,12 +15,12 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.UserInfo; public interface SocialsAssociateMapper extends IJpaBaseMapper { diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsProviderMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsProviderMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java index 193b60d6..080fce14 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsProviderMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java @@ -15,10 +15,10 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.entity.SocialsProvider; /** diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchroRelatedMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchroRelatedMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java index 9dd938fe..aa816421 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchroRelatedMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java @@ -18,11 +18,11 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.SynchroRelated; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchronizersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchronizersMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java index a40983e3..e6580776 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SynchronizersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java @@ -18,10 +18,10 @@ /** * */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.Synchronizers; +import org.dromara.maxkey.entity.Synchronizers; /** * @author Crystal.sea diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java index d8fdf1b6..289daf85 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java @@ -15,10 +15,10 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.entity.UserInfoAdjoint; +import org.dromara.maxkey.entity.UserInfoAdjoint; /** diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java index 4696f732..26af4db5 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java @@ -15,18 +15,18 @@ */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.UserInfoAdjoint; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.UserInfoAdjoint; /** diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/package-info.java similarity index 93% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/package-info.java index 402ddf71..2d22306c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/package-info.java @@ -19,4 +19,4 @@ * * Sql DAO Mapper XML Configuration. */ -package org.maxkey.persistence.mapper; +package org.dromara.maxkey.persistence.mapper; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java similarity index 93% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java index 0e4b2be0..cebc78a9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java @@ -15,22 +15,22 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.OrganizationsCast; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.AccountsMapper; -import org.maxkey.provision.ProvisionService; -import org.maxkey.provision.ProvisionAction; -import org.maxkey.provision.ProvisionTopic; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.OrganizationsCast; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.AccountsMapper; +import org.dromara.maxkey.provision.ProvisionAction; +import org.dromara.maxkey.provision.ProvisionService; +import org.dromara.maxkey.provision.ProvisionTopic; +import org.dromara.maxkey.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java similarity index 95% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java index 1ce7284a..91298f39 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java @@ -15,15 +15,15 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.io.Serializable; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.Roles; -import org.maxkey.persistence.mapper.AccountsStrategyMapper; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.persistence.mapper.AccountsStrategyMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/persistence/service/AppsAdaptersService.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java index 50d176ca..62d18ea6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsAdapters; -import org.maxkey.persistence.mapper.AppsAdaptersMapper; +import org.dromara.maxkey.entity.apps.AppsAdapters; +import org.dromara.maxkey.persistence.mapper.AppsAdaptersMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java index df6a04cf..61cd861b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsCasDetails; -import org.maxkey.persistence.mapper.AppsCasDetailsMapper; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.persistence.mapper.AppsCasDetailsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java index 15f4a590..6a8d5163 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsFormBasedDetails; -import org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper; +import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.persistence.mapper.AppsFormBasedDetailsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java index 62eb3ed4..7724b780 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsJwtDetails; -import org.maxkey.persistence.mapper.AppsJwtDetailsMapper; +import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.maxkey.persistence.mapper.AppsJwtDetailsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java index dd5c24bc..b42a1fa1 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.persistence.mapper.AppsSaml20DetailsMapper; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.persistence.mapper.AppsSaml20DetailsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java similarity index 92% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java index c690834e..da8a94a2 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java @@ -15,15 +15,15 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.UserApps; -import org.maxkey.persistence.mapper.AppsMapper; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.UserApps; +import org.dromara.maxkey.persistence.mapper.AppsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java index b2d09194..bf621bf6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.apps.AppsTokenBasedDetails; -import org.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ConnectorsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/ConnectorsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java index 75f42e8d..408e9545 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ConnectorsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Connectors; -import org.maxkey.persistence.mapper.ConnectorsMapper; +import org.dromara.maxkey.entity.Connectors; +import org.dromara.maxkey.persistence.mapper.ConnectorsMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/EmailSendersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/EmailSendersService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java index d38a2056..aee41060 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/EmailSendersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.EmailSenders; -import org.maxkey.persistence.mapper.EmailSendersMapper; +import org.dromara.maxkey.entity.EmailSenders; +import org.dromara.maxkey.persistence.mapper.EmailSendersMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/FileUploadService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/FileUploadService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java index b81406e8..d249812c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/FileUploadService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.FileUpload; -import org.maxkey.persistence.mapper.FileUploadMapper; +import org.dromara.maxkey.entity.FileUpload; +import org.dromara.maxkey.persistence.mapper.FileUploadMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java index ad0eafbb..53104307 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.HistoryConnector; -import org.maxkey.persistence.mapper.HistoryConnectorMapper; +import org.dromara.maxkey.entity.HistoryConnector; +import org.dromara.maxkey.persistence.mapper.HistoryConnectorMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java index 05831306..0d0dd241 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.HistoryLoginApps; -import org.maxkey.persistence.mapper.HistoryLoginAppsMapper; +import org.dromara.maxkey.entity.HistoryLoginApps; +import org.dromara.maxkey.persistence.mapper.HistoryLoginAppsMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java index 3015aafd..6c186ae5 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java @@ -15,12 +15,12 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.persistence.mapper.HistoryLoginMapper; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.persistence.mapper.HistoryLoginMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java index 90ec7b59..ce03a241 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.persistence.mapper.HistorySynchronizerMapper; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.persistence.mapper.HistorySynchronizerMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java index c9985a28..e480c09b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java @@ -15,23 +15,23 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.RoleMember; -import org.maxkey.entity.RolePermissions; -import org.maxkey.entity.Roles; -import org.maxkey.entity.HistorySystemLogs; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.Resources; -import org.maxkey.entity.RolePrivileges; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.entity.Synchronizers; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.HistorySystemLogsMapper; -import org.maxkey.util.JsonUtils; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.HistorySystemLogs; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.Resources; +import org.dromara.maxkey.entity.RoleMember; +import org.dromara.maxkey.entity.RolePermissions; +import org.dromara.maxkey.entity.RolePrivileges; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.HistorySystemLogsMapper; +import org.dromara.maxkey.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java index 03688d14..85e5686f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/InstitutionsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Institutions; -import org.maxkey.persistence.mapper.InstitutionsMapper; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.persistence.mapper.InstitutionsMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/LdapContextService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/LdapContextService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java index 2d813b1c..d49edd01 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/LdapContextService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.LdapContext; -import org.maxkey.persistence.mapper.LdapContextMapper; +import org.dromara.maxkey.entity.LdapContext; +import org.dromara.maxkey.persistence.mapper.LdapContextMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java similarity index 89% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java index 24210857..9a057dfe 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.OrganizationsCast; -import org.maxkey.persistence.mapper.OrganizationsCastMapper; +import org.dromara.maxkey.entity.OrganizationsCast; +import org.dromara.maxkey.persistence.mapper.OrganizationsCastMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/persistence/service/OrganizationsService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java index 9f3fd512..d978c86d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java @@ -15,18 +15,18 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.sql.Types; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; -import org.maxkey.entity.Organizations; -import org.maxkey.persistence.mapper.OrganizationsMapper; -import org.maxkey.provision.ProvisionService; -import org.maxkey.provision.ProvisionAction; -import org.maxkey.provision.ProvisionTopic; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.persistence.mapper.OrganizationsMapper; +import org.dromara.maxkey.provision.ProvisionAction; +import org.dromara.maxkey.provision.ProvisionService; +import org.dromara.maxkey.provision.ProvisionTopic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java index 1c852dd4..4cc5635f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.PasswordPolicy; -import org.maxkey.persistence.mapper.PasswordPolicyMapper; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.persistence.mapper.PasswordPolicyMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegisterService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java similarity index 86% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegisterService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java index ec5b85aa..9a957c47 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegisterService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java @@ -15,14 +15,14 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Register; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.RegisterMapper; +import org.dromara.maxkey.entity.Register; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.RegisterMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java similarity index 95% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java index d0e36827..826b820a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.HashMap; import java.util.List; @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.mybatis.jpa.persistence.JpaBaseEntity; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.persistence.mapper.ReportMapper; +import org.dromara.maxkey.persistence.mapper.ReportMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java index 22d0d4c6..c9acd01a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Resources; -import org.maxkey.persistence.mapper.ResourcesMapper; +import org.dromara.maxkey.entity.Resources; +import org.dromara.maxkey.persistence.mapper.ResourcesMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java index 42857d87..ca2b963b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java @@ -15,16 +15,16 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.RoleMember; -import org.maxkey.entity.Roles; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.RoleMemberMapper; +import org.dromara.maxkey.entity.RoleMember; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.RoleMemberMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePermissionssService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePermissionssService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java index 2ea0b4ba..503829ed 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePermissionssService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.RolePermissions; -import org.maxkey.persistence.mapper.RolePermissionsMapper; +import org.dromara.maxkey.entity.RolePermissions; +import org.dromara.maxkey.persistence.mapper.RolePermissionsMapper; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePrivilegesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePrivilegesService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java index ce79ab31..948d0b1c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolePrivilegesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.RolePrivileges; -import org.maxkey.persistence.mapper.RolePrivilegesMapper; +import org.dromara.maxkey.entity.RolePrivileges; +import org.dromara.maxkey.persistence.mapper.RolePrivilegesMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/persistence/service/RolesService.java similarity index 94% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java index 7732df29..28c4731b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RolesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.io.Serializable; import java.sql.Types; @@ -24,11 +24,11 @@ import java.time.LocalTime; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.Roles; -import org.maxkey.persistence.mapper.RolesMapper; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.persistence.mapper.RolesMapper; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SmsProviderService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java similarity index 87% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/SmsProviderService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java index a6b76b34..e18d7052 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SmsProviderService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.SmsProvider; -import org.maxkey.persistence.mapper.SmsProviderMapper; +import org.dromara.maxkey.entity.SmsProvider; +import org.dromara.maxkey.persistence.mapper.SmsProviderMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsAssociatesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java similarity index 85% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsAssociatesService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java index 85493696..ee2b8f3f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsAssociatesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java @@ -15,14 +15,14 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.SocialsAssociateMapper; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.SocialsAssociateMapper; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsProviderService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsProviderService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java index f37e4d8e..2d9977c8 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsProviderService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.persistence.mapper.SocialsProviderMapper; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.persistence.mapper.SocialsProviderMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchroRelatedService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchroRelatedService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java index e192242f..719eaa1b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchroRelatedService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java @@ -15,18 +15,18 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.sql.Types; import java.util.Date; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.mapper.SynchroRelatedMapper; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.mapper.SynchroRelatedMapper; +import org.dromara.maxkey.util.DateUtils; import org.springframework.stereotype.Repository; @Repository diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java index abd8d48b..528405eb 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.mapper.SynchronizersMapper; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.mapper.SynchronizersMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java similarity index 88% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java index dbdb317d..8a9d6687 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.entity.UserInfoAdjoint; -import org.maxkey.persistence.mapper.UserInfoAdjointMapper; +import org.dromara.maxkey.entity.UserInfoAdjoint; +import org.dromara.maxkey.persistence.mapper.UserInfoAdjointMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java similarity index 94% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java index 83450b74..12f4ee1f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java @@ -15,25 +15,25 @@ */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; import java.sql.Types; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.mapper.UserInfoMapper; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.provision.ProvisionService; -import org.maxkey.provision.ProvisionAction; -import org.maxkey.provision.ProvisionTopic; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.mapper.UserInfoMapper; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.provision.ProvisionAction; +import org.dromara.maxkey.provision.ProvisionService; +import org.dromara.maxkey.provision.ProvisionTopic; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/package-info.java similarity index 93% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/package-info.java index e305a460..fac0df93 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/package-info.java @@ -19,4 +19,4 @@ * * Mysql DAO Mapper XML Configuration. */ -package org.maxkey.persistence.service; +package org.dromara.maxkey.persistence.service; diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionAction.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionAction.java similarity index 96% rename from maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionAction.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionAction.java index f0af926d..eae123e9 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionAction.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionAction.java @@ -15,7 +15,7 @@ */ -package org.maxkey.provision; +package org.dromara.maxkey.provision; public class ProvisionAction { diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionMessage.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionMessage.java similarity index 98% rename from maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionMessage.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionMessage.java index 12b0752a..c512c444 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionMessage.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionMessage.java @@ -15,7 +15,7 @@ */ -package org.maxkey.provision; +package org.dromara.maxkey.provision; public class ProvisionMessage { diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionService.java similarity index 92% rename from maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionService.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionService.java index 70298a56..4302add6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionService.java @@ -15,13 +15,13 @@ */ -package org.maxkey.provision; +package org.dromara.maxkey.provision; import java.util.UUID; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.provision.thread.ProvisioningThread; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.provision.thread.ProvisioningThread; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionTopic.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionTopic.java similarity index 97% rename from maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionTopic.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionTopic.java index c9d7840d..7bd6afe4 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/ProvisionTopic.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionTopic.java @@ -15,7 +15,7 @@ */ -package org.maxkey.provision; +package org.dromara.maxkey.provision; public class ProvisionTopic { diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java similarity index 90% rename from maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java index dd05fccc..62b67b61 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java @@ -15,28 +15,28 @@ */ -package org.maxkey.provision.thread; +package org.dromara.maxkey.provision.thread; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import org.apache.mybatis.jpa.query.Query; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.Connectors; -import org.maxkey.entity.Message; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.ConnectorsService; -import org.maxkey.provision.ProvisionAction; -import org.maxkey.provision.ProvisionMessage; -import org.maxkey.provision.ProvisionTopic; -import org.maxkey.util.DateUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.ObjectTransformer; -import org.maxkey.web.HttpRequestAdapter; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.Connectors; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.ConnectorsService; +import org.dromara.maxkey.provision.ProvisionAction; +import org.dromara.maxkey.provision.ProvisionMessage; +import org.dromara.maxkey.provision.ProvisionTopic; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.ObjectTransformer; +import org.dromara.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunnerThread.java similarity index 96% rename from maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunnerThread.java index 608d844f..2881a67c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunnerThread.java @@ -15,7 +15,7 @@ */ -package org.maxkey.provision.thread; +package org.dromara.maxkey.provision.thread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningThread.java similarity index 91% rename from maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningThread.java index 2680b91a..d31a57e4 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningThread.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.maxkey.provision.thread; +package org.dromara.maxkey.provision.thread; import java.io.Serializable; import java.sql.Types; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.provision.ProvisionMessage; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.ObjectTransformer; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.provision.ProvisionMessage; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.ObjectTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; 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 16d84e9a..c293b066 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 @@ -20,10 +20,10 @@ package org.apache.mybatis.jpa.test; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.util.JpaWebContext; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.persistence.service.AccountsService; import org.junit.Before; import org.junit.Test; -import org.maxkey.entity.Accounts; -import org.maxkey.persistence.service.AccountsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; 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 5efd3904..f98f738c 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 @@ -20,10 +20,10 @@ package org.apache.mybatis.jpa.test; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.util.JpaWebContext; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AppsService; import org.junit.Before; import org.junit.Test; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.AppsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; 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 8d58c085..bd4a46a5 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 @@ -23,10 +23,10 @@ import java.util.Date; import java.util.List; import org.apache.mybatis.jpa.util.JpaWebContext; +import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService; import org.junit.Before; import org.junit.Test; -import org.maxkey.entity.apps.AppsFormBasedDetails; -import org.maxkey.persistence.service.AppsFormBasedDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; 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/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index cdd61e56..9d5df42f 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/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -18,19 +18,19 @@ /** * */ -package org.maxkey.authz.endpoint; +package org.dromara.maxkey.authz.endpoint; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.crypto.password.PasswordReciprocal; -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; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AccountsService; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java index 8d9fb90a..450a54af 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/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java @@ -18,16 +18,16 @@ /** * */ -package org.maxkey.authz.endpoint; +package org.dromara.maxkey.authz.endpoint; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.util.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ResponseBody; 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/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java index 21035e98..851f1d80 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/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java @@ -18,16 +18,15 @@ /** * */ -package org.maxkey.authz.endpoint; +package org.dromara.maxkey.authz.endpoint; import javax.servlet.http.HttpServletRequest; - -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.AppsCasDetailsService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AppsCasDetailsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java index 0cd93195..fbfc5b40 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/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java @@ -18,15 +18,15 @@ /** * */ -package org.maxkey.authz.endpoint; +package org.dromara.maxkey.authz.endpoint; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineSessionEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineSessionEndpoint.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java index e1316a54..992f9837 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/OnlineSessionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.endpoint; +package org.dromara.maxkey.authz.endpoint; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; 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/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java index 7160dc3e..81b23aa5 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/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java @@ -15,22 +15,22 @@ */ -package org.maxkey.authz.endpoint.adapter; +package org.dromara.maxkey.authz.endpoint.adapter; import java.io.UnsupportedEncodingException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.Base64Utils; -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.entity.Accounts; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.crypto.cert.CertSigner; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/singlelogout/DefaultSingleLogout.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/DefaultSingleLogout.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/DefaultSingleLogout.java index 5f712233..94a30fd6 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/dromara/maxkey/authz/singlelogout/DefaultSingleLogout.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authz.singlelogout; +package org.dromara.maxkey.authz.singlelogout; import java.util.HashMap; import java.util.UUID; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.util.DateUtils; import org.springframework.security.core.Authentication; public class DefaultSingleLogout extends SingleLogout{ diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/LogoutType.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/LogoutType.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/LogoutType.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/LogoutType.java index 0055e570..96491a10 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/LogoutType.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/LogoutType.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.singlelogout; +package org.dromara.maxkey.authz.singlelogout; public class LogoutType { 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/dromara/maxkey/authz/singlelogout/SamlSingleLogout.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SamlSingleLogout.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SamlSingleLogout.java index 5be0aa8a..cd971933 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/dromara/maxkey/authz/singlelogout/SamlSingleLogout.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authz.singlelogout; +package org.dromara.maxkey.authz.singlelogout; import java.util.HashMap; import java.util.UUID; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.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/dromara/maxkey/authz/singlelogout/SingleLogout.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/singlelogout/SingleLogout.java rename to maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SingleLogout.java index 32e49b46..73720182 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/dromara/maxkey/authz/singlelogout/SingleLogout.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.singlelogout; +package org.dromara.maxkey.authz.singlelogout; import java.util.Map; -import org.maxkey.entity.apps.Apps; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index 632b416f..07208c4e 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -18,15 +18,15 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.cas.endpoint.response.Service10ResponseBuilder; -import org.maxkey.authz.cas.endpoint.ticket.CasConstants; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.cas.endpoint.response.Service10ResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; 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/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 29e5f090..60dcba5b 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/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import java.lang.reflect.InvocationTargetException; @@ -26,19 +26,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; -import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; -import org.maxkey.authz.cas.endpoint.ticket.CasConstants; -import org.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketIOUImpl; -import org.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketImpl; -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.ConstsBoolean; -import org.maxkey.util.Instance; -import org.maxkey.util.StringUtils; -import org.maxkey.web.HttpResponseConstants; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketIOUImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; 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/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 990480eb..4c33aa30 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/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import java.lang.reflect.InvocationTargetException; @@ -26,19 +26,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; -import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; -import org.maxkey.authz.cas.endpoint.ticket.CasConstants; -import org.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketIOUImpl; -import org.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketImpl; -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.ConstsBoolean; -import org.maxkey.util.Instance; -import org.maxkey.util.StringUtils; -import org.maxkey.web.HttpResponseConstants; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketIOUImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyGrantingTicketImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; 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/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 570327ef..1e0f253d 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/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import java.security.Principal; import java.util.Map; @@ -27,14 +27,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.web.AuthorizationUtils; -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.entity.apps.AppsCasDetails; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; +import org.dromara.maxkey.authz.singlelogout.LogoutType; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java similarity index 78% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java index 39104e08..f43ee49d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authz.cas.endpoint.ticket.TicketServices; -import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.persistence.service.AppsCasDetailsService; -import org.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices; +import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; +import org.dromara.maxkey.persistence.service.AppsCasDetailsService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.web.HttpResponseAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.maxkey.web.HttpResponseAdapter; -import org.maxkey.web.HttpRequestAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java index 3bda3cf7..72e658a7 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java @@ -18,14 +18,14 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.cas.endpoint.ticket.CasConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; 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/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index dca50c3f..a1d24d77 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/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -18,22 +18,22 @@ /** * */ -package org.maxkey.authz.cas.endpoint; +package org.dromara.maxkey.authz.cas.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.web.AuthorizationUtils; -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.entity.UserInfo; -import org.maxkey.entity.apps.AppsCasDetails; -import org.maxkey.util.StringUtils; -import org.maxkey.web.HttpResponseConstants; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicketImpl; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java index 34e5f8d3..056ea8e6 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/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.cas.endpoint.adapter; +package org.dromara.maxkey.authz.cas.endpoint.adapter; import java.io.UnsupportedEncodingException; import org.apache.commons.codec.binary.Base64; -import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.apps.AppsCasDetails; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java index 4e3ea93b..47959053 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.adapter; +package org.dromara.maxkey.authz.cas.endpoint.adapter; -import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.apps.AppsCasDetails; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/package-info.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/package-info.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/package-info.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/package-info.java index 63a69e1d..c94ffde0 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/adapter/package-info.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/package-info.java @@ -22,4 +22,4 @@ * @author Crystal.Sea * */ -package org.maxkey.authz.cas.endpoint.adapter; +package org.dromara.maxkey.authz.cas.endpoint.adapter; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java index eed96330..3b56e1fe 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java @@ -15,11 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.response; +package org.dromara.maxkey.authz.cas.endpoint.response; import java.util.ArrayList; import java.util.HashMap; -import org.maxkey.web.HttpResponseConstants; + +import org.dromara.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java index 9af3cf00..8ff1bee6 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.response; +package org.dromara.maxkey.authz.cas.endpoint.response; -import org.maxkey.web.HttpResponseConstants; +import org.dromara.maxkey.web.HttpResponseConstants; public class ProxyServiceResponseBuilder extends ServiceResponseBuilder{ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java index e1f1df58..a816aae8 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.response; +package org.dromara.maxkey.authz.cas.endpoint.response; public class Service10ResponseBuilder extends CasServiceResponse { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java index 95e293bc..6beddcd8 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java @@ -15,11 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.response; +package org.dromara.maxkey.authz.cas.endpoint.response; import java.util.ArrayList; import java.util.Iterator; -import org.maxkey.web.HttpResponseConstants; + +import org.dromara.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/package-info.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/package-info.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/package-info.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/package-info.java index 1cb6fca5..162b02b3 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/package-info.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/package-info.java @@ -22,4 +22,4 @@ * @author Crystal.sea * */ -package org.maxkey.authz.cas.endpoint.response; +package org.dromara.maxkey.authz.cas.endpoint.response; 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/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java index 1fe64c2a..618b0e55 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/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/AbstractTicketException.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java index e7680e82..e7c7ab92 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java index ae77d40f..13c6d8ad 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import java.util.Collections; import java.util.HashMap; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java index 65242bf2..6fa9891f 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/CasConstants.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; public class CasConstants { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java index 753dd62f..d47c78c3 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import com.fasterxml.jackson.annotation.JsonTypeInfo; 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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java index 92ba8221..3387e02c 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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java index 1949053d..58f3ea78 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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java index e3bec39b..479aa7ff 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/dromara/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/RandomServiceTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java index d1482cae..e3197590 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator; +import org.dromara.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator; public abstract class RandomServiceTicketServices implements TicketServices { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Service.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Service.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Service.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Service.java index 886fbb2e..3530639f 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Service.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Service.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; /** * Marker interface for Services. Services are generally either remote diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java index be352fd6..b46d924b 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; -import org.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; import org.springframework.security.core.Authentication; import com.fasterxml.jackson.annotation.JsonTypeInfo; 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/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java index 7085ac90..674a03ee 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/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.EqualsBuilder; -import org.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; +import org.dromara.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/SimpleWebApplicationServiceImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java index 1f76b02b..2c6cfa34 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; /** * Represents a service which wishes to use the CAS protocol. 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/dromara/maxkey/authz/cas/endpoint/ticket/Ticket.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Ticket.java index 31e439de..bcb4cad6 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/dromara/maxkey/authz/cas/endpoint/ticket/Ticket.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import java.io.Serializable; import java.time.ZonedDateTime; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java index 8be01b6f..5040f5b1 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/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.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/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java index 4e20ea50..4585da05 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/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java @@ -15,14 +15,14 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.springframework.lang.NonNull; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketServices.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketServices.java index e22e5a39..569ba069 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketServices.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; public interface TicketServices { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketState.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketState.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketState.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketState.java index 115cdd5a..462d00fc 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketState.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketState.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; import java.time.ZonedDateTime; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java index 2ae1dc1d..69702d24 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket; +package org.dromara.maxkey.authz.cas.endpoint.ticket; /** * Represents a service using CAS that comes from the web. diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java index 651f9b4d..f4daaa4d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; import java.util.concurrent.atomic.AtomicLong; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java index cb3d21d5..146bc7a8 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; import java.security.SecureRandom; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java index c634b8ef..2068781f 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java index 31d81aa7..99d6c5e3 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; import org.apache.commons.lang3.StringUtils; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java index 9957a994..23e0e471 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; import java.net.InetAddress; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java index 566c4291..2227e940 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; /** * Interface to guaranteed to return a long. diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java index 57c6430c..85f8d2ab 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; /** * Interface to return a new sequential number for each call. diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java index bd5e5e89..a7e40269 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; /** * Interface to return a random String. diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java index 02e8f0b9..12f26d8a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; /** * Interface that enables for pluggable unique ticket Ids strategies. diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/package-info.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/package-info.java similarity index 91% rename from maxkey-core/src/main/java/org/maxkey/persistence/package-info.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/package-info.java index bee02002..2cf8c304 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/package-info.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/package-info.java @@ -22,4 +22,4 @@ * @author Administrator * */ -package org.maxkey.persistence; +package org.dromara.maxkey.authz.cas.endpoint.ticket.generator; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/package-info.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/package-info.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/package-info.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/package-info.java index 567f488c..e1781392 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/package-info.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/package-info.java @@ -22,4 +22,4 @@ * @author Administrator * */ -package org.maxkey.authz.cas.endpoint.ticket.st; +package org.dromara.maxkey.authz.cas.endpoint.ticket; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java index 927883f5..3eb76be5 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.pgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt; import java.util.concurrent.TimeUnit; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java index 8448dc71..63610952 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.pgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt; -import org.maxkey.authz.cas.endpoint.ticket.ExpirationPolicy; -import org.maxkey.authz.cas.endpoint.ticket.Service; -import org.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ExpirationPolicy; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Service; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicket; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java index a66d480b..735957f6 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicketServicesFactory.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.pgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt; -import org.maxkey.authz.cas.endpoint.ticket.TicketServices; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java index 93306fc8..667ca3de 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java @@ -15,9 +15,9 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.pgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt; -import org.maxkey.authz.cas.endpoint.ticket.ServiceTicket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.ServiceTicket; /** * The {@link ProxyTicket} represents a CAS proxy ticket. A proxy ticket is an opaque string that a diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java index 03178490..9fc54356 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.pgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; public class RedisProxyGrantingTicketServices extends RandomServiceTicketServices { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java index 43837bca..056ba752 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.st; +package org.dromara.maxkey.authz.cas.endpoint.ticket.st; import java.util.concurrent.TimeUnit; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java index 5632f911..2d1da2b1 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.st; +package org.dromara.maxkey.authz.cas.endpoint.ticket.st; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; public class RedisTicketServices extends RandomServiceTicketServices { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java index 96effbce..004483cf 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/TicketServicesFactory.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.st; +package org.dromara.maxkey.authz.cas.endpoint.ticket.st; -import org.maxkey.authz.cas.endpoint.ticket.TicketServices; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/package-info.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/package-info.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/package-info.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/package-info.java index 22db2309..3476a286 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/generator/package-info.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/package-info.java @@ -22,4 +22,4 @@ * @author Administrator * */ -package org.maxkey.authz.cas.endpoint.ticket.generator; +package org.dromara.maxkey.authz.cas.endpoint.ticket.st; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java index e9d9906a..d3e896e7 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.tgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.tgt; import java.util.concurrent.TimeUnit; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java index 63b95a57..cdc57588 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.tgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.tgt; -import org.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; -import org.maxkey.authz.cas.endpoint.ticket.Ticket; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; public class RedisTicketGrantingTicketServices extends RandomServiceTicketServices { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java index 5df81027..b3fe5371 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/TicketGrantingTicketServicesFactory.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.cas.endpoint.ticket.tgt; +package org.dromara.maxkey.authz.cas.endpoint.ticket.tgt; -import org.maxkey.authz.cas.endpoint.ticket.TicketServices; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/autoconfigure/CasAutoConfiguration.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java rename to maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/autoconfigure/CasAutoConfiguration.java index 51b093df..8cec5d90 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/autoconfigure/CasAutoConfiguration.java @@ -15,13 +15,13 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.authz.cas.endpoint.ticket.TicketServices; -import org.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicketServicesFactory; -import org.maxkey.authz.cas.endpoint.ticket.st.TicketServicesFactory; -import org.maxkey.authz.cas.endpoint.ticket.tgt.TicketGrantingTicketServicesFactory; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices; +import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicketServicesFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.st.TicketServicesFactory; +import org.dromara.maxkey.authz.cas.endpoint.ticket.tgt.TicketGrantingTicketServicesFactory; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java index 24e175fe..96472f61 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java @@ -16,7 +16,7 @@ package org.maxkey.web.authorize.endpoint.cas.ticket.generator; -import org.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator; +import org.dromara.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator; public class DefaultUniqueTicketIdGeneratorTest { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java index 19dcbb8a..4569de97 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java @@ -17,7 +17,7 @@ package org.maxkey.web.authorize.endpoint.cas.ticket.generator; -import org.maxkey.authz.cas.endpoint.ticket.generator.InetAddressUtils; +import org.dromara.maxkey.authz.cas.endpoint.ticket.generator.InetAddressUtils; public class InetAddressUtilsTest { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java index fc573e46..867e746d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java @@ -17,10 +17,10 @@ package org.maxkey.web.authorize.endpoint.response; -import org.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; -import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.pretty.impl.XmlPretty; +import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; +import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.pretty.impl.XmlPretty; public class ServiceResponseBuilderTest { 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/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java similarity index 83% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java index b29394bf..0e86ef0e 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/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java @@ -18,19 +18,19 @@ /** * */ -package org.maxkey.authz.exapi.endpoint; +package org.dromara.maxkey.authz.exapi.endpoint; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.Instance; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.util.Instance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java index 1c70298e..b0a7a8a0 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authz.exapi.endpoint; +package org.dromara.maxkey.authz.exapi.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.exapi.endpoint.adapter.netease.NeteaseRSATool; -import org.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.authz.exapi.endpoint.adapter.netease.NeteaseRSATool; +import org.dromara.maxkey.pretty.impl.JsonPretty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java index 2f44abcb..9486f0be 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java @@ -15,18 +15,19 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter; +package org.dromara.maxkey.authz.exapi.endpoint.adapter; import java.time.Instant; import java.util.HashMap; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.HttpsTrusts; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; + +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.util.HttpsTrusts; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java index d4998c47..252a344f 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter; +package org.dromara.maxkey.authz.exapi.endpoint.adapter; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.authz.exapi.endpoint.adapter.netease.NeteaseRSATool; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ExtraAttr; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.apps.Apps; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.exapi.endpoint.adapter.netease.NeteaseRSATool; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ExtraAttr; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.apps.Apps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java index 6d3bd909..b5075754 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java @@ -15,19 +15,19 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter; +package org.dromara.maxkey.authz.exapi.endpoint.adapter; import java.io.Serializable; import java.util.HashMap; import java.util.concurrent.TimeUnit; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.apps.Apps; -import org.maxkey.util.HttpsTrusts; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.util.HttpsTrusts; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java index e9827fe0..8e33825d 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java @@ -15,14 +15,15 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter; +package org.dromara.maxkey.authz.exapi.endpoint.adapter; import java.time.Instant; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.apps.Apps; + +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.apps.Apps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java index eb7f8a86..ab575c23 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/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java @@ -15,14 +15,15 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter; +package org.dromara.maxkey.authz.exapi.endpoint.adapter; import java.time.Instant; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.apps.Apps; + +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.apps.Apps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java rename to maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java index e204813a..f0c2d075 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.exapi.endpoint.adapter.netease; +package org.dromara.maxkey.authz.exapi.endpoint.adapter.netease; import java.security.Key; import java.security.KeyFactory; 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/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java similarity index 80% rename from maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 3bc8821a..3475784d 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/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -18,22 +18,22 @@ /** * */ -package org.maxkey.authz.formbased.endpoint; +package org.dromara.maxkey.authz.formbased.endpoint; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -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.ConstsBoolean; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.UserInfo; -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.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.formbased.endpoint.adapter.FormBasedDefaultAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService; +import org.dromara.maxkey.util.Instance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java rename to maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java index 2177d94b..94401605 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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.formbased.endpoint.adapter; +package org.dromara.maxkey.authz.formbased.endpoint.adapter; import java.time.Instant; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java rename to maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java index ea19641d..d807a207 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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.formbased.endpoint.adapter; +package org.dromara.maxkey.authz.formbased.endpoint.adapter; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java similarity index 84% rename from maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java rename to maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java index 7b37562b..ab4aa0a9 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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authz.formbased.endpoint.adapter; +package org.dromara.maxkey.authz.formbased.endpoint.adapter; import java.util.Date; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java rename to maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java index f86d61b6..26c16797 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/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.formbased.endpoint.adapter; +package org.dromara.maxkey.authz.formbased.endpoint.adapter; import java.time.Instant; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.apps.AppsFormBasedDetails; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.web.WebContext; import org.springframework.web.servlet.ModelAndView; public class FormBasedRedirectAdapter extends AbstractAuthorizeAdapter { 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/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java rename to maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java index 7e9bf582..c6882e59 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/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.jwt.endpoint.adapter; +package org.dromara.maxkey.authz.jwt.endpoint.adapter; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -23,12 +23,12 @@ import java.util.Arrays; import java.util.Date; import java.util.UUID; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.maxkey.web.WebConstants; import org.joda.time.DateTime; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; -import org.maxkey.entity.apps.AppsJwtDetails; -import org.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java similarity index 84% rename from maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index e6d2e0ec..ac9180b4 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/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.token.endpoint; +package org.dromara.maxkey.authz.token.endpoint; import java.lang.reflect.InvocationTargetException; import javax.servlet.http.HttpServletRequest; @@ -27,21 +27,21 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.mybatis.jpa.util.JpaWebContext; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.authz.jwt.endpoint.adapter.JwtAdapter; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.constants.ContentType; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.entity.UserInfo; -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.WebConstants; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.jwt.endpoint.adapter.JwtAdapter; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.maxkey.persistence.service.AppsJwtDetailsService; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/AuthenticationScheme.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/AuthenticationScheme.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/AuthenticationScheme.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/AuthenticationScheme.java index c9cfb620..2649489d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/AuthenticationScheme.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/AuthenticationScheme.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; /** * Enumeration of possible methods for transmitting authentication credentials. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java index 9a5c40ed..4caf5e59 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.util.Date; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java index e2986fc9..08f824b4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.io.Serializable; import java.util.Collections; @@ -26,7 +26,7 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; /** * Basic access token for OAuth 2. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java index ad1fae91..3151699d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2RefreshToken.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java index 565caf95..17bdfd91 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/ExpiringOAuth2RefreshToken.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.util.Date; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessToken.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessToken.java index d9624631..88366b24 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessToken.java @@ -10,14 +10,14 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.io.Serializable; import java.util.Date; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java index c64b77c9..8bb66455 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.io.IOException; @@ -19,7 +19,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; /** *

- * Provides the ability to deserialize JSON response into an {@link org.maxkey.authz.oauth2.common.OAuth2AccessToken} with jackson2 by implementing + * Provides the ability to deserialize JSON response into an {@link org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken} with jackson2 by implementing * {@link com.fasterxml.jackson.databind.JsonDeserializer}. *

*

@@ -40,7 +40,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; * * @author Rob Winch * @author Brian Clozel - * @see org.maxkey.authz.oauth2.common.OAuth2AccessTokenJackson2Serializer + * @see org.dromara.maxkey.authz.oauth2.common.OAuth2AccessTokenJackson2Serializer */ @SuppressWarnings("serial") public final class OAuth2AccessTokenJackson2Deserializer extends StdDeserializer { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java index 5c9b6861..20709c6d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Serializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.io.IOException; import java.util.Date; @@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; /** - * Provides the ability to serialize an {@link org.maxkey.authz.oauth2.common.OAuth2AccessToken} with jackson2 by implementing {@link com.fasterxml.jackson.databind.JsonDeserializer}. + * Provides the ability to serialize an {@link org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken} with jackson2 by implementing {@link com.fasterxml.jackson.databind.JsonDeserializer}. * Refer to {@link org.maxkey.authz.oauth2.common.OAuth2AccessTokenJackson1Deserializer} to learn more about the JSON format that is used. * * @author Rob Winch * @author Brian Clozel - * @see org.maxkey.authz.oauth2.common.OAuth2AccessTokenJackson2Deserializer + * @see org.dromara.maxkey.authz.oauth2.common.OAuth2AccessTokenJackson2Deserializer */ public final class OAuth2AccessTokenJackson2Serializer extends StdSerializer { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2Constants.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2Constants.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java index 793b46d6..0d40ef4f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2Constants.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; public class OAuth2Constants { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2RefreshToken.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2RefreshToken.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2RefreshToken.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2RefreshToken.java index 102a7907..fa07cd3f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2RefreshToken.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2RefreshToken.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common; +package org.dromara.maxkey.authz.oauth2.common; import java.io.Serializable; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java index 41fe2d07..d93da2e9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/BadClientCredentialsException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Exception thrown when a client was unable to authenticate. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java index 270768fa..71b5148c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/ClientAuthenticationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Base exception diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java index ca06a185..6d931913 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InsufficientScopeException.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; /** * Exception representing insufficient scope in a token when a request is handled by a Resource Server. It is akin to an diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java index 1fcf1df5..1e0a6fde 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidClientException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Exception thrown when a client was unable to authenticate. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java index 7a57c555..dc353fbb 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidGrantException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java index 00e0c6ef..cd6c837a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidRequestException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java index b6796eb5..6ead15c8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidScopeException.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; /** * Exception representing an invalid scope in a token or authorization request (i.e. from an Authorization Server). Note diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java index a18328b5..18894f0f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/InvalidTokenException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java index 03054a30..b767cb40 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2Exception.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.util.Map; import java.util.Set; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java index bb55bc43..c0830195 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.io.IOException; import java.util.HashMap; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java index d52481b9..87e62819 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Serializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.io.IOException; import java.util.Map.Entry; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java index d2b9eee1..88b208b3 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; /** * @author Brian Clozel diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java index f373b169..4039ed4d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Serializer.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import java.io.IOException; import java.util.Map.Entry; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java index 51f3bf4c..8be46e0b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/RedirectMismatchException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/SerializationException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/SerializationException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/SerializationException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/SerializationException.java index 87250a5b..6a1eb09f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/SerializationException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/SerializationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Thrown during a problem serialization/deserialization. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java index e406c0f1..8fdc31c2 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnapprovedClientAuthenticationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; import org.springframework.security.authentication.InsufficientAuthenticationException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java index 9cc8ad6b..fcd06a23 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedClientException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Exception thrown when a client was unable to authenticate. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java index b76bb83c..24db25e3 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnauthorizedUserException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * Exception thrown when a user was unable to authenticate. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java index 4d6699ee..f5b4b93a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedGrantTypeException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java index 981e5186..e3d63ca7 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UnsupportedResponseTypeException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java index 43817c91..809cd3c4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/UserDeniedAuthorizationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.exceptions; +package org.dromara.maxkey.authz.oauth2.common.exceptions; /** * @author Ryan Heaton diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java index 045454eb..18ab88c8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/DefaultJdbcListFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.util.List; import java.util.Map; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java index 0f0530ef..373bbd4c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/Jackson2JsonParser.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.util.Map; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JdbcListFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JdbcListFactory.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JdbcListFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JdbcListFactory.java index 19c84319..19921430 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JdbcListFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JdbcListFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.util.List; import java.util.Map; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java index 32398547..d696fd94 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateDeserializer.java @@ -27,7 +27,7 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.io.IOException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateSerializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateSerializer.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateSerializer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateSerializer.java index ec968ea0..b2549445 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonDateSerializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonDateSerializer.java @@ -27,7 +27,7 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.io.IOException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParser.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParser.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParser.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParser.java index 17b0e251..20373a83 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParser.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParser.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.util.Map; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParserFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParserFactory.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParserFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParserFactory.java index 3e5a3548..aa7c1bfa 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/JsonParserFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/JsonParserFactory.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import org.springframework.util.ClassUtils; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/OAuth2Utils.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/OAuth2Utils.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/OAuth2Utils.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/OAuth2Utils.java index c7873755..92d309db 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/OAuth2Utils.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/OAuth2Utils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.util.Arrays; import java.util.Collection; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java index 3dbf708d..14afc125 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/util/RandomValueStringGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.common.util; +package org.dromara.maxkey.authz.oauth2.common.util; import java.security.SecureRandom; import java.util.Random; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java index 850813f9..98631a0c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/AlgorithmMetadata.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt; +package org.dromara.maxkey.authz.oauth2.jwt; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/BinaryFormat.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/BinaryFormat.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/BinaryFormat.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/BinaryFormat.java index e468d389..58301653 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/BinaryFormat.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/BinaryFormat.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt; +package org.dromara.maxkey.authz.oauth2.jwt; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/Jwt.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/Jwt.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/Jwt.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/Jwt.java index 14096ad7..abce6217 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/Jwt.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/Jwt.java @@ -10,9 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt; +package org.dromara.maxkey.authz.oauth2.jwt; -import org.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtAlgorithms.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtAlgorithms.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtAlgorithms.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtAlgorithms.java index 3155df89..8971aacf 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtAlgorithms.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtAlgorithms.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt; +package org.dromara.maxkey.authz.oauth2.jwt; import java.util.HashMap; import java.util.Map; -import org.maxkey.authz.oauth2.jwt.crypto.cipher.CipherMetadata; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.cipher.CipherMetadata; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java index bcef27f8..2ee97a5a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java @@ -10,21 +10,21 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt; +package org.dromara.maxkey.authz.oauth2.jwt; -import static org.maxkey.authz.oauth2.jwt.JwtAlgorithms.sigAlg; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.b64UrlDecode; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.b64UrlEncode; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.concat; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Decode; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Encode; +import static org.dromara.maxkey.authz.oauth2.jwt.JwtAlgorithms.sigAlg; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.b64UrlDecode; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.b64UrlEncode; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.concat; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Decode; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Encode; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.CharBuffer; -import org.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; -import org.maxkey.authz.oauth2.jwt.crypto.sign.Signer; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.Signer; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Base64Codec.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Base64Codec.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java index d1d9387a..b1a4dacc 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Base64Codec.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.jwt.codec; +package org.dromara.maxkey.authz.oauth2.jwt.codec; /** * Base64 encoder which is a reduced version of Robert Harder's public domain implementation (version 2.3.7). diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Codecs.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Codecs.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Codecs.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Codecs.java index 47a5677a..5e70dd59 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/codec/Codecs.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Codecs.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.codec; +package org.dromara.maxkey.authz.oauth2.jwt.codec; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java index 7e0b414a..7b3cd926 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/cipher/CipherMetadata.java @@ -10,9 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.cipher; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.cipher; -import org.maxkey.authz.oauth2.jwt.AlgorithmMetadata; +import org.dromara.maxkey.authz.oauth2.jwt.AlgorithmMetadata; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java index 2f8bbc2c..e6dbd16c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/InvalidSignatureException.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java index ca9ea8af..039d93ad 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/MacSigner.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; import java.security.GeneralSecurityException; import javax.crypto.Mac; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java index fed11830..a0c34472 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaKeyHelper.java @@ -10,10 +10,10 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.b64Decode; -import static org.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Encode; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.b64Decode; +import static org.dromara.maxkey.authz.oauth2.jwt.codec.Codecs.utf8Encode; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java index b964f4fe..25fdeee1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaSigner.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; import java.math.BigInteger; import java.security.*; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java index b428d17f..b0e23b8f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/RsaVerifier.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; import java.math.BigInteger; import java.security.*; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java index dce8cd97..d7fc7f38 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignatureVerifier.java @@ -10,9 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; -import org.maxkey.authz.oauth2.jwt.AlgorithmMetadata; +import org.dromara.maxkey.authz.oauth2.jwt.AlgorithmMetadata; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java index f4c57a41..a662dce8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/Signer.java @@ -10,9 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; -import org.maxkey.authz.oauth2.jwt.AlgorithmMetadata; +import org.dromara.maxkey.authz.oauth2.jwt.AlgorithmMetadata; /** * @author Luke Taylor diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java index 8230a0b9..b81eba98 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/crypto/sign/SignerVerifier.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.jwt.crypto.sign; +package org.dromara.maxkey.authz.oauth2.jwt.crypto.sign; /** * @author Luke Taylor 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/dromara/maxkey/authz/oauth2/provider/AuthorizationRequest.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/AuthorizationRequest.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/AuthorizationRequest.java index 861251fd..db31a164 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/dromara/maxkey/authz/oauth2/provider/AuthorizationRequest.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.io.Serializable; import java.util.Collection; @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.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/BaseRequest.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/BaseRequest.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/BaseRequest.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/BaseRequest.java index d90be1e2..f461b72d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/BaseRequest.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/BaseRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.io.Serializable; import java.util.Collection; @@ -25,7 +25,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; /** * diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java index b4aa98b3..058b6552 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientAlreadyExistsException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; /** * Exception indicating that a client registration already exists (e.g. if someone tries to create a duplicate). 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/dromara/maxkey/authz/oauth2/provider/ClientDetailsService.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientDetailsService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientDetailsService.java index b3d2518e..1532e11e 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/dromara/maxkey/authz/oauth2/provider/ClientDetailsService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.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/ClientRegistrationException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientRegistrationException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientRegistrationException.java index 1f4d0254..a902a252 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientRegistrationException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; /** * @author Dave Syer 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/dromara/maxkey/authz/oauth2/provider/ClientRegistrationService.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/ClientRegistrationService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/ClientRegistrationService.java index 6b87c158..0e06a7b9 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/dromara/maxkey/authz/oauth2/provider/ClientRegistrationService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.List; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.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/CompositeTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/CompositeTokenGranter.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/CompositeTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/CompositeTokenGranter.java index 39a6b21f..4175fb21 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/CompositeTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/CompositeTokenGranter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.ArrayList; import java.util.List; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java index 06a0a985..88550125 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/DefaultSecurityContextAccessor.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.Collections; import java.util.HashSet; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/NoSuchClientException.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/NoSuchClientException.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/NoSuchClientException.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/NoSuchClientException.java index ed9dcd1f..54a5fa4d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/NoSuchClientException.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/NoSuchClientException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Authentication.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Authentication.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Authentication.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Authentication.java index 7f80b934..3e80c3d0 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Authentication.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Authentication.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Request.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Request.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Request.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Request.java index d1e28418..35e49e68 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2Request.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2Request.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.io.Serializable; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.springframework.security.core.GrantedAuthority; /** 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/dromara/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java index 31de7635..e8bdbadd 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/dromara/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java @@ -11,11 +11,11 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.Map; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java index 3dacb09d..bda870d0 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/dromara/maxkey/authz/oauth2/provider/OAuth2RequestValidator.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; -import org.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; -import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpoint; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.TokenEndpoint; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java index 841f7854..1db0e3b9 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/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java @@ -10,16 +10,16 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.ArrayList; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.session.Session; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.GrantedAuthority; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/SecurityContextAccessor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/SecurityContextAccessor.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/SecurityContextAccessor.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/SecurityContextAccessor.java index 5bc401ed..5ddc9e98 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/SecurityContextAccessor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/SecurityContextAccessor.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.Set; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/TokenGranter.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/TokenGranter.java index 1e2a557c..6484ea10 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/TokenGranter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; /** * Interface for granters of access tokens. Various grant types are defined in the specification, and each of those has 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/dromara/maxkey/authz/oauth2/provider/TokenRequest.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/TokenRequest.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/TokenRequest.java index d1aa7468..323d7454 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/dromara/maxkey/authz/oauth2/provider/TokenRequest.java @@ -15,16 +15,16 @@ */ -package org.maxkey.authz.oauth2.provider; +package org.dromara.maxkey.authz.oauth2.provider; import java.util.Collection; import java.util.HashMap; 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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.AuthorizationEndpoint; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.TokenEndpoint; +import org.dromara.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/Approval.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/Approval.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/Approval.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/Approval.java index 6cc1209e..3d0e723e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/Approval.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/Approval.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Calendar; import java.util.Date; -import org.maxkey.authz.oauth2.common.util.JsonDateDeserializer; -import org.maxkey.authz.oauth2.common.util.JsonDateSerializer; +import org.dromara.maxkey.authz.oauth2.common.util.JsonDateDeserializer; +import org.dromara.maxkey.authz.oauth2.common.util.JsonDateSerializer; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStore.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStore.java index 32604eb3..35d5f3dd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Collection; 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/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java index d29000af..3ada31ff 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/dromara/maxkey/authz/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Calendar; import java.util.Collection; @@ -27,14 +27,14 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -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.OAuth2RequestFactory; -import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientRegistrationException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.dromara.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/DefaultUserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/DefaultUserApprovalHandler.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/DefaultUserApprovalHandler.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/DefaultUserApprovalHandler.java index 7803983b..f256b7b8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/DefaultUserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/DefaultUserApprovalHandler.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.HashMap; import java.util.Map; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java index 9bb193ce..7b03f49b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/InMemoryApprovalStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Collection; import java.util.Collections; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java index 3602f878..804bf477 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/JdbcApprovalStore.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; -import static org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus.APPROVED; +import static org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus.APPROVED; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -29,7 +29,7 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.PreparedStatementSetter; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java similarity index 83% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java index 36eaa1f2..c2b6baba 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/TokenApprovalStore.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; -import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ public class TokenApprovalStore implements ApprovalStore { * This implementation is a no-op. We assume that the {@link TokenStore} is populated elsewhere, by (for example) a * token services instance that knows more about granted tokens than we could possibly infer from the approvals. * - * @see org.maxkey.authz.oauth2.provider.approval.ApprovalStore#addApprovals(java.util.Collection) + * @see org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStore#addApprovals(java.util.Collection) */ @Override public boolean addApprovals(Collection approvals) { @@ -66,7 +66,7 @@ public class TokenApprovalStore implements ApprovalStore { /** * Revoke all tokens that match the client and user in the approvals supplied. * - * @see org.maxkey.authz.oauth2.provider.approval.ApprovalStore#revokeApprovals(java.util.Collection) + * @see org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStore#revokeApprovals(java.util.Collection) */ @Override public boolean revokeApprovals(Collection approvals) { @@ -88,7 +88,7 @@ public class TokenApprovalStore implements ApprovalStore { /** * Extract the implied approvals from any tokens associated with the user and client id supplied. * - * @see org.maxkey.authz.oauth2.provider.approval.ApprovalStore#getApprovals(java.lang.String, + * @see org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStore#getApprovals(java.lang.String, * java.lang.String) */ @Override 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/dromara/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java index 104a2ce3..22593ba7 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/dromara/maxkey/authz/oauth2/provider/approval/TokenStoreUserApprovalHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.HashMap; import java.util.Map; @@ -22,16 +22,16 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -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.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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientRegistrationException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.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/UserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/UserApprovalHandler.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/UserApprovalHandler.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/UserApprovalHandler.java index 157ddd74..50c47225 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/UserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/UserApprovalHandler.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.provider.approval; +package org.dromara.maxkey.authz.oauth2.provider.approval; import java.util.Map; -import org.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java index c28d8cc7..c2bd2322 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java @@ -15,30 +15,30 @@ */ -package org.maxkey.authz.oauth2.provider.approval.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.approval.endpoint; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -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.configuration.ApplicationConfig; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -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.persistence.cache.MomentaryService; -import org.maxkey.persistence.service.AppsService; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval; +import org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStore; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java index ba203681..21b9399e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20UserApprovalHandler.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.approval.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.approval.endpoint; import java.util.Collection; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientRegistrationException; +import org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStoreUserApprovalHandler; +import org.dromara.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/authentication/BearerTokenExtractor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java index 079a4e97..0679a786 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.authentication; +package org.dromara.maxkey.authz.oauth2.provider.authentication; import java.util.Enumeration; @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java index 53c56ac4..6143bec2 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java @@ -12,7 +12,7 @@ */ -package org.maxkey.authz.oauth2.provider.authentication; +package org.dromara.maxkey.authz.oauth2.provider.authentication; import java.io.Serializable; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java index 207eaf35..565dce99 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java @@ -12,7 +12,7 @@ */ -package org.maxkey.authz.oauth2.provider.authentication; +package org.dromara.maxkey.authz.oauth2.provider.authentication; import javax.servlet.http.HttpServletRequest; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java index 370dc7d8..92df726e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.authentication; +package org.dromara.maxkey.authz.oauth2.provider.authentication; import javax.servlet.http.HttpServletRequest; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java similarity index 74% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java index 076b0b09..0451da6f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/ClientCredentialsTokenGranter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.client; +package org.dromara.maxkey.authz.oauth2.provider.client; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; /** * @author Dave Syer 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/dromara/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java index a25489a9..3ce82067 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/dromara/maxkey/authz/oauth2/provider/client/ClientDetailsUserDetailsService.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.client; +package org.dromara.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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.NoSuchClientException; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.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/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index c60e224c..16ce85ad 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/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.client; +package org.dromara.maxkey.authz.oauth2.provider.client; import java.sql.ResultSet; import java.sql.SQLException; @@ -29,15 +29,15 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.util.DefaultJdbcListFactory; -import org.maxkey.authz.oauth2.common.util.JdbcListFactory; -import org.maxkey.authz.oauth2.provider.ClientAlreadyExistsException; -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.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; +import org.dromara.maxkey.authz.oauth2.common.util.DefaultJdbcListFactory; +import org.dromara.maxkey.authz.oauth2.common.util.JdbcListFactory; +import org.dromara.maxkey.authz.oauth2.provider.ClientAlreadyExistsException; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientRegistrationService; +import org.dromara.maxkey.authz.oauth2.provider.NoSuchClientException; +import org.dromara.maxkey.crypto.password.NoOpPasswordEncoder; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.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/AuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServices.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServices.java index 79db2298..d052f1a0 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServices.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Services for issuing and storing authorization codes. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java index fa14a349..f8af7a05 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeServicesFactory.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java similarity index 82% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java index f566aa4a..5c22f02b 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/dromara/maxkey/authz/oauth2/provider/code/AuthorizationCodeTokenGranter.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; import java.util.HashMap; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.OAuth2Constants.CODE_CHALLENGE_METHOD_TYPE; -import org.maxkey.authz.oauth2.common.exceptions.InvalidClientException; -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.authz.oauth2.provider.ClientDetailsService; -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.TokenRequest; -import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; -import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants.CODE_CHALLENGE_METHOD_TYPE; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidClientException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidRequestException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.RedirectMismatchException; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.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/code/InMemoryAuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java index dd91cdf3..831daca9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java @@ -15,11 +15,12 @@ */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; import java.util.concurrent.TimeUnit; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; + import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java index 84dcf417..82b75a4c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RandomValueAuthorizationCodeServices.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; import java.util.UUID; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Base implementation for authorization code services that generates a random-value authorization code. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java index 51c848af..5c438d73 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/RedisAuthorizationCodeServices.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.provider.code; +package org.dromara.maxkey.authz.oauth2.provider.code; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; /** * Implementation of authorization code services that stores the codes and authentication in Redis. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java similarity index 78% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java index 9157007e..b9ef942b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.util.ArrayList; @@ -21,22 +21,22 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.CompositeTokenGranter; -import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; -import org.maxkey.authz.oauth2.provider.TokenGranter; -import org.maxkey.authz.oauth2.provider.client.ClientCredentialsTokenGranter; -import org.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; -import org.maxkey.authz.oauth2.provider.code.AuthorizationCodeTokenGranter; -import org.maxkey.authz.oauth2.provider.code.InMemoryAuthorizationCodeServices; -import org.maxkey.authz.oauth2.provider.implicit.ImplicitTokenGranter; -import org.maxkey.authz.oauth2.provider.password.ResourceOwnerPasswordTokenGranter; -import org.maxkey.authz.oauth2.provider.refresh.RefreshTokenGranter; -import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestFactory; -import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.persistence.cache.MomentaryService; -import org.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.CompositeTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.client.ClientCredentialsTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; +import org.dromara.maxkey.authz.oauth2.provider.code.AuthorizationCodeTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.code.InMemoryAuthorizationCodeServices; +import org.dromara.maxkey.authz.oauth2.provider.implicit.ImplicitTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.password.ResourceOwnerPasswordTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.refresh.RefreshTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.persistence.cache.MomentaryService; +import org.dromara.maxkey.persistence.service.AppsService; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; 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/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index e11e4183..01803046 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/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.net.URI; import java.security.Principal; @@ -23,35 +23,35 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.InvalidClientException; -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.authz.oauth2.common.exceptions.UnapprovedClientAuthenticationException; -import org.maxkey.authz.oauth2.common.exceptions.UnsupportedResponseTypeException; -import org.maxkey.authz.oauth2.common.exceptions.UserDeniedAuthorizationException; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.authz.oauth2.provider.AuthorizationRequest; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.OAuth2RequestValidator; -import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.authz.oauth2.provider.approval.DefaultUserApprovalHandler; -import org.maxkey.authz.oauth2.provider.approval.UserApprovalHandler; -import org.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; -import org.maxkey.authz.oauth2.provider.implicit.ImplicitTokenRequest; -import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; -import org.maxkey.util.HttpEncoder; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidClientException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidRequestException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.RedirectMismatchException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.UnapprovedClientAuthenticationException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.UnsupportedResponseTypeException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.UserDeniedAuthorizationException; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestValidator; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.approval.DefaultUserApprovalHandler; +import org.dromara.maxkey.authz.oauth2.provider.approval.UserApprovalHandler; +import org.dromara.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; +import org.dromara.maxkey.authz.oauth2.provider.implicit.ImplicitTokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.util.HttpEncoder; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java index 0d590fac..10efcaee 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java @@ -27,19 +27,19 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. *******************************************************************************/ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.AccessTokenConverter; -import org.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter; -import org.maxkey.authz.oauth2.provider.token.ResourceServerTokenServices; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.AccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.provider.token.ResourceServerTokenServices; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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/dromara/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java index 066c467b..adebe077 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/dromara/maxkey/authz/oauth2/provider/endpoint/DefaultRedirectResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.net.MalformedURLException; import java.net.URL; @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidRequestException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.RedirectMismatchException; +import org.dromara.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/ExactMatchRedirectResolver.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/ExactMatchRedirectResolver.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/ExactMatchRedirectResolver.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/ExactMatchRedirectResolver.java index 47854cd6..bad934fd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/ExactMatchRedirectResolver.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/ExactMatchRedirectResolver.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java index 15dcfe24..012ec597 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java @@ -15,22 +15,22 @@ */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.util.AuthorizationHeader; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.RequestTokenUtils; -import org.maxkey.web.HttpResponseAdapter; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.util.AuthorizationHeader; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.RequestTokenUtils; +import org.dromara.maxkey.web.HttpResponseAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java index 40567d69..e01b9fe5 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java @@ -15,17 +15,17 @@ */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.mybatis.jpa.util.JpaWebContext; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.constants.ContentType; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; 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/dromara/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java index fe9dc0ea..53b681b3 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/dromara/maxkey/authz/oauth2/provider/endpoint/RedirectResolver.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java index c4f60a60..660a6ff1 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/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.util.Arrays; import java.util.Collections; @@ -22,23 +22,23 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.InvalidClientException; -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.UnsupportedGrantTypeException; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -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.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.util.StringGenerator; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidClientException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidRequestException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.common.exceptions.UnsupportedGrantTypeException; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestValidator; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestValidator; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.util.StringGenerator; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -60,7 +60,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; *

* Endpoint for token requests as described in the OAuth2 spec. Clients post requests with a grant_type * parameter (e.g. "authorization_code") and other parameters as determined by the grant type. Supported grant types are - * handled by the provided {@link #setTokenGranter(org.maxkey.authz.oauth2.provider.TokenGranter) token + * handled by the provided {@link #setTokenGranter(org.dromara.maxkey.authz.oauth2.provider.TokenGranter) token * granter}. *

* diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java index 39d1aacc..7a37474c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.io.IOException; import java.util.HashMap; @@ -31,17 +31,17 @@ import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.authz.oauth2.provider.AuthorizationRequest; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; -import org.maxkey.util.AuthorizationHeader; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.util.AuthorizationHeader; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.AuthenticationDetailsSource; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java index 40a0ffbd..138ba851 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenKeyEndpoint.java @@ -27,15 +27,15 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. *******************************************************************************/ -package org.maxkey.authz.oauth2.provider.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.endpoint; import java.security.Principal; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java index b9683f82..1bdba288 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitGrantService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.authz.oauth2.provider.implicit; +package org.dromara.maxkey.authz.oauth2.provider.implicit; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; /** * Service to associate & store an incoming AuthorizationRequest with the TokenRequest that is passed 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/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java similarity index 76% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java index ba6dffa5..deed1a7b 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/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenGranter.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.implicit; +package org.dromara.maxkey.authz.oauth2.provider.implicit; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.TokenRequest; -import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; -import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.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/implicit/ImplicitTokenRequest.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenRequest.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenRequest.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenRequest.java index e8685d6b..e23ecff7 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/ImplicitTokenRequest.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/ImplicitTokenRequest.java @@ -11,10 +11,10 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.implicit; +package org.dromara.maxkey.authz.oauth2.provider.implicit; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; /** * @author Dave Syer diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java index 21589cb3..d4d5e1c0 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/implicit/InMemoryImplicitGrantService.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.oauth2.provider.implicit; +package org.dromara.maxkey.authz.oauth2.provider.implicit; import java.util.concurrent.ConcurrentHashMap; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; /** * In-memory implementation of the ImplicitGrantService. 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/dromara/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java similarity index 80% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java index 77a1c3a6..d1441bf1 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/dromara/maxkey/authz/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.password; +package org.dromara.maxkey.authz.oauth2.provider.password; import java.util.LinkedHashMap; import java.util.Map; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.TokenRequest; -import org.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; -import org.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java similarity index 69% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java index 8bfbe7e7..acac0da3 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/dromara/maxkey/authz/oauth2/provider/refresh/RefreshTokenGranter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.refresh; +package org.dromara.maxkey.authz.oauth2.provider.refresh; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.provider.token.AbstractTokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthorizationServerTokenServices; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java index d5115296..a2061c5e 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/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestFactory.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.request; +package org.dromara.maxkey.authz.oauth2.provider.request; import java.util.Collections; import java.util.LinkedHashSet; @@ -18,17 +18,17 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.InvalidClientException; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.authz.oauth2.provider.AuthorizationRequest; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.DefaultSecurityContextAccessor; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidClientException; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.DefaultSecurityContextAccessor; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.SecurityContextAccessor; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java similarity index 80% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java index 48549dd2..3de5ce88 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/dromara/maxkey/authz/oauth2/provider/request/DefaultOAuth2RequestValidator.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.oauth2.provider.request; +package org.dromara.maxkey.authz.oauth2.provider.request; import java.util.Set; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; +import org.dromara.maxkey.authz.oauth2.provider.AuthorizationRequest; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestValidator; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.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/dromara/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java similarity index 81% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java index 225659a8..51e50523 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/dromara/maxkey/authz/oauth2/provider/token/AbstractTokenGranter.java @@ -10,21 +10,21 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.exceptions.InvalidClientException; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.TokenGranter; -import org.maxkey.authz.oauth2.provider.TokenRequest; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidClientException; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.TokenGranter; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.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/AccessTokenConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AccessTokenConverter.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AccessTokenConverter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AccessTokenConverter.java index a55a5949..1d1e663a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AccessTokenConverter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AccessTokenConverter.java @@ -27,12 +27,12 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Map; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Converter interface for token service implementations that store authentication data inside the token. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java index 1894e15a..0617b6da 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthenticationKeyGenerator.java @@ -10,9 +10,9 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Strategy interface for extracting a unique key from an {@link OAuth2Authentication}. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java index 1e143eb0..85a3376d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/AuthorizationServerTokenServices.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; import org.springframework.security.core.AuthenticationException; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java index ce37c22d..901e7e40 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ConsumerTokenServices.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java index 14f561fc..b7486368 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAccessTokenConverter.java @@ -27,7 +27,7 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Collection; import java.util.Collections; @@ -38,10 +38,10 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; 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/token/DefaultAuthenticationKeyGenerator.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java index af57008c..c58107b7 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.io.UnsupportedEncodingException; import java.math.BigInteger; @@ -19,9 +19,9 @@ import java.security.NoSuchAlgorithmException; import java.util.LinkedHashMap; import java.util.Map; -import org.maxkey.authz.oauth2.common.util.OAuth2Utils; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.common.util.OAuth2Utils; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; /** * Basic key generator taking into account the client id, scope, reource ids and username (principal name) if they 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/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java index cfc42a2c..d9e25ea8 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/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java @@ -11,27 +11,27 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Date; import java.util.Set; import java.util.UUID; -import org.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.DefaultOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; -import org.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; -import org.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -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.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidScopeException; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.ClientRegistrationException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.TokenRequest; +import org.dromara.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/token/DefaultUserAuthenticationConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultUserAuthenticationConverter.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultUserAuthenticationConverter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultUserAuthenticationConverter.java index f8bcf193..0e246242 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/DefaultUserAuthenticationConverter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultUserAuthenticationConverter.java @@ -28,7 +28,7 @@ * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java index dc5d1036..0a820dcd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/RemoteTokenServices.java @@ -27,7 +27,7 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. *******************************************************************************/ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -36,9 +36,9 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java similarity index 83% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java index 69b3b20f..40b513ad 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/ResourceServerTokenServices.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.springframework.security.core.AuthenticationException; public interface ResourceServerTokenServices { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancer.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancer.java index e3289d71..b0f930cd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancer.java @@ -10,10 +10,10 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Strategy for enhancing an access token before it is stored by an {@link AuthorizationServerTokenServices} diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java similarity index 78% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java index 30659341..2a9a3bea 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenEnhancerChain.java @@ -10,13 +10,13 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Collections; import java.util.List; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * A composite token enhancer that loops over its delegate enhancers. @@ -38,8 +38,8 @@ public class TokenEnhancerChain implements TokenEnhancer { /** * Loop over the {@link #setTokenEnhancers(List) delegates} passing the result into the next member of the chain. * - * @see org.maxkey.authz.oauth2.provider.token.TokenEnhancer#enhance(org.maxkey.authz.oauth2.common.OAuth2AccessToken, - * org.maxkey.authz.oauth2.provider.OAuth2Authentication) + * @see org.dromara.maxkey.authz.oauth2.provider.token.TokenEnhancer#enhance(org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken, + * org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication) */ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) { OAuth2AccessToken result = accessToken; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenStore.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenStore.java index 6f7b1f58..4231ed3d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/TokenStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/TokenStore.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Collection; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; /** * Persistence interface for OAuth2 tokens. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java index 81a99f7a..035083cc 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/UserAuthenticationConverter.java @@ -28,7 +28,7 @@ * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.provider.token; +package org.dromara.maxkey.authz.oauth2.provider.token; import java.util.Map; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java index 4b3a19cf..12295dc1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/InMemoryTokenStore.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; import java.util.Collection; import java.util.Collections; @@ -27,12 +27,12 @@ import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.AuthenticationKeyGenerator; -import org.maxkey.authz.oauth2.provider.token.DefaultAuthenticationKeyGenerator; -import org.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthenticationKeyGenerator; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAuthenticationKeyGenerator; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; import org.springframework.util.Assert; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java index 2ba1d0c1..502b20c6 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java @@ -27,7 +27,7 @@ * subcomponents is subject to the terms and conditions of the * subcomponent's license, as noted in the LICENSE file. */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; import java.security.KeyPair; import java.security.PrivateKey; @@ -40,28 +40,28 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.DefaultOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; -import org.maxkey.authz.oauth2.common.util.JsonParser; -import org.maxkey.authz.oauth2.common.util.JsonParserFactory; -import org.maxkey.authz.oauth2.common.util.RandomValueStringGenerator; -import org.maxkey.authz.oauth2.jwt.Jwt; -import org.maxkey.authz.oauth2.jwt.JwtHelper; -import org.maxkey.authz.oauth2.jwt.crypto.sign.InvalidSignatureException; -import org.maxkey.authz.oauth2.jwt.crypto.sign.MacSigner; -import org.maxkey.authz.oauth2.jwt.crypto.sign.RsaSigner; -import org.maxkey.authz.oauth2.jwt.crypto.sign.RsaVerifier; -import org.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; -import org.maxkey.authz.oauth2.jwt.crypto.sign.Signer; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.AccessTokenConverter; -import org.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter; -import org.maxkey.authz.oauth2.provider.token.TokenEnhancer; +import org.dromara.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.exceptions.InvalidTokenException; +import org.dromara.maxkey.authz.oauth2.common.util.JsonParser; +import org.dromara.maxkey.authz.oauth2.common.util.JsonParserFactory; +import org.dromara.maxkey.authz.oauth2.common.util.RandomValueStringGenerator; +import org.dromara.maxkey.authz.oauth2.jwt.Jwt; +import org.dromara.maxkey.authz.oauth2.jwt.JwtHelper; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.InvalidSignatureException; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.MacSigner; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.RsaSigner; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.RsaVerifier; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.SignatureVerifier; +import org.dromara.maxkey.authz.oauth2.jwt.crypto.sign.Signer; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.AccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenEnhancer; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java index 97d5eeab..73dd1cd4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/JwtTokenStore.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; import java.util.ArrayList; import java.util.Collection; @@ -19,15 +19,15 @@ import java.util.Collections; import java.util.Date; import java.util.HashSet; -import org.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.approval.Approval; -import org.maxkey.authz.oauth2.provider.approval.ApprovalStore; -import org.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; -import org.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.common.DefaultExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval; +import org.dromara.maxkey.authz.oauth2.provider.approval.ApprovalStore; +import org.dromara.maxkey.authz.oauth2.provider.approval.Approval.ApprovalStatus; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; import org.springframework.security.core.Authentication; /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java index 2abd7ad4..a7331dc1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/KeyStoreKeyFactory.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; import java.security.KeyFactory; import java.security.KeyPair; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java index 8602c28f..76dd2ed8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/RedisTokenStore.java @@ -15,23 +15,23 @@ */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; import java.util.Collection; import java.util.Collections; import java.util.ArrayList; import java.util.List; -import org.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.AuthenticationKeyGenerator; -import org.maxkey.authz.oauth2.provider.token.DefaultAuthenticationKeyGenerator; -import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.persistence.redis.RedisConnection; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.util.ObjectTransformer; +import org.dromara.maxkey.authz.oauth2.common.ExpiringOAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2RefreshToken; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.AuthenticationKeyGenerator; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAuthenticationKeyGenerator; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.persistence.redis.RedisConnection; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.util.ObjectTransformer; 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/token/store/TokenStoreFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/TokenStoreFactory.java similarity index 86% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/TokenStoreFactory.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/TokenStoreFactory.java index 7f5b4cfa..36d3ee38 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/TokenStoreFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/store/TokenStoreFactory.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.oauth2.provider.token.store; +package org.dromara.maxkey.authz.oauth2.provider.token.store; -import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; 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/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index b68d7c47..32e73f5d 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/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.oauth2.provider.userinfo.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.userinfo.endpoint; import java.util.HashMap; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringGenerator; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.StringGenerator; +import org.dromara.maxkey.web.WebConstants; 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/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java similarity index 81% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index 6fcbd264..aa80ac46 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/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.userinfo.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.userinfo.endpoint; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; @@ -24,24 +24,24 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.persistence.service.AppsService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.Instance; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.RequestTokenUtils; -import org.maxkey.util.StringGenerator; -import org.maxkey.web.HttpResponseAdapter; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.RequestTokenUtils; +import org.dromara.maxkey.util.StringGenerator; +import org.dromara.maxkey.web.HttpResponseAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 185771a7..840c2781 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.userinfo.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.userinfo.endpoint; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -28,25 +28,25 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.constants.ContentType; -import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; -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; -import org.maxkey.util.RequestTokenUtils; -import org.maxkey.util.StringGenerator; -import org.maxkey.web.HttpResponseAdapter; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.RequestTokenUtils; +import org.dromara.maxkey.util.StringGenerator; +import org.dromara.maxkey.web.HttpResponseAdapter; +import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java index 6e200999..932ecf7a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/package-info.java @@ -22,4 +22,4 @@ * @author Crystal.Sea * */ -package org.maxkey.authz.oauth2.provider.userinfo.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.userinfo.endpoint; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java index 3be0e8f7..259a9043 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OauthServerConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.wellknown; +package org.dromara.maxkey.authz.oauth2.provider.wellknown; import java.util.Set; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java index f9a9d84c..3a7c812f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/OpenidConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.wellknown; +package org.dromara.maxkey.authz.oauth2.provider.wellknown; import java.util.Set; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java index ce9d78f6..5cd353f6 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.wellknown.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; import java.util.HashSet; import java.util.Set; @@ -23,12 +23,12 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; -import org.maxkey.authz.oauth2.provider.wellknown.OauthServerConfiguration; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; +import org.dromara.maxkey.authz.oauth2.provider.wellknown.OauthServerConfiguration; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java index fccad341..81ca38ed 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.oauth2.provider.wellknown.endpoint; +package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; import java.util.HashSet; import java.util.Set; @@ -23,12 +23,12 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; -import org.maxkey.authz.oauth2.provider.wellknown.OpenidConfiguration; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; +import org.dromara.maxkey.authz.oauth2.provider.wellknown.OpenidConfiguration; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java index f6aee12c..01a9d44d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/IdTokenHashUtils.java @@ -1,4 +1,4 @@ -package org.maxkey.authz.oidc.idtoken; +package org.dromara.maxkey.authz.oidc.idtoken; /******************************************************************************* * Copyright 2014 The MITRE Corporation 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/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java index 6449a033..ea3cb55b 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/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.oidc.idtoken; +package org.dromara.maxkey.authz.oidc.idtoken; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; @@ -28,19 +28,19 @@ import java.util.Set; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Request; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenEnhancer; +import org.dromara.maxkey.configuration.oidc.OIDCProviderMetadata; +import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.common.DefaultOAuth2AccessToken; -import org.maxkey.authz.oauth2.common.OAuth2AccessToken; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.OAuth2Request; -import org.maxkey.authz.oauth2.provider.token.TokenEnhancer; -import org.maxkey.configuration.oidc.OIDCProviderMetadata; -import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; -import org.maxkey.entity.apps.oauth2.provider.ClientDetails; import com.nimbusds.jose.util.Base64URL; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java rename to maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java index b29a0fe4..9dd8393a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.net.URI; import java.security.NoSuchAlgorithmException; @@ -23,28 +23,29 @@ import java.security.spec.InvalidKeySpecException; import javax.servlet.Filter; import javax.sql.DataSource; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.ClientDetailsService; -import org.maxkey.authz.oauth2.provider.OAuth2UserDetailsService; -import org.maxkey.authz.oauth2.provider.approval.TokenApprovalStore; -import org.maxkey.authz.oauth2.provider.approval.endpoint.OAuth20UserApprovalHandler; -import org.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; -import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; -import org.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; -import org.maxkey.authz.oauth2.provider.code.AuthorizationCodeServicesFactory; -import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter; -import org.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestFactory; -import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; -import org.maxkey.authz.oauth2.provider.token.store.TokenStoreFactory; -import org.maxkey.authz.oidc.idtoken.OIDCIdTokenEnhancer; -import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; -import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; -import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.repository.LoginRepository; + +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.ClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2UserDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.approval.TokenApprovalStore; +import org.dromara.maxkey.authz.oauth2.provider.approval.endpoint.OAuth20UserApprovalHandler; +import org.dromara.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.code.AuthorizationCodeServices; +import org.dromara.maxkey.authz.oauth2.provider.code.AuthorizationCodeServicesFactory; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter; +import org.dromara.maxkey.authz.oauth2.provider.request.DefaultOAuth2RequestFactory; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; +import org.dromara.maxkey.authz.oauth2.provider.token.store.TokenStoreFactory; +import org.dromara.maxkey.authz.oidc.idtoken.OIDCIdTokenEnhancer; +import org.dromara.maxkey.configuration.oidc.OIDCProviderMetadataDetails; +import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; +import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; +import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.repository.LoginRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/AuthnRequestInfo.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/AuthnRequestInfo.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/AuthnRequestInfo.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/AuthnRequestInfo.java index 9828a1d9..cf7652a7 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/AuthnRequestInfo.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/AuthnRequestInfo.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml.common; +package org.dromara.maxkey.authz.saml.common; import java.io.Serializable; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/EndpointGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/EndpointGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java index 454e34dd..a351302c 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/EndpointGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml.common; +package org.dromara.maxkey.authz.saml.common; import javax.xml.namespace.QName; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SecurityPolicyDelegate.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SecurityPolicyDelegate.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SecurityPolicyDelegate.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SecurityPolicyDelegate.java index 49aa2d2a..5d7c04f8 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SecurityPolicyDelegate.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SecurityPolicyDelegate.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml.common; +package org.dromara.maxkey.authz.saml.common; import java.util.List; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java index 1c6a2c56..fc88a363 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml.common; +package org.dromara.maxkey.authz.saml.common; import org.opensaml.Configuration; import org.opensaml.common.SignableSAMLObject; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/TrustResolver.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/TrustResolver.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/TrustResolver.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/TrustResolver.java index ce5a6350..7dfbf3f4 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/TrustResolver.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/TrustResolver.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.saml.common; +package org.dromara.maxkey.authz.saml.common; import java.security.KeyStore; import java.util.HashMap; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/IDService.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/IDService.java index a0050f55..b86da343 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/IDService.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/IDService.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml.service; +package org.dromara.maxkey.authz.saml.service; import java.util.UUID; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/TimeService.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/TimeService.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/TimeService.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/TimeService.java index 944140ce..abcb2cab 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/service/TimeService.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/service/TimeService.java @@ -17,7 +17,7 @@ -package org.maxkey.authz.saml.service; +package org.dromara.maxkey.authz.saml.service; import org.joda.time.DateTime; 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/dromara/maxkey/authz/saml20/binding/BindingAdapter.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/BindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/BindingAdapter.java index 9955768c..ca835d82 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/dromara/maxkey/authz/saml20/binding/BindingAdapter.java @@ -16,13 +16,13 @@ -package org.maxkey.authz.saml20.binding; +package org.dromara.maxkey.authz.saml20.binding; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.saml.common.AuthnRequestInfo; -import org.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.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/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/ExtractBindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java index f06a311b..57e872d6 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/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java @@ -16,14 +16,14 @@ -package org.maxkey.authz.saml20.binding; +package org.dromara.maxkey.authz.saml20.binding; import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; -import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.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/decoder/OpenHTTPPostDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java index fcd174f9..34bf45cf 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.binding.decoder; +package org.dromara.maxkey.authz.saml20.binding.decoder; import javax.servlet.http.HttpServletRequest; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java index b29a8a30..d6d1486d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.binding.decoder; +package org.dromara.maxkey.authz.saml20.binding.decoder; import javax.servlet.http.HttpServletRequest; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java index 06c1d2e5..94bc1242 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.binding.decoder; +package org.dromara.maxkey.authz.saml20.binding.decoder; import javax.servlet.http.HttpServletRequest; 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/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java index cd421650..25628cdd 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/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java @@ -16,16 +16,16 @@ -package org.maxkey.authz.saml20.binding.impl; +package org.dromara.maxkey.authz.saml20.binding.impl; import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; 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.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.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/ExtractRedirectBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java index 043a49b2..1def911d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java @@ -15,11 +15,11 @@ */ -package org.maxkey.authz.saml20.binding.impl; +package org.dromara.maxkey.authz.saml20.binding.impl; import java.security.KeyStore; -import org.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.authz.saml.common.TrustResolver; import org.opensaml.common.binding.decoding.SAMLMessageDecoder; import org.opensaml.ws.security.SecurityPolicyResolver; import org.opensaml.xml.security.credential.CredentialResolver; 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/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java similarity index 93% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java index 221096fa..b267feaa 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/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.binding.impl; +package org.dromara.maxkey.authz.saml20.binding.impl; import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; @@ -24,13 +24,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.Validate; import org.apache.velocity.app.VelocityEngine; -import org.maxkey.authz.saml.common.AuthnRequestInfo; -import org.maxkey.authz.saml.common.TrustResolver; -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.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.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/binding/impl/PostSimpleSignBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostSimpleSignBindingAdapter.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostSimpleSignBindingAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostSimpleSignBindingAdapter.java index 0d475464..9ebb2714 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/PostSimpleSignBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostSimpleSignBindingAdapter.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.binding.impl; +package org.dromara.maxkey.authz.saml20.binding.impl; import org.opensaml.saml2.binding.encoding.HTTPPostSimpleSignEncoder; import org.opensaml.ws.security.SecurityPolicyResolver; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java similarity index 88% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java index cfa5ef4a..6faa2374 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/AuthnRequestGenerator.java @@ -16,12 +16,12 @@ -package org.maxkey.authz.saml20.consumer; +package org.dromara.maxkey.authz.saml20.consumer; -import org.maxkey.authz.saml.service.IDService; -import org.maxkey.authz.saml.service.TimeService; -import org.maxkey.authz.saml20.xml.IssuerGenerator; +import org.dromara.maxkey.authz.saml.service.IDService; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.authz.saml20.xml.IssuerGenerator; import org.opensaml.saml2.core.AuthnRequest; import org.opensaml.saml2.core.impl.AuthnRequestBuilder; 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/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java similarity index 89% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index e7876c74..7d26a65c 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/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.consumer.endpoint; +package org.dromara.maxkey.authz.saml20.consumer.endpoint; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -30,25 +30,25 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authz.saml.common.EndpointGenerator; -import org.maxkey.authz.saml.common.TrustResolver; -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.binding.ExtractBindingAdapter; -import org.maxkey.authz.saml20.consumer.AuthnRequestGenerator; -import org.maxkey.authz.saml20.consumer.spring.IdentityProviderAuthenticationException; -import org.maxkey.authz.saml20.consumer.spring.ServiceProviderAuthenticationException; -import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; -import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.persistence.service.AppsSaml20DetailsService; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authz.saml.common.EndpointGenerator; +import org.dromara.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.authz.saml.service.IDService; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.authz.saml20.consumer.AuthnRequestGenerator; +import org.dromara.maxkey.authz.saml20.consumer.spring.IdentityProviderAuthenticationException; +import org.dromara.maxkey.authz.saml20.consumer.spring.ServiceProviderAuthenticationException; +import org.dromara.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; +import org.dromara.maxkey.authz.saml20.xml.SAML2ValidatorSuite; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.common.binding.security.IssueInstantRule; import org.opensaml.common.binding.security.MessageReplayRule; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java index 6dbc7238..a406b83d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/IdentityProviderAuthenticationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.consumer.spring; +package org.dromara.maxkey.authz.saml20.consumer.spring; import org.springframework.security.core.AuthenticationException; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java index 07d3e146..50baaf1a 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.consumer.spring; +package org.dromara.maxkey.authz.saml20.consumer.spring; import java.io.IOException; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java index 756488d0..490e4b8c 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/ServiceProviderAuthenticationException.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.consumer.spring; +package org.dromara.maxkey.authz.saml20.consumer.spring; import org.springframework.security.core.AuthenticationException; 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/dromara/maxkey/authz/saml20/jit/ProvisioningAdapter.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/jit/ProvisioningAdapter.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/jit/ProvisioningAdapter.java index 7149533b..0d0ae312 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/dromara/maxkey/authz/saml20/jit/ProvisioningAdapter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.jit; +package org.dromara.maxkey.authz.saml20.jit; public interface ProvisioningAdapter { diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java similarity index 98% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java index 3b146995..8beb2a7d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java @@ -18,7 +18,7 @@ /** * */ -package org.maxkey.authz.saml20.metadata; +package org.dromara.maxkey.authz.saml20.metadata; import java.io.File; import java.io.FileInputStream; @@ -26,7 +26,7 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.List; -import org.maxkey.crypto.cert.StringUtil; +import org.dromara.maxkey.crypto.cert.StringUtil; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.metadata.EntityDescriptor; import org.opensaml.saml2.metadata.IDPSSODescriptor; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java index a500ab2e..27d6a150 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/MetadataGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java @@ -15,12 +15,12 @@ */ -package org.maxkey.authz.saml20.metadata; +package org.dromara.maxkey.authz.saml20.metadata; import org.opensaml.DefaultBootstrap; -import org.maxkey.authz.saml.common.TrustResolver; -import org.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; import org.opensaml.util.storage.MapBasedStorageService; import org.opensaml.util.storage.ReplayCache; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java index 8c53be7e..1aad9172 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java @@ -15,20 +15,20 @@ */ -package org.maxkey.authz.saml20.metadata.endpoint; +package org.dromara.maxkey.authz.saml20.metadata.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.Validate; import org.apache.mybatis.jpa.util.JpaWebContext; -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.entity.Saml20Metadata; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.saml.common.TrustResolver; +import org.dromara.maxkey.authz.saml20.metadata.MetadataGenerator; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.entity.Saml20Metadata; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.core.NameIDType; import org.opensaml.saml2.metadata.ContactPersonTypeEnumeration; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java similarity index 99% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java index 421d5ea1..03003130 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/binding/encoding/WebServicePostEncoder.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.provider.binding.encoding; +package org.dromara.maxkey.authz.saml20.provider.binding.encoding; import java.io.UnsupportedEncodingException; 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/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java similarity index 85% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java index 1d9359cc..ea83da72 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/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java @@ -15,22 +15,22 @@ */ -package org.maxkey.authz.saml20.provider.endpoint; +package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -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.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.web.WebConstants; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.maxkey.authz.saml.common.EndpointGenerator; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.web.WebConstants; import org.opensaml.saml2.core.Response; 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/provider/endpoint/IdpInitEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java similarity index 87% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java index 3f27e5fd..f2b98e63 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/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java @@ -15,21 +15,22 @@ */ -package org.maxkey.authz.saml20.provider.endpoint; +package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.saml.common.AuthnRequestInfo; -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.entity.apps.AppsSAML20Details; -import org.maxkey.persistence.service.AppsSaml20DetailsService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; + +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java similarity index 94% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java index e38ffd56..645c9648 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java @@ -15,15 +15,15 @@ */ -package org.maxkey.authz.saml20.provider.endpoint; +package org.dromara.maxkey.authz.saml20.provider.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.saml20.binding.ExtractBindingAdapter; -import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.authz.saml20.xml.SAML2ValidatorSuite; +import org.dromara.maxkey.web.WebContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.core.LogoutRequest; import org.opensaml.ws.message.decoder.MessageDecodingException; 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/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java index d6c665f2..87ed4db8 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/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java @@ -15,21 +15,22 @@ */ -package org.maxkey.authz.saml20.provider.endpoint; +package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.saml.common.AuthnRequestInfo; -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.entity.apps.AppsSAML20Details; -import org.maxkey.persistence.service.AppsSaml20DetailsService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; + +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; +import org.dromara.maxkey.authz.saml20.xml.SAML2ValidatorSuite; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.core.AuthnRequest; import org.opensaml.ws.message.decoder.MessageDecodingException; 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/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AssertionGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java index d74c770c..7131639b 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/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java @@ -15,20 +15,20 @@ */ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import java.util.ArrayList; import java.util.HashMap; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.saml.service.IDService; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.xml.IssuerGenerator; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; -import org.maxkey.authn.web.AuthorizationUtils; -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.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.web.WebContext; import org.opensaml.Configuration; import org.opensaml.saml2.core.Assertion; 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/AttributeStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java index 86a1befd..80cab26e 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/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import java.util.ArrayList; import java.util.Collection; @@ -24,12 +24,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.constants.ldap.ActiveDirectoryUser; -import org.maxkey.entity.ExtraAttr; -import org.maxkey.entity.ExtraAttrs; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.constants.ldap.ActiveDirectoryUser; +import org.dromara.maxkey.entity.ExtraAttr; +import org.dromara.maxkey.entity.ExtraAttrs; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.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/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java similarity index 90% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java index 1f7dd68d..6f8bff16 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/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java @@ -16,18 +16,18 @@ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import java.util.HashMap; -import org.maxkey.authz.saml.common.AuthnRequestInfo; -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.constants.ConstsBoolean; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; +import org.dromara.maxkey.authz.saml.service.IDService; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; +import org.dromara.maxkey.authz.saml20.xml.IssuerGenerator; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.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/AuthnStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java index dd14e152..9ab3f420 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import org.joda.time.DateTime; import org.opensaml.saml2.core.AuthnContext; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java index 85267c84..e15f1eef 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import org.joda.time.DateTime; import org.opensaml.saml2.core.Audience; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/StatusGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/StatusGenerator.java similarity index 97% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/StatusGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/StatusGenerator.java index 6f5dad52..2f8a4072 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/StatusGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/StatusGenerator.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import org.opensaml.saml2.core.Status; import org.opensaml.saml2.core.StatusCode; 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/dromara/maxkey/authz/saml20/provider/xml/SubjectGenerator.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/SubjectGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/SubjectGenerator.java index 8700757c..d3fe5110 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/dromara/maxkey/authz/saml20/provider/xml/SubjectGenerator.java @@ -16,14 +16,14 @@ -package org.maxkey.authz.saml20.provider.xml; +package org.dromara.maxkey.authz.saml20.provider.xml; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authz.saml.service.TimeService; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.web.WebContext; import org.opensaml.saml2.core.NameID; import org.opensaml.saml2.core.NameIDType; import org.opensaml.saml2.core.Subject; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/IssuerGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/IssuerGenerator.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/IssuerGenerator.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/IssuerGenerator.java index a81abc88..b537a8a3 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/IssuerGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/IssuerGenerator.java @@ -16,7 +16,7 @@ -package org.maxkey.authz.saml20.xml; +package org.dromara.maxkey.authz.saml20.xml; import org.opensaml.saml2.core.Issuer; import org.opensaml.saml2.core.NameIDType; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java similarity index 96% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java index 03a515f1..4a7f2eab 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/xml/SAML2ValidatorSuite.java @@ -15,7 +15,7 @@ */ -package org.maxkey.authz.saml20.xml; +package org.dromara.maxkey.authz.saml20.xml; import org.opensaml.xml.Configuration; import org.opensaml.xml.XMLObject; 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/dromara/maxkey/autoconfigure/Saml20AutoConfiguration.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java rename to maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Saml20AutoConfiguration.java index 779e52ee..01d3df9e 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/dromara/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -15,27 +15,27 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.io.IOException; import java.util.Properties; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.VelocityException; -import org.maxkey.authz.saml.common.EndpointGenerator; -import org.maxkey.authz.saml.service.IDService; -import org.maxkey.authz.saml.service.TimeService; -import org.maxkey.authz.saml20.binding.decoder.OpenHTTPPostDecoder; -import org.maxkey.authz.saml20.binding.decoder.OpenHTTPPostSimpleSignDecoder; -import org.maxkey.authz.saml20.binding.decoder.OpenHTTPRedirectDecoder; -import org.maxkey.authz.saml20.binding.impl.ExtractPostBindingAdapter; -import org.maxkey.authz.saml20.binding.impl.ExtractRedirectBindingAdapter; -import org.maxkey.authz.saml20.binding.impl.PostBindingAdapter; -import org.maxkey.authz.saml20.binding.impl.PostSimpleSignBindingAdapter; -import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; -import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; -import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.entity.Saml20Metadata; +import org.dromara.maxkey.authz.saml.common.EndpointGenerator; +import org.dromara.maxkey.authz.saml.service.IDService; +import org.dromara.maxkey.authz.saml.service.TimeService; +import org.dromara.maxkey.authz.saml20.binding.decoder.OpenHTTPPostDecoder; +import org.dromara.maxkey.authz.saml20.binding.decoder.OpenHTTPPostSimpleSignDecoder; +import org.dromara.maxkey.authz.saml20.binding.decoder.OpenHTTPRedirectDecoder; +import org.dromara.maxkey.authz.saml20.binding.impl.ExtractPostBindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.impl.ExtractRedirectBindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.impl.PostBindingAdapter; +import org.dromara.maxkey.authz.saml20.binding.impl.PostSimpleSignBindingAdapter; +import org.dromara.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; +import org.dromara.maxkey.authz.saml20.xml.SAML2ValidatorSuite; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.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/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java similarity index 82% rename from maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java rename to maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index cd39d395..5afae0d0 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/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -18,25 +18,25 @@ /** * */ -package org.maxkey.authz.token.endpoint; +package org.dromara.maxkey.authz.token.endpoint; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsBoolean; -import org.maxkey.entity.UserInfo; -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; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsBoolean; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.persistence.service.AppsTokenBasedDetailsService; +import org.dromara.maxkey.util.Instance; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java similarity index 91% rename from maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java rename to maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java index 24da8bdb..72ae919a 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/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java @@ -15,18 +15,18 @@ */ -package org.maxkey.authz.token.endpoint.adapter; +package org.dromara.maxkey.authz.token.endpoint.adapter; import java.util.Date; import java.util.HashMap; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.StringGenerator; +import org.dromara.maxkey.web.WebConstants; import org.joda.time.DateTime; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.apps.AppsTokenBasedDetails; -import org.maxkey.util.DateUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringGenerator; -import org.maxkey.web.WebConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; 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/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java similarity index 92% rename from maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java rename to maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java index 42000253..5206406c 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/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java @@ -15,13 +15,13 @@ */ -package org.maxkey.authz.token.endpoint.adapter; +package org.dromara.maxkey.authz.token.endpoint.adapter; import java.util.Date; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.entity.apps.AppsTokenBasedDetails; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java similarity index 92% rename from maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java index a6e27dc0..ca0e0da9 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.activedirectory; +package org.dromara.maxkey.synchronizer.activedirectory; import java.util.ArrayList; import java.util.HashMap; @@ -26,15 +26,15 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.commons.lang3.StringUtils; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.constants.ldap.OrganizationalUnit; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.constants.ldap.OrganizationalUnit; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -101,7 +101,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer organization.getId(), organization.getOrgName(), Organizations.class.getSimpleName(), - org.maxkey.util.DateUtils.getCurrentDateAsString(), + org.dromara.maxkey.util.DateUtils.getCurrentDateAsString(), "success", synchronizer.getInstId()); this.historySynchronizerService.insert(historySynchronizer); diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java similarity index 92% rename from maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java index 378471d6..40ec6bd3 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.synchronizer.activedirectory; +package org.dromara.maxkey.synchronizer.activedirectory; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java similarity index 93% rename from maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java index 2034588c..2bbcb3aa 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.activedirectory; +package org.dromara.maxkey.synchronizer.activedirectory; import java.util.HashMap; import javax.naming.NamingEnumeration; @@ -25,17 +25,17 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.commons.lang3.StringUtils; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.constants.ldap.ActiveDirectoryUser; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.constants.ldap.ActiveDirectoryUser; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java similarity index 97% rename from maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java index 9a6a7028..81e5814f 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.dingtalk; +package org.dromara.maxkey.synchronizer.dingtalk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java similarity index 95% rename from maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java index 1a7599cd..57eaf53d 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java @@ -15,16 +15,16 @@ */ -package org.maxkey.synchronizer.dingtalk; +package org.dromara.maxkey.synchronizer.dingtalk; import java.util.NoSuchElementException; import java.util.concurrent.LinkedBlockingQueue; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java similarity index 94% rename from maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java index 978eb312..57712d26 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.synchronizer.dingtalk; +package org.dromara.maxkey.synchronizer.dingtalk; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java similarity index 93% rename from maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java index 09c0ce85..bf0b38ef 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java @@ -15,18 +15,18 @@ */ -package org.maxkey.synchronizer.dingtalk; +package org.dromara.maxkey.synchronizer.dingtalk; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.UserInfo; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java similarity index 89% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java index 38debdc9..af119237 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java @@ -15,15 +15,15 @@ */ -package org.maxkey.synchronizer.feishu; +package org.dromara.maxkey.synchronizer.feishu; import java.util.HashMap; import java.util.Map; -import org.maxkey.constants.ContentType; -import org.maxkey.synchronizer.entity.AccessToken; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.constants.ContentType; +import org.dromara.maxkey.synchronizer.entity.AccessToken; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java similarity index 90% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java index 58cd2784..1e445373 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java @@ -15,22 +15,22 @@ */ -package org.maxkey.synchronizer.feishu; +package org.dromara.maxkey.synchronizer.feishu; import java.util.HashMap; import java.util.NoSuchElementException; import java.util.concurrent.LinkedBlockingQueue; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.synchronizer.feishu.entity.FeishuDepts; -import org.maxkey.synchronizer.feishu.entity.FeishuDeptsResponse; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.synchronizer.feishu.entity.FeishuDepts; +import org.dromara.maxkey.synchronizer.feishu.entity.FeishuDeptsResponse; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java similarity index 93% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java index 867910d1..c2c36007 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.synchronizer.feishu; +package org.dromara.maxkey.synchronizer.feishu; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java similarity index 87% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java index 78028e2b..785c6c49 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java @@ -15,21 +15,21 @@ */ -package org.maxkey.synchronizer.feishu; +package org.dromara.maxkey.synchronizer.feishu; import java.util.HashMap; import java.util.List; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.UserInfo; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.synchronizer.feishu.entity.FeishuUsers; -import org.maxkey.synchronizer.feishu.entity.FeishuUsersResponse; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.synchronizer.feishu.entity.FeishuUsers; +import org.dromara.maxkey.synchronizer.feishu.entity.FeishuUsersResponse; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java similarity index 95% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java index feb1640c..a235f7ff 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; public class FeishuDeptStatus { boolean is_deleted; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDepts.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDepts.java similarity index 98% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDepts.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDepts.java index 2aad38d4..22a475df 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDepts.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDepts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; public class FeishuDepts { diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java similarity index 93% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java index 60c51e7f..6215f05e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; import java.util.ArrayList; -import org.maxkey.synchronizer.entity.ResponseData; +import org.dromara.maxkey.synchronizer.entity.ResponseData; public class FeishuDeptsData extends ResponseData { diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java similarity index 90% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java index d7b5f718..50824441 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuDeptsResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; -import org.maxkey.synchronizer.entity.ResponseData; +import org.dromara.maxkey.synchronizer.entity.ResponseData; public class FeishuDeptsResponse extends ResponseData { diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuI18nName.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuI18nName.java similarity index 96% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuI18nName.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuI18nName.java index 2a1dc718..2e243950 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuI18nName.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuI18nName.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; public class FeishuI18nName { diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java similarity index 97% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java index 3a903fa0..a85a2cf9 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUserStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; public class FeishuUserStatus { boolean is_frozen; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsers.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsers.java similarity index 99% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsers.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsers.java index 08907e1d..9abf79af 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsers.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsers.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; import java.util.Arrays; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersData.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersData.java similarity index 96% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersData.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersData.java index 219cb80b..eaa2f357 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersData.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersData.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; import java.util.ArrayList; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java similarity index 90% rename from maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java index fcf6aa15..0f428aed 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/entity/FeishuUsersResponse.java @@ -15,9 +15,9 @@ */ -package org.maxkey.synchronizer.feishu.entity; +package org.dromara.maxkey.synchronizer.feishu.entity; -import org.maxkey.synchronizer.entity.ResponseData; +import org.dromara.maxkey.synchronizer.entity.ResponseData; public class FeishuUsersResponse extends ResponseData{ diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/ColumnFieldMapper.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/ColumnFieldMapper.java similarity index 90% rename from maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/ColumnFieldMapper.java rename to maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/ColumnFieldMapper.java index e0baf268..e688504d 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/ColumnFieldMapper.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/ColumnFieldMapper.java @@ -15,9 +15,9 @@ */ -package org.maxkey.synchronizer.jdbc; +package org.dromara.maxkey.synchronizer.jdbc; -import org.maxkey.entity.DbTableColumn; +import org.dromara.maxkey.entity.DbTableColumn; public class ColumnFieldMapper extends DbTableColumn{ String field; diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java similarity index 93% rename from maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java index 5f0b4b7b..20dde9a5 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.jdbc; +package org.dromara.maxkey.synchronizer.jdbc; import java.sql.Connection; import java.sql.ResultSet; @@ -25,12 +25,12 @@ import java.util.ArrayList; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.DbTableMetaData; -import org.maxkey.entity.Organizations; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.util.JdbcUtils; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.DbTableMetaData; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.util.JdbcUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java similarity index 92% rename from maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java index 4df21eea..64662320 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.synchronizer.jdbc; +package org.dromara.maxkey.synchronizer.jdbc; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java similarity index 95% rename from maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java index 544b875e..d7713329 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/maxkey/synchronizer/jdbc/JdbcUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.jdbc; +package org.dromara.maxkey.synchronizer.jdbc; import java.sql.Connection; import java.sql.ResultSet; @@ -24,13 +24,13 @@ import java.sql.Statement; import java.util.ArrayList; import org.apache.commons.beanutils.PropertyUtils; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.DbTableMetaData; -import org.maxkey.entity.UserInfo; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.util.JdbcUtils; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.DbTableMetaData; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.util.JdbcUtils; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java similarity index 94% rename from maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java index 8ec1bfd0..5437db43 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.ldap; +package org.dromara.maxkey.synchronizer.ldap; import java.util.ArrayList; import java.util.HashMap; @@ -27,14 +27,14 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.commons.lang3.StringUtils; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.constants.ldap.OrganizationalUnit; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.constants.ldap.OrganizationalUnit; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java similarity index 91% rename from maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java index 62bf8ca3..092a8289 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.synchronizer.ldap; +package org.dromara.maxkey.synchronizer.ldap; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java similarity index 94% rename from maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java index 10ed270a..c94b3ee7 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.ldap; +package org.dromara.maxkey.synchronizer.ldap; import java.util.HashMap; import javax.naming.NamingEnumeration; @@ -25,15 +25,15 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.commons.lang3.StringUtils; -import org.maxkey.constants.ldap.InetOrgPerson; -import org.maxkey.crypto.DigestUtils; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ldap.InetOrgPerson; +import org.dromara.maxkey.crypto.DigestUtils; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java similarity index 87% rename from maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java index 6c372b55..4c3ad734 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.synchronizer.reorg; +package org.dromara.maxkey.synchronizer.reorg; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.synchronizer.workweixin.service.ReorgDeptService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.synchronizer.workweixin.service.ReorgDeptService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/workweixin/service/ReorgDeptService.java similarity index 91% rename from maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java rename to maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/workweixin/service/ReorgDeptService.java index 71869360..a72f63ca 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/dromara/maxkey/synchronizer/workweixin/service/ReorgDeptService.java @@ -15,15 +15,15 @@ */ -package org.maxkey.synchronizer.workweixin.service; +package org.dromara.maxkey.synchronizer.workweixin.service; import java.util.HashMap; import java.util.List; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Organizations; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java similarity index 90% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java index ab94177b..513df56b 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java @@ -15,11 +15,11 @@ */ -package org.maxkey.synchronizer.workweixin; +package org.dromara.maxkey.synchronizer.workweixin; -import org.maxkey.synchronizer.entity.AccessToken; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.synchronizer.entity.AccessToken; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java similarity index 88% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java index 0aed80cb..8a34b336 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java @@ -15,17 +15,17 @@ */ -package org.maxkey.synchronizer.workweixin; +package org.dromara.maxkey.synchronizer.workweixin; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.synchronizer.workweixin.entity.WorkWeixinDepts; -import org.maxkey.synchronizer.workweixin.entity.WorkWeixinDeptsResponse; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.synchronizer.workweixin.entity.WorkWeixinDepts; +import org.dromara.maxkey.synchronizer.workweixin.entity.WorkWeixinDeptsResponse; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java similarity index 94% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java index c3adc8ee..434bb8a0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java @@ -15,10 +15,10 @@ */ -package org.maxkey.synchronizer.workweixin; +package org.dromara.maxkey.synchronizer.workweixin; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java similarity index 86% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index 7dc7a93d..d2c81410 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java @@ -15,19 +15,19 @@ */ -package org.maxkey.synchronizer.workweixin; +package org.dromara.maxkey.synchronizer.workweixin; import java.util.List; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.UserInfo; -import org.maxkey.synchronizer.AbstractSynchronizerService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.synchronizer.workweixin.entity.WorkWeixinUsers; -import org.maxkey.synchronizer.workweixin.entity.WorkWeixinUsersResponse; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.HttpRequestAdapter; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.synchronizer.workweixin.entity.WorkWeixinUsers; +import org.dromara.maxkey.synchronizer.workweixin.entity.WorkWeixinUsersResponse; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.HttpRequestAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java similarity index 95% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java index 42c6491b..f6685423 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.workweixin.entity; +package org.dromara.maxkey.synchronizer.workweixin.entity; public class WorkWeixinDepts { diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java similarity index 89% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java index 5fd0c491..11db91b0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java @@ -15,11 +15,11 @@ */ -package org.maxkey.synchronizer.workweixin.entity; +package org.dromara.maxkey.synchronizer.workweixin.entity; import java.util.ArrayList; -import org.maxkey.synchronizer.entity.ResponseData; +import org.dromara.maxkey.synchronizer.entity.ResponseData; public class WorkWeixinDeptsResponse extends ResponseData{ diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java similarity index 98% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java index 3e0accc9..501b1749 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.workweixin.entity; +package org.dromara.maxkey.synchronizer.workweixin.entity; public class WorkWeixinUsers { diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java similarity index 89% rename from maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java index 194a080b..331a1dbc 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java @@ -15,10 +15,11 @@ */ -package org.maxkey.synchronizer.workweixin.entity; +package org.dromara.maxkey.synchronizer.workweixin.entity; import java.util.ArrayList; -import org.maxkey.synchronizer.entity.ResponseData; + +import org.dromara.maxkey.synchronizer.entity.ResponseData; public class WorkWeixinUsersResponse extends ResponseData{ diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java similarity index 96% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java index 4f4af114..60ed5634 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java @@ -15,15 +15,15 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.SynchronizerJob; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.synchronizer.SynchronizerJob; import org.quartz.CronExpression; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java similarity index 91% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java index 8e60a285..33dcbe7e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java @@ -15,21 +15,21 @@ */ -package org.maxkey.synchronizer; +package org.dromara.maxkey.synchronizer; import java.sql.Types; import java.util.HashMap; import java.util.List; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.SynchroRelated; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.service.HistorySynchronizerService; -import org.maxkey.persistence.service.OrganizationsService; -import org.maxkey.persistence.service.SynchroRelatedService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.persistence.service.SocialsAssociatesService; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.service.HistorySynchronizerService; +import org.dromara.maxkey.persistence.service.OrganizationsService; +import org.dromara.maxkey.persistence.service.SocialsAssociatesService; +import org.dromara.maxkey.persistence.service.SynchroRelatedService; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/ISynchronizerService.java similarity index 89% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/ISynchronizerService.java index 8e301968..be54d1eb 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/ISynchronizerService.java @@ -15,9 +15,9 @@ */ -package org.maxkey.synchronizer; +package org.dromara.maxkey.synchronizer; -import org.maxkey.entity.Synchronizers; +import org.dromara.maxkey.entity.Synchronizers; public interface ISynchronizerService { diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java similarity index 94% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java index e66e5ad0..1dfa02df 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java @@ -15,13 +15,13 @@ */ -package org.maxkey.synchronizer; +package org.dromara.maxkey.synchronizer; import java.util.HashMap; -import org.maxkey.entity.Synchronizers; -import org.maxkey.persistence.service.SynchronizersService; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.persistence.service.SynchronizersService; +import org.dromara.maxkey.web.WebContext; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/AccessToken.java similarity index 97% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/AccessToken.java index ea368fc1..d54bb9a0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/AccessToken.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.entity; +package org.dromara.maxkey.synchronizer.entity; public class AccessToken { diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/ResponseData.java similarity index 96% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/ResponseData.java index ed3c2876..105f2887 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/entity/ResponseData.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.entity; +package org.dromara.maxkey.synchronizer.entity; public class ResponseData { diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java rename to maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java index 01975d6d..0b58e27d 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.apis.identity.rest; +package org.dromara.maxkey.web.apis.identity.rest; import java.io.IOException; import org.apache.commons.lang3.StringUtils; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.Message; -import org.maxkey.entity.Organizations; -import org.maxkey.persistence.service.OrganizationsService; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.persistence.service.OrganizationsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java rename to maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java index 635ff0d3..b397bfaa 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web.apis.identity.rest; +package org.dromara.maxkey.web.apis.identity.rest; import java.io.IOException; import org.apache.commons.lang3.StringUtils; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java similarity index 89% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java index e2e1ec1b..4bc0249d 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim; +package org.dromara.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -24,17 +24,17 @@ import java.util.List; import java.util.Set; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.Roles; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.RoleMemberService; -import org.maxkey.persistence.service.RolesService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimGroup; -import org.maxkey.web.apis.identity.scim.resources.ScimMemberRef; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; -import org.maxkey.web.apis.identity.scim.resources.ScimParameters; -import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.RoleMemberService; +import org.dromara.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java index 199bfc29..07d4ac08 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java @@ -15,21 +15,21 @@ */ -package org.maxkey.web.apis.identity.scim; +package org.dromara.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.entity.Organizations; -import org.maxkey.persistence.service.OrganizationsService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; -import org.maxkey.web.apis.identity.scim.resources.ScimOrganization; -import org.maxkey.web.apis.identity.scim.resources.ScimParameters; -import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.persistence.service.OrganizationsService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganization; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java index 38a35b63..172b790c 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim; +package org.dromara.maxkey.web.apis.identity.scim; import com.fasterxml.jackson.annotation.JsonInclude; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java similarity index 87% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java index bb7bcd7c..898a524f 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java @@ -15,31 +15,31 @@ */ -package org.maxkey.web.apis.identity.scim; +package org.dromara.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.entity.Roles; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.RolesService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimEnterprise; -import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; -import org.maxkey.web.apis.identity.scim.resources.ScimGroupRef; -import org.maxkey.web.apis.identity.scim.resources.ScimManager; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; -import org.maxkey.web.apis.identity.scim.resources.ScimParameters; -import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; -import org.maxkey.web.apis.identity.scim.resources.ScimUser; -import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; -import org.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; -import org.maxkey.web.apis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; -import org.maxkey.web.apis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimEnterprise; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroupRef; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimManager; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUser; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java index 1e16a2e7..0037b999 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java index 39f68dbd..4be93757 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java index 0695a5ea..8b531002 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroup.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroup.java index b803f055..bf7aeffa 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroup.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.Set; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java index 6c21f7f8..bd45917d 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; public class ScimGroupRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimManager.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimManager.java index 6d5d568e..c22528d3 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimManager.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; public class ScimManager { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java index c06c488f..5c9b7df2 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; public class ScimMemberRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMeta.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMeta.java index 408bf19c..bb570b93 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMeta.java @@ -15,13 +15,13 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; import java.util.Date; import java.util.Set; -import org.maxkey.json.*; +import org.dromara.maxkey.json.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java index 0cf66599..441b5ed5 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganization.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganization.java index 0b9511d5..7ec1436a 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java index 1bbb536c..b33ffd59 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java index 00dfddd3..da1ef945 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java index 395dbd80..e8a262fa 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimParameters.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimParameters.java index 2d32080f..06f3dc48 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimParameters.java @@ -15,9 +15,9 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; -import org.maxkey.web.apis.identity.scim.ScimServiceProviderConfigController; +import org.dromara.maxkey.web.apis.identity.scim.ScimServiceProviderConfigController; public class ScimParameters { int startIndex = 1; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimResource.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimResource.java index bcc2a1c3..a1c69ef9 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimResource.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; import java.util.Set; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java index f2454b5a..2275c0cf 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.util.ArrayList; import java.util.Collections; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUser.java similarity index 99% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUser.java index 11428402..23626910 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java index 5a570dfc..05fb1c95 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java index 2f3c59ae..71acaac7 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java index ed05f23a..810470e2 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java index cffa5ea2..fee30634 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserIm.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserIm.java index 968c02f5..fcb6c11c 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserIm.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java index b68c0edb..c11e4c58 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java index fe120b80..1cc0e2dc 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java index a4343cba..9b58d11d 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserRole.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserRole.java index 5937d895..5079fa35 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserRole.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java similarity index 93% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java index c0d6f17e..516f377b 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apis.identity.scim.resources; +package org.dromara.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java index d1cb860b..4bd81518 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; public class ScimEnterpriseUserJsonString2ObjectTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index 83bcdfd3..d77d4f0e 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -21,14 +21,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimEnterprise; -import org.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; -import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; -import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; -import org.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimEnterprise; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; public class ScimEnterpriseUserJsonTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java index 2f5b5747..86cb020c 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimGroup; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup; public class ScimGroupJsonString2ObjectTest { public static void main(String[] args) { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java index fbaa2a6f..c192864b 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java @@ -21,11 +21,11 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimGroup; -import org.maxkey.web.apis.identity.scim.resources.ScimMemberRef; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; public class ScimGroupJsonTest { public static void main(String[] args) { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java index dcbac520..4f35a6d6 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimUser; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUser; public class ScimUserJsonString2ObjectTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index 2ceef271..5b43adb7 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -21,13 +21,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.pretty.impl.JsonPretty; -import org.maxkey.util.JsonUtils; -import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; -import org.maxkey.web.apis.identity.scim.resources.ScimMeta; -import org.maxkey.web.apis.identity.scim.resources.ScimUser; -import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; -import org.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; +import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUser; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; public class ScimUserJsonTest { diff --git a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/MaxKeyGatewayApplication.java b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/MaxKeyGatewayApplication.java similarity index 97% rename from maxkey-webs/maxkey-gataway/src/main/java/org/gateway/MaxKeyGatewayApplication.java rename to maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/MaxKeyGatewayApplication.java index d4d874c6..43b0ab5c 100644 --- a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/MaxKeyGatewayApplication.java +++ b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/MaxKeyGatewayApplication.java @@ -15,7 +15,7 @@ */ -package org.gateway; +package org.dromara.maxkey.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/controller/FallbackController.java b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/controller/FallbackController.java similarity index 95% rename from maxkey-webs/maxkey-gataway/src/main/java/org/gateway/controller/FallbackController.java rename to maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/controller/FallbackController.java index f82e5567..6243b435 100644 --- a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/controller/FallbackController.java +++ b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/controller/FallbackController.java @@ -15,7 +15,7 @@ */ -package org.gateway.controller; +package org.dromara.maxkey.gateway.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/filter/AuthAndLogFilter.java b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/filter/AuthAndLogFilter.java similarity index 96% rename from maxkey-webs/maxkey-gataway/src/main/java/org/gateway/filter/AuthAndLogFilter.java rename to maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/filter/AuthAndLogFilter.java index 92832acc..a5a96860 100644 --- a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/filter/AuthAndLogFilter.java +++ b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/filter/AuthAndLogFilter.java @@ -15,7 +15,7 @@ */ -package org.gateway.filter; +package org.dromara.maxkey.gateway.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/route/NacosDynamicRouteService.java b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/route/NacosDynamicRouteService.java similarity index 99% rename from maxkey-webs/maxkey-gataway/src/main/java/org/gateway/route/NacosDynamicRouteService.java rename to maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/route/NacosDynamicRouteService.java index a7e3a19a..6156b2c2 100644 --- a/maxkey-webs/maxkey-gataway/src/main/java/org/gateway/route/NacosDynamicRouteService.java +++ b/maxkey-webs/maxkey-gataway/src/main/java/org/dromara/maxkey/gateway/route/NacosDynamicRouteService.java @@ -140,3 +140,6 @@ public class NacosDynamicRouteService implements ApplicationEventPublisherAware } } */ + + + diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java similarity index 94% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java index c54824ef..4cc0fdfc 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java @@ -15,14 +15,14 @@ */ -package org.maxkey; +package org.dromara.maxkey; import javax.servlet.ServletException; import org.apache.ibatis.io.VFS; import org.apache.mybatis.jpa.SpringBootVFS; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.web.InitializeContext; import org.joda.time.DateTime; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.web.InitializeContext; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java similarity index 86% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java index e5c45a47..f59d56d6 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.io.BufferedReader; import java.io.IOException; @@ -24,24 +24,24 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; -import org.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; -import org.maxkey.authn.support.kerberos.KerberosProxy; -import org.maxkey.authn.support.kerberos.RemoteKerberosService; -import org.maxkey.configuration.EmailConfig; -import org.maxkey.constants.ConstsPersistence; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.MailOtpAuthnService; -import org.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; -import org.maxkey.password.onetimepwd.impl.MailOtpAuthn; -import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.maxkey.password.onetimepwd.token.RedisOtpTokenStore; -import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.LdapContextService; -import org.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.dromara.maxkey.authn.realm.ldap.LdapAuthenticationRealmService; +import org.dromara.maxkey.authn.support.kerberos.KerberosProxy; +import org.dromara.maxkey.authn.support.kerberos.RemoteKerberosService; +import org.dromara.maxkey.configuration.EmailConfig; +import org.dromara.maxkey.constants.ConstsPersistence; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.MailOtpAuthnService; +import org.dromara.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; +import org.dromara.maxkey.password.onetimepwd.impl.MailOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.LdapContextService; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java similarity index 92% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java index 6d6ab4c3..8e213d32 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java @@ -15,20 +15,20 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.List; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.support.basic.BasicEntryPoint; -import org.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; -import org.maxkey.authn.support.kerberos.HttpKerberosEntryPoint; -import org.maxkey.authn.support.kerberos.KerberosService; -import org.maxkey.authn.web.CurrentUserMethodArgumentResolver; -import org.maxkey.authn.web.interceptor.PermissionInterceptor; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.web.interceptor.HistorySignOnAppInterceptor; -import org.maxkey.web.interceptor.SingleSignOnInterceptor; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.support.basic.BasicEntryPoint; +import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; +import org.dromara.maxkey.authn.support.kerberos.HttpKerberosEntryPoint; +import org.dromara.maxkey.authn.support.kerberos.KerberosService; +import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; +import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.web.interceptor.HistorySignOnAppInterceptor; +import org.dromara.maxkey.web.interceptor.SingleSignOnInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/LoginSessionController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java similarity index 89% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/LoginSessionController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java index d3631d27..1417d2d2 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/LoginSessionController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java @@ -15,19 +15,19 @@ */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.access.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/package-info.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/package-info.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/package-info.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/package-info.java index b1cc8266..7cdaa30d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/package-info.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/package-info.java @@ -15,4 +15,4 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.access.contorller; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java similarity index 88% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java index acc96e54..d5404d1a 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java @@ -15,21 +15,21 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.List; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.Message; -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; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.UserApps; +import org.dromara.maxkey.persistence.service.AccountsService; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ChangePasswodController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java similarity index 77% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ChangePasswodController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java index 899043ce..803b2745 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ChangePasswodController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java @@ -15,22 +15,22 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.constants.ConstsPasswordSetType; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.Message; -import org.maxkey.entity.PasswordPolicy; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.PasswordPolicyService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.constants.ConstsPasswordSetType; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.PasswordPolicyService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java similarity index 91% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java index b45b7403..e6e9a3d7 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ForgotPasswordContorller.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java @@ -15,23 +15,23 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.configuration.EmailConfig; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.Message; -import org.maxkey.entity.PasswordPolicy; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.MailOtpAuthnService; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.persistence.service.PasswordPolicyService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.configuration.EmailConfig; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.MailOtpAuthnService; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.persistence.service.PasswordPolicyService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java similarity index 93% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java index baf46424..a55bc142 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java @@ -15,9 +15,9 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java similarity index 89% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java index 27e78eb2..cf4acca2 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.text.ParseException; import java.util.HashMap; @@ -25,23 +25,23 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.support.kerberos.KerberosService; -import org.maxkey.authn.support.rememberme.AbstractRemeberMeManager; -import org.maxkey.authn.support.rememberme.RemeberMe; -import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsLoginType; -import org.maxkey.entity.*; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.persistence.service.SocialsAssociatesService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.support.kerberos.KerberosService; +import org.dromara.maxkey.authn.support.rememberme.AbstractRemeberMeManager; +import org.dromara.maxkey.authn.support.rememberme.RemeberMe; +import org.dromara.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.*; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.persistence.service.SocialsAssociatesService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java similarity index 85% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index b29012e6..6f93ea29 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.Iterator; import java.util.Set; @@ -24,18 +24,18 @@ import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authz.singlelogout.SamlSingleLogout; -import org.maxkey.authz.singlelogout.DefaultSingleLogout; -import org.maxkey.authz.singlelogout.LogoutType; -import org.maxkey.authz.singlelogout.SingleLogout; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authz.singlelogout.DefaultSingleLogout; +import org.dromara.maxkey.authz.singlelogout.LogoutType; +import org.dromara.maxkey.authz.singlelogout.SamlSingleLogout; +import org.dromara.maxkey.authz.singlelogout.SingleLogout; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java similarity index 86% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java index 6e54f77a..a43e8910 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java @@ -15,24 +15,24 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.awt.image.BufferedImage; import java.util.HashMap; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.Base32Utils; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; -import org.maxkey.password.onetimepwd.algorithm.OtpSecret; -import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.RQCodeUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.Base32Utils; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.algorithm.OtpKeyUriFormat; +import org.dromara.maxkey.password.onetimepwd.algorithm.OtpSecret; +import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.RQCodeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java similarity index 89% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java index eee40e67..f714e521 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.FileUploadService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.FileUploadService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegisterController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java similarity index 86% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegisterController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java index f9294402..707804ba 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegisterController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java @@ -15,24 +15,24 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.io.IOException; import java.util.regex.Pattern; import javax.servlet.ServletException; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsStatus; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.sms.SmsOtpAuthnService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsStatus; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.sms.SmsOtpAuthnService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java similarity index 87% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java index fd132a2e..b038f8eb 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java @@ -15,18 +15,18 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsTimeInterval; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsTimeInterval; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java similarity index 85% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java index 075320b0..cc61a055 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.List; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.SocialsAssociate; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.SocialsAssociatesService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.SocialsAssociate; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.SocialsAssociatesService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index 4984f58f..d69fef8b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistoryLoginApps; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginAppsService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistoryLoginApps; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginAppsService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index ad5fa326..e028a715 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/package-info.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/package-info.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java index 9397df43..949332cd 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/package-info.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java @@ -15,4 +15,4 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistorySignOnAppInterceptor.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java similarity index 85% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistorySignOnAppInterceptor.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java index 8a17d82b..0d706259 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistorySignOnAppInterceptor.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java @@ -15,20 +15,20 @@ */ -package org.maxkey.web.interceptor; +package org.dromara.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.web.AuthorizationUtils; -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; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.entity.HistoryLoginApps; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.HistoryLoginAppsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/SingleSignOnInterceptor.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java similarity index 85% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/SingleSignOnInterceptor.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java index dcdd9063..76301593 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/SingleSignOnInterceptor.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java @@ -15,23 +15,23 @@ */ -package org.maxkey.web.interceptor; +package org.dromara.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.SignPrincipal; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.cas.endpoint.ticket.CasConstants; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.crypto.Base64Utils; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.AppsCasDetailsService; -import org.maxkey.persistence.service.AppsService; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.crypto.Base64Utils; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AppsCasDetailsService; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java index 2fc03ed8..4d299485 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java +++ b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java @@ -23,11 +23,11 @@ package org.maxkey.web.authentication.kerberos; import java.util.Date; import java.util.regex.Pattern; +import org.dromara.maxkey.authn.support.kerberos.KerberosToken; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.JsonUtils; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; -import org.maxkey.authn.support.kerberos.KerberosToken; -import org.maxkey.util.DateUtils; -import org.maxkey.util.JsonUtils; /** * @author Crystal.Sea diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java similarity index 95% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java index e3224c99..d4ba09c4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java @@ -15,13 +15,13 @@ */ -package org.maxkey; +package org.dromara.maxkey; import javax.servlet.ServletException; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.web.InitializeContext; import org.joda.time.DateTime; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.web.InitializeContext; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java similarity index 80% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java index 2b4b4855..183a5f28 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java @@ -15,15 +15,15 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.dromara.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java similarity index 83% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java index de292242..d62e2815 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java @@ -15,18 +15,18 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.listener.DynamicRolesListenerAdapter; -import org.maxkey.listener.ListenerAdapter; -import org.maxkey.listener.ListenerParameter; -import org.maxkey.listener.SessionListenerAdapter; -import org.maxkey.persistence.service.ConnectorsService; -import org.maxkey.persistence.service.RolesService; -import org.maxkey.provision.thread.ProvisioningRunner; -import org.maxkey.provision.thread.ProvisioningRunnerThread; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.listener.DynamicRolesListenerAdapter; +import org.dromara.maxkey.listener.ListenerAdapter; +import org.dromara.maxkey.listener.ListenerParameter; +import org.dromara.maxkey.listener.SessionListenerAdapter; +import org.dromara.maxkey.persistence.service.ConnectorsService; +import org.dromara.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.provision.thread.ProvisioningRunner; +import org.dromara.maxkey.provision.thread.ProvisioningRunnerThread; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.slf4j.Logger; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java similarity index 93% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java index ed79133a..408a7a54 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java @@ -15,14 +15,14 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.List; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.web.CurrentUserMethodArgumentResolver; -import org.maxkey.authn.web.interceptor.PermissionInterceptor; -import org.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; +import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; +import org.dromara.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java index fb1ccaf9..66238a93 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java @@ -15,17 +15,17 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import javax.sql.DataSource; -import org.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; -import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; -import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; +import org.dromara.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/DynamicRolesListenerAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java similarity index 95% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/DynamicRolesListenerAdapter.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java index f6c9aee0..8460320e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/DynamicRolesListenerAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java @@ -15,11 +15,11 @@ */ -package org.maxkey.listener; +package org.dromara.maxkey.listener; import java.io.Serializable; -import org.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.persistence.service.RolesService; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java similarity index 98% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerAdapter.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java index b0abe990..1ed091ab 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.listener; +package org.dromara.maxkey.listener; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerParameter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java similarity index 96% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerParameter.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java index 9f5061cd..fe82ec2d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/ListenerParameter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.listener; +package org.dromara.maxkey.listener; import org.quartz.JobDataMap; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/SessionListenerAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/SessionListenerAdapter.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/SessionListenerAdapter.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/SessionListenerAdapter.java index ec50fb39..5ab80ecf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/listener/SessionListenerAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/SessionListenerAdapter.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.maxkey.listener; +package org.dromara.maxkey.listener; import java.io.Serializable; import java.util.Date; -import org.maxkey.authn.session.Session; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.session.Session; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.util.DateUtils; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java index 233040f7..aa57f942 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java @@ -15,20 +15,20 @@ */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.access.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.RoleMember; -import org.maxkey.entity.Roles; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.RoleMemberService; -import org.maxkey.persistence.service.RolesService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.RoleMember; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.RoleMemberService; +import org.dromara.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolePermissionsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolePermissionsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java index 6a14b731..4d4752dc 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolePermissionsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.access.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.RolePermissions; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.RolePermissionssService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.RolePermissions; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.RolePermissionssService; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java similarity index 89% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolesController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java index 7c7bb6f9..ffed4aab 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java @@ -15,19 +15,19 @@ */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.access.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.entity.Roles; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.RolesService; -import org.maxkey.util.StringUtils; -import org.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Roles; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.RolesService; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/SessionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/SessionController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java index 9d6747c0..8457a2da 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/SessionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java @@ -15,20 +15,20 @@ */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.access.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginService; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java similarity index 95% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java index cd1f5daa..19792fd0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java index d4e7caca..c93e212d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java @@ -18,14 +18,14 @@ /** * */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.apps.Apps; -import org.maxkey.persistence.service.AppsService; -import org.maxkey.persistence.service.FileUploadService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.FileUploadService; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java index 1db7861b..a79bfd47 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsCasDetails; -import org.maxkey.persistence.service.AppsCasDetailsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.maxkey.persistence.service.AppsCasDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java index 3aa44329..eb20a1e1 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.AppsExtendApiDetails; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.AppsExtendApiDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java index 4318b2a2..1b72eba5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsFormBasedDetails; -import org.maxkey.persistence.service.AppsFormBasedDetailsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java index 8aca5c17..25a4edbd 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/JwtDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsJwtDetails; -import org.maxkey.persistence.service.AppsJwtDetailsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.maxkey.persistence.service.AppsJwtDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java similarity index 89% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java index 68dfc0a9..e61be563 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java @@ -15,19 +15,19 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authz.oauth2.common.OAuth2Constants; -import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.Apps; -import org.maxkey.entity.apps.AppsOAuth20Details; -import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.maxkey.entity.apps.AppsOAuth20Details; +import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java index 5c916545..98dfe1d9 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -28,18 +28,18 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.crypto.cert.X509CertUtils; -import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsSAML20Details; -import org.maxkey.persistence.service.AppsSaml20DetailsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authz.saml20.metadata.MetadataDescriptorUtil; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.crypto.cert.X509CertUtils; +import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; +import org.dromara.maxkey.crypto.keystore.KeyStoreUtil; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.metadata.EntityDescriptor; import org.opensaml.saml2.metadata.SPSSODescriptor; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java index 1b06f31e..d4ece8c2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web.apps.contorller; +package org.dromara.maxkey.web.apps.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsJwtDetails; -import org.maxkey.entity.apps.AppsTokenBasedDetails; -import org.maxkey.persistence.service.AppsTokenBasedDetailsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsProtocols; +import org.dromara.maxkey.crypto.ReciprocalUtils; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.maxkey.persistence.service.AppsTokenBasedDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AccountsStrategyController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java index cf8dd897..b21cd8b0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.AccountsService; -import org.maxkey.persistence.service.AccountsStrategyService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.AccountsService; +import org.dromara.maxkey.persistence.service.AccountsStrategyService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AdaptersController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java index f2f2e8cb..d0acf0d8 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.apps.AppsAdapters; -import org.maxkey.persistence.service.AppsAdaptersService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.apps.AppsAdapters; +import org.dromara.maxkey.persistence.service.AppsAdaptersService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/ConnectorsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java similarity index 91% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/ConnectorsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java index 3a02a1ef..29478774 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/ConnectorsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java @@ -15,16 +15,16 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Connectors; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.ConnectorsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Connectors; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.ConnectorsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/EmailSendersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/EmailSendersController.java similarity index 88% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/EmailSendersController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/EmailSendersController.java index 1fe0263a..02e3d626 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/EmailSendersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/EmailSendersController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.EmailSenders; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.EmailSendersService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.EmailSenders; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.EmailSendersService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/InstitutionsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/InstitutionsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java index ba62a0ae..eb91eaba 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/InstitutionsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java @@ -15,13 +15,13 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.InstitutionsService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.InstitutionsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LdapContextController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LdapContextController.java similarity index 89% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LdapContextController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LdapContextController.java index b1230b45..8904e4f2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LdapContextController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LdapContextController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.LdapContext; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.maxkey.persistence.ldap.LdapUtils; -import org.maxkey.persistence.service.LdapContextService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.LdapContext; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.persistence.ldap.LdapUtils; +import org.dromara.maxkey.persistence.service.LdapContextService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LocalizationController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java similarity index 89% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LocalizationController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java index 89bff89a..b20962fc 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/LocalizationController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Localization; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.UserInfoAdjoint; -import org.maxkey.persistence.repository.LocalizationRepository; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Localization; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.UserInfoAdjoint; +import org.dromara.maxkey.persistence.repository.LocalizationRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/PasswordPolicyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/PasswordPolicyController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java index 00fb6574..98e0a86c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/PasswordPolicyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import javax.validation.Valid; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.PasswordPolicy; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.PasswordPolicyService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.PasswordPolicyService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SmsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SmsProviderController.java similarity index 88% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SmsProviderController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SmsProviderController.java index 3e6a07ea..19ac6dd3 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SmsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SmsProviderController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Message; -import org.maxkey.entity.SmsProvider; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.SmsProviderService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.SmsProvider; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.SmsProviderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java similarity index 92% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SocialsProviderController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java index 8a0dcc3d..2b45fcb4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java @@ -15,15 +15,15 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Message; -import org.maxkey.entity.SocialsProvider; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.SocialsProviderService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.SocialsProviderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SynchronizersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java similarity index 88% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SynchronizersController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java index 6a8f86f3..5319d32b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/config/contorller/SynchronizersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java @@ -15,20 +15,20 @@ */ -package org.maxkey.web.config.contorller; +package org.dromara.maxkey.web.config.contorller; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Message; -import org.maxkey.entity.Synchronizers; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.SynchronizersService; -import org.maxkey.synchronizer.ISynchronizerService; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.SynchronizersService; +import org.dromara.maxkey.synchronizer.ISynchronizerService; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/package-info.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/package-info.java similarity index 92% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/package-info.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/package-info.java index 576357e2..f14a0e6d 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/access/contorller/package-info.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/package-info.java @@ -15,4 +15,4 @@ */ -package org.maxkey.web.access.contorller; +package org.dromara.maxkey.web.config.contorller; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java similarity index 88% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java index 55c22b70..80ba72f4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java @@ -15,23 +15,23 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.entity.Accounts; -import org.maxkey.entity.AccountsStrategy; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.AccountsService; -import org.maxkey.persistence.service.AccountsStrategyService; -import org.maxkey.persistence.service.AppsService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.entity.Accounts; +import org.dromara.maxkey.entity.AccountsStrategy; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.AccountsService; +import org.dromara.maxkey.persistence.service.AccountsStrategyService; +import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/DashboardController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/DashboardController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java index 976e641c..6a3f433c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/DashboardController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.HashMap; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.ReportService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.ReportService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java similarity index 93% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java index baf46424..a55bc142 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/IndexEndpoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java @@ -15,9 +15,9 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java similarity index 86% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java index e52e8d23..bc4c3e93 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java @@ -15,19 +15,19 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.util.HashMap; -import org.maxkey.authn.LoginCredential; -import org.maxkey.authn.jwt.AuthJwt; -import org.maxkey.authn.jwt.AuthTokenService; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.entity.Institutions; -import org.maxkey.entity.Message; -import org.maxkey.web.WebConstants; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.LoginCredential; +import org.dromara.maxkey.authn.jwt.AuthJwt; +import org.dromara.maxkey.authn.jwt.AuthTokenService; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.entity.Institutions; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index e3e77b06..1f7cd8c0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.authn.session.SessionManager; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.authn.session.SessionManager; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java similarity index 93% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java index 683ff48f..f0d3824e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.io.IOException; import java.util.ArrayList; @@ -28,19 +28,19 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.entity.ExcelImport; -import org.maxkey.entity.Message; -import org.maxkey.entity.Organizations; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.OrganizationsService; -import org.maxkey.util.ExcelUtils; -import org.maxkey.web.component.TreeAttributes; -import org.maxkey.web.component.TreeNode; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.entity.ExcelImport; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Organizations; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.OrganizationsService; +import org.dromara.maxkey.util.ExcelUtils; +import org.dromara.maxkey.web.component.TreeAttributes; +import org.dromara.maxkey.web.component.TreeNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java similarity index 94% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java index 5e671780..894279ee 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java @@ -15,14 +15,14 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.entity.UserInfoAdjoint; -import org.maxkey.persistence.service.UserInfoAdjointService; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.entity.UserInfoAdjoint; +import org.dromara.maxkey.persistence.service.UserInfoAdjointService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java similarity index 94% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java index 8760ae6c..b086a4c7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.contorller; +package org.dromara.maxkey.web.contorller; import java.beans.PropertyEditorSupport; import java.io.IOException; @@ -33,23 +33,23 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.constants.ConstsPasswordSetType; -import org.maxkey.entity.ChangePassword; -import org.maxkey.entity.ExcelImport; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.FileUploadService; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.util.DateUtils; -import org.maxkey.util.ExcelUtils; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringUtils; -import org.maxkey.web.WebContext; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.constants.ConstsPasswordSetType; +import org.dromara.maxkey.entity.ChangePassword; +import org.dromara.maxkey.entity.ExcelImport; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.FileUploadService; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.util.DateUtils; +import org.dromara.maxkey.util.ExcelUtils; +import org.dromara.maxkey.util.JsonUtils; +import org.dromara.maxkey.util.StringUtils; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/ConnectorHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/ConnectorHistoryController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java index 5e4ae2dc..6f1fc0c5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/ConnectorHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistoryConnector; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryConnectorService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistoryConnector; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryConnectorService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index b8d8d925..617d079c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistoryLoginApps; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginAppsService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistoryLoginApps; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginAppsService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index 459a4c92..f62c54fa 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistoryLogin; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistoryLoginService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistoryLoginService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SynchronizerHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SynchronizerHistoryController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java index 833ae5f0..94d30f50 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SynchronizerHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistorySynchronizer; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistorySynchronizerService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySynchronizerService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SystemLogsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java similarity index 87% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SystemLogsController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java index 70e0296a..752a3b4f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/SystemLogsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java @@ -15,17 +15,17 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.HistorySystemLogs; -import org.maxkey.entity.Message; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.util.DateUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.HistorySystemLogs; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/package-info.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java similarity index 92% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/package-info.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java index 9397df43..949332cd 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/package-info.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java @@ -15,4 +15,4 @@ */ -package org.maxkey.web.historys.contorller; +package org.dromara.maxkey.web.historys.contorller; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java similarity index 90% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/ResourcesController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index bbb7c724..bc36462e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java @@ -15,22 +15,22 @@ */ -package org.maxkey.web.permissions.contorller; +package org.dromara.maxkey.web.permissions.contorller; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.constants.ConstsEntryType; -import org.maxkey.constants.ConstsOperateAction; -import org.maxkey.constants.ConstsOperateResult; -import org.maxkey.entity.Message; -import org.maxkey.entity.Resources; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.ResourcesService; -import org.maxkey.web.component.TreeAttributes; -import org.maxkey.web.component.TreeNode; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.constants.ConstsEntryType; +import org.dromara.maxkey.constants.ConstsOperateAction; +import org.dromara.maxkey.constants.ConstsOperateResult; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.Resources; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.ResourcesService; +import org.dromara.maxkey.web.component.TreeAttributes; +import org.dromara.maxkey.web.component.TreeNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RolePrivilegesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/RolePrivilegesController.java similarity index 91% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RolePrivilegesController.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/RolePrivilegesController.java index 6ad5d423..4494378d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/RolePrivilegesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/RolePrivilegesController.java @@ -1,4 +1,4 @@ -package org.maxkey.web.permissions.contorller; +package org.dromara.maxkey.web.permissions.contorller; /* * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] * @@ -19,13 +19,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.maxkey.authn.annotation.CurrentUser; -import org.maxkey.entity.Message; -import org.maxkey.entity.RolePrivileges; -import org.maxkey.entity.UserInfo; -import org.maxkey.persistence.service.HistorySystemLogsService; -import org.maxkey.persistence.service.RolePrivilegesService; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.annotation.CurrentUser; +import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.RolePrivileges; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.persistence.service.HistorySystemLogsService; +import org.dromara.maxkey.persistence.service.RolePrivilegesService; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/MaxKeyOpenApiApplication.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java similarity index 95% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/MaxKeyOpenApiApplication.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java index 2373c38c..a20ee3d2 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/MaxKeyOpenApiApplication.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java @@ -15,13 +15,13 @@ */ -package org.maxkey; +package org.dromara.maxkey; import javax.servlet.ServletException; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.web.InitializeContext; import org.joda.time.DateTime; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.web.InitializeContext; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiConfig.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java similarity index 81% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiConfig.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java index 80a5cfaa..2f99f28d 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiConfig.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java @@ -15,15 +15,15 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.maxkey.persistence.repository.LoginHistoryRepository; -import org.maxkey.persistence.repository.LoginRepository; -import org.maxkey.persistence.repository.PasswordPolicyValidator; -import org.maxkey.persistence.service.UserInfoService; -import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.dromara.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; +import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; +import org.dromara.maxkey.persistence.repository.LoginRepository; +import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java similarity index 93% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java index 8e83d371..8d19a52d 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java @@ -15,15 +15,15 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import java.util.List; -import org.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.maxkey.authn.web.CurrentUserMethodArgumentResolver; -import org.maxkey.authn.web.interceptor.PermissionInterceptor; -import org.maxkey.configuration.ApplicationConfig; -import org.maxkey.web.interceptor.RestApiPermissionAdapter; +import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; +import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; +import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; +import org.dromara.maxkey.configuration.ApplicationConfig; +import org.dromara.maxkey.web.interceptor.RestApiPermissionAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java similarity index 87% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java index 4a039a1a..9804c391 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java @@ -15,17 +15,17 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import javax.sql.DataSource; -import org.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; -import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.authz.oauth2.provider.token.TokenStore; -import org.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; -import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; -import org.maxkey.persistence.redis.RedisConnectionFactory; +import org.dromara.maxkey.authz.oauth2.provider.client.ClientDetailsUserDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.authz.oauth2.provider.token.TokenStore; +import org.dromara.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; +import org.dromara.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; +import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/api/endpoint/RestTimeBasedOtpController.java similarity index 90% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/api/endpoint/RestTimeBasedOtpController.java index 287e613e..7c0e549f 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/api/endpoint/RestTimeBasedOtpController.java @@ -15,11 +15,11 @@ */ -package org.maxkey.web.api.endpoint; +package org.dromara.maxkey.web.api.endpoint; -import org.maxkey.entity.UserInfo; -import org.maxkey.password.onetimepwd.AbstractOtpAuthn; -import org.maxkey.persistence.service.UserInfoService; +import org.dromara.maxkey.entity.UserInfo; +import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; +import org.dromara.maxkey.persistence.service.UserInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java similarity index 89% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java index 68a81962..abc762cd 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java @@ -15,7 +15,7 @@ */ -package org.maxkey.web.interceptor; +package org.dromara.maxkey.web.interceptor; import java.util.concurrent.ConcurrentHashMap; @@ -23,10 +23,10 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.util.RequestTokenUtils; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.crypto.password.PasswordReciprocal; +import org.dromara.maxkey.util.RequestTokenUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java similarity index 91% rename from maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java rename to maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java index e4d556ce..03e98967 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -15,19 +15,19 @@ */ -package org.maxkey.web.interceptor; +package org.dromara.maxkey.web.interceptor; import java.util.concurrent.ConcurrentHashMap; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.web.AuthorizationUtils; -import org.maxkey.authz.oauth2.provider.OAuth2Authentication; -import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.util.AuthorizationHeader; -import org.maxkey.util.AuthorizationHeaderUtils; -import org.maxkey.util.StringUtils; +import org.dromara.maxkey.authn.web.AuthorizationUtils; +import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; +import org.dromara.maxkey.util.AuthorizationHeader; +import org.dromara.maxkey.util.AuthorizationHeaderUtils; +import org.dromara.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired;