cas Response & druid & org.dromara.maxkey.http

build.gradle

@@ -341,7 +341,7 @@ subprojects {
         //implementation group: 'com.highgo', name: 'HgdbJdbc', version: '6.2.3'
         //implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.3.5'
         implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
-        implementation group: 'com.alibaba', name: 'druid-spring-boot-starter', version: "${druidspringbootstarterVersion}"
+        implementation group: 'com.alibaba', name: 'druid-spring-boot-3-starter', version: "${druidspringbootstarterVersion}"
         implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
         implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: "${caffeineVersion}"
         //mybatis

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java

@@ -26,7 +26,7 @@ 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.idm.UserInfo;
-import org.dromara.maxkey.util.AuthorizationHeaderUtils;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 import org.dromara.maxkey.web.WebConstants;
 import org.dromara.maxkey.web.WebContext;
 import org.slf4j.Logger;

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java

@@ -21,8 +21,8 @@ package org.dromara.maxkey.authn.support.basic;
 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.dromara.maxkey.http.AuthorizationHeader;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.maxkey.util;
+package org.dromara.maxkey.http;
 
 public class AuthorizationHeader {
 

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeaderUtils.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.util;
+package org.dromara.maxkey.http;
 
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.maxkey.crypto.Base64Utils;

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpEncoder.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.util;
+package org.dromara.maxkey.http;
 
 import java.io.*;
 import java.net.*;

maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpRequestAdapter.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web;
+package org.dromara.maxkey.http;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -43,7 +43,6 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 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;

maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseAdapter.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web;
+package org.dromara.maxkey.http;
 
 import java.io.IOException;
 import org.dromara.maxkey.constants.ContentType;

maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseConstants.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web;
+package org.dromara.maxkey.http;
 
 public class HttpResponseConstants {
     

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java → maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpsTrusts.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.util;
+package org.dromara.maxkey.http;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java

@@ -19,6 +19,7 @@ package org.dromara.maxkey.util;
 
 
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 
 import jakarta.servlet.http.HttpServletRequest;
 

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java

@@ -491,7 +491,7 @@ public final class StrUtils {
     public static ArrayList<String> sqlInjection = null;
     
     static{
-        sqlInjection = new ArrayList<String>();
+        sqlInjection = new ArrayList<>();
         sqlInjection.add("--");
         sqlInjection.add(";");
         sqlInjection.add("/");

maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java

@@ -17,8 +17,8 @@
 
 package org.maxkey.rest;
 
-import org.dromara.maxkey.util.AuthorizationHeader;
-import org.dromara.maxkey.util.AuthorizationHeaderUtils;
+import org.dromara.maxkey.http.AuthorizationHeader;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 import org.junit.Test;
 
 public class AuthorizationHeaderTest {

maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java

@@ -27,6 +27,7 @@ import org.dromara.maxkey.entity.Connectors;
 import org.dromara.maxkey.entity.Message;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.maxkey.entity.idm.UserInfo;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.persistence.service.ConnectorsService;
 import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionMessage;
@@ -34,7 +35,6 @@ 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.dromara.mybatis.jpa.query.Query;
 import org.slf4j.Logger;

maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SingleLogout.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.authz.singlelogout;
 import java.util.Map;
 
 import org.dromara.maxkey.authn.session.VisitedDto;
-import org.dromara.maxkey.web.HttpRequestAdapter;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java

@@ -34,8 +34,8 @@ 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.http.HttpResponseConstants;
 import org.dromara.maxkey.util.Instance;
-import org.dromara.maxkey.web.HttpResponseConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java

@@ -34,8 +34,8 @@ 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.http.HttpResponseConstants;
 import org.dromara.maxkey.util.Instance;
-import org.dromara.maxkey.web.HttpResponseConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

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

@@ -20,10 +20,10 @@ 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.endpoint.AuthorizeBaseEndpoint;
+import org.dromara.maxkey.http.HttpRequestAdapter;
+import org.dromara.maxkey.http.HttpResponseAdapter;
 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.springframework.beans.factory.annotation.Autowired;

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

@@ -28,7 +28,7 @@ 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.entity.idm.UserInfo;
-import org.dromara.maxkey.web.HttpResponseConstants;
+import org.dromara.maxkey.http.HttpResponseConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -17,7 +17,7 @@
 
 package org.dromara.maxkey.authz.cas.endpoint.adapter;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.codec.binary.Base64;
 import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder;
@@ -31,8 +31,6 @@ import org.springframework.web.servlet.ModelAndView;
 public class CasDefaultAdapter extends AbstractAuthorizeAdapter {
     static final  Logger _logger = LoggerFactory.getLogger(CasDefaultAdapter.class);
     
-    static String Charset_UTF8="UTF-8";
-    
     ServiceResponseBuilder serviceResponseBuilder;
     
     @Override
@@ -42,13 +40,7 @@ public class CasDefaultAdapter extends AbstractAuthorizeAdapter {
     }
 
     public String base64Attr(String attrValue){
-        String b64="";
-        try {
-            b64=(attrValue == null? "":"base64:"+Base64.encodeBase64String(attrValue.getBytes(Charset_UTF8)));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return b64;
+        return (attrValue == null ? "" : "base64:"+Base64.encodeBase64String(attrValue.getBytes(StandardCharsets.UTF_8)));
     }
     
     @Override

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

@@ -20,7 +20,7 @@ package org.dromara.maxkey.authz.cas.endpoint.response;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.dromara.maxkey.web.HttpResponseConstants;
+import org.dromara.maxkey.http.HttpResponseConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +33,12 @@ public class CasServiceResponse {
     protected String user;
     protected String ticket;
     protected String format=HttpResponseConstants.FORMAT_TYPE.XML;
-    protected ArrayList<String >proxies=new ArrayList<String>();
+    protected ArrayList<String >proxies=new ArrayList<>();
     
-    protected HashMap<String,ArrayList<String>>casAttributes=new HashMap<String,ArrayList<String>>();
+    protected HashMap<String,ArrayList<String>>casAttributes=new HashMap<>();
     
     public CasServiceResponse() {
-        
+        super();
     }
 
     public String getCode() {
@@ -49,16 +49,18 @@ public class CasServiceResponse {
         if(casAttributes.containsKey(attr)){
             casAttributes.get(attr).add(value);
         }else{
-            ArrayList<String> newList=new ArrayList<String>();
+            ArrayList<String> newList=new ArrayList<>();
             newList.add(value);
             casAttributes.put(attr, newList);
         }
         return this;
     }
+    
     public CasServiceResponse setProxy(String proxy){
         proxies.add(proxy);
         return this;
     }
+    
     public CasServiceResponse setCode(String code) {
         this.code = code;
         return this;

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

@@ -17,7 +17,7 @@
 
 package org.dromara.maxkey.authz.cas.endpoint.response;
 
-import org.dromara.maxkey.web.HttpResponseConstants;
+import org.dromara.maxkey.http.HttpResponseConstants;
 
 public class ProxyServiceResponseBuilder extends  ServiceResponseBuilder{
 
@@ -37,22 +37,23 @@ public class ProxyServiceResponseBuilder extends  ServiceResponseBuilder{
         }else{
             responseString =serviceResponseJsonBuilder();
         }
-        _logger.trace("Response String : "+responseString);
+        _logger.trace("Response String : {}",responseString);
         return responseString;
     }
     
     @Override
     public String  serviceResponseXmlBuilder() {
-        StringBuffer responseResult=new StringBuffer("");
+    	StringBuilder responseResult=new StringBuilder("");
         responseResult.append("<cas:serviceResponse xmlns:cas=\"http://www.yale.edu/tp/cas\">");
         if(result){
-            responseResult.append("<cas:proxySuccess>");
-            responseResult.append("<cas:proxyTicket>").append(ticket).append("</cas:proxyTicket>");
-            responseResult.append("</cas:proxySuccess>");
+            responseResult.append("<cas:proxySuccess>")
+            .append("<cas:proxyTicket>").append(ticket).append("</cas:proxyTicket>")
+            .append("</cas:proxySuccess>");
         }else{
-            responseResult.append("<cas:proxyFailure code=\""+code+"\">");
-            responseResult.append(this.description);
-            responseResult.append("</cas:proxyFailure>");
+            responseResult
+            .append("<cas:proxyFailure code=\"").append(code).append("\">")
+            .append(this.description)
+            .append("</cas:proxyFailure>");
         }
         responseResult.append("</cas:serviceResponse>");
         return responseResult.toString();
@@ -60,20 +61,19 @@ public class ProxyServiceResponseBuilder extends  ServiceResponseBuilder{
     
     @Override
     public String  serviceResponseJsonBuilder() {
-        StringBuffer responseResult=new StringBuffer("");
+    	StringBuilder responseResult=new StringBuilder("");
         responseResult.append("{\"serviceResponse\" :{");
         if(result){
-            responseResult.append("\"proxySuccess\" : {");
-            responseResult.append("\"proxyTicket\" : \"").append(ticket).append("\"");
-            responseResult.append("}");
+            responseResult.append("\"proxySuccess\" : {")
+	            .append("\"proxyTicket\" : \"").append(ticket).append("\"")
+	            .append("}");
         }else{
-            responseResult.append("\"authenticationFailure\" : {");
-            responseResult.append("\"code\" : \"").append(this.code).append("\"");
-            responseResult.append(",\"description\" : \"").append(this.description).append("\"");
-            responseResult.append("}");
+            responseResult.append("\"authenticationFailure\" : {")
+	            .append("\"code\" : \"").append(this.code).append("\"")
+	            .append(",\"description\" : \"").append(this.description).append("\"")
+	            .append("}");
         }
-        responseResult.append("}");
-        responseResult.append("}");
+        responseResult.append("}").append("}");
         return responseResult.toString();
     }
     

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

@@ -21,7 +21,7 @@ public class Service10ResponseBuilder extends CasServiceResponse {
     
     @Override
     public String  serviceResponseBuilder() {
-        StringBuffer responseResult=new StringBuffer("");
+    	StringBuilder responseResult = new StringBuilder("");
         if(result){
             responseResult.append("yes").append("\n").append(user);
         }else{

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

@@ -20,7 +20,7 @@ package org.dromara.maxkey.authz.cas.endpoint.response;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.dromara.maxkey.web.HttpResponseConstants;
+import org.dromara.maxkey.http.HttpResponseConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,12 +45,12 @@ public class ServiceResponseBuilder extends CasServiceResponse {
             responseString= serviceResponseJsonBuilder();
         }
         
-        _logger.trace("Response String : "+responseString);
+        _logger.trace("Response String : {}",responseString);
         return responseString;
     }
     
     public String  serviceResponseXmlBuilder() {
-        StringBuffer responseResult=new StringBuffer("");
+    	StringBuilder responseResult=new StringBuilder("");
         responseResult.append("<cas:serviceResponse xmlns:cas=\"http://www.yale.edu/tp/cas\">");
         if(result){
             responseResult.append("<cas:authenticationSuccess>");
@@ -63,7 +63,7 @@ public class ServiceResponseBuilder extends CasServiceResponse {
                  //采用Iterator遍历HashMap  
                 Iterator<String> it = casAttributes.keySet().iterator();  
                 while(it.hasNext()) {  
-                    String key = (String)it.next();  
+                    String key = it.next();  
                     ArrayList<String> attrList=casAttributes.get(key);
                     //<cas:firstname>John</cas:firstname>
                     for(String value : attrList){
@@ -83,16 +83,17 @@ public class ServiceResponseBuilder extends CasServiceResponse {
             }
             responseResult.append("</cas:authenticationSuccess>");
         }else{
-            responseResult.append("<cas:authenticationFailure code=\""+code+"\">");
-            responseResult.append(this.description);
-            responseResult.append("</cas:authenticationFailure>");
+            responseResult
+            	.append("<cas:authenticationFailure code=\""+code+"\">")
+            	.append(this.description)
+            	.append("</cas:authenticationFailure>");
         }
         responseResult.append("</cas:serviceResponse>");
         return responseResult.toString();
     }
     
     public String  serviceResponseJsonBuilder() {
-        StringBuffer responseResult=new StringBuffer("");
+    	StringBuilder responseResult=new StringBuilder("");
         responseResult.append("{\"serviceResponse\" :{");
         if(result){
             responseResult.append("\"authenticationSuccess\" : {");
@@ -107,7 +108,7 @@ public class ServiceResponseBuilder extends CasServiceResponse {
                 Iterator<String> it = casAttributes.keySet().iterator();  
                 int attrCount=1;
                 while(it.hasNext()) {  
-                    String key = (String)it.next();  
+                    String key = it.next();  
                     ArrayList<String> attrList=casAttributes.get(key);
                     if(attrCount==1){
                         responseResult.append("\"").append(key).append("\":");

maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java

@@ -25,9 +25,9 @@ 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.http.HttpRequestAdapter;
+import org.dromara.maxkey.http.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;

maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java

@@ -25,9 +25,9 @@ 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.http.HttpRequestAdapter;
+import org.dromara.maxkey.http.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;

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java

@@ -24,10 +24,10 @@ 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.http.AuthorizationHeader;
+import org.dromara.maxkey.http.HttpResponseAdapter;
 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;

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java

@@ -31,8 +31,8 @@ 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.http.AuthorizationHeader;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 import org.dromara.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java

@@ -32,13 +32,13 @@ import org.dromara.maxkey.constants.ConstsBoolean;
 import org.dromara.maxkey.entity.apps.Apps;
 import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails;
 import org.dromara.maxkey.entity.idm.UserInfo;
+import org.dromara.maxkey.http.HttpResponseAdapter;
 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;

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java

@@ -38,12 +38,12 @@ import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptio
 import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService;
 import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails;
 import org.dromara.maxkey.entity.idm.UserInfo;
+import org.dromara.maxkey.http.HttpResponseAdapter;
 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;

maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java

@@ -21,9 +21,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.dromara.maxkey.constants.ContentType;
+import org.dromara.maxkey.http.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;
 

maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java

@@ -27,15 +27,15 @@ import java.util.concurrent.LinkedBlockingQueue;
 import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.idm.Organizations;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
 import org.dromara.maxkey.synchronizer.ISynchronizerService;
 import org.dromara.maxkey.entity.SyncJobConfigField;
 import org.dromara.maxkey.synchronizer.feishu.entity.FeishuDepts;
 import org.dromara.maxkey.synchronizer.feishu.entity.FeishuDeptsResponse;
 import org.dromara.maxkey.synchronizer.service.SyncJobConfigFieldService;
-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.beans.factory.annotation.Autowired;

maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java

@@ -25,15 +25,15 @@ import java.util.Map;
 import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.idm.UserInfo;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
 import org.dromara.maxkey.synchronizer.ISynchronizerService;
 import org.dromara.maxkey.entity.SyncJobConfigField;
 import org.dromara.maxkey.synchronizer.feishu.entity.FeishuUsers;
 import org.dromara.maxkey.synchronizer.feishu.entity.FeishuUsersResponse;
 import org.dromara.maxkey.synchronizer.service.SyncJobConfigFieldService;
-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.beans.factory.annotation.Autowired;

maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java

@@ -17,9 +17,9 @@
 
 package org.dromara.maxkey.synchronizer.workweixin;
 
+import org.dromara.maxkey.http.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;
 

maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java

@@ -21,13 +21,13 @@ import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.SyncJobConfigField;
 import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.idm.Organizations;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
 import org.dromara.maxkey.synchronizer.ISynchronizerService;
 import org.dromara.maxkey.synchronizer.service.SyncJobConfigFieldService;
 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.beans.factory.annotation.Autowired;

maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java

@@ -22,13 +22,13 @@ import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.SyncJobConfigField;
 import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.idm.UserInfo;
+import org.dromara.maxkey.http.HttpRequestAdapter;
 import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
 import org.dromara.maxkey.synchronizer.ISynchronizerService;
 import org.dromara.maxkey.synchronizer.service.SyncJobConfigFieldService;
 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.beans.factory.annotation.Autowired;

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java

@@ -25,9 +25,9 @@ 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.entity.apps.Apps;
+import org.dromara.maxkey.http.AuthorizationHeader;
+import org.dromara.maxkey.http.AuthorizationHeaderUtils;
 import org.dromara.maxkey.persistence.service.AppsService;
-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;