Bladeren bron

cas 目录优化

shimingxy 4 dagen geleden
bovenliggende
commit
ff8e68cf74
62 gewijzigde bestanden met toevoegingen van 125 en 120 verwijderingen
  1. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/CasDefaultAdapter.java
  2. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/CasPlainAdapter.java
  3. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/package-info.java
  4. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java
  5. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java
  6. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java
  7. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
  8. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1UsersEndpoint.java
  9. 5 4
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas10AuthorizeEndpoint.java
  10. 7 6
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas20AuthorizeEndpoint.java
  11. 8 7
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas20ProxyAuthorizeEndpoint.java
  12. 7 6
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas30AuthorizeEndpoint.java
  13. 8 7
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas30ProxyAuthorizeEndpoint.java
  14. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/CasServiceResponse.java
  15. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/ProxyServiceResponseBuilder.java
  16. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/Service10ResponseBuilder.java
  17. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/ServiceResponseBuilder.java
  18. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/package-info.java
  19. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractTicket.java
  20. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractTicketException.java
  21. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractWebApplicationService.java
  22. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/CasConstants.java
  23. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ExpirationPolicy.java
  24. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyGrantingTicketIOUImpl.java
  25. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyGrantingTicketImpl.java
  26. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyTicketImpl.java
  27. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/RandomServiceTicketServices.java
  28. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/Service.java
  29. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ServiceTicket.java
  30. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ServiceTicketImpl.java
  31. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/SimpleWebApplicationServiceImpl.java
  32. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/Ticket.java
  33. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketGrantingTicket.java
  34. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketGrantingTicketImpl.java
  35. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketServices.java
  36. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketState.java
  37. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/WebApplicationService.java
  38. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultLongNumericGenerator.java
  39. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultRandomStringGenerator.java
  40. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultUniqueTicketIdGenerator.java
  41. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java
  42. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/InetAddressUtils.java
  43. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/LongNumericGenerator.java
  44. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/NumericGenerator.java
  45. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/RandomStringGenerator.java
  46. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/UniqueTicketIdGenerator.java
  47. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/package-info.java
  48. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/package-info.java
  49. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/InMemoryProxyGrantingTicketServices.java
  50. 4 4
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/ProxyGrantingTicket.java
  51. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/ProxyTicket.java
  52. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/RedisProxyGrantingTicketServices.java
  53. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/InMemoryTicketServices.java
  54. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/RedisTicketServices.java
  55. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/package-info.java
  56. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/tgt/InMemoryTicketGrantingTicketServices.java
  57. 3 3
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/tgt/RedisTicketGrantingTicketServices.java
  58. 7 7
      maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/autoconfigure/CasAutoConfiguration.java
  59. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java
  60. 1 1
      maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java
  61. 2 2
      maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java
  62. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/CasDefaultAdapter.java

@@ -15,12 +15,12 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.adapter;
+package org.dromara.maxkey.authz.cas.adapter;
 
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.codec.binary.Base64;
-import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.dromara.maxkey.web.WebConstants;

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/CasPlainAdapter.java

@@ -15,9 +15,9 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.adapter;
+package org.dromara.maxkey.authz.cas.adapter;
 
-import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.dromara.maxkey.web.WebConstants;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/package-info.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/adapter/package-info.java

@@ -22,4 +22,4 @@
  * @author Crystal.Sea
  *
  */
-package org.dromara.maxkey.authz.cas.endpoint.adapter;
+package org.dromara.maxkey.authz.cas.adapter;

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java

@@ -26,8 +26,8 @@ import java.util.Map.Entry;
 
 import org.dromara.maxkey.authn.session.VisitedDto;
 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.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ServiceTicketImpl;
 import org.dromara.maxkey.authz.singlelogout.LogoutType;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.dromara.maxkey.web.WebConstants;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.authz.cas.endpoint;
 
 import org.dromara.maxkey.authn.session.SessionManager;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices;
+import org.dromara.maxkey.authz.cas.ticket.TicketServices;
 import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint;
 import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.http.HttpResponseAdapter;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java

@@ -22,7 +22,7 @@ package org.dromara.maxkey.authz.cas.endpoint;
 
 
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
 import org.dromara.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java

