diff --git a/build.gradle b/build.gradle index 54ba10752..bd8ff50a0 100644 --- a/build.gradle +++ b/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 diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java index d97008f1b..5f971a7a6 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java +++ b/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; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java index d3d5ea04a..4e80f2f8e 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/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; diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeader.java similarity index 98% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeader.java index 912e4e7da..054fccf92 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeader.java +++ b/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 { diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeaderUtils.java similarity index 98% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/AuthorizationHeaderUtils.java index c90ebda48..db1e86919 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java +++ b/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; diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpEncoder.java similarity index 98% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpEncoder.java index 79ed15ad4..dadd656de 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpEncoder.java +++ b/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.*; diff --git a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpRequestAdapter.java similarity index 99% rename from maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpRequestAdapter.java index e362a90b6..da285454a 100644 --- a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpRequestAdapter.java +++ b/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; diff --git a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseAdapter.java similarity index 98% rename from maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseAdapter.java index 2e364781a..b4dd15a01 100644 --- a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java +++ b/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; diff --git a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseConstants.java similarity index 96% rename from maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpResponseConstants.java index fe30acfdf..588269811 100644 --- a/maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseConstants.java +++ b/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 { diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpsTrusts.java similarity index 98% rename from maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java rename to maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpsTrusts.java index 0efb50855..52c075456 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java +++ b/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; diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java index d40e6a018..1e6daecb0 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java +++ b/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; diff --git a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java index 5c0a62e90..1ef6ef699 100644 --- a/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java +++ b/maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/StrUtils.java @@ -491,7 +491,7 @@ public final class StrUtils { public static ArrayList sqlInjection = null; static{ - sqlInjection = new ArrayList(); + sqlInjection = new ArrayList<>(); sqlInjection.add("--"); sqlInjection.add(";"); sqlInjection.add("/"); diff --git a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java b/maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java index 21b1dcb57..6faebb83a 100644 --- a/maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java +++ b/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 { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java index 053124bf1..18754479e 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SingleLogout.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SingleLogout.java index e8f443eaf..5197b7c1a 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/singlelogout/SingleLogout.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 71152b440..7c718584c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index af1c85053..4f230a212 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java index 28134392e..f4701d1c4 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1UsersEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1UsersEndpoint.java index 52c29d243..98de97193 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1UsersEndpoint.java +++ b/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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 index e8a2f21f3..0b940de9c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 @@ -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 diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 index f59650c6b..a0c6654b4 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 @@ -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 ArrayListproxies=new ArrayList(); + protected ArrayListproxies=new ArrayList<>(); - protected HashMap>casAttributes=new HashMap>(); + protected HashMap>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 newList=new ArrayList(); + ArrayList 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; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 index 1250e855e..55698b89b 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 @@ -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(""); if(result){ - responseResult.append(""); - responseResult.append("").append(ticket).append(""); - responseResult.append(""); + responseResult.append("") + .append("").append(ticket).append("") + .append(""); }else{ - responseResult.append(""); - responseResult.append(this.description); - responseResult.append(""); + responseResult + .append("") + .append(this.description) + .append(""); } responseResult.append(""); 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(); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 index 5138520d8..dfe78061d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 @@ -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{ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 index 407af37dd..6bc97d7c3 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/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 @@ -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(""); if(result){ responseResult.append(""); @@ -63,7 +63,7 @@ public class ServiceResponseBuilder extends CasServiceResponse { //采用Iterator遍历HashMap Iterator it = casAttributes.keySet().iterator(); while(it.hasNext()) { - String key = (String)it.next(); + String key = it.next(); ArrayList attrList=casAttributes.get(key); //John for(String value : attrList){ @@ -83,16 +83,17 @@ public class ServiceResponseBuilder extends CasServiceResponse { } responseResult.append(""); }else{ - responseResult.append(""); - responseResult.append(this.description); - responseResult.append(""); + responseResult + .append("") + .append(this.description) + .append(""); } responseResult.append(""); 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 it = casAttributes.keySet().iterator(); int attrCount=1; while(it.hasNext()) { - String key = (String)it.next(); + String key = it.next(); ArrayList attrList=casAttributes.get(key); if(attrCount==1){ responseResult.append("\"").append(key).append("\":"); diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/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 index 8baa01bef..1f4363e74 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/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 index 21c5fe2f4..5978f1052 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 index 5bdcec646..9c161db18 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 index 096b4a234..50b2c5c0d 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 index 75989e66b..732cb0212 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 index dc3961fed..228bfe99e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/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 @@ -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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java index 6df0f0284..a4075ddfe 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java +++ b/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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java index 6fb5fcbdf..0ff2676f9 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java +++ b/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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java index bf208381e..d64f64534 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java +++ b/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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java index 2db62b477..8ad1ae2e7 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java +++ b/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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java index 78b0d76ca..fc9de177b 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java +++ b/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; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index ab098143c..5dd7c67fd 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/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; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java index 922d906e1..85f9f097e 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/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;