From 46c3dba06018047816a40dabbf5e9ca3611d249c Mon Sep 17 00:00:00 2001 From: yzyunzhang <2516626946@qq.com> Date: Tue, 7 Feb 2023 09:08:09 +0000 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DingtalkOauthAuthenticationFilter.java | 2 +- .../DingtalkScanCodeAuthenticationFilter.java | 6 ++++-- .../QqOAuth2LoginAuthenticationFilter.java | 2 +- .../sms/filter/SmsAuthenticationFilter.java | 2 +- ...odeAuthorizationRequestRedirectFilter.java | 9 ++++++--- ...ChatScanCodeLoginAuthenticationFilter.java | 15 +++++++------- .../WeChatWorkAuthenticationConstants.java | 16 +++++++-------- ...odeAuthorizationRequestRedirectFilter.java | 4 ++-- ...WorkScanCodeLoginAuthenticationFilter.java | 2 +- .../common/constants/AccountConstants.java | 8 ++++---- .../common/constants/AnalysisConstants.java | 2 +- .../common/constants/AppConstants.java | 2 +- .../common/constants/AuditConstants.java | 2 +- .../constants/AuthenticationConstants.java | 2 +- .../common/constants/AuthorizeConstants.java | 2 +- .../common/constants/ProtocolConstants.java | 20 +++++++++---------- .../common/constants/SessionConstants.java | 2 +- .../common/constants/SettingConstants.java | 2 +- .../common/constants/StorageConstants.java | 2 +- .../common/enums/AuthenticationType.java | 2 ++ .../common/enums/CaptchaProviderType.java | 1 + .../employee/common/enums/DataOrigin.java | 2 ++ .../enums/IdentityProviderCategory.java | 2 ++ .../common/enums/IdentityProviderType.java | 2 ++ .../employee/common/enums/Language.java | 1 + .../common/enums/MessageCategory.java | 2 ++ .../employee/common/enums/MfaFactor.java | 2 ++ .../topiam/employee/common/enums/MfaMode.java | 2 ++ .../common/enums/OrganizationType.java | 2 ++ .../common/enums/PermissionActionType.java | 2 ++ .../employee/common/enums/PolicyEffect.java | 2 ++ .../common/enums/PolicyObjectType.java | 2 ++ .../common/enums/PolicySubjectType.java | 2 ++ .../topiam/employee/common/enums/SmsType.java | 6 ++++-- .../employee/common/enums/SyncStatus.java | 2 ++ .../employee/common/enums/TriggerType.java | 2 ++ .../employee/common/enums/UserGender.java | 2 ++ .../employee/common/enums/UserIdType.java | 2 ++ .../employee/common/enums/UserStatus.java | 2 ++ .../employee/common/enums/UserType.java | 2 ++ .../common/enums/app/AppCertUsingType.java | 1 + .../common/enums/app/AppProtocol.java | 1 + .../employee/common/enums/app/AppType.java | 2 ++ .../common/enums/app/AuthorizationType.java | 2 ++ .../common/enums/app/InitLoginType.java | 2 ++ .../app/SamlAttributeStatementValueType.java | 1 + .../IdentitySourceProvider.java | 2 ++ .../IdentitySourceActionType.java | 2 ++ .../IdentitySourceObjectType.java | 2 ++ .../topiam/employee/common/util/CasUtils.java | 2 +- .../employee/common/util/SamlUtils.java | 2 +- .../EiamElasticsearchConfiguration.java | 4 ++-- .../security/PublicSecretEndpoint.java | 2 +- .../decrypt/DecryptRequestBodyAdvice.java | 2 +- .../core/security/otp/OtpContextHelp.java | 2 +- .../weak/DefaultPasswordWeakLibImpl.java | 1 + .../constant/MessageSettingConstants.java | 2 +- .../wechatwork/util/AesException.java | 16 +++++++-------- .../openapi/constants/OpenApiConstants.java | 4 ++-- .../bind/IdpBindUserAuthenticationFilter.java | 2 +- .../portal/mfa/MfaAuthenticationFilter.java | 2 +- .../idp/tickets/TicketGrantingTicketImpl.java | 1 + .../cas/idp/xml/Response10GeneratorImpl.java | 2 +- .../cas/idp/xml/Response20GeneratorImpl.java | 2 +- .../cas/idp/xml/Response30GeneratorImpl.java | 2 +- ...zationPasswordAuthenticationConverter.java | 2 +- ...edisOAuth2AuthorizationConsentService.java | 2 +- .../RedisOAuth2AuthorizationService.java | 2 +- .../Saml2IdpSingleSignOnEndpointFilter.java | 4 ++-- .../Saml2IdpSingleSignOutEndpointFilter.java | 2 +- .../idp/endpoint/xml/AssertionGenerator.java | 2 +- .../xml/AttributeStatementGenerator.java | 2 +- .../endpoint/xml/AuthnStatementGenerator.java | 2 +- .../idp/endpoint/xml/ConditionsGenerator.java | 2 +- .../employee/support/util/UrlTestUtils.java | 2 +- .../constants/SynchronizerConstants.java | 4 ++-- 76 files changed, 149 insertions(+), 86 deletions(-) diff --git a/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkOauthAuthenticationFilter.java b/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkOauthAuthenticationFilter.java index ca09ed18..5bbd90cb 100644 --- a/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkOauthAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkOauthAuthenticationFilter.java @@ -72,7 +72,7 @@ import static cn.topiam.employee.common.enums.IdentityProviderType.DINGTALK_OAUT */ @SuppressWarnings("DuplicatedCode") public class DingtalkOauthAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { - public final static String DEFAULT_FILTER_PROCESSES_URI = DINGTALK_OAUTH + public static final String DEFAULT_FILTER_PROCESSES_URI = DINGTALK_OAUTH .getLoginPathPrefix() + "/*"; /** * AntPathRequestMatcher diff --git a/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkScanCodeAuthenticationFilter.java b/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkScanCodeAuthenticationFilter.java index 13d39e1b..6e399153 100644 --- a/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkScanCodeAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-dingtalk/src/main/java/cn/topiam/employee/authentication/dingtalk/filter/DingtalkScanCodeAuthenticationFilter.java @@ -65,7 +65,9 @@ import cn.topiam.employee.core.context.ServerContextHelp; import cn.topiam.employee.support.exception.TopIamException; import cn.topiam.employee.support.trace.TraceUtils; import cn.topiam.employee.support.util.HttpUrlUtils; -import static cn.topiam.employee.authentication.dingtalk.constant.DingTalkAuthenticationConstants.*; +import static cn.topiam.employee.authentication.dingtalk.constant.DingTalkAuthenticationConstants.GET_USERINFO_BY_CODE; +import static cn.topiam.employee.authentication.dingtalk.constant.DingTalkAuthenticationConstants.GET_USERINFO_BY_USERID; +import static cn.topiam.employee.authentication.dingtalk.constant.DingTalkAuthenticationConstants.GET_USERID_BY_UNIONID; import static cn.topiam.employee.authentication.dingtalk.filter.DingtalkScanCodeAuthorizationRequestGetFilter.PROVIDER_ID; import static cn.topiam.employee.common.enums.IdentityProviderType.DINGTALK_SCAN_CODE; @@ -80,7 +82,7 @@ import static cn.topiam.employee.common.enums.IdentityProviderType.DINGTALK_SCAN @SuppressWarnings("DuplicatedCode") public class DingtalkScanCodeAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { - public final static String DEFAULT_FILTER_PROCESSES_URI = DINGTALK_SCAN_CODE + public static final String DEFAULT_FILTER_PROCESSES_URI = DINGTALK_SCAN_CODE .getLoginPathPrefix() + "/*"; /** * AntPathRequestMatcher diff --git a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java index 0b55c440..c7231645 100644 --- a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java @@ -67,7 +67,7 @@ import static cn.topiam.employee.portal.idp.qq.constant.QqAuthenticationConstant @SuppressWarnings({ "AlibabaClassNamingShouldBeCamel", "DuplicatedCode" }) public class QqOAuth2LoginAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { final String ERROR_CODE = "error"; - public final static String DEFAULT_FILTER_PROCESSES_URI = QQ.getLoginPathPrefix() + public static final String DEFAULT_FILTER_PROCESSES_URI = QQ.getLoginPathPrefix() + "/*"; public static final AntPathRequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( QQ.getLoginPathPrefix() + "/" + "{" + PROVIDER_ID + "}", HttpMethod.GET.name()); diff --git a/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/sms/filter/SmsAuthenticationFilter.java b/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/sms/filter/SmsAuthenticationFilter.java index 6bf48b78..6e4a579b 100644 --- a/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/sms/filter/SmsAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/sms/filter/SmsAuthenticationFilter.java @@ -59,7 +59,7 @@ public class SmsAuthenticationFilter extends AbstractAuthenticationProcessingFil */ private boolean postOnly = true; - public final static String DEFAULT_FILTER_PROCESSES_URI = SMS_LOGIN; + public static final String DEFAULT_FILTER_PROCESSES_URI = SMS_LOGIN; public static final RequestMatcher SMS_LOGIN_MATCHER = new AntPathRequestMatcher( DEFAULT_FILTER_PROCESSES_URI, HttpMethod.POST.name()); diff --git a/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeAuthorizationRequestRedirectFilter.java b/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeAuthorizationRequestRedirectFilter.java index b7643b3e..5afe3186 100644 --- a/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeAuthorizationRequestRedirectFilter.java +++ b/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeAuthorizationRequestRedirectFilter.java @@ -51,7 +51,10 @@ import com.google.common.collect.Sets; import cn.topiam.employee.authentication.wechat.WeChatIdpScanCodeConfig; import cn.topiam.employee.common.entity.authentication.IdentityProviderEntity; import cn.topiam.employee.common.repository.authentication.IdentityProviderRepository; -import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.*; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.APP_ID; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.AUTHORIZATION_REQUEST; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.HREF; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.SNSAPI_LOGIN; import static cn.topiam.employee.common.enums.IdentityProviderType.WECHAT_SCAN_CODE; /** @@ -160,13 +163,13 @@ public class WeChatScanCodeAuthorizationRequestRedirectFilter extends OncePerReq authorizationRequest.getAuthorizationRequestUri()); } - private final static String STYLE = "" + private static final String STYLE = "" + ".impowerBox .qrcode {width: 280px;border: none;margin-top:10px;}\n" + ".impowerBox .title {display: none;}\n" + ".impowerBox .info {display: none;}\n" + ".status_icon {display: none}\n" + ".impowerBox .status {text-align: center;} "; - private final static String STYLE_BASE64 = "data:text/css;base64," + Base64.getEncoder() + private static final String STYLE_BASE64 = "data:text/css;base64," + Base64.getEncoder() .encodeToString(STYLE.getBytes(StandardCharsets.UTF_8)); public static RequestMatcher getRequestMatcher() { diff --git a/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeLoginAuthenticationFilter.java b/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeLoginAuthenticationFilter.java index 9118375e..c4ba73dc 100644 --- a/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeLoginAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-wechat/src/main/java/cn/topiam/employee/authentication/wechat/filter/WeChatScanCodeLoginAuthenticationFilter.java @@ -44,7 +44,6 @@ import cn.topiam.employee.authentication.common.filter.AbstractIdpAuthentication import cn.topiam.employee.authentication.common.modal.IdpUser; import cn.topiam.employee.authentication.common.service.UserIdpService; import cn.topiam.employee.authentication.wechat.WeChatIdpScanCodeConfig; -import cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants; import cn.topiam.employee.common.entity.authentication.IdentityProviderEntity; import cn.topiam.employee.common.enums.IdentityProviderType; import cn.topiam.employee.common.repository.authentication.IdentityProviderRepository; @@ -53,7 +52,11 @@ import cn.topiam.employee.support.exception.TopIamException; import cn.topiam.employee.support.util.HttpClientUtils; import static org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE; -import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.*; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.ACCESS_TOKEN; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.APP_ID; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.ERROR_CODE; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.SECRET; +import static cn.topiam.employee.authentication.wechat.constant.WeChatAuthenticationConstants.USER_INFO; import static cn.topiam.employee.authentication.wechat.filter.WeChatScanCodeAuthorizationRequestRedirectFilter.PROVIDER_ID; import static cn.topiam.employee.common.enums.IdentityProviderType.WECHAT_SCAN_CODE; @@ -66,7 +69,7 @@ import static cn.topiam.employee.common.enums.IdentityProviderType.WECHAT_SCAN_C public class WeChatScanCodeLoginAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { - public final static String DEFAULT_FILTER_PROCESSES_URI = WECHAT_SCAN_CODE + public static final String DEFAULT_FILTER_PROCESSES_URI = WECHAT_SCAN_CODE .getLoginPathPrefix() + "/*"; public static final AntPathRequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( WECHAT_SCAN_CODE.getLoginPathPrefix() + "/" + "{" + PROVIDER_ID + "}", @@ -133,8 +136,7 @@ public class WeChatScanCodeLoginAuthenticationFilter extends param.put(SECRET, config.getAppSecret()); param.put(OAuth2ParameterNames.CODE, code); param.put(OAuth2ParameterNames.GRANT_TYPE, AUTHORIZATION_CODE.getValue()); - JSONObject result = JSON - .parseObject(HttpClientUtils.get(WeChatAuthenticationConstants.ACCESS_TOKEN, param)); + JSONObject result = JSON.parseObject(HttpClientUtils.get(ACCESS_TOKEN, param)); if (result.containsKey(ERROR_CODE)) { logger.error("获取access_token发生错误: " + result.toJSONString()); throw new TopIamException("获取access_token发生错误: " + result.toJSONString()); @@ -144,8 +146,7 @@ public class WeChatScanCodeLoginAuthenticationFilter extends param.put(OAuth2ParameterNames.ACCESS_TOKEN, result.getString(OAuth2ParameterNames.ACCESS_TOKEN)); param.put(OidcScopes.OPENID, result.getString(OidcScopes.OPENID)); - result = JSON - .parseObject(HttpClientUtils.get(WeChatAuthenticationConstants.USER_INFO, param)); + result = JSON.parseObject(HttpClientUtils.get(USER_INFO, param)); if (result.containsKey(ERROR_CODE)) { logger.error("获取微信用户个人信息发生错误: " + result.toJSONString()); throw new TopIamException("获取微信用户个人信息发生错误: " + result.toJSONString()); diff --git a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/constant/WeChatWorkAuthenticationConstants.java b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/constant/WeChatWorkAuthenticationConstants.java index 20777290..13901fcb 100644 --- a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/constant/WeChatWorkAuthenticationConstants.java +++ b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/constant/WeChatWorkAuthenticationConstants.java @@ -24,14 +24,14 @@ package cn.topiam.employee.authentication.wechatwork.constant; * Created by support@topiam.cn on 2021/12/9 22:19 */ public final class WeChatWorkAuthenticationConstants { - public final static String APP_ID = "appid"; - public final static String AGENT_ID = "agentid"; - public final static String HREF = "href"; - public final static String LOGIN_TYPE = "login_type"; - public final static String JSSDK = "jssdk"; - public final static String URL_AUTHORIZE = "https://open.work.weixin.qq.com/wwopen/sso/v1/qrConnect"; + public static final String APP_ID = "appid"; + public static final String AGENT_ID = "agentid"; + public static final String HREF = "href"; + public static final String LOGIN_TYPE = "login_type"; + public static final String JSSDK = "jssdk"; + public static final String URL_AUTHORIZE = "https://open.work.weixin.qq.com/wwopen/sso/v1/qrConnect"; - public final static String GET_USER_INFO = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo"; + public static final String GET_USER_INFO = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo"; - public final static String GET_TOKEN = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"; + public static final String GET_TOKEN = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"; } diff --git a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeAuthorizationRequestRedirectFilter.java b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeAuthorizationRequestRedirectFilter.java index 7ef4915a..9063a4a7 100644 --- a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeAuthorizationRequestRedirectFilter.java +++ b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeAuthorizationRequestRedirectFilter.java @@ -149,13 +149,13 @@ public class WeChatWorkScanCodeAuthorizationRequestRedirectFilter extends OncePe authorizationRequest.getAuthorizationRequestUri()); } - private final static String STYLE = "" + private static final String STYLE = "" + ".impowerBox .qrcode {width: 280px;border: none;margin-top:10px;}\n" + ".impowerBox .title {display: none;}\n" + ".impowerBox .info {display: none;}\n" + ".status_icon {display: none}\n" + ".impowerBox .status {text-align: center;} "; - private final static String STYLE_BASE64 = "data:text/css;base64," + Base64.getEncoder() + private static final String STYLE_BASE64 = "data:text/css;base64," + Base64.getEncoder() .encodeToString(STYLE.getBytes(StandardCharsets.UTF_8)); public static RequestMatcher getRequestMatcher() { diff --git a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeLoginAuthenticationFilter.java b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeLoginAuthenticationFilter.java index 8c732d63..6d258a15 100644 --- a/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeLoginAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-wechatwork/src/main/java/cn/topiam/employee/authentication/wechatwork/filter/WeChatWorkScanCodeLoginAuthenticationFilter.java @@ -67,7 +67,7 @@ public class WeChatWorkScanCodeLoginAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { final String ERROR_CODE = "errcode"; final String SUCCESS = "0"; - public final static String DEFAULT_FILTER_PROCESSES_URI = WECHATWORK_SCAN_CODE + public static final String DEFAULT_FILTER_PROCESSES_URI = WECHATWORK_SCAN_CODE .getLoginPathPrefix() + "/*"; public static final AntPathRequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( WECHATWORK_SCAN_CODE.getLoginPathPrefix() + "/" + "{" + PROVIDER_ID + "}", diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AccountConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AccountConstants.java index 0801ebe4..3afd3d59 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AccountConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AccountConstants.java @@ -30,19 +30,19 @@ public final class AccountConstants { /** * 用户API */ - public final static String USER_PATH = API_PATH + "/user"; + public static final String USER_PATH = API_PATH + "/user"; /** * 组织机构API */ - public final static String ORGANIZATION_PATH = API_PATH + "/organization"; + public static final String ORGANIZATION_PATH = API_PATH + "/organization"; /** * 用户组API */ - public final static String USER_GROUP_PATH = API_PATH + "/user_group"; + public static final String USER_GROUP_PATH = API_PATH + "/user_group"; /** * 身份源API */ - public final static String IDENTITY_SOURCE_PATH = API_PATH + "/identity_source"; + public static final String IDENTITY_SOURCE_PATH = API_PATH + "/identity_source"; /** * 组名称 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AnalysisConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AnalysisConstants.java index 492cd6b9..5914c03f 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AnalysisConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AnalysisConstants.java @@ -30,7 +30,7 @@ public final class AnalysisConstants { /** * 统计分析API路径 */ - public final static String ANALYSIS_PATH = API_PATH + "/analysis"; + public static final String ANALYSIS_PATH = API_PATH + "/analysis"; /** * 组名称 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AppConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AppConstants.java index 7ae2301c..6ad1d89a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AppConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AppConstants.java @@ -31,7 +31,7 @@ public final class AppConstants { /** * 应用管理API路径 */ - public final static String APP_PATH = API_PATH + "/app"; + public static final String APP_PATH = API_PATH + "/app"; /** * 组名称 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuditConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuditConstants.java index 72f4a2ee..5599cd33 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuditConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuditConstants.java @@ -29,7 +29,7 @@ public final class AuditConstants { /** * 系统审计API路径 */ - public final static String AUDIT_PATH = API_PATH + "/audit"; + public static final String AUDIT_PATH = API_PATH + "/audit"; /** * 组名称 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthenticationConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthenticationConstants.java index 52a38b5d..2d58c976 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthenticationConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthenticationConstants.java @@ -26,7 +26,7 @@ import cn.topiam.employee.support.constant.EiamConstants; * Created by support@topiam.cn on 2020/7/26 19:07 */ public final class AuthenticationConstants { - public final static String AUTHENTICATION_PATH = EiamConstants.API_PATH + public static final String AUTHENTICATION_PATH = EiamConstants.API_PATH + "/authentication"; /** diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthorizeConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthorizeConstants.java index b297cbc3..dcc06e81 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthorizeConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/AuthorizeConstants.java @@ -30,7 +30,7 @@ public final class AuthorizeConstants { * LOGIN */ public static final String LOGIN_PATH = EiamConstants.API_PATH + "/login"; - public final static String AUTHORIZE_PATH = EiamConstants.API_PATH + "/authorize"; + public static final String AUTHORIZE_PATH = EiamConstants.API_PATH + "/authorize"; public static final String AUTHORIZATION_REQUEST_URI = EiamConstants.API_PATH + "/authorization"; /** diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/ProtocolConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/ProtocolConstants.java index 0c263bc4..bab48c61 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/ProtocolConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/ProtocolConstants.java @@ -73,11 +73,11 @@ public final class ProtocolConstants { /** * OIDC BASE 认证路径 */ - public final static String OIDC_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/" + APP_CODE_VARIABLE; + public static final String OIDC_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/" + APP_CODE_VARIABLE; - public final static String OIDC_AUTHORIZE_PATH = OIDC_AUTHORIZE_BASE_PATH + "/oidc"; + public static final String OIDC_AUTHORIZE_PATH = OIDC_AUTHORIZE_BASE_PATH + "/oidc"; - public final static String OAUTH2_AUTHORIZE_PATH = OIDC_AUTHORIZE_BASE_PATH + "/oauth2"; + public static final String OAUTH2_AUTHORIZE_PATH = OIDC_AUTHORIZE_BASE_PATH + "/oauth2"; /** * OpenID Provider metadata. @@ -130,7 +130,7 @@ public final class ProtocolConstants { /** * SAML2 认证路径 */ - public final static String SAML2_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/saml2/" + public static final String SAML2_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/saml2/" + APP_CODE_VARIABLE; /** @@ -154,21 +154,21 @@ public final class ProtocolConstants { /** * cas 根路径 */ - public final static String CAS_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/cas/" + public static final String CAS_AUTHORIZE_BASE_PATH = AUTHORIZE_PATH + "/cas/" + APP_CODE_VARIABLE; /** * cas 登陆地址 */ - public final static String CAS_LOGIN_PATH = CAS_AUTHORIZE_BASE_PATH + "/login"; - /** + public static final String CAS_LOGIN_PATH = CAS_AUTHORIZE_BASE_PATH + "/login"; + /* * cas ticket校验地址 */ - public final static String CAS_VALIDATE_V1_PATH = CAS_AUTHORIZE_BASE_PATH + "/validate"; + public static final String CAS_VALIDATE_V1_PATH = CAS_AUTHORIZE_BASE_PATH + "/validate"; - public final static String CAS_VALIDATE_V2_PATH = CAS_AUTHORIZE_BASE_PATH + public static final String CAS_VALIDATE_V2_PATH = CAS_AUTHORIZE_BASE_PATH + "/serviceValidate"; - public final static String CAS_VALIDATE_V3_PATH = CAS_AUTHORIZE_BASE_PATH + public static final String CAS_VALIDATE_V3_PATH = CAS_AUTHORIZE_BASE_PATH + "/p3/serviceValidate"; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/SessionConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/SessionConstants.java index 8de6cf16..093141e3 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/SessionConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/SessionConstants.java @@ -26,7 +26,7 @@ import cn.topiam.employee.support.constant.EiamConstants; * Created by support@topiam.cn on 2022/6/8 20:12 */ public final class SessionConstants { - public final static String SESSION_PATH = EiamConstants.API_PATH + "/session"; + public static final String SESSION_PATH = EiamConstants.API_PATH + "/session"; /** * CURRENT_USER diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/SettingConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/SettingConstants.java index a37d26e6..1e2514ab 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/SettingConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/SettingConstants.java @@ -31,7 +31,7 @@ public final class SettingConstants { /** * 系统设置API路径 */ - public final static String SETTING_PATH = EiamConstants.API_PATH + "/setting"; + public static final String SETTING_PATH = EiamConstants.API_PATH + "/setting"; /** * 组名称 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/constants/StorageConstants.java b/eiam-common/src/main/java/cn/topiam/employee/common/constants/StorageConstants.java index 6da13bdb..5cc4d5ca 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/constants/StorageConstants.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/constants/StorageConstants.java @@ -29,7 +29,7 @@ public final class StorageConstants { /** * 存储API路径 */ - public final static String STORAGE_PATH = EiamConstants.API_PATH + "/storage"; + public static final String STORAGE_PATH = EiamConstants.API_PATH + "/storage"; /** * 文件存储 diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/AuthenticationType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/AuthenticationType.java index cd6b5a4b..934617fb 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/AuthenticationType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/AuthenticationType.java @@ -68,6 +68,7 @@ public enum AuthenticationType implements BaseEnum { throw new NullPointerException("未获取到对应平台"); } + @Override public String getCode() { return code; } @@ -76,6 +77,7 @@ public enum AuthenticationType implements BaseEnum { this.code = code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/CaptchaProviderType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/CaptchaProviderType.java index 86abcc51..4e0bf8cf 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/CaptchaProviderType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/CaptchaProviderType.java @@ -76,6 +76,7 @@ public enum CaptchaProviderType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/DataOrigin.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/DataOrigin.java index 0ec8864c..f8f918a8 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/DataOrigin.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/DataOrigin.java @@ -64,10 +64,12 @@ public enum DataOrigin implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderCategory.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderCategory.java index 915487ab..dfe3252a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderCategory.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderCategory.java @@ -62,10 +62,12 @@ public enum IdentityProviderCategory implements BaseEnum { this.providers = providers; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderType.java index ef43433c..0c746866 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/IdentityProviderType.java @@ -94,6 +94,7 @@ public enum IdentityProviderType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } @@ -102,6 +103,7 @@ public enum IdentityProviderType implements BaseEnum { return name; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/Language.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/Language.java index 3419fc6e..329f0c08 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/Language.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/Language.java @@ -61,6 +61,7 @@ public enum Language implements BaseEnum { return locale; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MessageCategory.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MessageCategory.java index 7d5eeb9b..9f077f8e 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MessageCategory.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MessageCategory.java @@ -52,10 +52,12 @@ public enum MessageCategory implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaFactor.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaFactor.java index 5d62eb73..ff657716 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaFactor.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaFactor.java @@ -57,10 +57,12 @@ public enum MfaFactor implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaMode.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaMode.java index c0c0b073..83db5123 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaMode.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/MfaMode.java @@ -56,10 +56,12 @@ public enum MfaMode implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/OrganizationType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/OrganizationType.java index 477eee4f..6c831b6e 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/OrganizationType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/OrganizationType.java @@ -60,10 +60,12 @@ public enum OrganizationType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PermissionActionType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PermissionActionType.java index 99db64b7..6bb62285 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PermissionActionType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PermissionActionType.java @@ -62,10 +62,12 @@ public enum PermissionActionType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyEffect.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyEffect.java index d368d3bd..8b7d34cf 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyEffect.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyEffect.java @@ -52,10 +52,12 @@ public enum PolicyEffect implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyObjectType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyObjectType.java index ba86dc5e..e29cf037 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyObjectType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicyObjectType.java @@ -56,10 +56,12 @@ public enum PolicyObjectType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicySubjectType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicySubjectType.java index 19369d9b..2618085a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicySubjectType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/PolicySubjectType.java @@ -65,10 +65,12 @@ public enum PolicySubjectType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/SmsType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/SmsType.java index ce3e2b8a..ae593939 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/SmsType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/SmsType.java @@ -33,8 +33,8 @@ public enum SmsType implements BaseEnum { */ BIND_PHONE("bind_phone", "绑定手机号", MessageCategory.CODE), /** - * 绑定，修改手机号成功 - */ + * 绑定，修改手机号成功 + */ BIND_PHONE_SUCCESS("bind_phone_success", "绑定手机号成功", MessageCategory.CODE), /** @@ -110,10 +110,12 @@ public enum SmsType implements BaseEnum { this.category = category; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/SyncStatus.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/SyncStatus.java index 6c98e1b0..02bf561a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/SyncStatus.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/SyncStatus.java @@ -59,10 +59,12 @@ public enum SyncStatus implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/TriggerType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/TriggerType.java index a361faab..f8b80f06 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/TriggerType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/TriggerType.java @@ -46,10 +46,12 @@ public enum TriggerType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserGender.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserGender.java index f8dd9cba..5c46a108 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserGender.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserGender.java @@ -50,10 +50,12 @@ public enum UserGender implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserIdType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserIdType.java index a854373c..8d778871 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserIdType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserIdType.java @@ -49,10 +49,12 @@ public enum UserIdType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserStatus.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserStatus.java index d3b3f32e..a9379a25 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserStatus.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserStatus.java @@ -66,10 +66,12 @@ public enum UserStatus implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserType.java index 181903ca..3f0ebd83 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/UserType.java @@ -72,6 +72,7 @@ public enum UserType implements BaseEnum { throw new NullPointerException("未获取到类型"); } + @Override public String getCode() { return code; } @@ -80,6 +81,7 @@ public enum UserType implements BaseEnum { this.code = code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppCertUsingType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppCertUsingType.java index 3c20436f..e3073109 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppCertUsingType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppCertUsingType.java @@ -54,6 +54,7 @@ public enum AppCertUsingType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppProtocol.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppProtocol.java index ff0f8a0e..51b040ca 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppProtocol.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppProtocol.java @@ -66,6 +66,7 @@ public enum AppProtocol implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppType.java index a7d53320..bbfd6886 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AppType.java @@ -59,10 +59,12 @@ public enum AppType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AuthorizationType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AuthorizationType.java index fecc29ae..68a2a648 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AuthorizationType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/AuthorizationType.java @@ -53,10 +53,12 @@ public enum AuthorizationType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/InitLoginType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/InitLoginType.java index 7a437e0d..2093768d 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/InitLoginType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/InitLoginType.java @@ -53,10 +53,12 @@ public enum InitLoginType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/SamlAttributeStatementValueType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/SamlAttributeStatementValueType.java index 0f8e3336..e46d4a22 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/SamlAttributeStatementValueType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/app/SamlAttributeStatementValueType.java @@ -84,6 +84,7 @@ public enum SamlAttributeStatementValueType implements BaseEnum { return null; } + @Override public String getCode() { return code; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identityprovider/IdentitySourceProvider.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identityprovider/IdentitySourceProvider.java index e38c3372..2ae3b9e2 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identityprovider/IdentitySourceProvider.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identityprovider/IdentitySourceProvider.java @@ -80,6 +80,7 @@ public enum IdentitySourceProvider implements BaseEnum { return null; } + @Override public String getCode() { return code; } @@ -88,6 +89,7 @@ public enum IdentitySourceProvider implements BaseEnum { return name; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceActionType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceActionType.java index 708d735b..5bd97d26 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceActionType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceActionType.java @@ -57,10 +57,12 @@ public enum IdentitySourceActionType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceObjectType.java b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceObjectType.java index 9241a35f..14716843 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceObjectType.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/enums/identitysource/IdentitySourceObjectType.java @@ -55,10 +55,12 @@ public enum IdentitySourceObjectType implements BaseEnum { this.desc = desc; } + @Override public String getCode() { return code; } + @Override public String getDesc() { return desc; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/util/CasUtils.java b/eiam-common/src/main/java/cn/topiam/employee/common/util/CasUtils.java index 58fa4fab..ac0edff3 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/util/CasUtils.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/util/CasUtils.java @@ -25,6 +25,6 @@ import org.slf4j.LoggerFactory; * Created by support@topiam.cn on 2022/12/30 01:06 */ public class CasUtils { - private final static Logger logger = LoggerFactory.getLogger(CasUtils.class); + private static final Logger logger = LoggerFactory.getLogger(CasUtils.class); } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/util/SamlUtils.java b/eiam-common/src/main/java/cn/topiam/employee/common/util/SamlUtils.java index b9814f92..851e6abb 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/util/SamlUtils.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/util/SamlUtils.java @@ -61,7 +61,7 @@ import static org.opensaml.saml.common.xml.SAMLConstants.POST_METHOD; * Created by support@topiam.cn on 2022/5/18 21:54 */ public class SamlUtils { - private final static Logger logger = LoggerFactory.getLogger(SamlUtils.class); + private static final Logger logger = LoggerFactory.getLogger(SamlUtils.class); private static final AtomicBoolean INITIALIZED = new AtomicBoolean(false); /** diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/configuration/EiamElasticsearchConfiguration.java b/eiam-core/src/main/java/cn/topiam/employee/core/configuration/EiamElasticsearchConfiguration.java index 43fb33dc..b16f3e7c 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/configuration/EiamElasticsearchConfiguration.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/configuration/EiamElasticsearchConfiguration.java @@ -17,6 +17,8 @@ */ package cn.topiam.employee.core.configuration; +import java.time.Duration; + import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.elasticsearch.client.RestClientBuilder; @@ -24,8 +26,6 @@ import org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCus import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.time.Duration; - /** * EiamElasticsearchConfiguration * diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/endpoint/security/PublicSecretEndpoint.java b/eiam-core/src/main/java/cn/topiam/employee/core/endpoint/security/PublicSecretEndpoint.java index 46aabb4a..51e12fff 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/endpoint/security/PublicSecretEndpoint.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/endpoint/security/PublicSecretEndpoint.java @@ -54,7 +54,7 @@ public class PublicSecretEndpoint extends HttpServlet { public static final String PUBLIC_SECRET_PATH = EiamConstants.API_PATH + "/public_secret"; - private final static String TYPE = "type"; + private static final String TYPE = "type"; /** * 获取加密key diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/decrypt/DecryptRequestBodyAdvice.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/decrypt/DecryptRequestBodyAdvice.java index ef8d1d1d..9349b688 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/security/decrypt/DecryptRequestBodyAdvice.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/decrypt/DecryptRequestBodyAdvice.java @@ -57,7 +57,7 @@ import static cn.topiam.employee.support.constant.EiamConstants.TOPIAM_ENCRYPT_S public class DecryptRequestBodyAdvice extends RequestBodyAdviceAdapter { private final Logger logger = LoggerFactory.getLogger(DecryptRequestBodyAdvice.class); - private final static String ENCRYPT = "encrypt"; + private static final String ENCRYPT = "encrypt"; @Override public boolean supports(MethodParameter methodParameter, @NonNull Type targetType, diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/otp/OtpContextHelp.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/otp/OtpContextHelp.java index 5c013a2e..c7307958 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/security/otp/OtpContextHelp.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/otp/OtpContextHelp.java @@ -180,7 +180,7 @@ public class OtpContextHelp { /** * 发送验证码频繁，请稍候重试 */ - private final static String SEND_FREQUENTLY = "发送验证码频繁，请稍候重试"; + private static final String SEND_FREQUENTLY = "发送验证码频繁，请稍候重试"; /** * 验证码 code 值前缀 diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/password/weak/DefaultPasswordWeakLibImpl.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/password/weak/DefaultPasswordWeakLibImpl.java index 10c1af4b..f144afdc 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/security/password/weak/DefaultPasswordWeakLibImpl.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/password/weak/DefaultPasswordWeakLibImpl.java @@ -107,6 +107,7 @@ public class DefaultPasswordWeakLibImpl implements PasswordWeakLib { } } + @Override public Boolean wordExists(String word) { synchronized (dictionary) { return Boolean.TRUE.equals(dictionary.get(word)); diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/setting/constant/MessageSettingConstants.java b/eiam-core/src/main/java/cn/topiam/employee/core/setting/constant/MessageSettingConstants.java index 51a5c8af..ef4e115e 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/setting/constant/MessageSettingConstants.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/setting/constant/MessageSettingConstants.java @@ -46,7 +46,7 @@ public final class MessageSettingConstants { /** * 邮件内容路径 */ - public final static String MAIL_CONTENT_PATH = CLASSPATH_URL_PREFIX + public static final String MAIL_CONTENT_PATH = CLASSPATH_URL_PREFIX + "mail/content/"; /** diff --git a/eiam-identity-source/eiam-identity-source-wechatwork/src/main/java/cn/topiam/employee/identitysource/wechatwork/util/AesException.java b/eiam-identity-source/eiam-identity-source-wechatwork/src/main/java/cn/topiam/employee/identitysource/wechatwork/util/AesException.java index 01e3b4ee..83a9dcae 100644 --- a/eiam-identity-source/eiam-identity-source-wechatwork/src/main/java/cn/topiam/employee/identitysource/wechatwork/util/AesException.java +++ b/eiam-identity-source/eiam-identity-source-wechatwork/src/main/java/cn/topiam/employee/identitysource/wechatwork/util/AesException.java @@ -25,14 +25,14 @@ package cn.topiam.employee.identitysource.wechatwork.util; */ public class AesException extends Exception { - public final static int VALIDATE_SIGNATURE_ERROR = -40001; - public final static int PARSE_XML_ERROR = -40002; - public final static int COMPUTE_SIGNATURE_ERROR = -40003; - public final static int ILLEGAL_AES_KEY = -40004; - public final static int VALIDATE_CORP_ID_ERROR = -40005; - public final static int ENCRYPT_AES_ERROR = -40006; - public final static int DECRYPT_AES_ERROR = -40007; - public final static int ILLEGAL_BUFFER = -40008; + public static final int VALIDATE_SIGNATURE_ERROR = -40001; + public static final int PARSE_XML_ERROR = -40002; + public static final int COMPUTE_SIGNATURE_ERROR = -40003; + public static final int ILLEGAL_AES_KEY = -40004; + public static final int VALIDATE_CORP_ID_ERROR = -40005; + public static final int ENCRYPT_AES_ERROR = -40006; + public static final int DECRYPT_AES_ERROR = -40007; + public static final int ILLEGAL_BUFFER = -40008; private final int code; diff --git a/eiam-openapi/src/main/java/cn/topiam/employee/openapi/constants/OpenApiConstants.java b/eiam-openapi/src/main/java/cn/topiam/employee/openapi/constants/OpenApiConstants.java index 967b022f..986bc567 100644 --- a/eiam-openapi/src/main/java/cn/topiam/employee/openapi/constants/OpenApiConstants.java +++ b/eiam-openapi/src/main/java/cn/topiam/employee/openapi/constants/OpenApiConstants.java @@ -30,12 +30,12 @@ public class OpenApiConstants { /** * OpenAPI 路径 */ - public final static String OPEN_API_PATH = API_PATH + "/openapi"; + public static final String OPEN_API_PATH = API_PATH + "/openapi"; /** * 权限管理API 路径 */ - public final static String OPEN_API_PERMISSION_PATH = API_PATH + "/openapi/permission"; + public static final String OPEN_API_PERMISSION_PATH = API_PATH + "/openapi/permission"; /** * 组名称 diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/idp/bind/IdpBindUserAuthenticationFilter.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/idp/bind/IdpBindUserAuthenticationFilter.java index 41215105..8ade6911 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/idp/bind/IdpBindUserAuthenticationFilter.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/idp/bind/IdpBindUserAuthenticationFilter.java @@ -73,7 +73,7 @@ import static cn.topiam.employee.support.constant.EiamConstants.TOPIAM_BIND_MFA_ */ @Slf4j public class IdpBindUserAuthenticationFilter extends AbstractAuthenticationProcessingFilter { - public final static String DEFAULT_FILTER_PROCESSES_URI = USER_BIND_IDP; + public static final String DEFAULT_FILTER_PROCESSES_URI = USER_BIND_IDP; public static final RequestMatcher IDP_BIND_USER_MATCHER = new AntPathRequestMatcher( DEFAULT_FILTER_PROCESSES_URI, HttpMethod.POST.name()); diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/mfa/MfaAuthenticationFilter.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/mfa/MfaAuthenticationFilter.java index 8ef9adcd..49fe7735 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/mfa/MfaAuthenticationFilter.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/mfa/MfaAuthenticationFilter.java @@ -60,7 +60,7 @@ public class MfaAuthenticationFilter extends AbstractAuthenticationProcessingFil public static final String SPRING_SECURITY_FORM_TOTP_KEY = "totp"; public static final String SPRING_SECURITY_FORM_TYPE_KEY = "type"; - public final static String DEFAULT_FILTER_PROCESSES_URI = MFA_VALIDATE; + public static final String DEFAULT_FILTER_PROCESSES_URI = MFA_VALIDATE; public static final RequestMatcher MFA_LOGIN_MATCHER = new AntPathRequestMatcher( DEFAULT_FILTER_PROCESSES_URI, HttpMethod.POST.name()); diff --git a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/tickets/TicketGrantingTicketImpl.java b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/tickets/TicketGrantingTicketImpl.java index 2e79a1c2..b044cb47 100644 --- a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/tickets/TicketGrantingTicketImpl.java +++ b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/tickets/TicketGrantingTicketImpl.java @@ -49,6 +49,7 @@ public class TicketGrantingTicketImpl implements TicketGrantingTicket { return false; } + @Override public UserDetails getUserDetails() { return this.userDetails; } diff --git a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response10GeneratorImpl.java b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response10GeneratorImpl.java index c9e320e5..5b681af7 100644 --- a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response10GeneratorImpl.java +++ b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response10GeneratorImpl.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; */ public class Response10GeneratorImpl implements ResponseGenerator { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(Response20GeneratorImpl.class); private final HttpServletResponse response; diff --git a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response20GeneratorImpl.java b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response20GeneratorImpl.java index 7b884da5..a6f05463 100644 --- a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response20GeneratorImpl.java +++ b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response20GeneratorImpl.java @@ -46,7 +46,7 @@ import static cn.topiam.employee.protocol.cas.idp.constant.ProtocolConstants.*; */ public class Response20GeneratorImpl implements ResponseGenerator { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(Response20GeneratorImpl.class); private final HttpServletResponse response; diff --git a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response30GeneratorImpl.java b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response30GeneratorImpl.java index f4f2a6d4..2cddc4b1 100644 --- a/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response30GeneratorImpl.java +++ b/eiam-protocol/eiam-protocol-cas/src/main/java/cn/topiam/employee/protocol/cas/idp/xml/Response30GeneratorImpl.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; */ public class Response30GeneratorImpl extends Response20GeneratorImpl { - private final static Logger logger = LoggerFactory.getLogger(Response20GeneratorImpl.class); + private static final Logger logger = LoggerFactory.getLogger(Response20GeneratorImpl.class); public Response30GeneratorImpl(DocumentBuilder documentBuilder, HttpServletResponse response) { super(documentBuilder, response); diff --git a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/authentication/password/EiamOAuth2AuthorizationPasswordAuthenticationConverter.java b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/authentication/password/EiamOAuth2AuthorizationPasswordAuthenticationConverter.java index 32d11a0a..7e01c631 100644 --- a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/authentication/password/EiamOAuth2AuthorizationPasswordAuthenticationConverter.java +++ b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/authentication/password/EiamOAuth2AuthorizationPasswordAuthenticationConverter.java @@ -47,7 +47,7 @@ import static cn.topiam.employee.protocol.oidc.util.EiamOAuth2Utils.getParameter @SuppressWarnings({ "AlibabaClassNamingShouldBeCamel" }) public class EiamOAuth2AuthorizationPasswordAuthenticationConverter implements AuthenticationConverter { - public final static String DEFAULT_ERROR_URI = "https://datatracker.ietf.org/doc/html/rfc6749#section-5.2"; + public static final String DEFAULT_ERROR_URI = "https://datatracker.ietf.org/doc/html/rfc6749#section-5.2"; @Override public Authentication convert(HttpServletRequest request) { diff --git a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationConsentService.java b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationConsentService.java index 66e9f605..4e3d2bd4 100644 --- a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationConsentService.java +++ b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationConsentService.java @@ -38,7 +38,7 @@ public class RedisOAuth2AuthorizationConsentService implements OAuth2Authorizati private final RedisTemplate redisTemplate; - private final static Long TIMEOUT = 10L; + private static final Long TIMEOUT = 10L; @Override public void save(OAuth2AuthorizationConsent authorizationConsent) { diff --git a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationService.java b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationService.java index 47f226f4..ced1e114 100644 --- a/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationService.java +++ b/eiam-protocol/eiam-protocol-oidc/src/main/java/cn/topiam/employee/protocol/oidc/service/RedisOAuth2AuthorizationService.java @@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class RedisOAuth2AuthorizationService implements OAuth2AuthorizationService { - private final static Long TIMEOUT = 10L; + private static final Long TIMEOUT = 10L; private static final String AUTHORIZATION = "token"; diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOnEndpointFilter.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOnEndpointFilter.java index 23ae2431..1e60bc7c 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOnEndpointFilter.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOnEndpointFilter.java @@ -99,7 +99,7 @@ public class Saml2IdpSingleSignOnEndpointFilter extends OncePerRequestFilter implements OrderedFilter { private static final Logger logger = LoggerFactory .getLogger(Saml2IdpSingleSignOnEndpointFilter.class); - private final static RequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( + private static final RequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( Saml2EndpointConstants.SAML_SSO_PATH); private final RedirectCache redirectCache = new HttpSessionRedirectCache(); @@ -257,7 +257,7 @@ public class Saml2IdpSingleSignOnEndpointFilter extends OncePerRequestFilter /** * Velocity 引擎 */ - public final static VelocityEngine VELOCITY_ENGINE; + public static final VelocityEngine VELOCITY_ENGINE; static { VELOCITY_ENGINE = new VelocityEngine(); diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOutEndpointFilter.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOutEndpointFilter.java index 71351beb..4c4638e3 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOutEndpointFilter.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/Saml2IdpSingleSignOutEndpointFilter.java @@ -73,7 +73,7 @@ public class Saml2IdpSingleSignOutEndpointFilter extends OncePerRequestFilter private final Logger logger = LoggerFactory .getLogger(Saml2IdpSingleSignOutEndpointFilter.class); - private final static RequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( + private static final RequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( ProtocolConstants.Saml2EndpointConstants.SAML_LOGOUT_PATH); public static RequestMatcher getRequestMatcher() { diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AssertionGenerator.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AssertionGenerator.java index d0d667cc..ff7ed754 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AssertionGenerator.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AssertionGenerator.java @@ -60,7 +60,7 @@ import static cn.topiam.employee.common.util.SamlUtils.generateSecureRandomId; @RequiredArgsConstructor @Getter public class AssertionGenerator { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(AssertionGenerator.class); /** diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AttributeStatementGenerator.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AttributeStatementGenerator.java index a04b34ea..ebf19e38 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AttributeStatementGenerator.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AttributeStatementGenerator.java @@ -43,7 +43,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @Getter public class AttributeStatementGenerator { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(AttributeStatementGenerator.class); /** * 断言属性 diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AuthnStatementGenerator.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AuthnStatementGenerator.java index 7952a405..51bade5e 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AuthnStatementGenerator.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/AuthnStatementGenerator.java @@ -38,7 +38,7 @@ import cn.topiam.employee.support.context.ServletContextHelp; * Created by support@topiam.cn on 2022/6/1 22:52 */ public class AuthnStatementGenerator { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(AuthnStatementGenerator.class); private final AuthnContextClassRefType authnContextClassRefType; diff --git a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/ConditionsGenerator.java b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/ConditionsGenerator.java index 9b4a0734..6e2d389d 100644 --- a/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/ConditionsGenerator.java +++ b/eiam-protocol/eiam-protocol-saml2/src/main/java/cn/topiam/employee/protocol/saml2/idp/endpoint/xml/ConditionsGenerator.java @@ -38,7 +38,7 @@ import lombok.AllArgsConstructor; */ @AllArgsConstructor public class ConditionsGenerator { - private final static Logger logger = LoggerFactory.getLogger(ConditionsGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(ConditionsGenerator.class); /** * audienceUri */ diff --git a/eiam-support/src/main/java/cn/topiam/employee/support/util/UrlTestUtils.java b/eiam-support/src/main/java/cn/topiam/employee/support/util/UrlTestUtils.java index 4da389bc..5cefdb26 100644 --- a/eiam-support/src/main/java/cn/topiam/employee/support/util/UrlTestUtils.java +++ b/eiam-support/src/main/java/cn/topiam/employee/support/util/UrlTestUtils.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; */ public class UrlTestUtils { - private final static Logger logger = LoggerFactory.getLogger(UrlTestUtils.class); + private static final Logger logger = LoggerFactory.getLogger(UrlTestUtils.class); public static boolean testUrlWithTimeOut(String urlString, int timeOutMillSeconds) { try { diff --git a/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/constants/SynchronizerConstants.java b/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/constants/SynchronizerConstants.java index 204a9393..4f61b1df 100644 --- a/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/constants/SynchronizerConstants.java +++ b/eiam-synchronizer/src/main/java/cn/topiam/employee/synchronizer/constants/SynchronizerConstants.java @@ -30,10 +30,10 @@ public final class SynchronizerConstants { /** * 同步器事件接收路径 */ - public final static String EVENT_PATH = EiamConstants.API_PATH + "/event"; + public static final String EVENT_PATH = EiamConstants.API_PATH + "/event"; /** * 同步器事件接收路径 */ - public final static String EVENT_RECEIVE_PATH = EVENT_PATH + "/receive"; + public static final String EVENT_RECEIVE_PATH = EVENT_PATH + "/receive"; }