From d02db384ae18e676793edc0676b7037a0cf54831 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 31 Jul 2024 09:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authn/web/AuthTokenRefreshPoint.java | 16 +++-- .../maxkey/authn/web/FileUploadEndpoint.java | 9 ++- .../maxkey/authn/web/InstitutionEndpoint.java | 19 +++--- .../AbstractAuthenticationProvider.java | 8 +-- .../realm/ldap/ActiveDirectoryServer.java | 2 +- .../realm/ldap/LdapAuthenticationRealm.java | 2 +- .../authn/realm/ldap/StandardLdapServer.java | 2 +- .../authn/support/jwt/HttpJwtEntryPoint.java | 13 ++-- .../wsfederation/WsFederationServiceImpl.java | 2 +- .../AuthWeChatEnterpriseWebRequestCost.java | 2 +- .../AbstractSocialSignOnEndpoint.java | 2 +- .../socialsignon/SocialSignOnEndpoint.java | 50 +++++++-------- .../maxkey/crypto/jwt/HMAC512Service.java | 2 +- ...EncryptionAndDecryptionServiceBuilder.java | 2 +- ...DefaultJwtSigningAndValidationService.java | 2 +- ...ricSigningAndValidationServiceBuilder.java | 2 +- .../org/dromara/maxkey/entity/Message.java | 14 ++-- .../org/dromara/maxkey/pretty/Pretty.java | 2 +- .../org/dromara/maxkey/util/DateUtils.java | 64 +++++++++---------- .../dromara/maxkey/util/EthernetAddress.java | 2 +- .../org/dromara/maxkey/util/SnowFlakeId.java | 20 +++--- .../org/dromara/maxkey/web/WebConstants.java | 2 +- .../service/AccountsStrategyService.java | 2 +- .../service/AppsCasDetailsService.java | 2 +- .../service/AppsFormBasedDetailsService.java | 2 +- .../service/AppsJwtDetailsService.java | 2 +- .../service/AppsSaml20DetailsService.java | 2 +- .../persistence/service/AppsService.java | 6 +- .../service/AppsTokenBasedDetailsService.java | 2 +- .../service/ConnectorsService.java | 2 +- .../service/GroupMemberService.java | 2 +- .../persistence/service/GroupsService.java | 2 +- .../service/OrganizationsCastService.java | 2 +- .../service/RoleMemberService.java | 2 +- .../service/SocialsProviderService.java | 2 +- .../service/SynchronizersService.java | 2 +- .../persistence/service/UserInfoService.java | 2 +- .../authz/endpoint/AuthorizeBaseEndpoint.java | 2 +- .../endpoint/AuthorizeCredentialEndpoint.java | 16 ++--- .../authz/endpoint/AuthorizeEndpoint.java | 2 +- .../adapter/AbstractAuthorizeAdapter.java | 2 +- .../cas/endpoint/Cas10AuthorizeEndpoint.java | 2 +- .../cas/endpoint/Cas20AuthorizeEndpoint.java | 2 +- .../cas/endpoint/Cas30AuthorizeEndpoint.java | 2 +- .../cas/endpoint/CasAuthorizeEndpoint.java | 2 +- .../endpoint/CasBaseAuthorizeEndpoint.java | 2 +- .../authz/cas/endpoint/CasLogoutEndpoint.java | 2 +- .../endpoint/adapter/CasDefaultAdapter.java | 2 +- .../cas/endpoint/adapter/CasPlainAdapter.java | 2 +- .../endpoint/response/CasServiceResponse.java | 2 +- .../response/ServiceResponseBuilder.java | 2 +- .../cas/endpoint/ticket/CasConstants.java | 6 +- .../InMemoryProxyGrantingTicketServices.java | 2 +- .../ticket/st/InMemoryTicketServices.java | 2 +- .../InMemoryTicketGrantingTicketServices.java | 2 +- .../exapi/endpoint/ExtendApiMetadata.java | 2 +- .../adapter/ExtendApiCndnsApiMailAdapter.java | 2 +- .../ExtendApiNeteaseQiyeMailAdapter.java | 2 +- .../adapter/ExtendApiQQExmailAdapter.java | 4 +- .../ExtendApiTimestampSignAdapter.java | 2 +- .../adapter/ExtendApiZentaoAdapter.java | 2 +- .../adapter/netease/NeteaseRSATool.java | 2 +- .../endpoint/FormBasedAuthorizeEndpoint.java | 2 +- .../jwt/endpoint/adapter/JwtAdapter.java | 2 +- .../token/endpoint/JwtAuthorizeEndpoint.java | 2 +- .../authz/oauth2/common/OAuth2Constants.java | 22 +++---- .../authz/oauth2/jwt/codec/Base64Codec.java | 34 +++++----- .../OAuth20AccessConfirmationEndpoint.java | 23 ++++--- .../authentication/BearerTokenExtractor.java | 2 +- .../client/JdbcClientDetailsService.java | 2 +- .../InMemoryAuthorizationCodeServices.java | 2 +- .../endpoint/AuthorizationEndpoint.java | 28 ++++---- .../provider/endpoint/IntrospectEndpoint.java | 2 +- .../provider/endpoint/OauthJwksEndpoint.java | 2 +- .../TokenEndpointAuthenticationFilter.java | 2 +- .../endpoint/OAuthDefaultUserInfoAdapter.java | 2 +- .../userinfo/endpoint/UserInfoEndpoint.java | 2 +- .../endpoint/UserInfoOIDCEndpoint.java | 2 +- .../OauthAuthorizationServerEndpoint.java | 2 +- .../endpoint/OpenidConfigurationEndpoint.java | 2 +- .../oidc/idtoken/OIDCIdTokenEnhancer.java | 4 +- .../authz/saml/common/EndpointGenerator.java | 2 +- .../common/SignatureSecurityPolicyRule.java | 2 +- .../impl/ExtractPostBindingAdapter.java | 2 +- .../binding/impl/PostBindingAdapter.java | 2 +- .../consumer/endpoint/ConsumerEndpoint.java | 2 +- .../RealAuthenticationFailureHandler.java | 2 +- .../metadata/MetadataDescriptorUtil.java | 2 +- .../saml20/metadata/MetadataGenerator.java | 2 +- .../endpoint/SamlMetadataEndpoint.java | 2 +- .../provider/endpoint/AssertionEndpoint.java | 2 +- .../provider/endpoint/IdpInitEndpoint.java | 2 +- .../provider/endpoint/LogoutSamlEndpoint.java | 2 +- .../endpoint/SingleSignOnEndpoint.java | 2 +- .../provider/xml/AssertionGenerator.java | 2 +- .../xml/AttributeStatementGenerator.java | 2 +- .../provider/xml/AuthnResponseGenerator.java | 2 +- .../provider/xml/AuthnStatementGenerator.java | 2 +- .../provider/xml/ConditionsGenerator.java | 2 +- .../endpoint/TokenBasedAuthorizeEndpoint.java | 2 +- .../adapter/TokenBasedDefaultAdapter.java | 2 +- .../adapter/TokenBasedSimpleAdapter.java | 2 +- .../web/contorller/ImageCaptchaEndpoint.java | 13 ++-- .../ActiveDirectorySynchronizerService.java | 2 +- .../ActiveDirectoryUsersService.java | 2 +- .../dingtalk/DingtalkAccessTokenService.java | 2 +- .../dingtalk/DingtalkOrganizationService.java | 2 +- .../dingtalk/DingtalkSynchronizerService.java | 2 +- .../dingtalk/DingtalkUsersService.java | 2 +- .../feishu/FeishuAccessTokenService.java | 2 +- .../feishu/FeishuOrganizationService.java | 2 +- .../feishu/FeishuSynchronizerService.java | 2 +- .../feishu/FeishuUsersService.java | 2 +- .../jdbc/JdbcOrganizationService.java | 2 +- .../jdbc/JdbcSynchronizerService.java | 2 +- .../synchronizer/jdbc/JdbcUsersService.java | 2 +- .../ldap/LdapOrganizationService.java | 2 +- .../ldap/LdapSynchronizerService.java | 2 +- .../synchronizer/ldap/LdapUsersService.java | 2 +- .../WorkweixinAccessTokenService.java | 2 +- .../WorkweixinOrganizationService.java | 2 +- .../WorkweixinSynchronizerService.java | 2 +- .../workweixin/WorkweixinUsersService.java | 2 +- .../rest/RestOrganizationController.java | 26 ++------ .../identity/rest/RestUserInfoController.java | 22 ++----- .../identity/scim/ScimGroupController.java | 2 +- .../scim/ScimOrganizationController.java | 2 +- .../identity/scim/ScimUserController.java | 2 +- .../src/app/routes/apps/apps.component.html | 12 +--- .../contorller/LoginSessionController.java | 30 ++++----- .../web/contorller/AppListController.java | 13 ++-- .../contorller/ChangePasswodController.java | 25 +++----- .../contorller/ForgotPasswordContorller.java | 39 ++++++----- .../web/contorller/LoginEntryPoint.java | 48 ++++++-------- .../maxkey/web/contorller/LogoutEndpoint.java | 17 ++--- .../contorller/OneTimePasswordController.java | 10 +-- .../web/contorller/ProfileController.java | 10 +-- .../web/contorller/RegisterController.java | 16 ++--- .../maxkey/web/contorller/SafeController.java | 4 +- .../SocialSignOnListController.java | 10 +-- .../LoginAppsHistoryController.java | 4 +- .../contorller/LoginHistoryController.java | 4 +- .../access/contorller/AccessController.java | 27 ++++---- .../access/contorller/SessionController.java | 15 ++--- .../contorller/ApplicationsController.java | 52 +++++++-------- .../apps/contorller/CasDetailsController.java | 31 +++++---- .../ExtendApiDetailsController.java | 31 +++++---- .../FormBasedDetailsController.java | 31 +++++---- .../apps/contorller/JwtDetailsController.java | 31 +++++---- .../contorller/OAuth20DetailsController.java | 31 +++++---- .../contorller/SAML20DetailsController.java | 31 +++++---- .../TokenBasedDetailsController.java | 31 +++++---- .../AccountsStrategyController.java | 37 ++++++----- .../config/contorller/AdaptersController.java | 37 ++++++----- .../contorller/CnfEmailSendersController.java | 19 +++--- .../contorller/CnfLdapContextController.java | 21 +++--- .../CnfPasswordPolicyController.java | 15 ++--- .../contorller/CnfSmsProviderController.java | 15 ++--- .../contorller/ConnectorsController.java | 31 +++++---- .../contorller/InstitutionsController.java | 15 ++--- .../contorller/SocialsProviderController.java | 37 ++++++----- .../contorller/SynchronizersController.java | 36 +++++------ .../web/contorller/AccountsController.java | 49 +++++++------- .../web/contorller/DashboardController.java | 15 ++--- .../web/contorller/LoginEntryPoint.java | 13 ++-- .../maxkey/web/contorller/LogoutEndpoint.java | 11 ++-- .../ConnectorHistoryController.java | 15 ++--- .../LoginAppsHistoryController.java | 15 ++--- .../contorller/LoginHistoryController.java | 15 ++--- .../SynchronizerHistoryController.java | 14 ++-- .../contorller/SystemLogsController.java | 14 ++-- .../idm/contorller/GroupMemberController.java | 45 +++++++------ .../web/idm/contorller/GroupsController.java | 37 ++++++----- .../contorller/OrganizationsController.java | 52 +++++++-------- .../idm/contorller/UserInfoController.java | 64 +++++++++---------- .../contorller/PermissionController.java | 15 ++--- .../contorller/ResourcesController.java | 45 +++++++------ 177 files changed, 880 insertions(+), 986 deletions(-) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java index 6e6821123..09f1370a3 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java @@ -24,21 +24,21 @@ import org.dromara.maxkey.authn.jwt.AuthTokenService; import org.dromara.maxkey.authn.session.Session; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.entity.Message; -import org.dromara.maxkey.util.StrUtils; 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.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import jakarta.servlet.http.HttpServletRequest; -@Controller +@RestController @RequestMapping(value = "/auth") public class AuthTokenRefreshPoint { private static final Logger _logger = LoggerFactory.getLogger(AuthTokenRefreshPoint.class); @@ -52,7 +52,13 @@ public class AuthTokenRefreshPoint { @Autowired SessionManager sessionManager; - @RequestMapping(value={"/token/refresh"}, produces = {MediaType.APPLICATION_JSON_VALUE}) + @GetMapping(value={"/token/refresh"}) + public ResponseEntity refreshGet(HttpServletRequest request, + @RequestParam(name = "refresh_token", required = false) String refreshToken) { + return refresh(request,refreshToken); + } + + @PostMapping(value={"/token/refresh"}) public ResponseEntity refresh(HttpServletRequest request, @RequestParam(name = "refresh_token", required = false) String refreshToken) { _logger.debug("try to refresh token " ); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java index fed215089..26c99861f 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java @@ -27,10 +27,9 @@ import org.dromara.maxkey.persistence.service.FileUploadService; 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.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import jakarta.servlet.http.HttpServletRequest; @@ -44,9 +43,9 @@ public class FileUploadEndpoint { @Autowired FileUploadService fileUploadService; - @RequestMapping(value={"/file/upload/"}) + @PostMapping({"/file/upload/"}) @ResponseBody - public ResponseEntity upload( HttpServletRequest request, + public Message upload( HttpServletRequest request, HttpServletResponse response, @ModelAttribute FileUpload fileUpload, @CurrentUser UserInfo currentUser){ @@ -68,7 +67,7 @@ public class FileUploadEndpoint { _logger.error("FileUpload IOException",e); } } - return new Message(Message.SUCCESS,(Object)fileUpload.getId()).buildResponse(); + return new Message(Message.SUCCESS,(Object)fileUpload.getId()); } } diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java index e8a01dab4..f81b61b6b 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java @@ -25,22 +25,21 @@ import org.dromara.maxkey.persistence.repository.InstitutionsRepository; 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.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import jakarta.servlet.http.HttpServletRequest; -@Controller +@RestController @RequestMapping(value = "/inst") public class InstitutionEndpoint { private static final Logger _logger = LoggerFactory.getLogger(InstitutionEndpoint.class); - public final static String HEADER_HOST = "host"; + public static final String HEADER_HOST = "host"; - public final static String HEADER_HOSTNAME = "hostname"; + public static final String HEADER_HOSTNAME = "hostname"; @Autowired InstitutionsRepository institutionsRepository; @@ -48,8 +47,8 @@ public class InstitutionEndpoint { @Autowired ApplicationConfig applicationConfig; - @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get( + @GetMapping(value={"/get"}) + public Message get( HttpServletRequest request, @RequestHeader(value = "Origin",required=false) String originURL, @RequestHeader(value = HEADER_HOSTNAME,required=false) String headerHostName, @@ -76,11 +75,11 @@ public class InstitutionEndpoint { Institutions inst = institutionsRepository.get(host); if(inst != null) { _logger.debug("inst {}",inst); - return new Message(inst).buildResponse(); + return new Message<>(inst); }else { Institutions defaultInst = institutionsRepository.get("1"); _logger.debug("default inst {}",inst); - return new Message(defaultInst).buildResponse(); + return new Message<>(defaultInst); } } } diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java index f3bf6645f..5a9605335 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AbstractAuthenticationProvider.java @@ -56,10 +56,10 @@ public abstract class AbstractAuthenticationProvider { public static String PROVIDER_SUFFIX = "AuthenticationProvider"; public class AuthType{ - public final static String NORMAL = "normal"; - public final static String TFA = "tfa"; - public final static String MOBILE = "mobile"; - public final static String TRUSTED = "trusted"; + public static final String NORMAL = "normal"; + public static final String TFA = "tfa"; + public static final String MOBILE = "mobile"; + public static final String TRUSTED = "trusted"; } protected ApplicationConfig applicationConfig; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java index faef3744d..8cd4a9883 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * */ public final class ActiveDirectoryServer implements IAuthenticationServer { - private final static Logger _logger = LoggerFactory.getLogger(ActiveDirectoryServer.class); + private static final Logger _logger = LoggerFactory.getLogger(ActiveDirectoryServer.class); ActiveDirectoryUtils activeDirectoryUtils; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java index ac9612657..c6d5c860b 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java @@ -30,7 +30,7 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; public class LdapAuthenticationRealm extends AbstractAuthenticationRealm{ - private final static Logger _logger = LoggerFactory.getLogger(LdapAuthenticationRealm.class); + private static final Logger _logger = LoggerFactory.getLogger(LdapAuthenticationRealm.class); @NotNull @Size(min=1) diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java index 3441e2df1..32c1f5854 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * */ public final class StandardLdapServer implements IAuthenticationServer { - private final static Logger _logger = LoggerFactory.getLogger(StandardLdapServer.class); + private static final Logger _logger = LoggerFactory.getLogger(StandardLdapServer.class); LdapUtils ldapUtils; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java index d5243a9f4..e7ab2c278 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/jwt/HttpJwtEntryPoint.java @@ -22,6 +22,7 @@ import org.dromara.maxkey.authn.jwt.AuthTokenService; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.constants.ConstsLoginType; +import org.dromara.maxkey.entity.Institutions; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.web.WebConstants; import org.slf4j.Logger; @@ -54,7 +55,7 @@ public class HttpJwtEntryPoint { JwtLoginService jwtLoginService; @RequestMapping(value={"/jwt"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity jwt(@RequestParam(value = WebConstants.JWT_TOKEN_PARAMETER, required = true) String jwt) { + public Message jwt(@RequestParam(value = WebConstants.JWT_TOKEN_PARAMETER, required = true) String jwt) { try { //for jwt Login _logger.debug("jwt : " + jwt); @@ -67,13 +68,13 @@ public class HttpJwtEntryPoint { Authentication authentication = authenticationProvider.authenticate(loginCredential,true); _logger.debug("JWT Logined in , username " + username); AuthJwt authJwt = authTokenService.genAuthJwt(authentication); - return new Message(authJwt).buildResponse(); + return new Message(authJwt); } }catch(Exception e) { _logger.error("Exception ",e); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } /** @@ -82,7 +83,7 @@ public class HttpJwtEntryPoint { * @return */ @RequestMapping(value={"/jwt/trust"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity jwtTrust(@RequestParam(value = WebConstants.JWT_TOKEN_PARAMETER, required = true) String jwt) { + public Message jwtTrust(@RequestParam(value = WebConstants.JWT_TOKEN_PARAMETER, required = true) String jwt) { try { //for jwt Login _logger.debug("jwt : " + jwt); @@ -93,13 +94,13 @@ public class HttpJwtEntryPoint { Authentication authentication = authenticationProvider.authenticate(loginCredential,true); _logger.debug("JWT Logined in , username " + username); AuthJwt authJwt = authTokenService.genAuthJwt(authentication); - return new Message(authJwt).buildResponse(); + return new Message(authJwt); } }catch(Exception e) { _logger.error("Exception ",e); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java index fed60ff38..6200000df 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; public class WsFederationServiceImpl implements WsFederationService{ - final static Logger _logger = LoggerFactory.getLogger(WsFederationServiceImpl.class); + static final Logger _logger = LoggerFactory.getLogger(WsFederationServiceImpl.class); private WsFederationConfiguration wsFederationConfiguration; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java index 1599f1f63..3d41a0075 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AuthWeChatEnterpriseWebRequestCost extends AbstractAuthWeChatEnterpriseRequest { - final static Logger _logger = LoggerFactory.getLogger(AuthWeChatEnterpriseWebRequestCost.class); + static final Logger _logger = LoggerFactory.getLogger(AuthWeChatEnterpriseWebRequestCost.class); public AuthWeChatEnterpriseWebRequestCost(AuthConfig config) { super(config, AuthDefaultSource.WECHAT_ENTERPRISE_WEB); } diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java index c81977ee4..daac0aa31 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java @@ -42,7 +42,7 @@ import me.zhyd.oauth.request.AuthRequest; * */ public class AbstractSocialSignOnEndpoint { - final static Logger _logger = LoggerFactory.getLogger(AbstractSocialSignOnEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(AbstractSocialSignOnEndpoint.class); protected AuthRequest authRequest; 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 76881b4b4..9d4b1abef 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 @@ -51,12 +51,12 @@ import java.util.Map; @Controller @RequestMapping(value = "/logon/oauth20") public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class); @RequestMapping(value={"/authorize/{provider}"}, method = RequestMethod.GET) @ResponseBody - public ResponseEntity authorize( HttpServletRequest request, - @PathVariable String provider + public Message authorize( HttpServletRequest request, + @PathVariable("provider") String provider ) { _logger.trace("SocialSignOn provider : " + provider); String instId = WebContext.getInst().getId(); @@ -69,12 +69,12 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ ).authorize(authTokenService.genRandomJwt()); _logger.trace("authorize SocialSignOn : " + authorizationUrl); - return new Message((Object)authorizationUrl).buildResponse(); + return new Message((Object)authorizationUrl); } @RequestMapping(value={"/scanqrcode/{provider}"}, method = RequestMethod.GET) @ResponseBody - public ResponseEntity scanQRCode(HttpServletRequest request, + public Message scanQRCode(HttpServletRequest request, @PathVariable("provider") String provider) { String instId = WebContext.getInst().getId(); String originURL =WebContext.getContextPath(request,false); @@ -102,12 +102,12 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ socialSignOnProviderService.setToken(state); } - return new Message(scanQrProvider).buildResponse(); + return new Message(scanQrProvider); } @RequestMapping(value={"/bind/{provider}"}, method = RequestMethod.GET) - public ResponseEntity bind(@PathVariable String provider, + public Message bind(@PathVariable("provider") String provider, @CurrentUser UserInfo userInfo, HttpServletRequest request) { //auth call back may exception @@ -124,18 +124,18 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ _logger.debug("Social Bind : "+socialsAssociate); this.socialsAssociateService.delete(socialsAssociate); this.socialsAssociateService.insert(socialsAssociate); - return new Message().buildResponse(); + return new Message(); }catch(Exception e) { _logger.error("callback Exception ",e); } - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } @RequestMapping(value={"/callback/{provider}"}, method = RequestMethod.GET) - public ResponseEntity callback(@PathVariable String provider, + public Message callback(@PathVariable("provider") String provider, HttpServletRequest request) { //auth call back may exception try { @@ -152,7 +152,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ //如果存在第三方ID并且在数据库无法找到映射关系，则进行绑定逻辑 if (StringUtils.isNotEmpty(socialsAssociate.getSocialUserId())) { //返回message为第三方用户标识 - return new Message(Message.PROMPT,socialsAssociate.getSocialUserId()).buildResponse(); + return new Message(Message.PROMPT,socialsAssociate.getSocialUserId()); } } @@ -171,10 +171,10 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ //socialsAssociate.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); this.socialsAssociateService.update(socialsAssociate); - return new Message(authTokenService.genAuthJwt(authentication)).buildResponse(); + return new Message(authTokenService.genAuthJwt(authentication)); }catch(Exception e) { _logger.error("callback Exception ",e); - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } } @@ -184,13 +184,13 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ * @return */ @RequestMapping(value={"/workweixin/qr/auth/login"}, method = {RequestMethod.POST}) - public ResponseEntity qrAuthLogin( + public Message qrAuthLogin( @RequestParam Map param, HttpServletRequest request) { try { if (null == param){ - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } String token = param.get("token"); String username = param.get("username"); @@ -200,15 +200,15 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ //设置token和用户绑定 boolean flag = this.socialSignOnProviderService.bindtoken(token,username); if (flag) { - return new Message().buildResponse(); + return new Message(); } } else { - return new Message(Message.WARNING,"Invalid token").buildResponse(); + return new Message(Message.WARNING,"Invalid token"); } }catch(Exception e) { _logger.error("qrAuthLogin Exception ",e); } - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } @@ -220,22 +220,22 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ * @return */ @RequestMapping(value={"/qrcallback/{provider}/{state}"}, method = RequestMethod.GET) - public ResponseEntity qrcallback(@PathVariable String provider,@PathVariable String state, + public Message qrcallback(@PathVariable("provider") String provider,@PathVariable("state") String state, HttpServletRequest request) { try { //判断只有maxkey扫码 if (!provider.equalsIgnoreCase(AuthMaxkeyRequest.KEY)) { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } String loginName = socialSignOnProviderService.getToken(state); if (StringUtils.isEmpty(loginName)) { //二维码过期 - return new Message(Message.PROMPT).buildResponse(); + return new Message(Message.PROMPT); } if("-1".equalsIgnoreCase(loginName)){ //暂无用户扫码 - return new Message(Message.WARNING).buildResponse(); + return new Message(Message.WARNING); } String instId = WebContext.getInst().getId(); @@ -250,7 +250,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ _logger.debug("qrcallback Loaded SocialSignOn Socials Associate : "+socialsAssociate); if(null == socialsAssociate) { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } _logger.debug("qrcallback Social Sign On from {} mapping to user {}", socialsAssociate.getProvider(),socialsAssociate.getUsername()); @@ -266,10 +266,10 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ //socialsAssociate.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); this.socialsAssociateService.update(socialsAssociate); - return new Message(authTokenService.genAuthJwt(authentication)).buildResponse(); + return new Message(authTokenService.genAuthJwt(authentication)); }catch(Exception e) { _logger.error("qrcallback Exception ",e); - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } } } diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java index 3f69d59c3..48356a4b2 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/HMAC512Service.java @@ -33,7 +33,7 @@ import com.nimbusds.jose.util.Base64URL; public class HMAC512Service { - public final static String MXK_AUTH_JWK = "mxk_auth_jwk"; + public static final String MXK_AUTH_JWK = "mxk_auth_jwk"; JWSSigner signer; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java index 8aaaccba1..6c28c7db5 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java @@ -37,7 +37,7 @@ import com.nimbusds.jose.jwk.JWKSet; * */ public class RecipientJwtEncryptionAndDecryptionServiceBuilder { - final static Logger _logger = LoggerFactory.getLogger(RecipientJwtEncryptionAndDecryptionServiceBuilder.class); + static final Logger _logger = LoggerFactory.getLogger(RecipientJwtEncryptionAndDecryptionServiceBuilder.class); //private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); //private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java index 96c5c0712..dee828442 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java @@ -46,7 +46,7 @@ import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jwt.SignedJWT; public class DefaultJwtSigningAndValidationService implements JwtSigningAndValidationService { - final static Logger _logger = LoggerFactory.getLogger(DefaultJwtSigningAndValidationService.class); + static final Logger _logger = LoggerFactory.getLogger(DefaultJwtSigningAndValidationService.class); // map of identifier to signer private Map signers = new HashMap(); diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java index 79c2cd11a..274102fc5 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java @@ -37,7 +37,7 @@ import com.nimbusds.jose.jwk.JWK; * Builder Symmetric Signing Service */ public class SymmetricSigningAndValidationServiceBuilder { - final static Logger _logger = LoggerFactory.getLogger(SymmetricSigningAndValidationServiceBuilder.class); + static final Logger _logger = LoggerFactory.getLogger(SymmetricSigningAndValidationServiceBuilder.class); public static final String SYMMETRIC_KEY = "SYMMETRIC-KEY"; /** * diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java index 0e5257a07..c85803671 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/Message.java @@ -21,12 +21,12 @@ import org.springframework.http.ResponseEntity; public class Message { - public final static int SUCCESS = 0; //成功 - public final static int ERROR = 1; //错误 - public final static int FAIL = 2; //失败 - public final static int INFO = 101; //信息 - public final static int PROMPT = 102; //提示 - public final static int WARNING = 103; //警告 + public static final int SUCCESS = 0; //成功 + public static final int ERROR = 1; //错误 + public static final int FAIL = 2; //失败 + public static final int INFO = 101; //信息 + public static final int PROMPT = 102; //提示 + public static final int WARNING = 103; //警告 int code; @@ -89,7 +89,7 @@ public class Message { public void setData(T data) { this.data = data; } - + public ResponseEntity buildResponse() { return ResponseEntity.ok(this); } diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java index 2660a3519..d1a7dac41 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/pretty/Pretty.java @@ -18,7 +18,7 @@ package org.dromara.maxkey.pretty; public interface Pretty { - public final static String LINE_BREAK = "\n"; + public static final String LINE_BREAK = "\n"; public String format(String source); diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java index 9120b9435..97740df94 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java @@ -30,33 +30,33 @@ import org.joda.time.chrono.ISOChronology; public class DateUtils { - public final static String FORMAT_DATE_DEFAULT = "yyyy-MM-dd"; + public static final String FORMAT_DATE_DEFAULT = "yyyy-MM-dd"; - public final static String FORMAT_DATE_YYYYMMDD = "yyyyMMdd"; + public static final String FORMAT_DATE_YYYYMMDD = "yyyyMMdd"; - public final static String FORMAT_DATE_YYYY_MM_DD = "yyyy-MM-dd"; + public static final String FORMAT_DATE_YYYY_MM_DD = "yyyy-MM-dd"; - public final static String FORMAT_DATE_PATTERN_1="yyyy/MM/dd"; - public final static String FORMAT_DATE_PATTERN_2="yyyy/M/dd"; - public final static String FORMAT_DATE_PATTERN_3="yyyy/MM/d"; - public final static String FORMAT_DATE_PATTERN_4="yyyy/M/d"; - public final static String FORMAT_DATE_YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + public static final String FORMAT_DATE_PATTERN_1="yyyy/MM/dd"; + public static final String FORMAT_DATE_PATTERN_2="yyyy/M/dd"; + public static final String FORMAT_DATE_PATTERN_3="yyyy/MM/d"; + public static final String FORMAT_DATE_PATTERN_4="yyyy/M/d"; + public static final String FORMAT_DATE_YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; - public final static String FORMAT_DATE_ISO_TIMESTAMP="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; + public static final String FORMAT_DATE_ISO_TIMESTAMP="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; - public final static String FORMAT_DATE_YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + public static final String FORMAT_DATE_YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - public final static String FORMAT_DATE_YYYY_MM_DD_HHMM = "yyyy-MM-dd HHmm"; + public static final String FORMAT_DATE_YYYY_MM_DD_HHMM = "yyyy-MM-dd HHmm"; - public final static String FORMAT_DATE_YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm"; + public static final String FORMAT_DATE_YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm"; - public final static String FORMAT_DATE_HH_MM = "HH:mm"; + public static final String FORMAT_DATE_HH_MM = "HH:mm"; - public final static String FORMAT_DATE_HH_MM_SS = "HH:mm:ss"; + public static final String FORMAT_DATE_HH_MM_SS = "HH:mm:ss"; - public final static String FORMAT_DATE_HHMM = "HHmm"; + public static final String FORMAT_DATE_HHMM = "HHmm"; - public final static String FORMAT_DATE_HHMMSS = "HHmmss"; + public static final String FORMAT_DATE_HHMMSS = "HHmmss"; public static final String FORMAT_WORK_TIME = "yyyy-MM-dd HHmmss"; /** @@ -74,7 +74,7 @@ public class DateUtils { * stringValue2. * @since 1.2 */ - public final static int compareDate(String stringValue1, String stringValue2) + public static final int compareDate(String stringValue1, String stringValue2) throws ParseException { Date date1 = tryParse(stringValue1); if (date1 == null) { @@ -95,11 +95,11 @@ public class DateUtils { * * @see #FORMAT_DATE_DEFAULT */ - public final static String getCurrentDateAsString() { + public static final String getCurrentDateAsString() { return getCurrentDateAsString(FORMAT_DATE_DEFAULT); } - public final static String getCurrentDateTimeAsString() { + public static final String getCurrentDateTimeAsString() { return getCurrentDateAsString(FORMAT_DATE_YYYY_MM_DD_HH_MM_SS); } @@ -112,12 +112,12 @@ public class DateUtils { * @return current system date. * */ - public final static String getCurrentDateAsString(String formatPattern) { + public static final String getCurrentDateAsString(String formatPattern) { Date date = new Date(); return format(date, formatPattern); } - public final static String getFormtPattern1ToPattern2(String stringValue,String formatPattern1,String formatPattern2){ + public static final String getFormtPattern1ToPattern2(String stringValue,String formatPattern1,String formatPattern2){ Date date = parse(stringValue, formatPattern1); return format(date, formatPattern2); } @@ -127,7 +127,7 @@ public class DateUtils { * * @return current system date. */ - public final static Date getCurrentDate() { + public static final Date getCurrentDate() { return new Date(); } @@ -135,7 +135,7 @@ public class DateUtils { * 0������, 1����һ, 2���ڶ�, 3������, 4������, 5������,6������ * @return */ - public final static String getTodayOfWeek(){ + public static final String getTodayOfWeek(){ Calendar calendar = Calendar.getInstance(); Date date = new Date(); calendar.setTime(date); @@ -149,7 +149,7 @@ public class DateUtils { * @param endTime * @return */ - public final static boolean compareTime(String startTime,String endTime) throws ParseException{ + public static final boolean compareTime(String startTime,String endTime) throws ParseException{ SimpleDateFormat sdf = new SimpleDateFormat("hh:mm:ss"); Date start = sdf.parse(startTime); Date end = sdf.parse(endTime); @@ -180,7 +180,7 @@ public class DateUtils { * * @see #FORMAT_DATE_DEFAULT */ - public final static String format(Date date) { + public static final String format(Date date) { if (date == null) { return ""; } @@ -196,7 +196,7 @@ public class DateUtils { * * @see #FORMAT_DATE_DEFAULT */ - public final static String formatDateTime(Date date) { + public static final String formatDateTime(Date date) { if (date == null) { return ""; } @@ -212,7 +212,7 @@ public class DateUtils { * * @see #FORMAT_DATE_DEFAULT */ - public final static String formatTimestamp(Date date) { + public static final String formatTimestamp(Date date) { if (date == null) { return ""; } @@ -228,7 +228,7 @@ public class DateUtils { * * @see #FORMAT_DATE_DEFAULT */ - public final static Date parseTimestamp(String date) { + public static final Date parseTimestamp(String date) { if (date == null) { return null; } @@ -250,7 +250,7 @@ public class DateUtils { * @see #FORMAT_DATE_YYYY_MM_DD_HH_MM_SS * @see #FORMAT_DATE_YYYY_MM_DD_HHMMSS */ - public final static String format(Date date, String formatPattern) { + public static final String format(Date date, String formatPattern) { if (date == null) { return ""; } @@ -265,7 +265,7 @@ public class DateUtils { * @return Date represents stringValue. * @see #FORMAT_DATE_DEFAULT */ - public final static Date parse(String stringValue) { + public static final Date parse(String stringValue) { return parse(stringValue, FORMAT_DATE_DEFAULT); } @@ -279,7 +279,7 @@ public class DateUtils { * @return Date represents stringValue, null while parse exception occurred. * @see #FORMAT_DATE_DEFAULT */ - public final static Date parse(String stringValue, String formatPattern) { + public static final Date parse(String stringValue, String formatPattern) { SimpleDateFormat format = new SimpleDateFormat(formatPattern); try { return format.parse(stringValue); @@ -297,7 +297,7 @@ public class DateUtils { * string value. * @return Date represents stringValue, null while parse exception occurred. */ - public final static Date tryParse(String stringValue) { + public static final Date tryParse(String stringValue) { Date date = parse(stringValue, FORMAT_DATE_YYYY_MM_DD); if (date != null) { return date; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java index d9e73ec26..c961b224e 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java @@ -35,7 +35,7 @@ public class EthernetAddress private static final long serialVersionUID = 1L; - private final static char[] HEX_CHARS = "0123456789abcdefABCDEF".toCharArray(); + private static final char[] HEX_CHARS = "0123456789abcdefABCDEF".toCharArray(); /** * We may need a random number generator, for creating dummy ethernet diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java index 4256d0b5a..e964e2651 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/SnowFlakeId.java @@ -31,28 +31,28 @@ public class SnowFlakeId { /** * 起始的时间戳 */ - private final static long START_STMP = 1480166465631L; + private static final long START_STMP = 1480166465631L; /** * 每一部分占用的位数 */ - private final static long SEQUENCE_BIT = 12; //序列号占用的位数 - private final static long MACHINE_BIT = 5; //机器标识占用的位数 - private final static long DATACENTER_BIT = 5;//数据中心占用的位数 + private static final long SEQUENCE_BIT = 12; //序列号占用的位数 + private static final long MACHINE_BIT = 5; //机器标识占用的位数 + private static final long DATACENTER_BIT = 5;//数据中心占用的位数 /** * 每一部分的最大值 */ - private final static long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT); - private final static long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT); - private final static long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT); + private static final long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT); + private static final long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT); + private static final long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT); /** * 每一部分向左的位移 */ - private final static long MACHINE_LEFT = SEQUENCE_BIT; - private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT; - private final static long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT; + private static final long MACHINE_LEFT = SEQUENCE_BIT; + private static final long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT; + private static final long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT; private long datacenterId; //数据中心 private long machineId; //机器标识 diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java index 075890434..2d0d9ccb6 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebConstants.java @@ -32,7 +32,7 @@ public class WebConstants { public static final String CURRENT_INST = "current_inst"; - public final static String INST_COOKIE_NAME = "mxk_inst"; + public static final String INST_COOKIE_NAME = "mxk_inst"; // SPRING_SECURITY_SAVED_REQUEST public static final String FIRST_SAVED_REQUEST_PARAMETER diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java index b95db9004..ed331ae06 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java @@ -35,7 +35,7 @@ public class AccountsStrategyService extends JpaService imple */ private static final long serialVersionUID = -921086134545225302L; - final static Logger _logger = LoggerFactory.getLogger(AccountsStrategyService.class); + static final Logger _logger = LoggerFactory.getLogger(AccountsStrategyService.class); /* @JsonIgnore @Autowired diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java index a0fc9d495..57f5cf6f9 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsCasDetailsService extends JpaService{ - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java index 8a4292746..53636b2f1 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsFormBasedDetailsService extends JpaService{ - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java index 0ae2ef83d..f6a511c72 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsJwtDetailsService extends JpaService{ - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java index 8f24888dc..9691e0b32 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsSaml20DetailsService extends JpaService{ - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java index 125f50076..af3f31a05 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java @@ -32,11 +32,11 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsService extends JpaService{ //maxkey-mgt - public final static String MGT_APP_ID = "622076759805923328"; + public static final String MGT_APP_ID = "622076759805923328"; - public final static String DETAIL_SUFFIX = "_detail"; + public static final String DETAIL_SUFFIX = "_detail"; - protected final static Cache detailsCacheStore = + protected static final Cache detailsCacheStore = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .build(); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java index 0888a5147..74531e772 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; @Repository public class AppsTokenBasedDetailsService extends JpaService{ - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java index 110806fc5..9551a0db8 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Repository; @Repository public class ConnectorsService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(ConnectorsService.class); + static final Logger _logger = LoggerFactory.getLogger(ConnectorsService.class); public ConnectorsService() { super(ConnectorsMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java index d6f4061cc..e52b8eb3d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Repository; @Repository public class GroupMemberService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(GroupMemberService.class); + static final Logger _logger = LoggerFactory.getLogger(GroupMemberService.class); public GroupMemberService() { super(GroupMemberMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java index f674830a2..7c3fad8eb 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java @@ -45,7 +45,7 @@ public class GroupsService extends JpaService implements Serializable { */ private static final long serialVersionUID = -4156671926199393550L; - final static Logger _logger = LoggerFactory.getLogger(GroupsService.class); + static final Logger _logger = LoggerFactory.getLogger(GroupsService.class); @JsonIgnore @Autowired GroupMemberService groupMemberService; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java index 373ceab06..3d854b9bc 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Repository; @Repository public class OrganizationsCastService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(OrganizationsCastService.class); + static final Logger _logger = LoggerFactory.getLogger(OrganizationsCastService.class); public OrganizationsCastService() { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java index d0175aa82..64f6ed5cc 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; @Repository public class RoleMemberService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(RoleMemberService.class); + static final Logger _logger = LoggerFactory.getLogger(RoleMemberService.class); public RoleMemberService() { super(RoleMemberMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java index 4f9abc6f9..395fd941a 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Repository; @Repository public class SocialsProviderService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(SocialsProviderService.class); + static final Logger _logger = LoggerFactory.getLogger(SocialsProviderService.class); public SocialsProviderService() { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java index 43d06bd06..5ad0a6fed 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Repository; @Repository public class SynchronizersService extends JpaService{ - final static Logger _logger = LoggerFactory.getLogger(SynchronizersService.class); + static final Logger _logger = LoggerFactory.getLogger(SynchronizersService.class); public SynchronizersService() { super(SynchronizersMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java index e06be52bc..ba02a08b8 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java @@ -47,7 +47,7 @@ import org.springframework.stereotype.Repository; */ @Repository public class UserInfoService extends JpaService { - final static Logger _logger = LoggerFactory.getLogger(UserInfoService.class); + static final Logger _logger = LoggerFactory.getLogger(UserInfoService.class); @Autowired private PasswordEncoder passwordEncoder; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index a08f388cf..550b85b25 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -42,7 +42,7 @@ import org.springframework.web.servlet.ModelAndView; * */ public class AuthorizeBaseEndpoint { - final static Logger _logger = LoggerFactory.getLogger(AuthorizeBaseEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(AuthorizeBaseEndpoint.class); @Autowired protected ApplicationConfig applicationConfig; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java index 8caa4a517..661e7897d 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java @@ -31,6 +31,7 @@ import org.dromara.maxkey.entity.idm.UserInfo; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,13 +40,12 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author Crystal.Sea * */ -@Controller +@RestController @RequestMapping(value = { "/authz/credential" }) public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ @RequestMapping("/get/{appId}") - @ResponseBody - public ResponseEntity get( + public Message get( @PathVariable("appId") String appId, @CurrentUser UserInfo currentUser){ Apps app = getApp(appId); @@ -64,11 +64,11 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ account.setCreateType("manual"); account.setStatus(ConstsStatus.ACTIVE); } - return new Message(account).buildResponse(); + return new Message(account); } @RequestMapping("/update") - public ResponseEntity update( + public Message update( @RequestBody Accounts account, @CurrentUser UserInfo currentUser){ if(StringUtils.isNotEmpty(account.getRelatedPassword()) @@ -78,16 +78,16 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ PasswordReciprocal.getInstance().encode(account.getRelatedPassword())); if(accountsService.get(account.getId()) == null) { if(accountsService.insert(account)){ - return new Message().buildResponse(); + return new Message(); } }else { if(accountsService.update(account)){ - return new Message().buildResponse(); + return new Message(); } } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java index 6725dd31a..e0de42285 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java @@ -45,7 +45,7 @@ import jakarta.servlet.http.HttpServletRequest; @Tag(name = "1-2认证总地址文档模块") @Controller public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(AuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(AuthorizeEndpoint.class); @Autowired AppsCasDetailsService casDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java index ee102dbdd..c887b89b2 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; public abstract class AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(AbstractAuthorizeAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(AbstractAuthorizeAdapter.class); protected Apps app; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index 8f14ab901..5e0b11dfe 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -45,7 +45,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class Cas10AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(Cas10AuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(Cas10AuthorizeEndpoint.class); /** * @param request diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 68f72779a..7af435978 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -57,7 +57,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class Cas20AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(Cas20AuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(Cas20AuthorizeEndpoint.class); /** * @param request diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index a2753688e..ffea43997 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -55,7 +55,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(Cas30AuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(Cas30AuthorizeEndpoint.class); @Operation(summary = "CAS 3.0 ticket验证接口", description = "通过ticket获取当前登录用户信息") @RequestMapping(value=CasConstants.ENDPOINT.ENDPOINT_SERVICE_VALIDATE_V3,method={RequestMethod.GET,RequestMethod.POST}) diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index b997f51c2..f06afdcce 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -54,7 +54,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class CasAuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(CasAuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(CasAuthorizeEndpoint.class); @Operation(summary = "CAS页面跳转service认证接口", description = "传递参数service",method="GET") @GetMapping(CasConstants.ENDPOINT.ENDPOINT_LOGIN) diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java index f43ee49d4..28134392e 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasBaseAuthorizeEndpoint.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; public class CasBaseAuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(CasBaseAuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(CasBaseAuthorizeEndpoint.class); @Autowired protected AppsCasDetailsService casDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java index 1e23da8a8..78df9b88c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java @@ -44,7 +44,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class CasLogoutEndpoint extends CasBaseAuthorizeEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(CasLogoutEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(CasLogoutEndpoint.class); /** * for cas logout then redirect to logout diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java index 1ef29f76c..941b4c5bb 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasDefaultAdapter.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; public class CasDefaultAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(CasDefaultAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(CasDefaultAdapter.class); static String Charset_UTF8="UTF-8"; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java index f9c2d59ce..ebd453d34 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/adapter/CasPlainAdapter.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; public class CasPlainAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(CasPlainAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(CasPlainAdapter.class); ServiceResponseBuilder serviceResponseBuilder; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java index 3b56e1fee..af9c6a9af 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/CasServiceResponse.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class CasServiceResponse { - final static Logger _logger = LoggerFactory.getLogger(CasServiceResponse.class); + static final Logger _logger = LoggerFactory.getLogger(CasServiceResponse.class); protected String code; protected String description; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java index 3846312b0..3b82770b1 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ServiceResponseBuilder extends CasServiceResponse { - final static Logger _logger = LoggerFactory.getLogger(ServiceResponseBuilder.class); + static final Logger _logger = LoggerFactory.getLogger(ServiceResponseBuilder.class); public ServiceResponseBuilder(){ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java index 6fa9891f2..38584187d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/CasConstants.java @@ -21,12 +21,12 @@ package org.dromara.maxkey.authz.cas.endpoint.ticket; public class CasConstants { /* CAS Protocol Parameters. **/ public static final class PARAMETER{ - public final static String ENDPOINT_CAS_DETAILS = "CAS_AUTHORIZE_ENDPOINT_CAS_DETAILS"; + public static final String ENDPOINT_CAS_DETAILS = "CAS_AUTHORIZE_ENDPOINT_CAS_DETAILS"; - public final static String PARAMETER_MAP = "CAS_AUTHORIZE_ENDPOINT_PARAMETER_MAP"; + public static final String PARAMETER_MAP = "CAS_AUTHORIZE_ENDPOINT_PARAMETER_MAP"; /** Constant representing the ticket parameter in the request. */ - public final static String TICKET = "ticket"; + public static final String TICKET = "ticket"; /** Constant representing the service parameter in the request. */ public static final String SERVICE = "service"; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java index 3eb76be58..7dc6f2ad5 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java @@ -28,7 +28,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; public class InMemoryProxyGrantingTicketServices extends RandomServiceTicketServices { - protected final static Cache casTicketStore = + protected static final Cache casTicketStore = Caffeine.newBuilder() .expireAfterWrite(60, TimeUnit.MINUTES) .build(); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java index 056ba7520..0282ecbaa 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java @@ -28,7 +28,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; public class InMemoryTicketServices extends RandomServiceTicketServices { - protected final static Cache casTicketStore = + protected static final Cache casTicketStore = Caffeine.newBuilder() .expireAfterWrite(60, TimeUnit.MINUTES) .build(); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java index d3e896e71..6045abad6 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/tgt/InMemoryTicketGrantingTicketServices.java @@ -28,7 +28,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; public class InMemoryTicketGrantingTicketServices extends RandomServiceTicketServices { - protected final static Cache casTicketGrantingTicketStore = + protected static final Cache casTicketGrantingTicketStore = Caffeine.newBuilder() .expireAfterWrite(2, TimeUnit.DAYS) .build(); diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java index 54739e52e..56ec0fa03 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java @@ -35,7 +35,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-8-ExtendApi接口文档模块-元数据") @Controller public class ExtendApiMetadata { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiMetadata.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiMetadata.class); @Operation(summary = "netease qiye mail RSA Key", description = "网易企业邮箱RSA Key生成器",method="GET") @RequestMapping( diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java index 9486f0be6..55ba411e1 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java @@ -38,7 +38,7 @@ import org.springframework.web.servlet.ModelAndView; * */ public class ExtendApiCndnsApiMailAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiCndnsApiMailAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiCndnsApiMailAdapter.class); //sign no parameter //sign=md5(action=getDomainInfo&appid=***&time=1579736456 + md5(token)) //sign with parameter diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java index 252a344ff..d7340d03f 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiNeteaseQiyeMailAdapter.java @@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView; * */ public class ExtendApiNeteaseQiyeMailAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiNeteaseQiyeMailAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiNeteaseQiyeMailAdapter.class); //https://entryhz.qiye.163.com static String REDIRECT_PARAMETER = "domain=%s&account_name=%s&time=%s&enc=%s&lang=%s"; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java index b5075754b..d3b10176d 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java @@ -41,13 +41,13 @@ import com.github.benmanes.caffeine.cache.Caffeine; * */ public class ExtendApiQQExmailAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiQQExmailAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiQQExmailAdapter.class); //https://exmail.qq.com/qy_mng_logic/doc#10003 static String TOKEN_URI = "https://api.exmail.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s"; //https://exmail.qq.com/qy_mng_logic/doc#10036 static String AUTHKEY_URI = "https://api.exmail.qq.com/cgi-bin/service/get_login_url?access_token=%s&userid=%s"; - final static Cache tokenCache = Caffeine.newBuilder() + static final Cache tokenCache = Caffeine.newBuilder() .expireAfterWrite(7200, TimeUnit.SECONDS) .build(); diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java index 8e33825d1..5c748d4c8 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiTimestampSignAdapter.java @@ -41,7 +41,7 @@ import org.springframework.web.servlet.ModelAndView; * */ public class ExtendApiTimestampSignAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiTimestampSignAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiTimestampSignAdapter.class); Accounts account; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java index ab575c230..daf91ab0a 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/ExtendApiZentaoAdapter.java @@ -40,7 +40,7 @@ import org.springframework.web.servlet.ModelAndView; * */ public class ExtendApiZentaoAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(ExtendApiZentaoAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(ExtendApiZentaoAdapter.class); static String login_url_template="api.php?m=user&f=apilogin&account=%s&code=%s&time=%s&token=%s"; static String login_url_m_template="account=%s&code=%s&time=%s&token=%s"; diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java index f0c2d0755..bf227d556 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/adapter/netease/NeteaseRSATool.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; public class NeteaseRSATool { - final static Logger _logger = LoggerFactory.getLogger(NeteaseRSATool.class); + static final Logger _logger = LoggerFactory.getLogger(NeteaseRSATool.class); private static final char[] bcdLookup = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 5132f90c8..a5ea57d24 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletRequest; @Tag(name = "2-7-FormBased接口文档模块") @Controller public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(FormBasedAuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(FormBasedAuthorizeEndpoint.class); @Autowired AppsFormBasedDetailsService formBasedDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java index d5dc01e5f..857a4bb40 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/jwt/endpoint/adapter/JwtAdapter.java @@ -44,7 +44,7 @@ import com.nimbusds.jwt.PlainJWT; import com.nimbusds.jwt.SignedJWT; public class JwtAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(JwtAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(JwtAdapter.class); AppsJwtDetails jwtDetails; diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index b45ab62a8..78ca7a6b5 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -62,7 +62,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(JwtAuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(JwtAuthorizeEndpoint.class); @Autowired AppsJwtDetailsService jwtDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java index 0d40ef4f1..497f531cf 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/OAuth2Constants.java @@ -107,26 +107,26 @@ public class OAuth2Constants { public static class ENDPOINT{ - public final static String ENDPOINT_BASE = "/authz/oauth/v20"; + public static final String ENDPOINT_BASE = "/authz/oauth/v20"; - public final static String ENDPOINT_AUTHORIZE = ENDPOINT_BASE + "/authorize"; + public static final String ENDPOINT_AUTHORIZE = ENDPOINT_BASE + "/authorize"; - public final static String ENDPOINT_TOKEN = ENDPOINT_BASE + "/token"; + public static final String ENDPOINT_TOKEN = ENDPOINT_BASE + "/token"; - public final static String ENDPOINT_CHECK_TOKEN = ENDPOINT_BASE + "/check_token"; + public static final String ENDPOINT_CHECK_TOKEN = ENDPOINT_BASE + "/check_token"; - public final static String ENDPOINT_TOKEN_KEY = ENDPOINT_BASE + "/token_key"; + public static final String ENDPOINT_TOKEN_KEY = ENDPOINT_BASE + "/token_key"; - public final static String ENDPOINT_APPROVAL_CONFIRM = ENDPOINT_BASE + "/approval_confirm"; + public static final String ENDPOINT_APPROVAL_CONFIRM = ENDPOINT_BASE + "/approval_confirm"; - public final static String ENDPOINT_ERROR = ENDPOINT_BASE + "/error"; + public static final String ENDPOINT_ERROR = ENDPOINT_BASE + "/error"; - public final static String ENDPOINT_USERINFO = "/api/oauth/v20/me"; + public static final String ENDPOINT_USERINFO = "/api/oauth/v20/me"; - public final static String ENDPOINT_OPENID_CONNECT_USERINFO = "/api/connect/v10/userinfo"; + public static final String ENDPOINT_OPENID_CONNECT_USERINFO = "/api/connect/v10/userinfo"; - public final static String ENDPOINT_TENCENT_IOA_AUTHORIZE = "/oauth2/authorize"; - public final static String ENDPOINT_TENCENT_IOA_TOKEN = "/oauth2/token"; + public static final String ENDPOINT_TENCENT_IOA_AUTHORIZE = "/oauth2/authorize"; + public static final String ENDPOINT_TENCENT_IOA_TOKEN = "/oauth2/token"; } } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java index b1a4dacc2..0c58db5ae 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/jwt/codec/Base64Codec.java @@ -26,17 +26,17 @@ package org.dromara.maxkey.authz.oauth2.jwt.codec; final class Base64Codec { /** No options specified. Value is zero. */ - public final static int NO_OPTIONS = 0; + public static final int NO_OPTIONS = 0; /** Specify encoding in first bit. Value is one. */ - public final static int ENCODE = 1; + public static final int ENCODE = 1; /** Specify decoding in first bit. Value is zero. */ - public final static int DECODE = 0; + public static final int DECODE = 0; /** Do break lines when encoding. Value is 8. */ - public final static int DO_BREAK_LINES = 8; + public static final int DO_BREAK_LINES = 8; /** * Encode using Base64-like encoding that is URL- and Filename-safe as described @@ -46,36 +46,36 @@ final class Base64Codec { * or at the very least should not be called Base64 without also specifying that is * was encoded using the URL- and Filename-safe dialect. */ - public final static int URL_SAFE = 16; + public static final int URL_SAFE = 16; /** * Encode using the special "ordered" dialect of Base64 described here: * http://www.faqs.org/qa/rfcc-1940.html. */ - public final static int ORDERED = 32; + public static final int ORDERED = 32; /** Maximum line length (76) of Base64 output. */ - private final static int MAX_LINE_LENGTH = 76; + private static final int MAX_LINE_LENGTH = 76; /** The equals sign (=) as a byte. */ - private final static byte EQUALS_SIGN = (byte)'='; + private static final byte EQUALS_SIGN = (byte)'='; /** The new line character (\n) as a byte. */ - private final static byte NEW_LINE = (byte)'\n'; + private static final byte NEW_LINE = (byte)'\n'; - private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding - private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding + private static final byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding + private static final byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding /* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */ /** The 64 valid Base64 values. */ /* Host platform me be something funny like EBCDIC, so we hardcode these values. */ - private final static byte[] _STANDARD_ALPHABET = { + private static final byte[] _STANDARD_ALPHABET = { (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G', (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N', (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', @@ -93,7 +93,7 @@ final class Base64Codec { * Translates a Base64 value to either its 6-bit reconstruction value * or a negative number indicating some other meaning. **/ - private final static byte[] _STANDARD_DECODABET = { + private static final byte[] _STANDARD_DECODABET = { -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8 -5,-5, // Whitespace: Tab and Linefeed -9,-9, // Decimal 11 - 12 @@ -135,7 +135,7 @@ final class Base64Codec { * http://www.faqs.org/rfcs/rfc3548.html. * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus" and "slash." */ - private final static byte[] _URL_SAFE_ALPHABET = { + private static final byte[] _URL_SAFE_ALPHABET = { (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G', (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N', (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', @@ -151,7 +151,7 @@ final class Base64Codec { /** * Used in decoding URL- and Filename-safe dialects of Base64. */ - private final static byte[] _URL_SAFE_DECODABET = { + private static final byte[] _URL_SAFE_DECODABET = { -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8 -5,-5, // Whitespace: Tab and Linefeed -9,-9, // Decimal 11 - 12 @@ -198,7 +198,7 @@ final class Base64Codec { * and it is described here: * http://www.faqs.org/qa/rfcc-1940.html. */ - private final static byte[] _ORDERED_ALPHABET = { + private static final byte[] _ORDERED_ALPHABET = { (byte)'-', (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9', @@ -216,7 +216,7 @@ final class Base64Codec { /** * Used in decoding the "ordered" dialect of Base64. */ - private final static byte[] _ORDERED_DECODABET = { + private static final byte[] _ORDERED_DECODABET = { -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8 -5,-5, // Whitespace: Tab and Linefeed -9,-9, // Decimal 11 - 12 diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java index b84403fac..283f48453 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java @@ -37,17 +37,15 @@ import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.cache.MomentaryService; import org.dromara.maxkey.persistence.service.AppsService; -import org.dromara.maxkey.util.StrUtils; -import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; /** @@ -103,7 +101,7 @@ public class OAuth20AccessConfirmationEndpoint { model.put("auth_request", clientAuth); model.put("client", client); model.put("oauth_version", "oauth 2.0"); - Map scopes = new LinkedHashMap(); + Map scopes = new LinkedHashMap<>(); for (String scope : clientAuth.getScope()) { scopes.put(OAuth2Constants.PARAMETER.SCOPE_PREFIX + scope, "false"); } @@ -127,7 +125,7 @@ public class OAuth20AccessConfirmationEndpoint { ModelAndView modelAndView = new ModelAndView("authorize/oauth_access_confirmation"); _logger.trace("Confirmation details "); for (Object key : model.keySet()) { - _logger.trace("key " + key +"=" + model.get(key)); + _logger.trace("key {} = {}" , key, model.get(key)); } model.put("authorizeApproveUri", applicationConfig.getFrontendUri()+"/#/authz/oauth2approve"); @@ -137,11 +135,12 @@ public class OAuth20AccessConfirmationEndpoint { } @RequestMapping(OAuth2Constants.ENDPOINT.ENDPOINT_APPROVAL_CONFIRM+"/get/{oauth_approval}") - public ResponseEntity getAccess( - @PathVariable("oauth_approval") String oauth_approval, + @ResponseBody + public Message> getAccess( + @PathVariable("oauth_approval") String oauthApproval, @CurrentUser UserInfo currentUser) { - Map model = new HashMap(); - if(authTokenService.validateJwtToken(oauth_approval)) { + Map model = new HashMap<>(); + if(authTokenService.validateJwtToken(oauthApproval)) { try { AuthorizationRequest clientAuth = (AuthorizationRequest) momentaryService.get(currentUser.getSessionId(), "authorizationRequest"); @@ -156,7 +155,7 @@ public class OAuth20AccessConfirmationEndpoint { model.put("appName", app.getAppName()); model.put("iconBase64", app.getIconBase64()); model.put("oauth_version", "oauth 2.0"); - Map scopes = new LinkedHashMap(); + Map scopes = new LinkedHashMap<>(); for (String scope : clientAuth.getScope()) { scopes.put(OAuth2Constants.PARAMETER.SCOPE_PREFIX + scope, "false"); } @@ -179,10 +178,10 @@ public class OAuth20AccessConfirmationEndpoint { _logger.trace("Confirmation details "); for (Object key : model.keySet()) { - _logger.trace("key " + key +"=" + model.get(key)); + _logger.trace("key {} = {}" ,key,model.get(key)); } } - return new Message>(model).buildResponse(); + return new Message<>(model); } /** diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java index 9a51a52e4..cd0b17ce2 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java @@ -34,7 +34,7 @@ import jakarta.servlet.http.HttpServletRequest; */ public class BearerTokenExtractor implements TokenExtractor { - private final static Log logger = LogFactory.getLog(BearerTokenExtractor.class); + private static final Log logger = LogFactory.getLog(BearerTokenExtractor.class); @Override public Authentication extract(HttpServletRequest request) { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index 16ce85ad7..1cd784960 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java @@ -58,7 +58,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg private static final Log logger = LogFactory.getLog(JdbcClientDetailsService.class); - protected final static Cache detailsCache = + protected static final Cache detailsCache = Caffeine.newBuilder() .expireAfterWrite(30, TimeUnit.MINUTES) .maximumSize(200000) diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java index 831daca9c..12d4c1142 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/code/InMemoryAuthorizationCodeServices.java @@ -31,7 +31,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; * @author Dave Syer */ public class InMemoryAuthorizationCodeServices extends RandomValueAuthorizationCodeServices { - protected final static Cache authorizationCodeStore = + protected static final Cache authorizationCodeStore = Caffeine.newBuilder() .expireAfterWrite(3, TimeUnit.MINUTES) .build(); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index 56119444e..6b274ee1b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -61,7 +61,9 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -96,7 +98,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class AuthorizationEndpoint extends AbstractEndpoint { - final static Logger _logger = LoggerFactory.getLogger(AuthorizationEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(AuthorizationEndpoint.class); private static final String OAUTH_V20_AUTHORIZATION_URL = "" + OAuth2Constants.ENDPOINT.ENDPOINT_AUTHORIZE + "?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto"; @@ -118,13 +120,13 @@ public class AuthorizationEndpoint extends AbstractEndpoint { } @Operation(summary = "OAuth 2.0 认证接口", description = "传递参数应用ID，自动完成跳转认证拼接",method="GET") - @RequestMapping(value = {OAuth2Constants.ENDPOINT.ENDPOINT_BASE + "/{id}"},method = RequestMethod.GET) + @GetMapping(value = {OAuth2Constants.ENDPOINT.ENDPOINT_BASE + "/{id}"}) public ModelAndView authorize( HttpServletRequest request, HttpServletResponse response, @PathVariable("id") String id){ ClientDetails clientDetails =getClientDetailsService().loadClientByClientId(id,true); - _logger.debug(""+clientDetails); + _logger.debug("clientDetails {}",clientDetails); String authorizationUrl = ""; try { authorizationUrl = String.format(OAUTH_V20_AUTHORIZATION_URL, @@ -140,11 +142,10 @@ public class AuthorizationEndpoint extends AbstractEndpoint { } @Operation(summary = "OAuth 2.0 认证接口", description = "传递参数client_id,response_type,redirect_uri等",method="GET") - @RequestMapping(value = { + @GetMapping(value = { OAuth2Constants.ENDPOINT.ENDPOINT_AUTHORIZE, OAuth2Constants.ENDPOINT.ENDPOINT_TENCENT_IOA_AUTHORIZE - }, - method = RequestMethod.GET) + }) public ModelAndView authorize( Map model, @RequestParam Map parameters, @@ -238,10 +239,9 @@ public class AuthorizationEndpoint extends AbstractEndpoint { } //approval must post - @RequestMapping(value = {OAuth2Constants.ENDPOINT.ENDPOINT_AUTHORIZE+"/approval"}, - params = OAuth2Constants.PARAMETER.USER_OAUTH_APPROVAL, - method = RequestMethod.POST) - public ResponseEntity authorizeApproveOrDeny( + @PostMapping(value = {OAuth2Constants.ENDPOINT.ENDPOINT_AUTHORIZE+"/approval"}, + params = OAuth2Constants.PARAMETER.USER_OAUTH_APPROVAL) + public Message< Object> authorizeApproveOrDeny( @RequestParam Map approvalParameters, @CurrentUser UserInfo currentUser, SessionStatus sessionStatus) { @@ -281,16 +281,16 @@ public class AuthorizationEndpoint extends AbstractEndpoint { new UserDeniedAuthorizationException("User denied access"), responseTypes.contains(OAuth2Constants.PARAMETER.TOKEN) ) - ).buildResponse(); + ); } if (responseTypes.contains(OAuth2Constants.PARAMETER.TOKEN)) { return new Message< Object>((Object) - getImplicitGrantResponse(authorizationRequest)).buildResponse(); + getImplicitGrantResponse(authorizationRequest)); } return new Message< Object>((Object) - getAuthorizationCodeResponse(authorizationRequest, (Authentication) principal)).buildResponse(); + getAuthorizationCodeResponse(authorizationRequest, (Authentication) principal)); } finally { sessionStatus.setComplete(); @@ -341,7 +341,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint { authorizationRequest, generateCode(authorizationRequest, authUser) ); - _logger.debug("successfulRedirect " + successfulRedirect); + _logger.debug("successfulRedirect {}" , successfulRedirect); return successfulRedirect; } catch (OAuth2Exception e) { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java index 2f17e8de6..44e148a35 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java @@ -45,7 +45,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class IntrospectEndpoint { - final static Logger _logger = LoggerFactory.getLogger(IntrospectEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(IntrospectEndpoint.class); @Autowired @Qualifier("oauth20JdbcClientDetailsService") private ClientDetailsService clientDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java index 1cc55b1b8..77bc6143b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java @@ -41,7 +41,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class OauthJwksEndpoint extends AbstractEndpoint { - final static Logger _logger = LoggerFactory.getLogger(OauthJwksEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(OauthJwksEndpoint.class); @Operation(summary = "OAuth JWk 元数据接口", description = "参数mxk_metadata_APPID",method="GET") @RequestMapping( diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java index d0396026e..4e28b83c8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -86,7 +86,7 @@ import jakarta.servlet.http.HttpServletResponse; OAuth2Constants.ENDPOINT.ENDPOINT_TENCENT_IOA_TOKEN+"/*"}) public class TokenEndpointAuthenticationFilter implements Filter { - final static Logger _logger = LoggerFactory.getLogger(TokenEndpointAuthenticationFilter.class); + static final Logger _logger = LoggerFactory.getLogger(TokenEndpointAuthenticationFilter.class); private AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); boolean allowOnlyPost; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index 1cc886ba3..46dd05f39 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(OAuthDefaultUserInfoAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(OAuthDefaultUserInfoAdapter.class); ClientDetails clientDetails; public OAuthDefaultUserInfoAdapter() {} diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index 350d065f6..a3434101e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -54,7 +54,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class UserInfoEndpoint { - final static Logger _logger = LoggerFactory.getLogger(UserInfoEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(UserInfoEndpoint.class); @Autowired @Qualifier("oauth20JdbcClientDetailsService") private ClientDetailsService clientDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 6eda410c7..20cf3aa4f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java @@ -74,7 +74,7 @@ import com.nimbusds.jwt.SignedJWT; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class UserInfoOIDCEndpoint { - final static Logger _logger = LoggerFactory.getLogger(UserInfoOIDCEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(UserInfoOIDCEndpoint.class); @Autowired @Qualifier("oauth20JdbcClientDetailsService") private ClientDetailsService clientDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java index dbca3c682..3552c6316 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java @@ -44,7 +44,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class OauthAuthorizationServerEndpoint extends AbstractEndpoint { - final static Logger _logger = LoggerFactory.getLogger(OauthAuthorizationServerEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(OauthAuthorizationServerEndpoint.class); @Operation(summary = "OAuth v2 metadata 元数据接口", description = "参数client_id",method="GET,POST") @RequestMapping( diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java index f4e2cc326..09602c872 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java @@ -38,7 +38,7 @@ import java.util.Set; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class OpenidConfigurationEndpoint extends AbstractEndpoint { - final static Logger _logger = LoggerFactory.getLogger(OpenidConfigurationEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(OpenidConfigurationEndpoint.class); @Operation(summary = "OpenID Connect metadata 元数据接口", description = "参数client_id",method="GET,POST") 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 5252ddc6c..8b2c16102 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 @@ -62,9 +62,9 @@ import com.nimbusds.jwt.SignedJWT; * */ public class OIDCIdTokenEnhancer implements TokenEnhancer { - private final static Logger _logger = LoggerFactory.getLogger(OIDCIdTokenEnhancer.class); + private static final Logger _logger = LoggerFactory.getLogger(OIDCIdTokenEnhancer.class); - public final static String ID_TOKEN_SCOPE="openid"; + public static final String ID_TOKEN_SCOPE="openid"; private OIDCProviderMetadata providerMetadata; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java index a351302c9..cc4dc96f2 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/EndpointGenerator.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class EndpointGenerator { - private final static Logger logger = LoggerFactory.getLogger(EndpointGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(EndpointGenerator.class); public Endpoint generateEndpoint( String location) { logger.debug("end point location: {}", location); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java index fc88a363b..591083fd5 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java @@ -48,7 +48,7 @@ import org.springframework.beans.factory.InitializingBean; */ public class SignatureSecurityPolicyRule implements InitializingBean, SecurityPolicyRule { - private final static Logger logger = LoggerFactory.getLogger(SignatureSecurityPolicyRule.class); + private static final Logger logger = LoggerFactory.getLogger(SignatureSecurityPolicyRule.class); private final CredentialResolver credentialResolver; private final SAMLSignatureProfileValidator samlSignatureProfileValidator; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java index 7bd7edd4b..f95de84c7 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java @@ -42,7 +42,7 @@ import org.springframework.beans.factory.InitializingBean; import jakarta.servlet.http.HttpServletRequest; public class ExtractPostBindingAdapter implements ExtractBindingAdapter, InitializingBean{ - private final static Logger _logger = LoggerFactory.getLogger(ExtractPostBindingAdapter.class); + private static final Logger _logger = LoggerFactory.getLogger(ExtractPostBindingAdapter.class); static final String SAML_REQUEST_POST_PARAM_NAME = "SAMLRequest"; static final String SAML_RESPONSE_POST_PARAM_NAME = "SAMLResponse"; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java index d95d73df2..3483ce33f 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java @@ -54,7 +54,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; public class PostBindingAdapter implements BindingAdapter, InitializingBean{ - private final static Logger logger = LoggerFactory.getLogger(PostBindingAdapter.class); + private static final Logger logger = LoggerFactory.getLogger(PostBindingAdapter.class); static final String SAML_REQUEST_POST_PARAM_NAME = "SAMLRequest"; static final String SAML_RESPONSE_POST_PARAM_NAME = "SAMLResponse"; 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 e16c1a1b8..11f8d406d 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 @@ -82,7 +82,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class ConsumerEndpoint { - private final static Logger logger = LoggerFactory.getLogger(ConsumerEndpoint.class); + private static final Logger logger = LoggerFactory.getLogger(ConsumerEndpoint.class); private BindingAdapter bindingAdapter; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java index a9dd4794e..c6ec2fb5f 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java @@ -50,7 +50,7 @@ import jakarta.servlet.http.HttpServletResponse; public class RealAuthenticationFailureHandler implements AuthenticationFailureHandler { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(RealAuthenticationFailureHandler.class); private final RequestCache requestCache; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java index 8beb2a7d5..6636c0545 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataDescriptorUtil.java @@ -56,7 +56,7 @@ import org.w3c.dom.Element; * */ public class MetadataDescriptorUtil { - private final static Logger logger = LoggerFactory.getLogger(MetadataDescriptorUtil.class); + private static final Logger logger = LoggerFactory.getLogger(MetadataDescriptorUtil.class); private static MetadataDescriptorUtil instance = null; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java index 27d6a150a..40402331a 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/MetadataGenerator.java @@ -95,7 +95,7 @@ import org.springframework.core.io.FileSystemResource; import java.security.KeyStore; public class MetadataGenerator { - private final static Logger logger = LoggerFactory.getLogger(MetadataGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(MetadataGenerator.class); /** Parser manager used to parse XML. */ protected static BasicParserPool parser; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java index e06d16864..7c4f28e6f 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java @@ -58,7 +58,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller @RequestMapping(value = { "/metadata/saml20/" }) public class SamlMetadataEndpoint { - private final static Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(SamlMetadataEndpoint.class); @Autowired diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java index 4cd5667e1..30cd8efbc 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java @@ -46,7 +46,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class AssertionEndpoint { - private final static Logger logger = LoggerFactory.getLogger(AssertionEndpoint.class); + private static final Logger logger = LoggerFactory.getLogger(AssertionEndpoint.class); private BindingAdapter bindingAdapter; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java index efeeaeade..d33c0d8c6 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java @@ -52,7 +52,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller public class IdpInitEndpoint { - private final static Logger logger = LoggerFactory.getLogger(IdpInitEndpoint.class); + private static final Logger logger = LoggerFactory.getLogger(IdpInitEndpoint.class); private BindingAdapter bindingAdapter; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java index 31741671d..d4bc3eaf9 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java @@ -43,7 +43,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller public class LogoutSamlEndpoint { - private final static Logger logger = LoggerFactory.getLogger(LogoutSamlEndpoint.class); + private static final Logger logger = LoggerFactory.getLogger(LogoutSamlEndpoint.class); @Autowired @Qualifier("extractRedirectBindingAdapter") diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java index 34b3a6f3e..b0c704a68 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java @@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller public class SingleSignOnEndpoint { - private final static Logger logger = LoggerFactory.getLogger(SingleSignOnEndpoint.class); + private static final Logger logger = LoggerFactory.getLogger(SingleSignOnEndpoint.class); private BindingAdapter bindingAdapter; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java index be1097326..b73f37d72 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AssertionGenerator.java @@ -51,7 +51,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; public class AssertionGenerator { - private final static Logger logger = LoggerFactory.getLogger(AssertionGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(AssertionGenerator.class); private final IssuerGenerator issuerGenerator; private final SubjectGenerator subjectGenerator; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java index acff1fd20..7a8d064dd 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; import org.springframework.security.core.GrantedAuthority; public class AttributeStatementGenerator { - private final static Logger logger = LoggerFactory.getLogger(AttributeStatementGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(AttributeStatementGenerator.class); private final XMLObjectBuilderFactory builderFactory = Configuration.getBuilderFactory(); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java index d8fd1f6cf..95ea9e580 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AuthnResponseGenerator { - private final static Logger logger = LoggerFactory.getLogger(AuthnResponseGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(AuthnResponseGenerator.class); private String issuerName; private IDService idService; private TimeService timeService; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java index 9ab3f4208..a6ece26ca 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AuthnStatementGenerator.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AuthnStatementGenerator { - private final static Logger logger = LoggerFactory.getLogger(AuthnStatementGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(AuthnStatementGenerator.class); public AuthnStatement generateAuthnStatement(DateTime authnInstant) { //Response/Assertion/AuthnStatement/AuthContext/AuthContextClassRef diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java index e15f1eefb..b9f937f75 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/ConditionsGenerator.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ConditionsGenerator { - private final static Logger logger = LoggerFactory.getLogger(ConditionsGenerator.class); + private static final Logger logger = LoggerFactory.getLogger(ConditionsGenerator.class); public Conditions generateConditions(String audienceUrl,int validInSeconds) { Conditions conditions = new ConditionsBuilder().buildObject(); diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index ba03c70b8..415659a2f 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -55,7 +55,7 @@ import jakarta.servlet.http.HttpServletResponse; @Controller public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(TokenBasedAuthorizeEndpoint.class); + static final Logger _logger = LoggerFactory.getLogger(TokenBasedAuthorizeEndpoint.class); @Autowired AppsTokenBasedDetailsService tokenBasedDetailsService; diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java index dcbd8dc5d..f51ef8eba 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(TokenBasedDefaultAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(TokenBasedDefaultAdapter.class); String token = ""; @Override diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java index 5206406cf..75ad266ca 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(TokenBasedSimpleAdapter.class); + static final Logger _logger = LoggerFactory.getLogger(TokenBasedSimpleAdapter.class); String token = ""; @Override diff --git a/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java index 0b28788b7..9d4c0114c 100644 --- a/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java +++ b/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java @@ -28,10 +28,9 @@ 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.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** @@ -39,7 +38,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Crystal.Sea * */ -@Controller +@RestController public class ImageCaptchaEndpoint { private static final Logger _logger = LoggerFactory.getLogger(ImageCaptchaEndpoint.class); @@ -59,7 +58,7 @@ public class ImageCaptchaEndpoint { * @param response HttpServletResponse */ @GetMapping(value={"/captcha"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity captchaHandleRequest( + public Message captchaHandleRequest( @RequestParam(value="captcha",required=false,defaultValue="text") String captchaType, @RequestParam(value="state",required=false,defaultValue="state") String state) { try { @@ -94,13 +93,11 @@ public class ImageCaptchaEndpoint { _logger.trace("b64Image {}" , b64Image); - return new Message( - new ImageCaptcha(state,b64Image) - ).buildResponse(); + return new Message<>(new ImageCaptcha(state,b64Image)); } catch (Exception e) { _logger.error("captcha Producer Error" , e); } - return new Message< Object>(Message.FAIL).buildResponse(); + return new Message<>(Message.FAIL); } public void setCaptchaProducer(Producer captchaProducer) { diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java index 1b82d3b4e..672d928fd 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; @Service public class ActiveDirectorySynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(ActiveDirectorySynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(ActiveDirectorySynchronizerService.class); Synchronizers synchronizer; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java index 65ce2df8f..2c96e9214 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java @@ -42,7 +42,7 @@ import org.springframework.stereotype.Service; @Service public class ActiveDirectoryUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(ActiveDirectoryUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(ActiveDirectoryUsersService.class); ActiveDirectoryUtils ldapUtils; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java index 81e5814f6..ab6e5c1b1 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java @@ -27,7 +27,7 @@ import com.dingtalk.api.response.OapiGettokenResponse; import com.taobao.api.ApiException; public class DingtalkAccessTokenService { - final static Logger _logger = LoggerFactory.getLogger(DingtalkAccessTokenService.class); + static final Logger _logger = LoggerFactory.getLogger(DingtalkAccessTokenService.class); String appkey; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java index 0d3be7761..6d4004a2b 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java @@ -39,7 +39,7 @@ import com.taobao.api.ApiException; @Service public class DingtalkOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingtalkOrganizationService.class); + static final Logger _logger = LoggerFactory.getLogger(DingtalkOrganizationService.class); static Long ROOT_DEPT_ID = 1L; diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java index 57712d26e..7fc26a086 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java @@ -28,7 +28,7 @@ import com.taobao.api.ApiException; @Service public class DingtalkSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingtalkSynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(DingtalkSynchronizerService.class); Synchronizers synchronizer; @Autowired diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java index c9addd44c..a4ee1c256 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/dromara/maxkey/synchronizer/dingtalk/DingtalkUsersService.java @@ -38,7 +38,7 @@ import com.dingtalk.api.response.OapiV2UserListResponse.ListUserResponse; @Service public class DingtalkUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingtalkUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(DingtalkUsersService.class); String access_token; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java index af119237a..77eed1d22 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuAccessTokenService.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class FeishuAccessTokenService { - final static Logger _logger = LoggerFactory.getLogger(FeishuAccessTokenService.class); + static final Logger _logger = LoggerFactory.getLogger(FeishuAccessTokenService.class); String appId; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java index 604049e20..a28d8299c 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuOrganizationService.java @@ -37,7 +37,7 @@ import org.springframework.stereotype.Service; @Service public class FeishuOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(FeishuOrganizationService.class); + static final Logger _logger = LoggerFactory.getLogger(FeishuOrganizationService.class); String access_token; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java index c2c360078..4dd22d86a 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuSynchronizerService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Service; @Service public class FeishuSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(FeishuSynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(FeishuSynchronizerService.class); Synchronizers synchronizer; @Autowired diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java index b0bc33beb..446d92ebc 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/dromara/maxkey/synchronizer/feishu/FeishuUsersService.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Service; @Service public class FeishuUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(FeishuUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(FeishuUsersService.class); String access_token; diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java index 544fd4588..025b34f11 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcOrganizationService.java @@ -38,7 +38,7 @@ import java.util.ArrayList; @Service public class JdbcOrganizationService extends AbstractSynchronizerService implements ISynchronizerService { - final static Logger _logger = LoggerFactory.getLogger(JdbcOrganizationService.class); + static final Logger _logger = LoggerFactory.getLogger(JdbcOrganizationService.class); static ArrayList mapperList = new ArrayList<>(); @Override diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java index 64662320a..109ebc853 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcSynchronizerService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Service; @Service public class JdbcSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(JdbcSynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(JdbcSynchronizerService.class); Synchronizers synchronizer; diff --git a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java index 8e93a57eb..9acdb786a 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-jdbc/src/main/java/org/dromara/maxkey/synchronizer/jdbc/JdbcUsersService.java @@ -38,7 +38,7 @@ import java.util.ArrayList; @Service public class JdbcUsersService extends AbstractSynchronizerService implements ISynchronizerService { - final static Logger _logger = LoggerFactory.getLogger(JdbcUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(JdbcUsersService.class); static ArrayList mapperList = new ArrayList<>(); diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java index 11ebf5929..b5267df22 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapOrganizationService.java @@ -41,7 +41,7 @@ import org.springframework.stereotype.Service; @Service public class LdapOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(LdapOrganizationService.class); + static final Logger _logger = LoggerFactory.getLogger(LdapOrganizationService.class); LdapUtils ldapUtils; diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java index 5c3541d95..33a6a1bb3 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapSynchronizerService.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; @Service public class LdapSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(LdapSynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(LdapSynchronizerService.class); Synchronizers synchronizer; diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java index af0d7fab0..6b07b59e0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/dromara/maxkey/synchronizer/ldap/LdapUsersService.java @@ -40,7 +40,7 @@ import org.springframework.stereotype.Service; @Service public class LdapUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(LdapUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(LdapUsersService.class); LdapUtils ldapUtils; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java index 513df56b8..be781aafe 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class WorkweixinAccessTokenService { - final static Logger _logger = LoggerFactory.getLogger(WorkweixinAccessTokenService.class); + static final Logger _logger = LoggerFactory.getLogger(WorkweixinAccessTokenService.class); String corpid; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java index 135a6a6af..3a76acf52 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Service; @Service public class WorkweixinOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(WorkweixinOrganizationService.class); + static final Logger _logger = LoggerFactory.getLogger(WorkweixinOrganizationService.class); String access_token; diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java index 434bb8a01..5e22c5a6b 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java @@ -26,7 +26,7 @@ import org.springframework.stereotype.Service; @Service public class WorkweixinSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(WorkweixinSynchronizerService.class); + static final Logger _logger = LoggerFactory.getLogger(WorkweixinSynchronizerService.class); Synchronizers synchronizer; @Autowired diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index 5bc65852b..62f718f0e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/dromara/maxkey/synchronizer/workweixin/WorkweixinUsersService.java @@ -34,7 +34,7 @@ import org.springframework.stereotype.Service; @Service public class WorkweixinUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(WorkweixinUsersService.class); + static final Logger _logger = LoggerFactory.getLogger(WorkweixinUsersService.class); String access_token; diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java index 77072f021..dca25686a 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.web.apis.identity.rest; -import java.io.IOException; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.idm.Organizations; @@ -29,8 +27,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -39,13 +35,12 @@ import org.springframework.web.bind.annotation.PostMapping; 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.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.util.UriComponentsBuilder; -@Controller +@RestController @RequestMapping(value={"/api/idm/Organization"}) public class RestOrganizationController { static final Logger _logger = LoggerFactory.getLogger(RestOrganizationController.class); @@ -53,20 +48,17 @@ public class RestOrganizationController { @Autowired OrganizationsService organizationsService; - @ResponseBody @GetMapping(value = "/{id}") public Organizations getUser(@PathVariable String id, @RequestParam(required = false) String attributes) { _logger.debug("Organizations id {} , attributes {}", id , attributes); - Organizations org = organizationsService.get(id); - return org; + return organizationsService.get(id); } - @ResponseBody @PostMapping public Organizations create(@RequestBody Organizations org, @RequestParam(required = false) String attributes, - UriComponentsBuilder builder) throws IOException { + UriComponentsBuilder builder) { _logger.debug("Organizations content {} , attributes {}", org , attributes); Organizations loadOrg = organizationsService.get(org.getId()); if(loadOrg == null) { @@ -77,12 +69,10 @@ public class RestOrganizationController { return org; } - @ResponseBody @PutMapping(value = "/{id}") public Organizations replace(@PathVariable String id, @RequestBody Organizations org, - @RequestParam(required = false) String attributes) - throws IOException { + @RequestParam(required = false) String attributes) { _logger.debug("Organizations id {} , content {} , attributes {}", id , org , attributes); Organizations loadOrg = organizationsService.get(id); if(loadOrg == null) { @@ -103,13 +93,11 @@ public class RestOrganizationController { } @GetMapping(value = { "/.search" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - @ResponseBody - public ResponseEntity search(@ModelAttribute Organizations org) { + public Message> search(@ModelAttribute Organizations org) { if(StringUtils.isBlank(org.getInstId())){ org.setInstId("1"); } _logger.debug("Organizations {}" , org); - return new Message>( - organizationsService.fetchPageResults(org)).buildResponse(); + return new Message<>(organizationsService.fetchPageResults(org)); } } diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java index 53761f45b..5d75e84f8 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.web.apis.identity.rest; -import java.io.IOException; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.idm.UserInfo; @@ -30,8 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -41,11 +37,11 @@ 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.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.util.UriComponentsBuilder; -@Controller +@RestController @RequestMapping(value={"/api/idm/Users"}) public class RestUserInfoController { @@ -56,7 +52,6 @@ public class RestUserInfoController { private UserInfoService userInfoService; @GetMapping(value = "/{id}") - @ResponseBody public UserInfo getUser( @PathVariable String id, @RequestParam(required = false) String attributes) { @@ -67,10 +62,9 @@ public class RestUserInfoController { } @PostMapping - @ResponseBody public UserInfo create(@RequestBody UserInfo userInfo, @RequestParam(required = false) String attributes, - UriComponentsBuilder builder) throws IOException { + UriComponentsBuilder builder) { _logger.debug("UserInfo content {} , attributes {}", userInfo , attributes); UserInfo loadUserInfo = userInfoService.findByUsername(userInfo.getUsername()); if(loadUserInfo != null) { @@ -82,11 +76,9 @@ public class RestUserInfoController { } @PutMapping(value = "/{id}") - @ResponseBody public UserInfo replace(@PathVariable String id, @RequestBody UserInfo userInfo, - @RequestParam(required = false) String attributes) - throws IOException { + @RequestParam(required = false) String attributes) { _logger.debug("UserInfo content {} , attributes {}", userInfo , attributes); UserInfo loadUserInfo = userInfoService.findByUsername(userInfo.getUsername()); if(loadUserInfo != null) { @@ -105,14 +97,12 @@ public class RestUserInfoController { } @GetMapping(value = { "/.search" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - @ResponseBody - public ResponseEntity search(@ModelAttribute UserInfo userInfo) { + public Message> search(@ModelAttribute UserInfo userInfo) { _logger.debug("UserInfo {}",userInfo); if(StringUtils.isBlank(userInfo.getInstId())){ userInfo.setInstId("1"); } - return new Message>( - userInfoService.fetchPageResults(userInfo)).buildResponse(); + return new Message<>(userInfoService.fetchPageResults(userInfo)); } } 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 82c5c2c11..7c9458623 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 @@ -53,7 +53,7 @@ import org.springframework.web.util.UriComponentsBuilder; @RestController @RequestMapping(value = "/api/idm/SCIM/v2/Groups") public class ScimGroupController { - final static Logger _logger = LoggerFactory.getLogger(ScimGroupController.class); + static final Logger _logger = LoggerFactory.getLogger(ScimGroupController.class); @Autowired GroupsService groupsService; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java index 5d6cd903e..731775848 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java @@ -56,7 +56,7 @@ import org.springframework.web.util.UriComponentsBuilder; @RestController @RequestMapping(value = "/api/idm/SCIM/v2/Organizations") public class ScimOrganizationController { - final static Logger _logger = LoggerFactory.getLogger(ScimOrganizationController.class); + static final Logger _logger = LoggerFactory.getLogger(ScimOrganizationController.class); @Autowired OrganizationsService organizationsService; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java index 97e49d2d4..44ab81d15 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java @@ -67,7 +67,7 @@ import org.springframework.web.util.UriComponentsBuilder; @RestController @RequestMapping(value = "/api/idm/SCIM/v2/Users") public class ScimUserController { - final static Logger _logger = LoggerFactory.getLogger(ScimUserController.class); + static final Logger _logger = LoggerFactory.getLogger(ScimUserController.class); @Autowired private UserInfoService userInfoService; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html index 69d31c601..7848f3b04 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html @@ -138,17 +138,7 @@
- - - -
    -
  • {{ 'mxk.apps.resources' | i18n }}
    • -
  • {{ 'mxk.text.delete' | i18n }}
    • -
- +
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java index 73ff66d3b..26b1f5dce 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java @@ -19,6 +19,8 @@ package org.dromara.maxkey.web.access.contorller; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; + import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.entity.Message; @@ -26,20 +28,18 @@ import org.dromara.maxkey.entity.history.HistoryLogin; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.util.DateUtils; -import org.dromara.maxkey.util.StrUtils; import org.dromara.mybatis.jpa.entity.JpaPageResults; 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.GetMapping; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; /** * 登录会话管理. @@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value = { "/access/session" }) public class LoginSessionController { static final Logger logger = LoggerFactory.getLogger(LoginSessionController.class); @@ -65,9 +65,8 @@ public class LoginSessionController { * @param logsAuth * @return */ - @RequestMapping(value = { "/fetch" }) - @ResponseBody - public ResponseEntity fetch( + @GetMapping(value = { "/fetch" }) + public Message> fetch( @ModelAttribute("historyLogin") HistoryLogin historyLogin, @CurrentUser UserInfo currentUser) { logger.debug("history/session/fetch {}" , historyLogin); @@ -75,16 +74,15 @@ public class LoginSessionController { historyLogin.setInstId(currentUser.getInstId()); return new Message>( historyLoginService.queryOnlineSession(historyLogin) - ).buildResponse(); + ); } - @ResponseBody - @RequestMapping(value="/terminate") - public ResponseEntity terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { - logger.debug(ids); + @GetMapping(value="/terminate") + public Message terminate(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + logger.debug("ids {}",ids); boolean isTerminated = false; try { - for(String sessionId : StrUtils.string2List(ids, ",")) { + for(String sessionId : ids) { logger.trace("terminate session Id {} ",sessionId); if(currentUser.getSessionId().contains(sessionId)) { continue;//skip current session @@ -101,9 +99,9 @@ public class LoginSessionController { } if(isTerminated) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message<>(Message.SUCCESS); } else { - return new Message(Message.ERROR).buildResponse(); + return new Message<>(Message.ERROR); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java index 48af02c51..6df9d94a0 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.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.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -68,7 +67,7 @@ public class AppListController { */ @RequestMapping(value = { "/appList" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity appList( + public Message> appList( @RequestParam(value = "gridList", required = false) String gridList, @CurrentUser UserInfo currentUser) { userInfoService.updateGridList(gridList,currentUser); @@ -80,13 +79,13 @@ public class AppListController { app.transIconBase64(); } //AuthorizationUtils.setAuthentication(null); - return new Message>(appList).buildResponse(); + return new Message>(appList); } @RequestMapping(value = { "/account/get" }) @ResponseBody - public ResponseEntity getAccount( + public Message getAccount( @RequestParam("credential") String credential, @RequestParam("appId") String appId, @CurrentUser UserInfo currentUser) { @@ -104,13 +103,13 @@ public class AppListController { account.setUsername(currentUser.getUsername()); account.setDisplayName(currentUser.getDisplayName()); } - return new Message(account).buildResponse(); + return new Message<>(account); } @RequestMapping(value = { "/account/update" }) @ResponseBody - public ResponseEntity updateAccount( + public Message updateAccount( @RequestParam("credential") String credential, @ModelAttribute Accounts account, @CurrentUser UserInfo currentUser) { @@ -137,6 +136,6 @@ public class AppListController { } } - return new Message().buildResponse(); + return new Message<>(); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java index 4cbacbb9c..4b26088b1 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java @@ -34,14 +34,9 @@ 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.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -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.*; -@Controller +@RestController @RequestMapping(value={"/config"}) public class ChangePasswodController { static final Logger logger = LoggerFactory.getLogger(ChangePasswodController.class); @@ -55,18 +50,16 @@ public class ChangePasswodController { @Autowired private CnfPasswordPolicyService passwordPolicyService; - @RequestMapping(value={"/passwordpolicy"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity passwordpolicy(@CurrentUser UserInfo currentUser){ + @GetMapping(value={"/passwordpolicy"}) + public Message passwordpolicy(@CurrentUser UserInfo currentUser){ CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(currentUser.getInstId()); //构建密码强度说明 passwordPolicy.buildMessage(); - return new Message(passwordPolicy).buildResponse(); + return new Message<>(passwordPolicy); } - - @ResponseBody - @RequestMapping(value = { "/changePassword" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity changePasswod( + @PostMapping(value = { "/changePassword" }) + public Message changePasswod( @RequestBody ChangePassword changePassword, @CurrentUser UserInfo currentUser) { if(!currentUser.getId().equals(changePassword.getId())){ @@ -83,11 +76,11 @@ public class ChangePasswodController { ConstsAct.CHANGE_PASSWORD, ConstsActResult.SUCCESS, currentUser); - return new Message().buildResponse(); + return new Message<>(); }else { String message = (String) WebContext.getAttribute(PasswordPolicyValidator.PASSWORD_POLICY_VALIDATE_RESULT); logger.info("-message: {}",message); - return new Message(Message.ERROR,message).buildResponse(); + return new Message<>(Message.ERROR,message); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java index 34d62acb2..647c5a760 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java @@ -40,7 +40,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.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,17 +90,17 @@ public class ForgotPasswordContorller { private CnfPasswordPolicyService passwordPolicyService; @RequestMapping(value={"/passwordpolicy"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity passwordpolicy(){ + public Message passwordpolicy(){ CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(WebContext.getInst().getId()); //构建密码强度说明 passwordPolicy.buildMessage(); - return new Message(passwordPolicy).buildResponse(); + return new Message(passwordPolicy); } @ResponseBody @RequestMapping(value = { "/validateCaptcha" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity validateCaptcha( + public Message validateCaptcha( @RequestParam String userId, @RequestParam String state, @RequestParam String captcha, @@ -112,17 +111,17 @@ public class ForgotPasswordContorller { if(userInfo != null) { AbstractOtpAuthn smsOtpAuthn = smsOtpAuthnService.getByInstId(userInfo.getInstId()); if (otpCaptcha == null || !smsOtpAuthn.validate(userInfo, otpCaptcha)) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @ResponseBody @RequestMapping(value = { "/produceOtp" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity produceOtp( + public Message produceOtp( @RequestParam String mobile, @RequestParam String state, @RequestParam String captcha) { @@ -130,7 +129,7 @@ public class ForgotPasswordContorller { logger.debug(" Mobile {}: " ,mobile); if (!authTokenService.validateCaptcha(state,captcha)) { logger.debug("login captcha valid error."); - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } ChangePassword change = null; @@ -142,23 +141,23 @@ public class ForgotPasswordContorller { change.clearPassword(); AbstractOtpAuthn smsOtpAuthn = smsOtpAuthnService.getByInstId(userInfo.getInstId()); smsOtpAuthn.produce(userInfo); - return new Message(change).buildResponse(); + return new Message(change); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @ResponseBody @RequestMapping(value = { "/produceEmailOtp" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity produceEmailOtp( + public Message produceEmailOtp( @RequestParam String email, @RequestParam String state, @RequestParam String captcha) { logger.debug("/forgotpassword/produceEmailOtp Email {} : " , email); if (!authTokenService.validateCaptcha(state,captcha)) { logger.debug("captcha valid error."); - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } ChangePassword change = null; @@ -169,14 +168,14 @@ public class ForgotPasswordContorller { change.clearPassword(); AbstractOtpAuthn mailOtpAuthn = mailOtpAuthnService.getMailOtpAuthn(userInfo.getInstId()); mailOtpAuthn.produce(userInfo); - return new Message(change).buildResponse(); + return new Message(change); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @RequestMapping(value = { "/setpassword" }) - public ResponseEntity setPassWord( + public Message setPassWord( @ModelAttribute ChangePassword changePassword, @RequestParam String forgotType, @RequestParam String otpCaptcha, @@ -205,15 +204,15 @@ public class ForgotPasswordContorller { ConstsAct.FORGOT_PASSWORD, ConstsActResult.SUCCESS, loadedUserInfo); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); }else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java index 8204f3888..eefb4e869 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.web.contorller; import java.text.ParseException; import java.util.HashMap; -import java.util.regex.Pattern; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.jwt.AuthJwt; @@ -44,9 +42,7 @@ 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.core.Authentication; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -69,9 +65,7 @@ import jakarta.servlet.http.HttpServletResponse; @RequestMapping(value = "/login") public class LoginEntryPoint { private static Logger logger = LoggerFactory.getLogger(LoginEntryPoint.class); - - Pattern mobileRegex = Pattern.compile("^(13[4,5,6,7,8,9]|15[0,8,9,1,7]|188|187)\\\\d{8}$"); - + @Autowired AuthTokenService authTokenService; @@ -109,9 +103,8 @@ public class LoginEntryPoint { * @return */ @Operation(summary = "登录接口", description = "用户登录地址",method="GET") - @GetMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get( - @RequestParam(value = "remember_me", required = false) String rememberMeJwt) { + @GetMapping(value={"/get"}) + public Message get(@RequestParam(value = "remember_me", required = false) String rememberMeJwt) { logger.debug("/get."); //Remember Me if(StringUtils.isNotBlank(rememberMeJwt) @@ -126,7 +119,7 @@ public class LoginEntryPoint { if(authentication != null) { AuthJwt authJwt = authTokenService.genAuthJwt(authentication); authJwt.setRemeberMe(remeberMeJwt); - return new Message(authJwt).buildResponse(); + return new Message(authJwt); } } } catch (ParseException e) { @@ -154,23 +147,23 @@ public class LoginEntryPoint { //load Social Sign On Providers model.put("socials", socialSignOnProviderService.loadSocials(inst.getId())); - return new Message>(model).buildResponse(); + return new Message>(model); } @RequestMapping(value={"/sendotp/{mobile}"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity produceOtp(@PathVariable("mobile") String mobile) { + public Message produceOtp(@PathVariable("mobile") String mobile) { UserInfo userInfo=userInfoService.findByEmailMobile(mobile); if(userInfo != null) { smsAuthnService.getByInstId(WebContext.getInst().getId()).produce(userInfo); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } - @RequestMapping(value={"/signin/bindusersocials"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity bindusersocials(@RequestBody LoginCredential credential) { + @PostMapping(value={"/signin/bindusersocials"}) + public Message bindusersocials(@RequestBody LoginCredential credential) { //短信验证码 String code = credential.getCode(); //映射社交服务的账号 @@ -203,10 +196,10 @@ public class LoginEntryPoint { Authentication authentication = authenticationProvider.authenticate(loginCredential,true); - return new Message(authTokenService.genAuthJwt(authentication)).buildResponse(); + return new Message(authTokenService.genAuthJwt(authentication)); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @@ -217,9 +210,8 @@ public class LoginEntryPoint { */ @Operation(summary = "登录接口", description = "登录接口",method="POST") @PostMapping(value={"/signin"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity signin( HttpServletRequest request, HttpServletResponse response, - @RequestBody LoginCredential credential) { - Message authJwtMessage = new Message(Message.FAIL); + public Message signin( HttpServletRequest request, HttpServletResponse response,@RequestBody LoginCredential credential) { + Message authJwtMessage = new Message<>(Message.FAIL); if(authTokenService.validateJwtToken(credential.getState())){ String authType = credential.getAuthType(); logger.debug("Login AuthN Type {}" , authType); @@ -236,7 +228,7 @@ public class LoginEntryPoint { authJwt.setPasswordSetType( (Integer)WebContext.getAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE)); } - authJwtMessage = new Message(authJwt); + authJwtMessage = new Message<>(authJwt); }else {//fail String errorMsg = WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE) == null ? @@ -248,7 +240,7 @@ public class LoginEntryPoint { logger.error("Login AuthN type must eq normal , tfa or mobile . "); } } - return authJwtMessage.buildResponse(); + return authJwtMessage; } /** @@ -256,15 +248,15 @@ public class LoginEntryPoint { * @param loginCredential * @return */ - @RequestMapping(value={"/congress"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity congress( @RequestBody LoginCredential credential) { + @PostMapping(value={"/congress"}) + public Message congress( @RequestBody LoginCredential credential) { if(StringUtils.isNotBlank(credential.getCongress())){ AuthJwt authJwt = authTokenService.consumeCongress(credential.getCongress()); if(authJwt != null) { - return new Message(authJwt).buildResponse(); + return new Message<>(authJwt); } } - return new Message(Message.FAIL).buildResponse(); + return new Message<>(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index 2e5b82f1f..477bd75e8 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -38,9 +38,8 @@ 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.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; @@ -65,8 +64,8 @@ public class LogoutEndpoint { * @return ResponseEntity */ @Operation(summary = "前端注销接口", description = "前端注销接口",method="GET") - @RequestMapping(value={"/logout"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity logout(@CurrentUser UserInfo currentUser){ + @GetMapping(value={"/logout"}, produces = {MediaType.APPLICATION_JSON_VALUE}) + public Message logout(@CurrentUser UserInfo currentUser){ //if logined in have onlineTicket ,need remove or logout back String sessionId = currentUser.getSessionId(); Session session = sessionManager.get(sessionId); @@ -94,15 +93,13 @@ public class LogoutEndpoint { currentUser.getId(), currentUser.getUsername()); } - return new Message().buildResponse(); + return new Message(); } @Operation(summary = "单点注销接口", description = "redirect_uri跳转地址",method="GET") - @RequestMapping(value={"/force/logout"}) - public ModelAndView forceLogout( - HttpServletRequest request, - @RequestParam(value = "redirect_uri",required = false) String redirect_uri - ){ + @GetMapping({"/force/logout"}) + public ModelAndView forceLogout(HttpServletRequest request, + @RequestParam(value = "redirect_uri",required = false) String redirect_uri){ //invalidate http session logger.debug("/force/logout http Session id {}",request.getSession().getId()); request.getSession().invalidate(); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java index 46d64c0a5..70678d93c 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java @@ -64,7 +64,7 @@ public class OneTimePasswordController { @RequestMapping(value = {"/timebased"}) @ResponseBody - public ResponseEntity timebased( + public Message timebased( @RequestParam(name="generate") String generate, @CurrentUser UserInfo currentUser) { HashMaptimebased =new HashMap<>(); @@ -88,7 +88,7 @@ public class OneTimePasswordController { timebased.put("sharedSecret", sharedSecret); timebased.put("hexSharedSecret", hexSharedSecret); timebased.put("rqCode", rqCode); - return new Message>(timebased).buildResponse(); + return new Message>(timebased); } public void generate(String generate,@CurrentUser UserInfo currentUser) { @@ -106,15 +106,15 @@ public class OneTimePasswordController { } @RequestMapping("/verify") - public ResponseEntity verify(@RequestParam("otp") String otp, @CurrentUser UserInfo currentUser) { + public Message verify(@RequestParam("otp") String otp, @CurrentUser UserInfo currentUser) { // 从当前用户信息中获取共享密钥 String sharedSecret = PasswordReciprocal.getInstance().decoder(currentUser.getSharedSecret()); // 计算当前时间对应的动态密码 boolean validate = timeBasedOtpAuthn.validate(currentUser, otp); if (validate) { - return new Message<>(0,"One-Time Password verification succeeded").buildResponse(); + return new Message<>(0,"One-Time Password verification succeeded"); } else { - return new Message<>(2,"One-Time Password verification failed").buildResponse(); + return new Message<>(2,"One-Time Password verification failed"); } } 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 c1bce37ed..40b47bf83 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 @@ -46,10 +46,10 @@ public class ProfileController { FileUploadService fileUploadService; @RequestMapping(value = { "/get" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@CurrentUser UserInfo currentUser) { + public Message get(@CurrentUser UserInfo currentUser) { UserInfo userInfo = userInfoService.findByUsername(currentUser.getUsername()); userInfo.trans(); - return new Message(userInfo).buildResponse(); + return new Message(userInfo); } /** @@ -61,7 +61,7 @@ public class ProfileController { */ @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody UserInfo userInfo, @CurrentUser UserInfo currentUser, BindingResult result) { @@ -85,10 +85,10 @@ public class ProfileController { } if (userInfoService.updateProfile(userInfo) > 0) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } 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 7ecfd0eea..13317e058 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 @@ -70,7 +70,7 @@ public class RegisterController { @ResponseBody @RequestMapping(value = { "/produceOtp" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity produceOtp( + public Message produceOtp( @RequestParam String mobile) { logger.debug("/signup/produceOtp Mobile {}: " ,mobile); @@ -81,16 +81,16 @@ public class RegisterController { userInfo.setMobile(mobile); AbstractOtpAuthn smsOtpAuthn = smsOtpAuthnService.getByInstId(WebContext.getInst().getId()); smsOtpAuthn.produce(userInfo); - return new Message(userInfo).buildResponse(); + return new Message(userInfo); } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } //直接注册 @RequestMapping(value={"/register"}) @ResponseBody - public ResponseEntity register( + public Message register( @ModelAttribute UserInfo userInfo, @RequestParam String captcha) throws ServletException, IOException { UserInfo validateUserInfo = new UserInfo(); @@ -102,12 +102,12 @@ public class RegisterController { UserInfo temp = userInfoService.findByEmailMobile(userInfo.getEmail()); if(temp != null) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } temp = userInfoService.findByUsername(userInfo.getUsername()); if(temp != null) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } //default InstId @@ -121,10 +121,10 @@ public class RegisterController { userInfo.setStatus(ConstsStatus.INACTIVE); if(userInfoService.insert(userInfo)) { - return new Message().buildResponse(); + return new Message(); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } 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 8251970e8..c4f34687c 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 @@ -54,7 +54,7 @@ public class SafeController { @ResponseBody @RequestMapping(value="/setting") - public ResponseEntity setting( + public Message setting( HttpServletRequest request, HttpServletResponse response, @RequestParam("authnType") String authnType, @@ -78,7 +78,7 @@ public class SafeController { userInfoService.updateEmail(currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } 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 1b6d3c791..389156eab 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 @@ -46,22 +46,22 @@ public class SocialSignOnListController { @RequestMapping(value={"/fetch"}) @ResponseBody - public ResponseEntity fetch(@CurrentUser UserInfo currentUser){ + public Message fetch(@CurrentUser UserInfo currentUser){ List listSocialsAssociate= socialsAssociatesService.queryByUser(currentUser); - return new Message>(listSocialsAssociate).buildResponse(); + return new Message>(listSocialsAssociate); } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsAssociatesService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } 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 2343d0fa7..e708f7adf 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 @@ -59,7 +59,7 @@ public class LoginAppsHistoryController { */ @RequestMapping(value={"/loginAppsHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp, @CurrentUser UserInfo currentUser){ logger.debug("historys/loginAppsHistory/fetch/ {}",historyLoginApp); @@ -68,7 +68,7 @@ public class LoginAppsHistoryController { historyLoginApp.setInstId(currentUser.getInstId()); return new Message>( historyLoginAppsService.fetchPageResults(historyLoginApp) - ).buildResponse(); + ); } @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 0daeb14d9..f91e08c4c 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 @@ -59,7 +59,7 @@ public class LoginHistoryController { */ @RequestMapping(value={"/loginHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyLogin") HistoryLogin historyLogin, @CurrentUser UserInfo currentUser ){ @@ -68,7 +68,7 @@ public class LoginHistoryController { historyLogin.setUserId(currentUser.getId()); return new Message>( loginHistoryService.fetchPageResults(historyLogin) - ).buildResponse(); + ); } @InitBinder diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/AccessController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/AccessController.java index 403bf99eb..7f6eaad1a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/AccessController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/AccessController.java @@ -32,15 +32,14 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/access/access"}) public class AccessController { static final Logger logger = LoggerFactory.getLogger(AccessController.class); @@ -53,7 +52,7 @@ public class AccessController { @RequestMapping(value = { "/appsInGroup" }) @ResponseBody - public ResponseEntity appsInRole( + public Message appsInRole( @ModelAttribute Access groupPermission, @CurrentUser UserInfo currentUser) { JpaPageResults groupPermissions; @@ -65,12 +64,12 @@ public class AccessController { app.transIconBase64(); } } - return new Message>(Message.FAIL,groupPermissions).buildResponse(); + return new Message>(Message.FAIL,groupPermissions); } @RequestMapping(value = { "/appsNotInGroup" }) @ResponseBody - public ResponseEntity appsNotInRole( + public Message appsNotInRole( @ModelAttribute Access groupPermission, @CurrentUser UserInfo currentUser) { JpaPageResults groupPermissions; @@ -82,16 +81,16 @@ public class AccessController { app.transIconBase64(); } } - return new Message>(Message.FAIL,groupPermissions).buildResponse(); + return new Message>(Message.FAIL,groupPermissions); } @RequestMapping(value = {"/add"}) @ResponseBody - public ResponseEntity insertPermission( + public Message insertPermission( @RequestBody Access groupPermission, @CurrentUser UserInfo currentUser) { if (groupPermission == null || groupPermission.getGroupId() == null) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } String roleId = groupPermission.getGroupId(); @@ -108,20 +107,20 @@ public class AccessController { } } if(result) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (accessService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java index 12d96cdf5..98697784f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java @@ -33,14 +33,13 @@ 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; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; /** * 登录会话管理. @@ -49,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value = { "/access/session" }) public class SessionController { static final Logger logger = LoggerFactory.getLogger(SessionController.class); @@ -71,21 +70,21 @@ public class SessionController { */ @RequestMapping(value = { "/fetch" }) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyLogin") HistoryLogin historyLogin, @CurrentUser UserInfo currentUser) { logger.debug("history/session/fetch {}" , historyLogin); historyLogin.setInstId(currentUser.getInstId()); return new Message>( historyLoginService.queryOnlineSession(historyLogin) - ).buildResponse(); + ); } @ResponseBody @RequestMapping(value="/terminate") - public ResponseEntity terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public Message terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { logger.debug(ids); boolean isTerminated = false; try { @@ -102,9 +101,9 @@ public class SessionController { } if(isTerminated) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java index f16b93ea9..039222771 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java @@ -30,14 +30,14 @@ import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWEAlgorithm; import com.nimbusds.jose.JWSAlgorithm; @@ -49,24 +49,24 @@ import com.nimbusds.jose.jwk.gen.OctetSequenceKeyGenerator; import com.nimbusds.jose.jwk.gen.RSAKeyGenerator; -@Controller +@RestController @RequestMapping(value={"/apps"}) public class ApplicationsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(ApplicationsController.class); @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { Apps app=new Apps(); app.setId(app.generateId()); app.setProtocol(ConstsProtocols.BASIC); app.setSecret(ReciprocalUtils.generateKey("")); - return new Message(app).buildResponse(); + return new Message(app); } @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) { apps.setInstId(currentUser.getInstId()); JpaPageResults appsList =appsService.fetchPageResults(apps); for (Apps app : appsList.getRows()){ @@ -75,80 +75,80 @@ public class ApplicationsController extends BaseAppContorller { app.setSharedPassword(null); } logger.debug("List {}" , appsList); - return new Message>(appsList).buildResponse(); + return new Message>(appsList); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) { logger.debug("-query : {}" , apps); if (appsService.query(apps)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Apps apps = appsService.get(id); decoderSecret(apps); apps.transIconBase64(); - return new Message(apps).buildResponse(); + return new Message(apps); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , apps); transform(apps); apps.setInstId(currentUser.getInstId()); if (appsService.insert(apps)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , apps); transform(apps); apps.setInstId(currentUser.getInstId()); if (appsService.update(apps)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = { "/updateExtendAttr" }) - public ResponseEntity updateExtendAttr(@RequestBody Apps app) { + public Message updateExtendAttr(@RequestBody Apps app) { logger.debug("-updateExtendAttr id : {} , ExtendAttr : {}" , app.getId(),app.getExtendAttr()); if (appsService.updateExtendAttr(app)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = { "/generate/secret/{type}" }) - public ResponseEntity generateSecret(@PathVariable("type") String type,@RequestParam(name="id",required=false) String id) throws JOSEException { + public Message generateSecret(@PathVariable("type") String type,@RequestParam(name="id",required=false) String id) throws JOSEException { String secret=""; type=type.toLowerCase(); if(type.equals("des")){ @@ -203,7 +203,7 @@ public class ApplicationsController extends BaseAppContorller { secret=ReciprocalUtils.generateKey(""); } - return new Message(Message.SUCCESS,(Object)secret).buildResponse(); + return new Message(Message.SUCCESS,(Object)secret); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java index 9a3ff9609..1c251272e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java @@ -30,16 +30,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/cas"}) public class CasDetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(CasDetailsController.class); @@ -48,56 +47,56 @@ public class CasDetailsController extends BaseAppContorller { AppsCasDetailsService casDetailsService; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsCasDetails casDetails =new AppsCasDetails(); casDetails.setId(casDetails.generateId()); casDetails.setProtocol(ConstsProtocols.CAS); casDetails.setSecret(ReciprocalUtils.generateKey("")); - return new Message(casDetails).buildResponse(); + return new Message(casDetails); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsCasDetails casDetails=casDetailsService.getAppDetails(id , false); super.decoderSecret(casDetails); casDetails.transIconBase64(); - return new Message(casDetails).buildResponse(); + return new Message(casDetails); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , casDetails); transform(casDetails); casDetails.setInstId(currentUser.getInstId()); if (casDetailsService.insert(casDetails)&&appsService.insertApp(casDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , casDetails); transform(casDetails); casDetails.setInstId(currentUser.getInstId()); if (casDetailsService.update(casDetails)&&appsService.updateApp(casDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java index d85d6c6c1..3a6ba97a5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java @@ -30,42 +30,41 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/extendapi"}) public class ExtendApiDetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(ExtendApiDetailsController.class); @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); extendApiDetails.setId(extendApiDetails.generateId()); extendApiDetails.setProtocol(ConstsProtocols.EXTEND_API); extendApiDetails.setSecret(ReciprocalUtils.generateKey("")); - return new Message(extendApiDetails).buildResponse(); + return new Message(extendApiDetails); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Apps application= appsService.get(id); super.decoderSecret(application); AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); BeanUtils.copyProperties(application, extendApiDetails); extendApiDetails.transIconBase64(); - return new Message(extendApiDetails).buildResponse(); + return new Message(extendApiDetails); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add( + public Message add( @RequestBody AppsExtendApiDetails extendApiDetails, @CurrentUser UserInfo currentUser) { logger.debug("-Add :" + extendApiDetails); @@ -73,37 +72,37 @@ public class ExtendApiDetailsController extends BaseAppContorller { transform(extendApiDetails); extendApiDetails.setInstId(currentUser.getInstId()); if (appsService.insertApp(extendApiDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody AppsExtendApiDetails extendApiDetails, @CurrentUser UserInfo currentUser) { logger.debug("-update :" + extendApiDetails); transform(extendApiDetails); extendApiDetails.setInstId(currentUser.getInstId()); if (appsService.updateApp(extendApiDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete( + public Message delete( @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java index 14e0be3fb..6aff0612c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java @@ -30,16 +30,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/formbased"}) public class FormBasedDetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(FormBasedDetailsController.class); @@ -48,26 +47,26 @@ public class FormBasedDetailsController extends BaseAppContorller { AppsFormBasedDetailsService formBasedDetailsService; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setId(formBasedDetails.generateId()); formBasedDetails.setProtocol(ConstsProtocols.FORMBASED); formBasedDetails.setSecret(ReciprocalUtils.generateKey("")); - return new Message(formBasedDetails).buildResponse(); + return new Message(formBasedDetails); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsFormBasedDetails formBasedDetails=formBasedDetailsService.getAppDetails(id , false); decoderSecret(formBasedDetails); decoderSharedPassword(formBasedDetails); formBasedDetails.transIconBase64(); - return new Message(formBasedDetails).buildResponse(); + return new Message(formBasedDetails); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add( + public Message add( @RequestBody AppsFormBasedDetails formBasedDetails, @CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , formBasedDetails); @@ -76,15 +75,15 @@ public class FormBasedDetailsController extends BaseAppContorller { formBasedDetails.setInstId(currentUser.getInstId()); if (formBasedDetailsService.insert(formBasedDetails) &&appsService.insertApp(formBasedDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody AppsFormBasedDetails formBasedDetails, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , formBasedDetails); @@ -92,23 +91,23 @@ public class FormBasedDetailsController extends BaseAppContorller { formBasedDetails.setInstId(currentUser.getInstId()); if (formBasedDetailsService.update(formBasedDetails) &&appsService.updateApp(formBasedDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete( + public Message delete( @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (formBasedDetailsService.deleteBatch(ids) && appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java index e406d9888..78db8a462 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java @@ -30,16 +30,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/jwt"}) public class JwtDetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(JwtDetailsController.class); @@ -48,59 +47,59 @@ public class JwtDetailsController extends BaseAppContorller { AppsJwtDetailsService jwtDetailsService; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsJwtDetails jwtDetails =new AppsJwtDetails(); jwtDetails.setId(jwtDetails.generateId()); jwtDetails.setProtocol(ConstsProtocols.JWT); jwtDetails.setSecret(ReciprocalUtils.generateKey("")); jwtDetails.setUserPropertys("userPropertys"); - return new Message(jwtDetails).buildResponse(); + return new Message(jwtDetails); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsJwtDetails jwtDetails=jwtDetailsService.getAppDetails(id , false); decoderSecret(jwtDetails); jwtDetails.transIconBase64(); - return new Message(jwtDetails).buildResponse(); + return new Message(jwtDetails); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , jwtDetails); transform(jwtDetails); jwtDetails.setInstId(currentUser.getInstId()); if (jwtDetailsService.insert(jwtDetails)&&appsService.insertApp(jwtDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , jwtDetails); transform(jwtDetails); jwtDetails.setInstId(currentUser.getInstId()); if (jwtDetailsService.update(jwtDetails)&&appsService.updateApp(jwtDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (jwtDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java index 3762581a7..b5e4a3f82 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java @@ -33,16 +33,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/oauth20"}) public class OAuth20DetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(OAuth20DetailsController.class); @@ -51,18 +50,18 @@ public class OAuth20DetailsController extends BaseAppContorller { JdbcClientDetailsService oauth20JdbcClientDetailsService; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsOAuth20Details oauth20Details=new AppsOAuth20Details(); oauth20Details.setId(oauth20Details.generateId()); oauth20Details.setSecret(ReciprocalUtils.generateKey("")); oauth20Details.setClientId(oauth20Details.getId()); oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20Details.setProtocol(ConstsProtocols.OAUTH20); - return new Message(oauth20Details).buildResponse(); + return new Message(oauth20Details); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { BaseClientDetails baseClientDetails=(BaseClientDetails)oauth20JdbcClientDetailsService.loadClientByClientId(id,false); Apps application=appsService.get(id);// decoderSecret(application); @@ -71,12 +70,12 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20Details.setClientSecret(application.getSecret()); logger.debug("forwardUpdate {}" , oauth20Details); oauth20Details.transIconBase64(); - return new Message(oauth20Details).buildResponse(); + return new Message(oauth20Details); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add( + public Message add( @RequestBody AppsOAuth20Details oauth20Details, @CurrentUser UserInfo currentUser) { logger.debug("-Add : {}", oauth20Details); @@ -91,15 +90,15 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20JdbcClientDetailsService.addClientDetails(oauth20Details.clientDetailsRowMapper()); if (appsService.insertApp(oauth20Details)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody AppsOAuth20Details oauth20Details, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , oauth20Details); @@ -116,15 +115,15 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20JdbcClientDetailsService.updateClientSecret(oauth20Details.getClientId(), oauth20Details.getClientSecret()); if (appsService.updateApp(oauth20Details)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete( + public Message delete( @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); @@ -132,9 +131,9 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20JdbcClientDetailsService.removeClientDetails(id); } if (appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java index 85309bbca..51ecfb41a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -48,16 +48,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/saml20"}) public class SAML20DetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(SAML20DetailsController.class); @@ -72,26 +71,26 @@ public class SAML20DetailsController extends BaseAppContorller { ApplicationConfig applicationConfig; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsSAML20Details saml20Details=new AppsSAML20Details(); saml20Details.setSecret(ReciprocalUtils.generateKey("")); saml20Details.setProtocol(ConstsProtocols.SAML20); saml20Details.setId(saml20Details.generateId()); - return new Message(saml20Details).buildResponse(); + return new Message(saml20Details); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsSAML20Details saml20Details=saml20DetailsService.getAppDetails(id , false); decoderSecret(saml20Details); saml20Details.transIconBase64(); //modelAndView.addObject("authzURI",applicationConfig.getAuthzUri()); - return new Message(saml20Details).buildResponse(); + return new Message(saml20Details); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add( + public Message add( @RequestBody AppsSAML20Details saml20Details, @CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , saml20Details); @@ -104,15 +103,15 @@ public class SAML20DetailsController extends BaseAppContorller { saml20Details.setInstId(currentUser.getInstId()); saml20DetailsService.insert(saml20Details); if (appsService.insertApp(saml20Details)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody AppsSAML20Details saml20Details, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , saml20Details); @@ -124,22 +123,22 @@ public class SAML20DetailsController extends BaseAppContorller { saml20Details.setInstId(currentUser.getInstId()); saml20DetailsService.update(saml20Details); if (appsService.updateApp(saml20Details)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete( + public Message delete( @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (saml20DetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java index 8454c9bc4..008baa8fe 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java @@ -31,16 +31,15 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/apps/tokenbased"}) public class TokenBasedDetailsController extends BaseAppContorller { static final Logger logger = LoggerFactory.getLogger(TokenBasedDetailsController.class); @@ -49,29 +48,29 @@ public class TokenBasedDetailsController extends BaseAppContorller { AppsTokenBasedDetailsService tokenBasedDetailsService; @RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity init() { + public Message init() { AppsTokenBasedDetails tokenBasedDetails =new AppsTokenBasedDetails(); tokenBasedDetails.setId(tokenBasedDetails.generateId()); tokenBasedDetails.setProtocol(ConstsProtocols.TOKENBASED); tokenBasedDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.AES)); tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret()); tokenBasedDetails.setUserPropertys("userPropertys"); - return new Message(tokenBasedDetails).buildResponse(); + return new Message(tokenBasedDetails); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsTokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.getAppDetails(id , false); decoderSecret(tokenBasedDetails); String algorithmKey=passwordReciprocal.decoder(tokenBasedDetails.getAlgorithmKey()); tokenBasedDetails.setAlgorithmKey(algorithmKey); tokenBasedDetails.transIconBase64(); - return new Message(tokenBasedDetails).buildResponse(); + return new Message(tokenBasedDetails); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add( + public Message add( @RequestBody AppsTokenBasedDetails tokenBasedDetails, @CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , tokenBasedDetails); @@ -82,15 +81,15 @@ public class TokenBasedDetailsController extends BaseAppContorller { tokenBasedDetails.setInstId(currentUser.getInstId()); if (tokenBasedDetailsService.insert(tokenBasedDetails) &&appsService.insertApp(tokenBasedDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody AppsTokenBasedDetails tokenBasedDetails, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , tokenBasedDetails); @@ -99,22 +98,22 @@ public class TokenBasedDetailsController extends BaseAppContorller { tokenBasedDetails.setInstId(currentUser.getInstId()); if (tokenBasedDetailsService.update(tokenBasedDetails) &&appsService.updateApp(tokenBasedDetails)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete( + public Message delete( @RequestParam("ids") List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (tokenBasedDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java index 8d8c6dc25..af83a5b39 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java @@ -30,16 +30,15 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/config/accountsstrategy"}) public class AccountsStrategyController { static final Logger logger = LoggerFactory.getLogger(AccountsStrategyController.class); @@ -52,7 +51,7 @@ public class AccountsStrategyController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { accountsStrategy.setInstId(currentUser.getInstId()); JpaPageResults accountsStrategyList =accountsStrategyService.fetchPageResults(accountsStrategy); for (AccountsStrategy strategy : accountsStrategyList.getRows()){ @@ -60,59 +59,59 @@ public class AccountsStrategyController { } logger.debug("Accounts Strategy {}" , accountsStrategyList); return new Message>( - accountsStrategyList).buildResponse(); + accountsStrategyList); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { logger.debug("-query : {}" , accountsStrategy); if (accountsStrategyService.query(accountsStrategy)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AccountsStrategy accountsStrategy = accountsStrategyService.get(id); - return new Message(accountsStrategy).buildResponse(); + return new Message(accountsStrategy); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , accountsStrategy); if (accountsStrategyService.insert(accountsStrategy)) { accountsService.refreshByStrategy(accountsStrategy); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , accountsStrategy); if (accountsStrategyService.update(accountsStrategy)) { accountsService.refreshByStrategy(accountsStrategy); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (accountsStrategyService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java index 5a33d9c41..f14c96480 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java @@ -29,17 +29,16 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/config/adapters"}) public class AdaptersController { static final Logger logger = LoggerFactory.getLogger(AdaptersController.class); @@ -49,60 +48,60 @@ public class AdaptersController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute AppsAdapters appsAdapter) { + public Message fetch(@ModelAttribute AppsAdapters appsAdapter) { logger.debug("fetch {}",appsAdapter); return new Message>( - appsAdaptersService.fetchPageResults(appsAdapter)).buildResponse(); + appsAdaptersService.fetchPageResults(appsAdapter)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { logger.debug("-query : {}" , appsAdapter); if (appsAdaptersService.query(appsAdapter)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { AppsAdapters appsAdapter=appsAdaptersService.get(id); - return new Message(appsAdapter).buildResponse(); + return new Message(appsAdapter); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , appsAdapter); if (appsAdaptersService.insert(appsAdapter)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , appsAdapter); if (appsAdaptersService.update(appsAdapter)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsAdaptersService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java index 692e84f4a..a7dae8b80 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java @@ -27,14 +27,13 @@ import org.dromara.maxkey.persistence.service.CnfEmailSendersService; 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.validation.BindingResult; 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; -@Controller +@RestController @RequestMapping(value={"/config/emailsenders"}) public class CnfEmailSendersController { static final Logger logger = LoggerFactory.getLogger(CnfEmailSendersController.class); @@ -43,7 +42,7 @@ public class CnfEmailSendersController { private CnfEmailSendersService emailSendersService; @RequestMapping(value={"/get"}) - public ResponseEntity get(@CurrentUser UserInfo currentUser){ + public Message get(@CurrentUser UserInfo currentUser){ CnfEmailSenders emailSenders = emailSendersService.get(currentUser.getInstId()); if(emailSenders != null && StringUtils.isNotBlank(emailSenders.getCredentials())) { emailSenders.setCredentials(PasswordReciprocal.getInstance().decoder(emailSenders.getCredentials())); @@ -52,27 +51,27 @@ public class CnfEmailSendersController { emailSenders.setProtocol("smtp"); emailSenders.setEncoding("utf-8"); } - return new Message(emailSenders).buildResponse(); + return new Message(emailSenders); } @RequestMapping(value={"/update"}) @ResponseBody - public ResponseEntity update( @RequestBody CnfEmailSenders emailSenders,@CurrentUser UserInfo currentUser,BindingResult result) { + public Message update( @RequestBody CnfEmailSenders emailSenders,@CurrentUser UserInfo currentUser,BindingResult result) { logger.debug("update emailSenders : {}" , emailSenders); emailSenders.setInstId(currentUser.getInstId()); emailSenders.setCredentials(PasswordReciprocal.getInstance().encode(emailSenders.getCredentials())); if(StringUtils.isBlank(emailSenders.getId())) { emailSenders.setId(emailSenders.getInstId()); if(emailSendersService.insert(emailSenders)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); }else { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } }else { if(emailSendersService.update(emailSenders)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); }else { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java index df071bb30..c3a2509a7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java @@ -30,14 +30,13 @@ 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.validation.BindingResult; 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; -@Controller +@RestController @RequestMapping(value={"/config/ldapcontext"}) public class CnfLdapContextController { static final Logger logger = LoggerFactory.getLogger(CnfLdapContextController.class); @@ -46,17 +45,17 @@ public class CnfLdapContextController { private CnfLdapContextService ldapContextService; @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@CurrentUser UserInfo currentUser){ + public Message get(@CurrentUser UserInfo currentUser){ CnfLdapContext ldapContext = ldapContextService.get(currentUser.getInstId()); if(ldapContext != null && StringUtils.isNoneBlank(ldapContext.getCredentials())) { ldapContext.setCredentials(PasswordReciprocal.getInstance().decoder(ldapContext.getCredentials())); } - return new Message(ldapContext).buildResponse(); + return new Message(ldapContext); } @RequestMapping(value={"/update"}) @ResponseBody - public ResponseEntity update( @RequestBody CnfLdapContext ldapContext,@CurrentUser UserInfo currentUser,BindingResult result) { + public Message update( @RequestBody CnfLdapContext ldapContext,@CurrentUser UserInfo currentUser,BindingResult result) { logger.debug("update ldapContext : {}" ,ldapContext); ldapContext.setCredentials(PasswordReciprocal.getInstance().encode(ldapContext.getCredentials())); ldapContext.setInstId(currentUser.getInstId()); @@ -68,15 +67,15 @@ public class CnfLdapContextController { updateResult = ldapContextService.update(ldapContext); } if(updateResult) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value={"/test"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity test(@CurrentUser UserInfo currentUser){ + public Message test(@CurrentUser UserInfo currentUser){ CnfLdapContext ldapContext = ldapContextService.get(currentUser.getInstId()); if(ldapContext != null && StringUtils.isNoneBlank(ldapContext.getCredentials())) { ldapContext.setCredentials(PasswordReciprocal.getInstance().decoder(ldapContext.getCredentials())); @@ -106,9 +105,9 @@ public class CnfLdapContextController { if(ldapUtils.openConnection() != null) { ldapUtils.close(); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); }else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java index 1dd54c290..9eba4b2f9 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java @@ -27,16 +27,15 @@ 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.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import jakarta.validation.Valid; -@Controller +@RestController @RequestMapping(value={"/config/passwordpolicy"}) public class CnfPasswordPolicyController { static final Logger logger = LoggerFactory.getLogger(CnfPasswordPolicyController.class); @@ -45,20 +44,20 @@ public class CnfPasswordPolicyController { private CnfPasswordPolicyService passwordPolicyService; @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@CurrentUser UserInfo currentUser){ + public Message get(@CurrentUser UserInfo currentUser){ CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(currentUser.getInstId()); - return new Message(passwordPolicy).buildResponse(); + return new Message(passwordPolicy); } @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@Valid @RequestBody CnfPasswordPolicy passwordPolicy,@CurrentUser UserInfo currentUser,BindingResult result) { + public Message update(@Valid @RequestBody CnfPasswordPolicy passwordPolicy,@CurrentUser UserInfo currentUser,BindingResult result) { logger.debug("updateRole passwordPolicy : {}" ,passwordPolicy); //Message message = this.validate(result, passwordPolicy); if(passwordPolicyService.update(passwordPolicy)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.ERROR).buildResponse(); + return new Message(Message.ERROR); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java index 0bf0104a8..4d8c35cdf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java @@ -28,14 +28,13 @@ 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.validation.BindingResult; 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; -@Controller +@RestController @RequestMapping(value={"/config/smsprovider"}) public class CnfSmsProviderController { static final Logger logger = LoggerFactory.getLogger(CnfSmsProviderController.class); @@ -44,17 +43,17 @@ public class CnfSmsProviderController { private CnfSmsProviderService smsProviderService; @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@CurrentUser UserInfo currentUser){ + public Message get(@CurrentUser UserInfo currentUser){ CnfSmsProvider smsProvider = smsProviderService.get(currentUser.getInstId()); if(smsProvider != null && StringUtils.isNoneBlank(smsProvider.getId())) { smsProvider.setAppSecret(PasswordReciprocal.getInstance().decoder(smsProvider.getAppSecret())); } - return new Message(smsProvider).buildResponse(); + return new Message(smsProvider); } @RequestMapping(value={"/update"}) @ResponseBody - public ResponseEntity update( @RequestBody CnfSmsProvider smsProvider,@CurrentUser UserInfo currentUser,BindingResult result) { + public Message update( @RequestBody CnfSmsProvider smsProvider,@CurrentUser UserInfo currentUser,BindingResult result) { logger.debug("update smsProvider : {}" ,smsProvider); smsProvider.setAppSecret(PasswordReciprocal.getInstance().encode(smsProvider.getAppSecret())); smsProvider.setInstId(currentUser.getInstId()); @@ -66,9 +65,9 @@ public class CnfSmsProviderController { updateResult = smsProviderService.update(smsProvider); } if(updateResult) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java index 384237095..b44357675 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java @@ -31,15 +31,14 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/config/connectors"}) public class ConnectorsController { static final Logger logger = LoggerFactory.getLogger(ConnectorsController.class); @@ -49,58 +48,58 @@ public class ConnectorsController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(Connectors connector,@CurrentUser UserInfo currentUser) { + public Message fetch(Connectors connector,@CurrentUser UserInfo currentUser) { logger.debug("fetch {}" , connector); connector.setInstId(currentUser.getInstId()); return new Message>( - connectorsService.fetchPageResults(connector)).buildResponse(); + connectorsService.fetchPageResults(connector)); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Connectors connector = connectorsService.get(id); if(StringUtils.isNotBlank(connector.getCredentials())) { connector.setCredentials(PasswordReciprocal.getInstance().decoder(connector.getCredentials())); } - return new Message(connector).buildResponse(); + return new Message(connector); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , connector); connector.setInstId(currentUser.getInstId()); if(StringUtils.isNotBlank(connector.getCredentials())) { connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials())); } if (connectorsService.insert(connector)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , connector); connector.setInstId(currentUser.getInstId()); connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials())); if (connectorsService.update(connector)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (connectorsService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java index 9be7659f0..f3bef41e7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java @@ -26,13 +26,12 @@ 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.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/config/institutions"}) public class InstitutionsController { static final Logger logger = LoggerFactory.getLogger(InstitutionsController.class); @@ -41,21 +40,21 @@ public class InstitutionsController { private InstitutionsService institutionsService; @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@CurrentUser UserInfo currentUser){ + public Message get(@CurrentUser UserInfo currentUser){ Institutions institutions = institutionsService.get(currentUser.getInstId()); - return new Message(Message.SUCCESS,institutions).buildResponse(); + return new Message(Message.SUCCESS,institutions); } @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody Institutions institutions, @CurrentUser UserInfo currentUser, BindingResult result) { logger.debug("updateRole institutions : {}" , institutions); if(institutionsService.update(institutions)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java index 8a15c97ef..f398c9e6b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java @@ -30,17 +30,16 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/config/socialsprovider"}) public class SocialsProviderController { static final Logger logger = LoggerFactory.getLogger(SocialsProviderController.class); @@ -50,67 +49,67 @@ public class SocialsProviderController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { logger.debug("fetch {}" ,socialsProvider); socialsProvider.setInstId(currentUser.getInstId()); return new Message>( - socialsProviderService.fetchPageResults(socialsProvider)).buildResponse(); + socialsProviderService.fetchPageResults(socialsProvider)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { logger.debug("-query : {}" , socialsProvider); socialsProvider.setInstId(currentUser.getInstId()); if (socialsProviderService.query(socialsProvider)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { SocialsProvider socialsProvider=socialsProviderService.get(id); socialsProvider.setClientSecret(PasswordReciprocal.getInstance().decoder(socialsProvider.getClientSecret())); - return new Message(socialsProvider).buildResponse(); + return new Message(socialsProvider); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , socialsProvider); socialsProvider.setInstId(currentUser.getInstId()); socialsProvider.setClientSecret(PasswordReciprocal.getInstance().encode(socialsProvider.getClientSecret())); if (socialsProviderService.insert(socialsProvider)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , socialsProvider); socialsProvider.setInstId(currentUser.getInstId()); socialsProvider.setClientSecret(PasswordReciprocal.getInstance().encode(socialsProvider.getClientSecret())); if (socialsProviderService.update(socialsProvider)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsProviderService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } 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 95400e23e..6e528ac23 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 @@ -32,13 +32,11 @@ 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.*; import java.util.List; -@Controller +@RestController @RequestMapping(value = {"/config/synchronizers"}) public class SynchronizersController { static final Logger logger = LoggerFactory.getLogger(SynchronizersController.class); @@ -48,62 +46,62 @@ public class SynchronizersController { @RequestMapping(value = {"/fetch"}, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { + public Message fetch(Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { logger.debug("fetch {}", synchronizers); synchronizers.setInstId(currentUser.getInstId()); return new Message<>( - synchronizersService.fetchPageResults(synchronizers)).buildResponse(); + synchronizersService.fetchPageResults(synchronizers)); } @RequestMapping(value = {"/get/{id}"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Synchronizers synchronizers = synchronizersService.get(id); synchronizers.setCredentials(PasswordReciprocal.getInstance().decoder(synchronizers.getCredentials())); - return new Message<>(synchronizers).buildResponse(); + return new Message<>(synchronizers); } @ResponseBody @RequestMapping(value = {"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity add(@RequestBody Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { + public Message add(@RequestBody Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { logger.debug("-add : {}", synchronizers); synchronizers.setInstId(currentUser.getInstId()); if (StringUtils.isNotBlank(synchronizers.getCredentials())) { synchronizers.setCredentials(PasswordReciprocal.getInstance().encode(synchronizers.getCredentials())); } if (synchronizersService.insert(synchronizers)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = {"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Synchronizers synchronizers, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}", synchronizers); synchronizers.setInstId(currentUser.getInstId()); synchronizers.setCredentials(PasswordReciprocal.getInstance().encode(synchronizers.getCredentials())); if (synchronizersService.update(synchronizers)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = {"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids) { + public Message delete(@RequestParam("ids") List ids) { logger.debug("-delete ids : {} ", ids); if (synchronizersService.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = {"/synchr"}) - public ResponseEntity synchr(@RequestParam("id") String id) { + public Message synchr(@RequestParam("id") String id) { logger.debug("-sync ids : {}", id); List ids = StrUtils.string2List(id, ","); @@ -122,10 +120,10 @@ public class SynchronizersController { } } catch (Exception e) { logger.error("synchronizer Exception ", e); - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java index aab38e2f1..bc1fc5385 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java @@ -38,20 +38,19 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/accounts"}) public class AccountsController { - final static Logger _logger = LoggerFactory.getLogger(AccountsController.class); + static final Logger _logger = LoggerFactory.getLogger(AccountsController.class); @Autowired AccountsService accountsService; @@ -70,35 +69,35 @@ public class AccountsController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) { _logger.debug("fetch {}" , accounts); accounts.setInstId(currentUser.getInstId()); return new Message>( - accountsService.fetchPageResults(accounts)).buildResponse(); + accountsService.fetchPageResults(accounts)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) { _logger.debug("-query : {}" , account); account.setInstId(currentUser.getInstId()); if (accountsService.query(account)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Accounts account=accountsService.get(id); account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(account.getRelatedPassword())); - return new Message(account).buildResponse(); + return new Message(account); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) { _logger.debug("-Add : {}" , account); account.setInstId(currentUser.getInstId()); account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword())); @@ -109,15 +108,15 @@ public class AccountsController { ConstsAct.CREATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) { _logger.debug("-update : {}" , account); account.setInstId(currentUser.getInstId()); account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword())); @@ -128,16 +127,16 @@ public class AccountsController { ConstsAct.UPDATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity updateStatus(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) { + public Message updateStatus(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) { _logger.debug("accounts : {}" , accounts); Accounts loadAccount = accountsService.get(accounts.getId()); accounts.setInstId(currentUser.getInstId()); @@ -154,15 +153,15 @@ public class AccountsController { ConstsAct.statusActon.get(accounts.getStatus()), ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { _logger.debug("-delete ids : {} " , ids); if (accountsService.deleteBatch(ids)) { @@ -172,22 +171,22 @@ public class AccountsController { ConstsAct.DELETE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = "/generate") - public ResponseEntity generate(@ModelAttribute Accounts account) { + public Message generate(@ModelAttribute Accounts account) { AccountsStrategy accountsStrategy = accountsStrategyService.get(account.getStrategyId()); UserInfo userInfo = userInfoService.get(account.getUserId()); return new Message( Message.SUCCESS, (Object)accountsService.generateAccount(userInfo,accountsStrategy) - ).buildResponse(); + ); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java index e8b7ed80e..799aedc2e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java @@ -26,24 +26,23 @@ import org.dromara.maxkey.persistence.service.ReportService; 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.GetMapping; +import org.springframework.web.bind.annotation.RestController; + /** * Index * @author Crystal.Sea * */ -@Controller +@RestController public class DashboardController { private static Logger logger = LoggerFactory.getLogger(DashboardController.class); @Autowired ReportService reportService; - @RequestMapping(value={"/dashboard"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity dashboard(@CurrentUser UserInfo currentUser) { + @GetMapping(value={"/dashboard"}) + public Message dashboard(@CurrentUser UserInfo currentUser) { logger.debug("dashboard . "); HashMap reportParameter = new HashMap(); reportParameter.put("instId", currentUser.getInstId()); @@ -59,7 +58,7 @@ public class DashboardController { reportParameter.put("reportBrowser", reportService.analysisBrowser(reportParameter)); reportParameter.put("reportApp", reportService.analysisApp(reportParameter)); - return new Message>(reportParameter).buildResponse(); + return new Message>(reportParameter); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java index 8ba8d2873..6abfdcf36 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java @@ -31,11 +31,10 @@ 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.security.core.Authentication; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.http.MediaType; @@ -43,7 +42,7 @@ import org.springframework.http.MediaType; * @author Crystal.Sea * */ -@Controller +@RestController @RequestMapping(value = "/login") public class LoginEntryPoint { private static Logger logger = LoggerFactory.getLogger(LoginEntryPoint.class); @@ -62,7 +61,7 @@ public class LoginEntryPoint { * @return */ @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get() { + public Message get() { logger.debug("/login."); HashMap model = new HashMap(); @@ -73,11 +72,11 @@ public class LoginEntryPoint { model.put("captcha", "true"); } model.put("state", authTokenService.genRandomJwt()); - return new Message>(model).buildResponse(); + return new Message>(model); } @RequestMapping(value={"/signin"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity signin( @RequestBody LoginCredential loginCredential) { + public Message signin( @RequestBody LoginCredential loginCredential) { Message authJwtMessage = new Message(Message.FAIL); if(authTokenService.validateJwtToken(loginCredential.getState())){ Authentication authentication = authenticationProvider.authenticate(loginCredential); @@ -91,7 +90,7 @@ public class LoginEntryPoint { logger.debug("login fail , message {}",errorMsg); } } - return authJwtMessage.buildResponse(); + return authJwtMessage; } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index 493e40ba1..b4a94a928 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -24,11 +24,8 @@ import org.dromara.maxkey.entity.idm.UserInfo; 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.GetMapping; import jakarta.servlet.http.HttpServletRequest; @Controller @@ -38,8 +35,8 @@ public class LogoutEndpoint { @Autowired protected SessionManager sessionManager; - @RequestMapping(value={"/logout"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity logout(HttpServletRequest request,@CurrentUser UserInfo currentUser){ + @GetMapping(value={"/logout"}) + public Message logout(HttpServletRequest request,@CurrentUser UserInfo currentUser){ sessionManager.terminate( currentUser.getSessionId(), currentUser.getId(), @@ -47,7 +44,7 @@ public class LogoutEndpoint { //invalidate http session logger.debug("/logout invalidate http Session id {}",request.getSession().getId()); request.getSession().invalidate(); - return new Message().buildResponse(); + return new Message(); } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java index c5f4ac25c..01aa6ebb0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java @@ -30,13 +30,8 @@ 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; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 连接器日志查询 @@ -45,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value={"/historys"}) public class ConnectorHistoryController { static final Logger logger = LoggerFactory.getLogger(ConnectorHistoryController.class); @@ -57,16 +52,16 @@ public class ConnectorHistoryController { * @param historySynchronizer * @return */ - @RequestMapping(value={"/connectorHistory/fetch"}) + @GetMapping({"/connectorHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyConnector") HistoryConnector historyConnector, @CurrentUser UserInfo currentUser){ logger.debug("historys/historyConnector/fetch/ {}",historyConnector); historyConnector.setInstId(currentUser.getInstId()); return new Message>( historyConnectorService.fetchPageResults(historyConnector) - ).buildResponse(); + ); } @InitBinder diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index a6c935aca..e22a9b743 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -30,13 +30,8 @@ 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; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 单点登录日志查询 @@ -45,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value={"/historys"}) public class LoginAppsHistoryController { static final Logger logger = LoggerFactory.getLogger(LoginAppsHistoryController.class); @@ -57,9 +52,9 @@ public class LoginAppsHistoryController { * @param loginAppsHistory * @return */ - @RequestMapping(value={"/loginAppsHistory/fetch"}) + @GetMapping({"/loginAppsHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp, @CurrentUser UserInfo currentUser){ logger.debug("historys/loginAppsHistory/fetch/ {}",historyLoginApp); @@ -67,7 +62,7 @@ public class LoginAppsHistoryController { historyLoginApp.setInstId(currentUser.getInstId()); return new Message>( historyLoginAppsService.fetchPageResults(historyLoginApp) - ).buildResponse(); + ); } @InitBinder diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index edaa972b2..4890ddd00 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -30,13 +30,8 @@ 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; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 登录日志查询 @@ -45,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value={"/historys"}) public class LoginHistoryController { static final Logger logger = LoggerFactory.getLogger(LoginHistoryController.class); @@ -57,9 +52,9 @@ public class LoginHistoryController { * @param HistoryLogin * @return */ - @RequestMapping(value={"/loginHistory/fetch"}) + @GetMapping({"/loginHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historyLogin") HistoryLogin historyLogin, @CurrentUser UserInfo currentUser ){ @@ -67,7 +62,7 @@ public class LoginHistoryController { historyLogin.setInstId(currentUser.getInstId()); return new Message>( loginHistoryService.fetchPageResults(historyLogin) - ).buildResponse(); + ); } @InitBinder 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 688550bb7..d0de81926 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,13 +30,9 @@ 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; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 同步器日志查询 @@ -45,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value={"/historys"}) public class SynchronizerHistoryController { static final Logger logger = LoggerFactory.getLogger(SynchronizerHistoryController.class); @@ -57,16 +53,16 @@ public class SynchronizerHistoryController { * @param historySynchronizer * @return */ - @RequestMapping(value={"/synchronizerHistory/fetch"}) + @GetMapping({"/synchronizerHistory/fetch"}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute("historySynchronizer") HistorySynchronizer historySynchronizer, @CurrentUser UserInfo currentUser){ logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer); historySynchronizer.setInstId(currentUser.getInstId()); return new Message>( historySynchronizerService.fetchPageResults(historySynchronizer) - ).buildResponse(); + ); } @InitBinder 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 5121554ae..714030373 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,13 +30,9 @@ 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; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 系统操作日志查询 @@ -45,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * */ -@Controller +@RestController @RequestMapping(value={"/historys"}) public class SystemLogsController { static final Logger logger = LoggerFactory.getLogger(SystemLogsController.class); @@ -58,15 +54,15 @@ public class SystemLogsController { * @param logs * @return */ - @RequestMapping(value={"/systemLogs/fetch"}) + @GetMapping({"/systemLogs/fetch"}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute("historyLog") HistorySystemLogs historyLog, + public Message fetch(@ModelAttribute("historyLog") HistorySystemLogs historyLog, @CurrentUser UserInfo currentUser){ logger.debug("historys/historyLog/fetch {} ",historyLog); historyLog.setInstId(currentUser.getInstId()); return new Message>( historySystemLogsService.fetchPageResults(historyLog) - ).buildResponse(); + ); } @InitBinder diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java index 7bc547d1f..286d27e75 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java @@ -35,19 +35,18 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/access/groupmembers"}) public class GroupMemberController { - final static Logger logger = LoggerFactory.getLogger(GroupMemberController.class); + static final Logger logger = LoggerFactory.getLogger(GroupMemberController.class); @Autowired GroupMemberService service; @@ -63,40 +62,40 @@ public class GroupMemberController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute GroupMember groupMember, @CurrentUser UserInfo currentUser) { logger.debug("fetch {}" , groupMember); groupMember.setInstId(currentUser.getInstId()); return new Message>( - service.fetchPageResults(groupMember)).buildResponse(); + service.fetchPageResults(groupMember)); } @RequestMapping(value = { "/memberIn" }) @ResponseBody - public ResponseEntity memberInRole(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { + public Message memberInRole(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { logger.debug("groupMember : {}" , groupMember); groupMember.setInstId(currentUser.getInstId()); return new Message>( - service.fetchPageResults("memberIn",groupMember)).buildResponse(); + service.fetchPageResults("memberIn",groupMember)); } @RequestMapping(value = { "/memberNotIn" }) @ResponseBody - public ResponseEntity memberNotIn(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { + public Message memberNotIn(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { groupMember.setInstId(currentUser.getInstId()); return new Message>( - service.fetchPageResults("memberNotIn",groupMember)).buildResponse(); + service.fetchPageResults("memberNotIn",groupMember)); } @RequestMapping(value = { "/noMember" }) @ResponseBody - public ResponseEntity noMember(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { + public Message noMember(@ModelAttribute GroupMember groupMember,@CurrentUser UserInfo currentUser) { groupMember.setInstId(currentUser.getInstId()); return new Message>( - service.noMember(groupMember)).buildResponse(); + service.noMember(groupMember)); } /** @@ -107,9 +106,9 @@ public class GroupMemberController { */ @RequestMapping(value = {"/add"}) @ResponseBody - public ResponseEntity addGroupMember(@RequestBody GroupMember groupMember,@CurrentUser UserInfo currentUser) { + public Message addGroupMember(@RequestBody GroupMember groupMember,@CurrentUser UserInfo currentUser) { if (groupMember == null || groupMember.getGroupId() == null) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } String groupId = groupMember.getGroupId(); @@ -139,10 +138,10 @@ public class GroupMemberController { } } if(result) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @@ -154,9 +153,9 @@ public class GroupMemberController { */ @RequestMapping(value = {"/addMember2Groups"}) @ResponseBody - public ResponseEntity addMember2Groups(@RequestBody GroupMember groupMember,@CurrentUser UserInfo currentUser) { + public Message addMember2Groups(@RequestBody GroupMember groupMember,@CurrentUser UserInfo currentUser) { if (groupMember == null || StringUtils.isBlank(groupMember.getUsername())) { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } UserInfo userInfo = userInfoService.findByUsername(groupMember.getUsername()); @@ -182,20 +181,20 @@ public class GroupMemberController { } } if(result) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (service.deleteBatch(ids)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java index de066bd21..ca751682d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java @@ -36,17 +36,16 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/access/groups"}) public class GroupsController { static final Logger logger = LoggerFactory.getLogger(GroupsController.class); @@ -59,37 +58,37 @@ public class GroupsController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch( + public Message fetch( @ModelAttribute Groups group, @CurrentUser UserInfo currentUser) { logger.debug("group {}" , group); group.setInstId(currentUser.getInstId()); return new Message>( - service.fetchPageResults(group)).buildResponse(); + service.fetchPageResults(group)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute Groups group,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute Groups group,@CurrentUser UserInfo currentUser) { logger.debug("-query : {}" , group); group.setInstId(currentUser.getInstId()); if (service.query(group)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id,@CurrentUser UserInfo currentUser) { + public Message get(@PathVariable("id") String id,@CurrentUser UserInfo currentUser) { Groups group =service.get(id); - return new Message(group).buildResponse(); + return new Message(group); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Groups group,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Groups group,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , group); group.setInstId(currentUser.getInstId()); group.setId(group.generateId()); @@ -104,15 +103,15 @@ public class GroupsController { ConstsAct.CREATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Groups group,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Groups group,@CurrentUser UserInfo currentUser) { logger.debug("-update group : {}" , group); if(group.getId().equalsIgnoreCase("ROLE_ALL_USER")) { group.setDefaultAllUser(); @@ -126,15 +125,15 @@ public class GroupsController { ConstsAct.UPDATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); ids.removeAll(Arrays.asList("ROLE_ALL_USER","ROLE_ADMINISTRATORS","-1")); if (service.deleteBatch(ids)) { @@ -144,9 +143,9 @@ public class GroupsController { ConstsAct.DELETE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java index 13d1e4a34..1cbd34d83 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java @@ -46,8 +46,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.util.CollectionUtils; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; @@ -55,10 +53,12 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + import com.google.common.collect.Lists; -@Controller +@RestController @RequestMapping({"/orgs"}) public class OrganizationsController { static final Logger logger = LoggerFactory.getLogger(OrganizationsController.class); @@ -71,35 +71,35 @@ public class OrganizationsController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) { logger.debug("fetch {}" , org); org.setInstId(currentUser.getInstId()); return new Message>( - organizationsService.fetchPageResults(org)).buildResponse(); + organizationsService.fetchPageResults(org)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) { logger.debug("-query {}" , org); org.setInstId(currentUser.getInstId()); List orgList = organizationsService.query(org); if (orgList != null) { - return new Message>(Message.SUCCESS,orgList).buildResponse(); + return new Message>(Message.SUCCESS,orgList); } else { - return new Message>(Message.FAIL).buildResponse(); + return new Message>(Message.FAIL); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Organizations org=organizationsService.get(id); - return new Message(org).buildResponse(); + return new Message(org); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Organizations org,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Organizations org,@CurrentUser UserInfo currentUser) { logger.debug("-Add : {}" , org); org.setInstId(currentUser.getInstId()); if (organizationsService.insert(org)) { @@ -109,15 +109,15 @@ public class OrganizationsController { ConstsAct.CREATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Organizations org,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Organizations org,@CurrentUser UserInfo currentUser) { logger.debug("-update :{}" , org); org.setInstId(currentUser.getInstId()); if (organizationsService.update(org)) { @@ -127,15 +127,15 @@ public class OrganizationsController { ConstsAct.UPDATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (organizationsService.deleteBatch(ids)) { systemLog.insert( @@ -144,16 +144,16 @@ public class OrganizationsController { ConstsAct.DELETE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity tree(@ModelAttribute Organizations organization,@CurrentUser UserInfo currentUser) { + public Message tree(@ModelAttribute Organizations organization,@CurrentUser UserInfo currentUser) { logger.debug("-tree {}" , organization); List orgList = organizationsService.query( Query.builder().eq("instid", currentUser.getInstId())); @@ -185,14 +185,14 @@ public class OrganizationsController { } } treeAttributes.setNodeCount(nodeCount); - return new Message(Message.SUCCESS,treeAttributes).buildResponse(); + return new Message(Message.SUCCESS,treeAttributes); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value = "/import") - public ResponseEntity importingOrganizations( + public Message importingOrganizations( @ModelAttribute("excelImportFile")ExcelImport excelImportFile, @CurrentUser UserInfo currentUser) { if (excelImportFile.isExcelNotEmpty() ) { @@ -217,9 +217,9 @@ public class OrganizationsController { if(!CollectionUtils.isEmpty(orgsList)){ orgsList = orgsList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getId()))), ArrayList::new)); if(organizationsService.insertBatch(orgsList)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); }else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } } catch (IOException e) { @@ -229,7 +229,7 @@ public class OrganizationsController { } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java index f11150ad1..449a738e8 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java @@ -54,8 +54,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; @@ -65,13 +63,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + import com.google.common.collect.Lists; /** * @author Crystal.Sea * */ -@Controller +@RestController @RequestMapping(value = { "/users" }) public class UserInfoController { static final Logger logger = LoggerFactory.getLogger(UserInfoController.class); @@ -87,41 +87,41 @@ public class UserInfoController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { logger.debug(""+userInfo); userInfo.setInstId(currentUser.getInstId()); return new Message>( - userInfoService.fetchPageResults(userInfo)).buildResponse(); + userInfoService.fetchPageResults(userInfo)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { logger.debug("-query :" + userInfo); if (userInfoService.query(userInfo)!=null) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { UserInfo userInfo=userInfoService.get(id); userInfo.trans(); - return new Message(userInfo).buildResponse(); + return new Message(userInfo); } @RequestMapping(value = { "/getByUsername/{username}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity getByUsername(@PathVariable("username") String username) { + public Message getByUsername(@PathVariable("username") String username) { UserInfo userInfo=userInfoService.findByUsername(username); userInfo.trans(); - return new Message(userInfo).buildResponse(); + return new Message(userInfo); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody UserInfo userInfo,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody UserInfo userInfo,@CurrentUser UserInfo currentUser) { logger.debug("-Add :" + userInfo); userInfo.setId(WebContext.genId()); userInfo.setInstId(currentUser.getInstId()); @@ -136,15 +136,15 @@ public class UserInfoController { ConstsAct.CREATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody UserInfo userInfo,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody UserInfo userInfo,@CurrentUser UserInfo currentUser) { logger.debug("-update :" + userInfo); logger.info(userInfo.getExtraAttributeName()); logger.info(userInfo.getExtraAttributeValue()); @@ -164,15 +164,15 @@ public class UserInfoController { ConstsAct.UPDATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (userInfoService.deleteBatch(ids)) { @@ -182,20 +182,20 @@ public class UserInfoController { ConstsAct.DELETE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value = "/randomPassword", produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity randomPassword() { + public Message randomPassword() { return new Message( Message.SUCCESS, (Object)userInfoService.randomPassword() - ).buildResponse(); + ); } @@ -215,7 +215,7 @@ public class UserInfoController { @ResponseBody @RequestMapping(value="/changePassword", produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity changePassword( + public Message changePassword( @RequestBody ChangePassword changePassword, @CurrentUser UserInfo currentUser) { logger.debug("UserId {}",changePassword.getUserId()); @@ -227,15 +227,15 @@ public class UserInfoController { ConstsAct.CHANGE_PASSWORD, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity updateStatus(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { + public Message updateStatus(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) { logger.debug(""+userInfo); UserInfo loadUserInfo = userInfoService.get(userInfo.getId()); userInfo.setInstId(currentUser.getInstId()); @@ -248,14 +248,14 @@ public class UserInfoController { ConstsAct.statusActon.get(userInfo.getStatus()), ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @RequestMapping(value = "/import") - public ResponseEntity importingUsers( + public Message importingUsers( @ModelAttribute("excelImportFile")ExcelImport excelImportFile, @CurrentUser UserInfo currentUser) { if (excelImportFile.isExcelNotEmpty() ) { @@ -283,7 +283,7 @@ public class UserInfoController { if(!CollectionUtils.isEmpty(userInfoList)){ userInfoList = userInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUsername()))), ArrayList::new)); if( userInfoService.insertBatch(userInfoList)) { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } } catch (IOException e) { @@ -292,7 +292,7 @@ public class UserInfoController { excelImportFile.closeWorkbook(); } } - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java index 9a46975fa..9928f64c7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/PermissionController.java @@ -30,15 +30,14 @@ 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.ModelAttribute; 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; -@Controller +@RestController @RequestMapping(value={"/permissions/permission"}) public class PermissionController { static final Logger logger = LoggerFactory.getLogger(PermissionController.class); @@ -51,7 +50,7 @@ public class PermissionController { @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update( + public Message update( @RequestBody Permission groupPrivileges, @CurrentUser UserInfo currentUser) { logger.debug("-update : {}" , groupPrivileges); @@ -101,17 +100,17 @@ public class PermissionController { if (!newGroupPrivilegesList.isEmpty() && permissionService.insertGroupPrivileges(newGroupPrivilegesList)) { logger.debug("-insert : {}" , newGroupPrivilegesList); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } } @ResponseBody @RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get( + public Message get( @ModelAttribute Permission groupPrivileges, @CurrentUser UserInfo currentUser) { logger.debug("-get : {}" , groupPrivileges); @@ -124,7 +123,7 @@ public class PermissionController { List rolePrivilegeList = permissionService.queryGroupPrivileges(queryGroupPrivilege); return new Message>( - rolePrivilegeList).buildResponse(); + rolePrivilegeList); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index ecd1b5bcf..b6009fa5d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java @@ -36,20 +36,19 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController @RequestMapping(value={"/permissions/resources"}) public class ResourcesController { - final static Logger logger = LoggerFactory.getLogger(ResourcesController.class); + static final Logger logger = LoggerFactory.getLogger(ResourcesController.class); @Autowired ResourcesService resourcesService; @@ -59,35 +58,35 @@ public class ResourcesController { @RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody - public ResponseEntity fetch(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { + public Message fetch(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { logger.debug("fetch {}" , resource); resource.setInstId(currentUser.getInstId()); return new Message>( - resourcesService.fetchPageResults(resource)).buildResponse(); + resourcesService.fetchPageResults(resource)); } @ResponseBody @RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity query(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { + public Message query(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { logger.debug("-query {}" , resource); resource.setInstId(currentUser.getInstId()); List resourceList = resourcesService.query(resource); if (resourceList != null) { - return new Message>(Message.SUCCESS,resourceList).buildResponse(); + return new Message>(Message.SUCCESS,resourceList); } else { - return new Message>(Message.FAIL).buildResponse(); + return new Message>(Message.FAIL); } } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity get(@PathVariable("id") String id) { + public Message get(@PathVariable("id") String id) { Resources resource=resourcesService.get(id); - return new Message(resource).buildResponse(); + return new Message(resource); } @ResponseBody @RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity insert(@RequestBody Resources resource,@CurrentUser UserInfo currentUser) { + public Message insert(@RequestBody Resources resource,@CurrentUser UserInfo currentUser) { logger.debug("-Add :" + resource); resource.setInstId(currentUser.getInstId()); if (resourcesService.insert(resource)) { @@ -97,15 +96,15 @@ public class ResourcesController { ConstsAct.CREATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity update(@RequestBody Resources resource,@CurrentUser UserInfo currentUser) { + public Message update(@RequestBody Resources resource,@CurrentUser UserInfo currentUser) { logger.debug("-update :" + resource); resource.setInstId(currentUser.getInstId()); if (resourcesService.update(resource)) { @@ -115,15 +114,15 @@ public class ResourcesController { ConstsAct.UPDATE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (resourcesService.deleteBatch(ids)) { systemLog.insert( @@ -132,16 +131,16 @@ public class ResourcesController { ConstsAct.DELETE, ConstsActResult.SUCCESS, currentUser); - return new Message(Message.SUCCESS).buildResponse(); + return new Message(Message.SUCCESS); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } } @ResponseBody @RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity tree(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { + public Message tree(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) { logger.debug("-tree {}" , resource); List resourceList = resourcesService.query(Query.builder().eq("instid", currentUser.getInstId())); if (resourceList != null) { @@ -169,9 +168,9 @@ public class ResourcesController { treeAttributes.setRootNode(rootNode); treeAttributes.setNodeCount(nodeCount); - return new Message(Message.SUCCESS,treeAttributes).buildResponse(); + return new Message(Message.SUCCESS,treeAttributes); } else { - return new Message(Message.FAIL).buildResponse(); + return new Message(Message.FAIL); } }