From 7a1ae62e124bc54a2cce40f9f9afd33fd53f774a Mon Sep 17 00:00:00 2001 From: shimingxy Date: Mon, 14 Apr 2025 14:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java | 1 - .../maxkey/authn/provider/impl/MfaAuthenticationProvider.java | 1 - .../dromara/maxkey/authn/provider/scancode/ScanCodeState.java | 1 - .../maxkey/autoconfigure/AuthnProviderAutoConfiguration.java | 2 -- .../dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java | 4 ++-- .../dromara/maxkey/persistence/mapper/GroupMemberMapper.java | 2 -- .../maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java | 1 - .../oauth2/common/OAuth2AccessTokenJackson2Deserializer.java | 2 +- .../exceptions/OAuth2ExceptionJackson1Deserializer.java | 2 +- .../exceptions/OAuth2ExceptionJackson2Deserializer.java | 2 +- .../java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java | 2 +- .../maxkey/autoconfigure/ApplicationAutoConfiguration.java | 1 - 12 files changed, 6 insertions(+), 15 deletions(-) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java index 9a3473ccb..0156102b5 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.authn.web; -import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.jwt.AuthJwt; import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService; import org.dromara.maxkey.authn.jwt.AuthTokenService; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java index e539cdb5d..54064f9d9 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java @@ -24,7 +24,6 @@ import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.constants.ConstsLoginType; -import org.dromara.maxkey.entity.Institutions; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeState.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeState.java index dffa46598..c78582137 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeState.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeState.java @@ -18,7 +18,6 @@ package org.dromara.maxkey.authn.provider.scancode; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.maxkey.authn.session.Session; /** * @description: diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java index 7f0061372..772061310 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java @@ -28,9 +28,7 @@ import org.dromara.maxkey.authn.support.rememberme.JdbcRemeberMeManager; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.password.sms.SmsOtpAuthnService; import org.dromara.maxkey.persistence.service.CnfPasswordPolicyService; -import org.dromara.maxkey.persistence.service.LoginService; import org.dromara.maxkey.persistence.service.PasswordPolicyValidatorService; -import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.persistence.service.impl.PasswordPolicyValidatorServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java index 67a29ba16..616ace84c 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jose/keystore/JWKSetKeyStore.java @@ -16,7 +16,6 @@ package org.dromara.maxkey.crypto.jose.keystore; * limitations under the License. ******************************************************************************/ -import com.google.common.base.Charsets; import com.google.common.io.CharStreams; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.jwk.JWK; @@ -25,6 +24,7 @@ import com.nimbusds.jose.jwk.RSAKey; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.security.PublicKey; import java.text.ParseException; import java.util.List; @@ -77,7 +77,7 @@ public class JWKSetKeyStore { _logger.debug("JWK location " + location.getURL()); // read in the file from disk String s = CharStreams - .toString(new InputStreamReader(location.getInputStream(), Charsets.UTF_8)); + .toString(new InputStreamReader(location.getInputStream(), StandardCharsets.UTF_8)); // parse it into a jwkSet object jwkSet = JWKSet.parse(s); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupMemberMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupMemberMapper.java index d8ecb3807..094fea5c1 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupMemberMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupMemberMapper.java @@ -25,8 +25,6 @@ import java.util.List; import org.dromara.maxkey.entity.idm.GroupMember; import org.dromara.maxkey.entity.idm.Groups; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.entity.permissions.RoleMember; -import org.dromara.maxkey.entity.permissions.Roles; import org.dromara.mybatis.jpa.IJpaMapper; /** 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 eca6997ad..0f141655f 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 @@ -25,7 +25,6 @@ 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.adapter.CasPlainAdapter; 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; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java index 8bb664550..315bcbf54 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java @@ -62,7 +62,7 @@ public final class OAuth2AccessTokenJackson2Deserializer extends StdDeserializer // What should occur if a parameter exists twice while (jp.nextToken() != JsonToken.END_OBJECT) { - String name = jp.getCurrentName(); + String name = jp.currentName(); jp.nextToken(); if (OAuth2AccessToken.ACCESS_TOKEN.equals(name)) { tokenValue = jp.getText(); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java index c08301954..ea458f2eb 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson1Deserializer.java @@ -43,7 +43,7 @@ public class OAuth2ExceptionJackson1Deserializer extends JsonDeserializer errorParams = new HashMap(); for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) { // Must point to field name - String fieldName = jp.getCurrentName(); + String fieldName = jp.currentName(); // And then the value... t = jp.nextToken(); // Note: must handle null explicitly here; value deserializers won't diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java index 88b208b39..bc5e849c9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/exceptions/OAuth2ExceptionJackson2Deserializer.java @@ -48,7 +48,7 @@ public class OAuth2ExceptionJackson2Deserializer extends StdDeserializer errorParams = new HashMap(); for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) { // Must point to field name - String fieldName = jp.getCurrentName(); + String fieldName = jp.currentName(); // And then the value... t = jp.nextToken(); // Note: must handle null explicitly here; value deserializers won't diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java index 2ee97a5af..59cf20991 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/JwtHelper.java @@ -117,7 +117,7 @@ class JwtHeaderHelper { String alg = null, enc = null, iv = null; jp.nextToken(); while (jp.nextToken() != JsonToken.END_OBJECT) { - String fieldname = jp.getCurrentName(); + String fieldname = jp.currentName(); jp.nextToken(); if (!JsonToken.VALUE_STRING.equals(jp.getCurrentToken())) { throw new IllegalArgumentException("Header fields must be strings"); diff --git a/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java index 78a6053ce..46d6e63bb 100644 --- a/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -43,7 +43,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.core.io.Resource; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.DelegatingPasswordEncoder;