@@ -25,9 +25,9 @@ import org.apache.commons.lang3.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.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.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ServiceTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.TicketGrantingTicketImpl;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1UsersEndpoint.java

@@ -24,9 +24,9 @@ package org.dromara.maxkey.authz.cas.endpoint;
 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.TicketGrantingTicketImpl;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.TicketGrantingTicketImpl;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.http.HttpResponseConstants;
 import org.slf4j.Logger;

+ 5 - 4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas10AuthorizeEndpoint.java

@@ -18,13 +18,14 @@
 /**
  * 
  */
-package org.dromara.maxkey.authz.cas.endpoint;
+package org.dromara.maxkey.authz.cas.endpoint.validate;
 
 
 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.dromara.maxkey.authz.cas.endpoint.CasBaseAuthorizeEndpoint;
+import org.dromara.maxkey.authz.cas.response.Service10ResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 7 - 6
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas20AuthorizeEndpoint.java

@@ -18,18 +18,19 @@
 /**
  * 
  */
-package org.dromara.maxkey.authz.cas.endpoint;
+package org.dromara.maxkey.authz.cas.endpoint.validate;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.maxkey.authn.SignPrincipal;
-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.Ticket;
+import org.dromara.maxkey.authz.cas.endpoint.CasBaseAuthorizeEndpoint;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketIOUImpl;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.constants.ConstsBoolean;
 import org.dromara.maxkey.http.HttpResponseConstants;

+ 8 - 7
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20ProxyAuthorizeEndpoint.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas20ProxyAuthorizeEndpoint.java

@@ -18,18 +18,19 @@
 /**
  * 
  */
-package org.dromara.maxkey.authz.cas.endpoint;
+package org.dromara.maxkey.authz.cas.endpoint.validate;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.commons.beanutils.BeanUtils;
 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.ProxyGrantingTicketImpl;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.endpoint.CasBaseAuthorizeEndpoint;
+import org.dromara.maxkey.authz.cas.response.ProxyServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.ProxyTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.constants.ConstsBoolean;
 import org.dromara.maxkey.http.HttpResponseConstants;

+ 7 - 6
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas30AuthorizeEndpoint.java

@@ -18,18 +18,19 @@
 /**
  * 
  */
-package org.dromara.maxkey.authz.cas.endpoint;
+package org.dromara.maxkey.authz.cas.endpoint.validate;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.maxkey.authn.SignPrincipal;
-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.Ticket;
+import org.dromara.maxkey.authz.cas.endpoint.CasBaseAuthorizeEndpoint;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketIOUImpl;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.constants.ConstsBoolean;
 import org.dromara.maxkey.http.HttpResponseConstants;

+ 8 - 7
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30ProxyAuthorizeEndpoint.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/validate/Cas30ProxyAuthorizeEndpoint.java

@@ -18,18 +18,19 @@
 /**
  * 
  */
-package org.dromara.maxkey.authz.cas.endpoint;
+package org.dromara.maxkey.authz.cas.endpoint.validate;
 
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.commons.beanutils.BeanUtils;
 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.ProxyGrantingTicketImpl;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.ProxyTicketImpl;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.endpoint.CasBaseAuthorizeEndpoint;
+import org.dromara.maxkey.authz.cas.response.ProxyServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.ticket.CasConstants;
+import org.dromara.maxkey.authz.cas.ticket.ProxyGrantingTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.ProxyTicketImpl;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.constants.ConstsBoolean;
 import org.dromara.maxkey.http.HttpResponseConstants;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/CasServiceResponse.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.response;
+package org.dromara.maxkey.authz.cas.response;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/ProxyServiceResponseBuilder.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.response;
+package org.dromara.maxkey.authz.cas.response;
 
 import org.dromara.maxkey.http.HttpResponseConstants;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/Service10ResponseBuilder.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/Service10ResponseBuilder.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.response;
