diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/QrCodeCredentialDto.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/QrCodeCredentialDto.java index e1d421a5..6624e960 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/QrCodeCredentialDto.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/QrCodeCredentialDto.java @@ -20,8 +20,6 @@ package org.dromara.maxkey.authn; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; -import java.io.Serial; -import java.io.Serializable; /** * @description: diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java index 50962888..2a82f354 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/AuthJwtService.java @@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.crypto.jwt.HMAC512Service; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.util.StrUtils; import org.dromara.maxkey.web.WebContext; import org.joda.time.DateTime; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeService.java index c6ea07ad..871fa36f 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/scancode/ScanCodeService.java @@ -17,20 +17,16 @@ package org.dromara.maxkey.authn.provider.scancode; -import com.fasterxml.jackson.databind.ObjectMapper; import org.dromara.maxkey.authn.session.Session; -import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.exception.BusinessException; import org.dromara.maxkey.persistence.cache.MomentaryService; import org.dromara.maxkey.util.IdGenerator; -import org.dromara.maxkey.util.JsonUtils; import org.dromara.maxkey.util.TimeJsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import java.time.Duration; import java.util.Objects; /** diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java index 003e5d38..32ef924e 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -31,7 +31,6 @@ import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.dromara.maxkey.persistence.service.UserInfoService; -import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java index c12c4632..44181477 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java @@ -24,7 +24,6 @@ import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.constants.ConstsLoginType; -import org.dromara.maxkey.util.StrUtils; import org.opensaml.saml1.core.impl.AssertionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java index 9c2ba3b4..c6adc854 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java @@ -16,24 +16,11 @@ package me.zhyd.oauth.request; -import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.config.AuthConfig; -import me.zhyd.oauth.enums.AuthUserGender; -import me.zhyd.oauth.enums.scope.AuthHuaweiScope; -import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; -import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.utils.AuthScopeUtils; -import me.zhyd.oauth.utils.HttpUtils; -import me.zhyd.oauth.utils.UrlBuilder; - -import java.util.HashMap; -import java.util.Map; - -import static me.zhyd.oauth.enums.AuthResponseStatus.SUCCESS; public class AuthMaxkeyRequest extends AuthDefaultRequest { diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index 9d4b1abe..04995fc2 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -34,7 +34,6 @@ import org.dromara.maxkey.uuid.UUID; import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java index 86f4c067..4694e042 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java @@ -19,10 +19,6 @@ package org.dromara.maxkey.authn.support.socialsignon.token; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.constants.ConstsTimeInterval; -import org.dromara.maxkey.persistence.redis.RedisConnection; -import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; -import org.joda.time.DateTime; - import java.util.concurrent.ConcurrentHashMap; public class RedisTokenStore { diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java index 80444d73..f289b1f7 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java @@ -32,7 +32,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.LogFactory; import org.dromara.maxkey.util.Instance; import org.dromara.maxkey.util.StringGenerator; -import org.dromara.maxkey.util.StrUtils; /** * Reciprocal cipher or Symmetric-key algorithm diff --git a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java b/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java new file mode 100644 index 00000000..c4adf2c1 --- /dev/null +++ b/maxkey-common/src/test/java/org/maxkey/otp/algorithm/QRcodeTest.java @@ -0,0 +1,120 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.otp.algorithm; + +import java.io.File; + +import org.dromara.maxkey.util.QRCode; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.MultiFormatWriter; +import com.google.zxing.common.BitMatrix; + + +/** + * VCARD + * + * + * BEGIN:VCARD + VERSION:3.0 + N:Gump;Forrest;;Mr. + FN:Forrest Gump + ORG:Bubba Gump Shrimp Co. + TITLE:Shrimp Man + PHOTO;VALUE=URL;TYPE=GIF:http://www.example.com/dir_photos/my_photo.gif + TEL;TYPE=WORK,VOICE:(111) 555-12121 + TEL;TYPE=HOME,VOICE:(404) 555-1212 + ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America + LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America + ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America + LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America + EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com + REV:2008-04-24T19:52:43Z + END:VCARD + + + + BEGIN:VCARD + VERSION:4.0 + N:Gump;Forrest;;; + FN:Forrest Gump + ORG:Bubba Gump Shrimp Co. + TITLE:Shrimp Man + PHOTO;MEDIATYPE=image/gif:http://www.example.com/dir_photos/my_photo.gif + TEL;TYPE=work,voice;VALUE=uri:tel:+1-111-555-1212 + TEL;TYPE=home,voice;VALUE=uri:tel:+1-404-555-1212 + ADR;TYPE=work;LABEL="100 Waters Edge\nBaytown, LA 30314\nUnited States of America" + :;;100 Waters Edge;Baytown;LA;30314;United States of America + ADR;TYPE=home;LABEL="42 Plantation St.\nBaytown, LA 30314\nUnited States of America" + :;;42 Plantation St.;Baytown;LA;30314;United States of America + EMAIL:forrestgump@example.com + REV:20080424T195243Z + END:VCARD + */ +public class QRcodeTest { + + // 编码 + public static void main(String[] args) { + try { + + String str = """ + BEGIN:VCARD + VERSION:3.0 + N:石鸣 + EMAIL:shimh@qq.com + TEL:15618726256 + TEL;CELL:12345678912 + ADR:上海 + ORG: + Connsec + TITLE:技术总监 + URL:http://blog.csdn.net/lidew521 + NOTE:呼呼测试下吧。。。 + END:VCARD + """; + + String str1 = """ + BEGIN:VCARD + VERSION:3.0 + N:Gump;Forrest;;Mr. + ORG:Bubba Gump Shrimp Co. + TITLE:Shrimp Man + TEL;TYPE=WORK,VOICE:(111) 555-12121 + ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America + EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com + URL:http://www.johndoe.com + GENDER:F + REV:2008-04-24T19:52:43Z + END:VCARD + """; + + System.out.println(str); + //String str = "CN:男;COP:公司;ZW:职务";// 二维码内容 + String path = "D:\\hwy.png"; + BitMatrix byteMatrix; + byteMatrix = new MultiFormatWriter().encode(new String(str1.getBytes("UTF-8"),"iso-8859-1"), BarcodeFormat.QR_CODE, 300, 300); + File file = new File(path); + + QRCode.writeToPath(byteMatrix, "png", file); + } catch (Exception e) { + e.printStackTrace(); + } + } + + +} diff --git a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java b/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java deleted file mode 100644 index 26dc927e..00000000 --- a/maxkey-common/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.otp.algorithm; - -import java.io.File; - -import org.dromara.maxkey.util.QRCode; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.common.BitMatrix; - -public class RQcodeTest { - - /* - * BEGIN:VCARD -VERSION:3.0 -N:Gump;Forrest;;Mr. -FN:Forrest Gump -ORG:Bubba Gump Shrimp Co. -TITLE:Shrimp Man -PHOTO;VALUE=URL;TYPE=GIF:http://www.example.com/dir_photos/my_photo.gif -TEL;TYPE=WORK,VOICE:(111) 555-12121 -TEL;TYPE=HOME,VOICE:(404) 555-1212 -ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America -LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America -ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America -LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America -EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com -REV:2008-04-24T19:52:43Z -END:VCARD - - - -BEGIN:VCARD -VERSION:4.0 -N:Gump;Forrest;;; -FN:Forrest Gump -ORG:Bubba Gump Shrimp Co. -TITLE:Shrimp Man -PHOTO;MEDIATYPE=image/gif:http://www.example.com/dir_photos/my_photo.gif -TEL;TYPE=work,voice;VALUE=uri:tel:+1-111-555-1212 -TEL;TYPE=home,voice;VALUE=uri:tel:+1-404-555-1212 -ADR;TYPE=work;LABEL="100 Waters Edge\nBaytown, LA 30314\nUnited States of America" - :;;100 Waters Edge;Baytown;LA;30314;United States of America -ADR;TYPE=home;LABEL="42 Plantation St.\nBaytown, LA 30314\nUnited States of America" - :;;42 Plantation St.;Baytown;LA;30314;United States of America -EMAIL:forrestgump@example.com -REV:20080424T195243Z -END:VCARD - */ - // 编码 - public static void main(String[] args) { - try { - - String str = "BEGIN:VCARD\n" + - "VERSION:3.0\n" + - "N:石明海\n" + - "EMAIL:shimh@qq.com\n" + - "TEL:15618726256\n" + - "TEL;CELL:12345678912" + - "ADR:上海\n" + - "ORG:" + - "Connsec\n" + - "TITLE:技术总监\n" + - //"URL:http://blog.csdn.net/lidew521\n" + - //"NOTE:呼呼测试下吧。。。\n" + - "END:VCARD"; - - String str1 = "BEGIN:VCARD\n" + - "VERSION:3.0\n" + - "N:Gump;Forrest;;Mr.\n" + - "ORG:Bubba Gump Shrimp Co.\n" + - "TITLE:Shrimp Man\n" + - "TEL;TYPE=WORK,VOICE:(111) 555-12121\n" + - "ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America\n" + - "EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com\n" + - "URL:http://www.johndoe.com\n" + - "GENDER:F\n"+ - "REV:2008-04-24T19:52:43Z\n" + - "END:VCARD\n" ; - - System.out.println(str); - //String str = "CN:男;COP:公司;ZW:职务";// 二维码内容 - String path = "D:\\hwy.png"; - BitMatrix byteMatrix; - byteMatrix = new MultiFormatWriter().encode(new String(str1.getBytes("UTF-8"),"iso-8859-1"), - BarcodeFormat.QR_CODE, 300, 300); - File file = new File(path); - - QRCode.writeToPath(byteMatrix, "png", file); - } catch (Exception e) { - e.printStackTrace(); - } - } - - -} diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java index b910c5fe..0f6a91d7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import org.dromara.mybatis.jpa.entity.JpaEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java index 8633826f..5ccb35c4 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java @@ -19,12 +19,7 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import org.dromara.mybatis.jpa.entity.JpaEntity; - -import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; import jakarta.persistence.Table; @Entity diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java index fe529666..e25fb8d9 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import org.dromara.mybatis.jpa.entity.JpaEntity; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java index 65d76fec..e7b9eefa 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java @@ -22,8 +22,6 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import org.dromara.mybatis.jpa.entity.JpaEntity; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java index b52b0d50..c94ef985 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java @@ -20,8 +20,6 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; import java.security.cert.X509Certificate; -import org.dromara.mybatis.jpa.entity.JpaEntity; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java index cbfbaff1..f1cda3f3 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java @@ -21,9 +21,6 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; - -import org.dromara.mybatis.jpa.entity.JpaEntity; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java b/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java index 577e1a17..fc323b1d 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/exception/BusinessException.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.exception; -import java.io.Serial; - /** * @description: * @author: orangeBabu diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java index b0283a23..8abd08b4 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java @@ -22,7 +22,6 @@ import org.pac4j.cas.client.rest.CasRestFormClient; import org.pac4j.cas.config.CasConfiguration; import org.pac4j.cas.credentials.authenticator.CasRestAuthenticator; import org.pac4j.cas.profile.CasProfile; -import org.pac4j.core.context.J2EContext; import org.pac4j.core.context.WebContext; import org.pac4j.core.credentials.TokenCredentials; import org.pac4j.core.credentials.UsernamePasswordCredentials; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java index b22d9960..557327ed 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/OAuth2UserDetailsService.java @@ -12,7 +12,6 @@ */ package org.dromara.maxkey.authz.oauth2.provider; -import java.util.ArrayList; import java.util.List; import org.dromara.maxkey.authn.SignPrincipal; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java index 75730c77..c6c5b19a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/CheckTokenEndpoint.java @@ -40,10 +40,8 @@ import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.dromara.maxkey.authz.oauth2.provider.token.AccessTokenConverter; import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter; import org.dromara.maxkey.authz.oauth2.provider.token.ResourceServerTokenServices; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.Operation; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java index 8b2c1610..533ab30f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java @@ -40,7 +40,6 @@ 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.joda.time.DateTime; -import org.joda.time.format.DateTimeFormat; import com.nimbusds.jose.util.Base64URL; import org.slf4j.Logger; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index 11f8d406..f641da6b 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -29,7 +29,6 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.dromara.maxkey.authn.LoginCredential; -import org.dromara.maxkey.authn.jwt.AuthJwt; import org.dromara.maxkey.authn.jwt.AuthTokenService; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.authz.saml.common.EndpointGenerator; @@ -53,7 +52,6 @@ import org.opensaml.common.binding.security.MessageReplayRule; import org.opensaml.saml2.core.Assertion; import org.opensaml.saml2.core.Response; import org.opensaml.saml2.core.StatusCode; -import org.opensaml.ws.message.decoder.MessageDecodingException; import org.opensaml.xml.security.CriteriaSet; import org.opensaml.xml.security.SecurityException; import org.opensaml.xml.security.credential.Credential; diff --git a/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java index 75a9b508..b50d6588 100644 --- a/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java +++ b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java @@ -15,8 +15,6 @@ */ package org.dromara.maxkey.ip2location.online; -import java.io.IOException; - import org.dromara.maxkey.ip2location.AbstractIpLocation; import org.dromara.maxkey.ip2location.IpLocation; import org.dromara.maxkey.ip2location.Region; diff --git a/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java index 90282a54..3890132f 100644 --- a/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java +++ b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.ip2location; -import org.dromara.maxkey.ip2location.IpLocation; import org.dromara.maxkey.ip2location.online.Ip138; import org.junit.Test; diff --git a/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java index 35533503..165e1fae 100644 --- a/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java +++ b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java @@ -15,7 +15,6 @@ */ package org.dromara.maxkey.ip2location; -import org.dromara.maxkey.ip2location.IpLocationParser; import org.dromara.maxkey.ip2location.online.Ip138; import org.junit.Test; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java index 7c945862..ba20bb59 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java @@ -27,8 +27,6 @@ import org.dromara.maxkey.entity.idm.Groups; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.GroupMemberService; import org.dromara.maxkey.persistence.service.GroupsService; -import org.dromara.maxkey.util.DateUtils; -import org.dromara.maxkey.util.StrUtils; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java index d1bc82e0..a2f33d62 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java @@ -17,14 +17,11 @@ package org.dromara.maxkey.autoconfigure; -import java.util.List; - import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.authn.support.basic.BasicEntryPoint; import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; import org.dromara.maxkey.authn.support.kerberos.HttpKerberosEntryPoint; import org.dromara.maxkey.authn.support.kerberos.KerberosService; -import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.web.interceptor.HistorySignOnAppInterceptor; @@ -34,8 +31,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java index d163c7c6..3394f512 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java @@ -32,7 +32,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java index 4a9381ee..ccb4b1a9 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java @@ -35,7 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java index 3021d1de..980107a1 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java @@ -27,7 +27,6 @@ import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java index bb07e79e..c35d5c3b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java @@ -29,7 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index dbb9da22..23030f76 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index f91e08c4..4225a6a5 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java index b5a7761b..1523563b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java @@ -25,8 +25,6 @@ import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.dromara.maxkey.persistence.service.UserInfoService; -import org.dromara.maxkey.synchronizer.ISynchronizerService; -import org.dromara.maxkey.synchronizer.ldap.LdapSynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java index be19210d..781aebe2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java @@ -28,8 +28,6 @@ import org.dromara.maxkey.entity.Connectors; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.Synchronizers; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.persistence.service.SynchronizersService; -import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.dromara.maxkey.util.StrUtils; import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; @@ -37,7 +35,6 @@ import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.Date; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java index d0de8192..604d290c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java index 71403037..908c69b7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*;