+package org.dromara.maxkey.authz.cas.response;
 
 public class Service10ResponseBuilder extends CasServiceResponse {
     

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/ServiceResponseBuilder.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.response;
+package org.dromara.maxkey.authz.cas.response;
 
 import java.util.ArrayList;
 import java.util.Iterator;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/package-info.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/response/package-info.java

@@ -22,4 +22,4 @@
  * @author Crystal.sea
  *
  */
-package org.dromara.maxkey.authz.cas.endpoint.response;
+package org.dromara.maxkey.authz.cas.response;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractTicket.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicketException.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractTicketException.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 
 /**

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/AbstractWebApplicationService.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import java.util.Collections;
 import java.util.HashMap;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/CasConstants.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 
 public class CasConstants {

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ExpirationPolicy.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ExpirationPolicy.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketIOUImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyGrantingTicketIOUImpl.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.springframework.security.core.Authentication;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyGrantingTicketImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyGrantingTicketImpl.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.springframework.security.core.Authentication;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ProxyTicketImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ProxyTicketImpl.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.springframework.security.core.Authentication;

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/RandomServiceTicketServices.java

@@ -15,9 +15,9 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator;
+import org.dromara.maxkey.authz.cas.ticket.generator.DefaultUniqueTicketIdGenerator;
 
 
 public abstract class RandomServiceTicketServices implements TicketServices {

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Service.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/Service.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 /**
  * Marker interface for Services. Services are generally either remote

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ServiceTicket.java

@@ -15,9 +15,9 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket;
+import org.dromara.maxkey.authz.cas.ticket.pgt.ProxyGrantingTicket;
 import org.springframework.security.core.Authentication;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/ServiceTicketImpl.java

@@ -15,10 +15,10 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket;
+import org.dromara.maxkey.authz.cas.ticket.pgt.ProxyGrantingTicket;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.springframework.security.core.Authentication;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/SimpleWebApplicationServiceImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/SimpleWebApplicationServiceImpl.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 /**
  * Represents a service which wishes to use the CAS protocol.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/Ticket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/Ticket.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import java.io.Serializable;
 import java.time.ZonedDateTime;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketGrantingTicket.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketGrantingTicketImpl.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketServices.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 public interface TicketServices {
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketState.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/TicketState.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 import java.time.ZonedDateTime;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/WebApplicationService.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/WebApplicationService.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;
 
 /**
  * Represents a service using CAS that comes from the web.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultLongNumericGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultLongNumericGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 import java.util.concurrent.atomic.AtomicLong;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultRandomStringGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultRandomStringGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 import java.security.SecureRandom;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/DefaultUniqueTicketIdGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/DefaultUniqueTicketIdGenerator.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/HostNameBasedUniqueTicketIdGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/InetAddressUtils.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/InetAddressUtils.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 import java.net.InetAddress;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/LongNumericGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/LongNumericGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 /**
  * Interface to guaranteed to return a long.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/NumericGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/NumericGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 /**
  * Interface to return a new sequential number for each call.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/RandomStringGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/RandomStringGenerator.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 /**
  * Interface to return a random String.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/UniqueTicketIdGenerator.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/UniqueTicketIdGenerator.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.generator;
 
 /**
  * Interface that enables for pluggable unique ticket Ids strategies.

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/package-info.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/generator/package-info.java

@@ -22,4 +22,4 @@
  * @author Administrator
  *
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket.st;
+package org.dromara.maxkey.authz.cas.ticket.generator;

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/package-info.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/package-info.java

@@ -22,4 +22,4 @@
  * @author Administrator
  *
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket;
+package org.dromara.maxkey.authz.cas.ticket;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/InMemoryProxyGrantingTicketServices.java

@@ -15,12 +15,12 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt;
+package org.dromara.maxkey.authz.cas.ticket.pgt;
 
 import java.util.concurrent.TimeUnit;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;

+ 4 - 4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyGrantingTicket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/ProxyGrantingTicket.java

@@ -15,11 +15,11 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt;
+package org.dromara.maxkey.authz.cas.ticket.pgt;
 
-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 org.dromara.maxkey.authz.cas.ticket.ExpirationPolicy;
+import org.dromara.maxkey.authz.cas.ticket.Service;
+import org.dromara.maxkey.authz.cas.ticket.TicketGrantingTicket;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/ProxyTicket.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/ProxyTicket.java

@@ -15,9 +15,9 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt;
+package org.dromara.maxkey.authz.cas.ticket.pgt;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.ServiceTicket;
+import org.dromara.maxkey.authz.cas.ticket.ServiceTicket;
 
 /**
  * The {@link ProxyTicket} represents a CAS proxy ticket. A proxy ticket is an opaque string that a

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/RedisProxyGrantingTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/pgt/RedisProxyGrantingTicketServices.java

@@ -15,10 +15,10 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.pgt;
+package org.dromara.maxkey.authz.cas.ticket.pgt;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.persistence.redis.RedisConnection;
 import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
 

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/InMemoryTicketServices.java

@@ -15,12 +15,12 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.st;
+package org.dromara.maxkey.authz.cas.ticket.st;
 
 import java.util.concurrent.TimeUnit;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/RedisTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/RedisTicketServices.java

@@ -15,10 +15,10 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.st;
+package org.dromara.maxkey.authz.cas.ticket.st;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.persistence.redis.RedisConnection;
 import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
 

+ 1 - 1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/generator/package-info.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/st/package-info.java

@@ -22,4 +22,4 @@
  * @author Administrator
  *
  */
-package org.dromara.maxkey.authz.cas.endpoint.ticket.generator;
+package org.dromara.maxkey.authz.cas.ticket.st;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/tgt/InMemoryTicketGrantingTicketServices.java

@@ -15,12 +15,12 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.tgt;
+package org.dromara.maxkey.authz.cas.ticket.tgt;
 
 import java.util.concurrent.TimeUnit;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;

+ 3 - 3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/RedisTicketGrantingTicketServices.java → maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/ticket/tgt/RedisTicketGrantingTicketServices.java

@@ -15,10 +15,10 @@
  */
  
 
-package org.dromara.maxkey.authz.cas.endpoint.ticket.tgt;
+package org.dromara.maxkey.authz.cas.ticket.tgt;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.RandomServiceTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.Ticket;
+import org.dromara.maxkey.authz.cas.ticket.RandomServiceTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.Ticket;
 import org.dromara.maxkey.persistence.redis.RedisConnection;
 import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
 

+ 7 - 7
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/autoconfigure/CasAutoConfiguration.java

@@ -17,13 +17,13 @@
 
 package org.dromara.maxkey.autoconfigure;
 
-import org.dromara.maxkey.authz.cas.endpoint.ticket.TicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.InMemoryProxyGrantingTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.RedisProxyGrantingTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.st.InMemoryTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.st.RedisTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.tgt.InMemoryTicketGrantingTicketServices;
-import org.dromara.maxkey.authz.cas.endpoint.ticket.tgt.RedisTicketGrantingTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.TicketServices;
+import org.dromara.maxkey.authz.cas.ticket.pgt.InMemoryProxyGrantingTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.pgt.RedisProxyGrantingTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.st.InMemoryTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.st.RedisTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.tgt.InMemoryTicketGrantingTicketServices;
+import org.dromara.maxkey.authz.cas.ticket.tgt.RedisTicketGrantingTicketServices;
 import org.dromara.maxkey.constants.ConstsPersistence;
 import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
 import org.slf4j.Logger;

+ 1 - 1
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.dromara.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator;
+import org.dromara.maxkey.authz.cas.ticket.generator.DefaultUniqueTicketIdGenerator;
 
 public class DefaultUniqueTicketIdGeneratorTest {
 

+ 1 - 1
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.dromara.maxkey.authz.cas.endpoint.ticket.generator.InetAddressUtils;
+import org.dromara.maxkey.authz.cas.ticket.generator.InetAddressUtils;
 
 public class InetAddressUtilsTest {
 

+ 2 - 2
maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java

@@ -17,8 +17,8 @@
 
 package org.maxkey.web.authorize.endpoint.response;
 
-import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder;
-import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ProxyServiceResponseBuilder;
+import org.dromara.maxkey.authz.cas.response.ServiceResponseBuilder;
 import org.dromara.maxkey.pretty.impl.JsonPretty;
 import org.dromara.maxkey.pretty.impl.XmlPretty;
 

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java

@@ -21,7 +21,7 @@ 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.cas.ticket.CasConstants;
 import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants;
 import org.dromara.maxkey.configuration.ApplicationConfig;
 import org.dromara.maxkey.crypto.Base64Utils;