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 cf77c7795..8a28bba81 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 @@ -40,7 +40,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ @GetMapping("/get/{appId}") public Message get( - @PathVariable("appId") String appId, + @PathVariable String appId, @CurrentUser UserInfo currentUser){ Apps app = getApp(appId); Accounts account = getAccounts(app,currentUser); 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 7015c361b..ecd4f3073 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 @@ -53,7 +53,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ //all single sign on url @Operation(summary = "认证总地址接口", description = "参数应用ID,分发到不同应用的认证地址",method="GET") @GetMapping("/authz/{id}") - public ModelAndView authorize(HttpServletRequest request,@PathVariable("id") String id){ + public ModelAndView authorize(HttpServletRequest request,@PathVariable String id){ Apps app = getApp(id); WebContext.setAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID, app.getId()); ModelAndView modelAndView = WebContext.redirect(app.getLoginUrl()); diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java index 82dfe3ee4..e484c8fc9 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java @@ -50,7 +50,7 @@ public class AuthorizeProtectedEndpoint{ @GetMapping("/authz/protected") public ModelAndView authorizeProtected( - @RequestParam("password") String password, + @RequestParam String password, @RequestParam("redirect_uri") String redirectUri, @CurrentUser UserInfo currentUser){ if( currentUser.getAppLoginPassword().equals(PasswordReciprocal.getInstance().encode(password))){ diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java index a25b183e4..033428e2d 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/OnlineSessionEndpoint.java @@ -38,7 +38,7 @@ public class OnlineSessionEndpoint { @Operation(summary = "在线ticket验证接口", description = "") @GetMapping(value="/validate") - public String ticketValidate(@RequestParam(value ="ticket",required = true) String ticket) { + public String ticketValidate(@RequestParam(required = true) String ticket) { Session session = sessionManager.get(ticket); return session == null ? "" : session.getId(); } 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 e43a151fd..ec63b4985 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 @@ -69,7 +69,7 @@ public class CasAuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ @Operation(summary = "CAS页面跳转应用ID认证接口", description = "传递参数应用ID",method="GET") @GetMapping(CasConstants.ENDPOINT.ENDPOINT_BASE + "/{id}") - public ModelAndView authorize( @PathVariable("id") String id, + public ModelAndView authorize( @PathVariable String id, HttpServletRequest request, HttpServletResponse response ){ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index aad70a1c9..a0b1435af 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -112,7 +112,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ public ResponseEntity requestServiceTicket( HttpServletRequest request, HttpServletResponse response, - @PathVariable("ticketGrantingTicket") String ticketGrantingTicket, + @PathVariable String ticketGrantingTicket, @RequestParam(value=CasConstants.PARAMETER.SERVICE) String casService, @RequestParam(value=CasConstants.PARAMETER.RENEW,required=false) String renew, @RequestParam(value=CasConstants.PARAMETER.REST_USERNAME,required=false) String username, @@ -135,7 +135,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ @Operation(summary = "CAS REST认证接口", description = "检查TGT状态",method="GET") @GetMapping(value=CasConstants.ENDPOINT.ENDPOINT_REST_TICKET_V1 + "/{ticketGrantingTicket}") public ResponseEntity verifyTicketGrantingTicketStatus( - @PathVariable("ticketGrantingTicket") String ticketGrantingTicket, + @PathVariable String ticketGrantingTicket, HttpServletRequest request, HttpServletResponse response){ try { @@ -153,7 +153,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ @Operation(summary = "CAS REST认证接口", description = "注销TGT状态",method="DELETE") @DeleteMapping(value=CasConstants.ENDPOINT.ENDPOINT_REST_TICKET_V1+"/{ticketGrantingTicket}") public ResponseEntity destroyTicketGrantingTicket( - @PathVariable("ticketGrantingTicket") String ticketGrantingTicket, + @PathVariable String ticketGrantingTicket, HttpServletRequest request, HttpServletResponse response){ try { diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java index 8dc7eef42..05496f4cf 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java @@ -53,7 +53,7 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{ @GetMapping("/authz/api/{id}") public ModelAndView authorize( HttpServletRequest request, - @PathVariable("id") String id, + @PathVariable String id, @CurrentUser UserInfo currentUser){ ModelAndView modelAndView = new ModelAndView("authorize/redirect_sso_submit"); 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 138770937..07aff5c0b 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 @@ -71,7 +71,7 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{ public ModelAndView authorize( HttpServletRequest request, HttpServletResponse response, - @PathVariable("id") String id, + @PathVariable String id, @CurrentUser UserInfo currentUser){ ModelAndView modelAndView=new ModelAndView(); Apps application = getApp(id); @@ -110,7 +110,7 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{ public String metadata(HttpServletRequest request, HttpServletResponse response, @PathVariable("appid") String appId, - @PathVariable("mediaType") String mediaType) { + @PathVariable String mediaType) { AppsJwtDetails jwtDetails = jwtDetailsService.getAppDetails(appId , true); if(jwtDetails != null) { String jwkSetString = ""; 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 f09fec00d..91bc9c18c 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 @@ -121,7 +121,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint { public ModelAndView authorize( HttpServletRequest request, HttpServletResponse response, - @PathVariable("id") String id){ + @PathVariable String id){ ClientDetails clientDetails =getClientDetailsService().loadClientByClientId(id,true); _logger.debug("clientDetails {}",clientDetails); String authorizationUrl = ""; 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 3d4add93b..81e620a63 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 @@ -48,8 +48,8 @@ public class OauthJwksEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public String keysMetadataByParam(HttpServletRequest request , HttpServletResponse response, - @RequestParam(value="inst_id",required = false) String inst_id, - @RequestParam(value="client_id",required = false) String client_id) { + @RequestParam(required = false) String inst_id, + @RequestParam(required = false) String client_id) { return buildMetadata(request,response,inst_id,client_id,ContentType.JSON); } @@ -58,8 +58,8 @@ public class OauthJwksEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public String keysMetadatabyPath(HttpServletRequest request , HttpServletResponse response, - @PathVariable(value="instId") String instId, - @PathVariable(value="clientId") String clientId) { + @PathVariable String instId, + @PathVariable String clientId) { return buildMetadata(request,response,instId,clientId,ContentType.JSON); } @@ -69,8 +69,8 @@ public class OauthJwksEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public String metadata(HttpServletRequest request , HttpServletResponse response, - @PathVariable(value="clientId") String clientId, - @PathVariable(value="mediaType") String mediaType) { + @PathVariable String clientId, + @PathVariable String mediaType) { return buildMetadata(request,response,null,clientId,mediaType); } 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 efc15f136..e1f264170 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 @@ -49,8 +49,8 @@ public class OauthAuthorizationServerEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public OauthServerConfiguration configurationByParam( - @RequestParam(value = "inst_id", required = false) String inst_id, - @RequestParam(value = "client_id", required = false) String client_id) { + @RequestParam(required = false) String inst_id, + @RequestParam(required = false) String client_id) { return configurationMetadata( inst_id,client_id,"RequestParam"); } @@ -60,8 +60,8 @@ public class OauthAuthorizationServerEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public OauthServerConfiguration configurationByPath( - @PathVariable("instId") String instId, - @PathVariable(value = "clientId", required = false) String clientId) { + @PathVariable String instId, + @PathVariable(required = false) String clientId) { return configurationMetadata(instId,clientId,"PathVariable"); } 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 92327e8bc..36cf04de9 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 @@ -45,8 +45,8 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public OpenidConfiguration configurationByParam( - @RequestParam(value = "inst_id", required = false) String inst_id, - @RequestParam(value = "client_id", required = false) String client_id) { + @RequestParam(required = false) String inst_id, + @RequestParam(required = false) String client_id) { _logger.debug("Configuration By Param"); return configurationMetadata(inst_id,client_id,"RequestParam"); } @@ -57,8 +57,8 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint { method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody public OpenidConfiguration configurationByPath( - @PathVariable("instId") String instId , - @PathVariable(value = "clientId") String clientId) { + @PathVariable String instId , + @PathVariable String clientId) { _logger.debug("Configuration By Path"); return configurationMetadata(instId,clientId,"PathVariable"); } 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 737ba953e..406f5fc77 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 @@ -67,7 +67,7 @@ public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ public ModelAndView authorize( HttpServletRequest request, HttpServletResponse response, - @PathVariable("id") String id, + @PathVariable String id, @CurrentUser UserInfo currentUser){ ModelAndView modelAndView=new ModelAndView(); 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 5eb1f8016..7f7ca2621 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 @@ -66,7 +66,7 @@ public class ImageCaptchaEndpoint { @GetMapping(value={"/captcha"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message captchaHandleRequest( @RequestParam(value="captcha",required=false,defaultValue="text") String captchaType, - @RequestParam(value="state",required=false,defaultValue="state") String state) { + @RequestParam(required=false,defaultValue="state") String state) { try { String kaptchaText = captchaProducer.createText(); String kaptchaValue = kaptchaText; diff --git a/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/autoconfigure/PasskeyAutoConfiguration.java b/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/autoconfigure/PasskeyAutoConfiguration.java index 01896f58d..e45b12778 100644 --- a/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/autoconfigure/PasskeyAutoConfiguration.java +++ b/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/autoconfigure/PasskeyAutoConfiguration.java @@ -43,14 +43,14 @@ public class PasskeyAutoConfiguration { @Bean @ConditionalOnMissingBean - public PasskeyService passkeyService(PasskeyProperties passkeyProperties) { + PasskeyService passkeyService(PasskeyProperties passkeyProperties) { _logger.debug("Creating PasskeyService bean with properties: {}", passkeyProperties.isEnabled()); return new PasskeyServiceImpl(); } @Bean @ConditionalOnMissingBean - public PasskeyManager passkeyManager() { + PasskeyManager passkeyManager() { _logger.debug("Creating PasskeyManager bean"); return new PasskeyManager(); } diff --git a/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/config/WebAuthnConfig.java b/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/config/WebAuthnConfig.java index 367b9624d..1d11b862e 100644 --- a/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/config/WebAuthnConfig.java +++ b/maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/config/WebAuthnConfig.java @@ -42,7 +42,7 @@ public class WebAuthnConfig { * 用于处理 WebAuthn 注册和认证的核心组件 */ @Bean - public WebAuthnManager webAuthnManager() { + WebAuthnManager webAuthnManager() { return WebAuthnManager.createNonStrictWebAuthnManager(); } @@ -51,7 +51,7 @@ public class WebAuthnConfig { * 用于 WebAuthn 数据的序列化和反序列化 */ @Bean - public ObjectConverter objectConverter() { + ObjectConverter objectConverter() { return new ObjectConverter(); } @@ -60,7 +60,7 @@ public class WebAuthnConfig { * 定义支持的算法类型 */ @Bean - public List publicKeyCredentialParameters() { + List publicKeyCredentialParameters() { return Arrays.asList( new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.ES256), new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.RS256), diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/controller/LoginSessionController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/controller/LoginSessionController.java index d70212157..978d22d6b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/controller/LoginSessionController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/controller/LoginSessionController.java @@ -68,7 +68,7 @@ public class LoginSessionController { */ @GetMapping(value = { "/fetch" }) public Message> fetch( - @ModelAttribute("historyLogin") HistoryLogin historyLogin, + @ModelAttribute HistoryLogin historyLogin, @CurrentUser UserInfo currentUser) { logger.debug("history/session/fetch {}" , historyLogin); historyLogin.setUserId(currentUser.getId()); @@ -79,7 +79,7 @@ public class LoginSessionController { } @DeleteMapping(value="/terminate") - public Message terminate(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message terminate(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("ids {}",ids); boolean isTerminated = false; try { diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/AppListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/AppListController.java index 1c167fe08..3e54af241 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/AppListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/AppListController.java @@ -67,7 +67,7 @@ public class AppListController { */ @GetMapping(value = { "/appList" }, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message> appList( - @RequestParam(value = "gridList", required = false) String gridList, + @RequestParam(required = false) String gridList, @CurrentUser UserInfo currentUser) { userInfoService.updateGridList(gridList,currentUser); UserApps userApps = new UserApps(); @@ -83,8 +83,8 @@ public class AppListController { @GetMapping(value = { "/account/get" }) public Message getAccount( - @RequestParam("credential") String credential, - @RequestParam("appId") String appId, + @RequestParam String credential, + @RequestParam String appId, @CurrentUser UserInfo currentUser) { Accounts account = null ; @@ -106,7 +106,7 @@ public class AppListController { @PutMapping(value = { "/account/update" }) public Message updateAccount( - @RequestParam("credential") String credential, + @RequestParam String credential, @ModelAttribute Accounts account, @CurrentUser UserInfo currentUser) { Accounts appUsers = new Accounts(); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LoginEntryPoint.java index 9a4198567..e2918bcd3 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LoginEntryPoint.java @@ -161,7 +161,7 @@ public class LoginEntryPoint { @RequestMapping(value={"/sendotp/{mobile}"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message produceOtp(@PathVariable("mobile") String mobile) { + public Message produceOtp(@PathVariable String mobile) { UserInfo userInfo=userInfoService.findByEmailMobile(mobile); if(userInfo != null) { smsAuthnService.getByInstId(WebContext.getInst().getId()).produce(userInfo); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LogoutEndpoint.java index 1999b91b0..7accdb9d1 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/LogoutEndpoint.java @@ -113,7 +113,7 @@ public class LogoutEndpoint { @Operation(summary = "单点注销接口", description = "redirect_uri跳转地址",method="GET") @GetMapping({"/force/logout"}) public ModelAndView forceLogout(HttpServletRequest request, - @RequestParam(value = "redirect_uri",required = false) String redirect_uri){ + @RequestParam(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/controller/OneTimePasswordController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/OneTimePasswordController.java index 64a056252..9ec98edc8 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/OneTimePasswordController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/OneTimePasswordController.java @@ -124,7 +124,7 @@ public class OneTimePasswordController { } @GetMapping("/verify") - public Message verify(@RequestParam("otpCode") String otpCode, @CurrentUser UserInfo currentUser) { + public Message verify(@RequestParam String otpCode, @CurrentUser UserInfo currentUser) { // 从当前用户信息中获取共享密钥 UserInfo user = userInfoService.get(currentUser.getId()); // 计算当前时间对应的动态密码 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SafeController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SafeController.java index 6d9a90e6b..ebe03318c 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SafeController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SafeController.java @@ -56,12 +56,12 @@ public class SafeController { public Message setting( HttpServletRequest request, HttpServletResponse response, - @RequestParam("authnType") String authnType, - @RequestParam("mobile") String mobile, - @RequestParam("mobileVerify") String mobileVerify, - @RequestParam("email") String email, - @RequestParam("emailVerify") String emailVerify, - @RequestParam("theme") String theme, + @RequestParam String authnType, + @RequestParam String mobile, + @RequestParam String mobileVerify, + @RequestParam String email, + @RequestParam String emailVerify, + @RequestParam String theme, @CurrentUser UserInfo currentUser) { currentUser.setAuthnType(Integer.parseInt(authnType)); userInfoService.updateAuthnType(currentUser); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SocialSignOnListController.java index b59d69244..8afab2bc8 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/controller/SocialSignOnListController.java @@ -55,7 +55,7 @@ public class SocialSignOnListController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsAssociatesService.deleteBatch(ids)) { return new Message(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java index 464616131..56e852ce9 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java @@ -59,7 +59,7 @@ public class LoginAppsHistoryController { @RequestMapping(value={"/loginAppsHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp, + @ModelAttribute HistoryLoginApps historyLoginApp, @CurrentUser UserInfo currentUser){ logger.debug("historys/loginAppsHistory/fetch/ {}",historyLoginApp); historyLoginApp.setId(null); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java index 8a7c42078..b50077a0c 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java @@ -59,7 +59,7 @@ public class LoginHistoryController { @RequestMapping(value={"/loginHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historyLogin") HistoryLogin historyLogin, + @ModelAttribute HistoryLogin historyLogin, @CurrentUser UserInfo currentUser ){ logger.debug("historys/loginHistory/fetch/ {}",historyLogin); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/AccessController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/AccessController.java index f55c7d01d..11a21d91f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/AccessController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/AccessController.java @@ -113,7 +113,7 @@ public class AccessController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (accessService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/SessionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/SessionController.java index e71a31d03..20c74b487 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/SessionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/controller/SessionController.java @@ -71,7 +71,7 @@ public class SessionController { @RequestMapping(value = { "/fetch" }) @ResponseBody public Message fetch( - @ModelAttribute("historyLogin") HistoryLogin historyLogin, + @ModelAttribute HistoryLogin historyLogin, @CurrentUser UserInfo currentUser) { logger.debug("history/session/fetch {}" , historyLogin); historyLogin.setInstId(currentUser.getInstId()); @@ -84,7 +84,7 @@ public class SessionController { @ResponseBody @RequestMapping(value="/terminate") - public Message terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) { + public Message terminate(@RequestParam String ids,@CurrentUser UserInfo currentUser) { logger.debug(ids); boolean isTerminated = false; try { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ApplicationsController.java index 06673cd30..2a98addbc 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ApplicationsController.java @@ -83,7 +83,7 @@ public class ApplicationsController extends BaseAppContorller { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Apps apps = appsService.get(id); decoderSecret(apps); apps.transIconBase64(); @@ -115,7 +115,7 @@ public class ApplicationsController extends BaseAppContorller { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); @@ -135,7 +135,7 @@ public class ApplicationsController extends BaseAppContorller { } @GetMapping({ "/generate/secret/{type}" }) - public Message generateSecret(@PathVariable("type") String type,@RequestParam(name="id",required=false) String id) throws JOSEException { + public Message generateSecret(@PathVariable String type,@RequestParam(required=false) String id) throws JOSEException { String secret=""; type=type.toLowerCase(); if(type.equals("des")){ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/CasDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/CasDetailsController.java index 163a3ee16..849f3b1a0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/CasDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/CasDetailsController.java @@ -51,7 +51,7 @@ public class CasDetailsController extends BaseAppContorller { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsCasDetails casDetails=casDetailsService.getAppDetails(id , false); super.decoderSecret(casDetails); casDetails.transIconBase64(); @@ -83,7 +83,7 @@ public class CasDetailsController extends BaseAppContorller { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ExtendApiDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ExtendApiDetailsController.java index c382d85b7..5fdcfd9d7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ExtendApiDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/ExtendApiDetailsController.java @@ -48,7 +48,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Apps application= appsService.get(id); super.decoderSecret(application); AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); @@ -87,7 +87,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/FormBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/FormBasedDetailsController.java index ff75648f6..a72e92f3e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/FormBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/FormBasedDetailsController.java @@ -56,7 +56,7 @@ public class FormBasedDetailsController extends BaseAppContorller { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsFormBasedDetails formBasedDetails=formBasedDetailsService.getAppDetails(id , false); decoderSecret(formBasedDetails); decoderSharedPassword(formBasedDetails); @@ -100,7 +100,7 @@ public class FormBasedDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message delete( - @RequestParam("ids") List ids, + @RequestParam List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (formBasedDetailsService.deleteBatch(ids) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/JwtDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/JwtDetailsController.java index 5735deaf6..9357f161c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/JwtDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/JwtDetailsController.java @@ -57,7 +57,7 @@ public class JwtDetailsController extends BaseAppContorller { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsJwtDetails jwtDetails=jwtDetailsService.getAppDetails(id , false); decoderSecret(jwtDetails); jwtDetails.transIconBase64(); @@ -94,7 +94,7 @@ public class JwtDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (jwtDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { return new Message(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/OAuth20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/OAuth20DetailsController.java index 2fb67e472..cbe8d9036 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/OAuth20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/OAuth20DetailsController.java @@ -61,7 +61,7 @@ public class OAuth20DetailsController extends BaseAppContorller { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { BaseClientDetails baseClientDetails=(BaseClientDetails)oauth20JdbcClientDetailsService.loadClientByClientId(id,false); Apps application=appsService.get(id);// decoderSecret(application); @@ -124,7 +124,7 @@ public class OAuth20DetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message delete( - @RequestParam("ids") List ids, + @RequestParam List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); for (String id : ids){ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/SAML20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/SAML20DetailsController.java index 7c3493ea6..39079069a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/SAML20DetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/SAML20DetailsController.java @@ -80,7 +80,7 @@ public class SAML20DetailsController extends BaseAppContorller { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsSAML20Details saml20Details=saml20DetailsService.getAppDetails(id , false); decoderSecret(saml20Details); saml20Details.transIconBase64(); @@ -132,7 +132,7 @@ public class SAML20DetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message delete( - @RequestParam("ids") List ids, + @RequestParam List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (saml20DetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/TokenBasedDetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/TokenBasedDetailsController.java index 7b73f67f4..09606e76c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/TokenBasedDetailsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/TokenBasedDetailsController.java @@ -60,7 +60,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsTokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.getAppDetails(id , false); decoderSecret(tokenBasedDetails); String algorithmKey=passwordReciprocal.decoder(tokenBasedDetails.getAlgorithmKey()); @@ -108,7 +108,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) public Message delete( - @RequestParam("ids") List ids, + @RequestParam List ids, @CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (tokenBasedDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AccountsStrategyController.java index fbe300575..056e2dfeb 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AccountsStrategyController.java @@ -66,7 +66,7 @@ public class AccountsStrategyController { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AccountsStrategy accountsStrategy = accountsStrategyService.get(id); return new Message<>(accountsStrategy); } @@ -95,7 +95,7 @@ public class AccountsStrategyController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (accountsStrategyService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AdaptersController.java index ad3529740..8ab6db509 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/AdaptersController.java @@ -59,7 +59,7 @@ public class AdaptersController { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { AppsAdapters appsAdapter=appsAdaptersService.get(id); return new Message<>(appsAdapter); } @@ -86,7 +86,7 @@ public class AdaptersController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (appsAdaptersService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/ConnectorsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/ConnectorsController.java index 36ffd1f83..9b9f5b8ae 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/ConnectorsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/ConnectorsController.java @@ -49,7 +49,7 @@ public class ConnectorsController { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Connectors connector = connectorsService.get(id); if(StringUtils.isNotBlank(connector.getCredentials())) { connector.setCredentials(PasswordReciprocal.getInstance().decoder(connector.getCredentials())); @@ -84,7 +84,7 @@ public class ConnectorsController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (connectorsService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SocialsProviderController.java index bdc8f52d6..60310e2a4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SocialsProviderController.java @@ -69,7 +69,7 @@ public class SocialsProviderController { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { SocialsProvider socialsProvider=socialsProviderService.get(id); socialsProvider.setClientSecret(PasswordReciprocal.getInstance().decoder(socialsProvider.getClientSecret())); return new Message(socialsProvider); @@ -104,7 +104,7 @@ public class SocialsProviderController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (socialsProviderService.deleteBatch(ids)) { return new Message(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SynchronizersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SynchronizersController.java index a7bf593bb..bb104eeeb 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SynchronizersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/controller/SynchronizersController.java @@ -61,7 +61,7 @@ public class SynchronizersController { } @RequestMapping(value = {"/get/{id}"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Synchronizers synchronizers = synchronizersService.get(id); synchronizers.setCredentials(PasswordReciprocal.getInstance().decoder(synchronizers.getCredentials())); return new Message<>(synchronizers); @@ -97,7 +97,7 @@ public class SynchronizersController { @ResponseBody @RequestMapping(value = {"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids) { + public Message delete(@RequestParam List ids) { logger.debug("-delete ids : {} ", ids); if (synchronizersService.deleteBatch(ids)) { return new Message(Message.SUCCESS); @@ -108,7 +108,7 @@ public class SynchronizersController { @ResponseBody @RequestMapping(value = {"/synchr"}) - public Message synchr(@RequestParam("id") String id) { + public Message synchr(@RequestParam String id) { logger.debug("-sync ids : {}", id); List ids = StrUtils.string2List(id, ","); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/controller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/controller/AccountsController.java index e37e6dbf7..b87899b7d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/controller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/controller/AccountsController.java @@ -91,7 +91,7 @@ public class AccountsController { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Accounts account=accountsService.get(id); account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(account.getRelatedPassword())); return new Message<>(account); @@ -159,7 +159,7 @@ public class AccountsController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { _logger.debug("-delete ids : {} " , ids); if (accountsService.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/ConnectorHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/ConnectorHistoryController.java index 276e6e5d3..407148588 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/ConnectorHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/ConnectorHistoryController.java @@ -55,7 +55,7 @@ public class ConnectorHistoryController { @GetMapping({"/connectorHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historyConnector") HistoryConnector historyConnector, + @ModelAttribute HistoryConnector historyConnector, @CurrentUser UserInfo currentUser){ logger.debug("historys/historyConnector/fetch/ {}",historyConnector); historyConnector.setInstId(currentUser.getInstId()); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java index fdb7f7fac..a96ca9ce0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginAppsHistoryController.java @@ -55,7 +55,7 @@ public class LoginAppsHistoryController { @GetMapping({"/loginAppsHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp, + @ModelAttribute HistoryLoginApps historyLoginApp, @CurrentUser UserInfo currentUser){ logger.debug("historys/loginAppsHistory/fetch/ {}",historyLoginApp); historyLoginApp.setId(null); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java index 32669d8df..eea5a8f12 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/LoginHistoryController.java @@ -55,7 +55,7 @@ public class LoginHistoryController { @GetMapping({"/loginHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historyLogin") HistoryLogin historyLogin, + @ModelAttribute HistoryLogin historyLogin, @CurrentUser UserInfo currentUser ){ logger.debug("historys/loginHistory/fetch/ {}",historyLogin); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SynchronizerHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SynchronizerHistoryController.java index 7e01b24df..5af3d2cb7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SynchronizerHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SynchronizerHistoryController.java @@ -55,7 +55,7 @@ public class SynchronizerHistoryController { @GetMapping({"/synchronizerHistory/fetch"}) @ResponseBody public Message fetch( - @ModelAttribute("historySynchronizer") HistorySynchronizer historySynchronizer, + @ModelAttribute HistorySynchronizer historySynchronizer, @CurrentUser UserInfo currentUser){ logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer); historySynchronizer.setInstId(currentUser.getInstId()); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SystemLogsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SystemLogsController.java index b88eab560..d336e5b07 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SystemLogsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/controller/SystemLogsController.java @@ -55,7 +55,7 @@ public class SystemLogsController { */ @GetMapping({"/systemLogs/fetch"}) @ResponseBody - public Message fetch(@ModelAttribute("historyLog") HistorySystemLogs historyLog, + public Message fetch(@ModelAttribute HistorySystemLogs historyLog, @CurrentUser UserInfo currentUser){ logger.debug("historys/historyLog/fetch {} ",historyLog); historyLog.setInstId(currentUser.getInstId()); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupMemberController.java index 55f34cc6d..6bedbd0f6 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupMemberController.java @@ -189,7 +189,7 @@ public class GroupMemberController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); if (service.deleteBatch(ids)) { return new Message(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupsController.java index f4532d73a..465866432 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/GroupsController.java @@ -81,7 +81,7 @@ public class GroupsController { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id,@CurrentUser UserInfo currentUser) { + public Message get(@PathVariable String id,@CurrentUser UserInfo currentUser) { Groups group =service.get(id); return new Message(group); } @@ -133,7 +133,7 @@ public class GroupsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {}" , ids); ids.removeAll(Arrays.asList("ROLE_ALL_USER","ROLE_ADMINISTRATORS","-1")); if (service.deleteBatch(ids)) { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/OrganizationsController.java index 13868692c..ec08c1043 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/OrganizationsController.java @@ -92,7 +92,7 @@ public class OrganizationsController { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Organizations org=organizationsService.get(id); return new Message(org); } @@ -135,7 +135,7 @@ public class OrganizationsController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (ids != null && ids.contains(Organizations.ROOT_ORG_ID)) { return new Message(Message.FAIL, "根组织不允许删除"); @@ -196,7 +196,7 @@ public class OrganizationsController { @RequestMapping(value = "/import") public Message importingOrganizations( - @ModelAttribute("excelImportFile")ExcelImport excelImportFile, + @ModelAttribute ExcelImport excelImportFile, @CurrentUser UserInfo currentUser) { if (excelImportFile.isExcelNotEmpty() ) { try { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/UserInfoController.java index 126d6a064..c49fd8371 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/controller/UserInfoController.java @@ -107,14 +107,14 @@ public class UserInfoController { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { UserInfo userInfo=userInfoService.get(id); userInfo.trans(); return new Message(userInfo); } @RequestMapping(value = { "/getByUsername/{username}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message getByUsername(@PathVariable("username") String username) { + public Message getByUsername(@PathVariable String username) { UserInfo userInfo=userInfoService.findByUsername(username); userInfo.trans(); return new Message(userInfo); @@ -173,7 +173,7 @@ public class UserInfoController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (userInfoService.deleteBatch(ids)) { @@ -273,7 +273,7 @@ public class UserInfoController { @RequestMapping(value = "/import") public Message importingUsers( - @ModelAttribute("excelImportFile")ExcelImport excelImportFile, + @ModelAttribute ExcelImport excelImportFile, @CurrentUser UserInfo currentUser) { if (excelImportFile.isExcelNotEmpty() ) { try { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/ResourcesController.java index 8af9a2d95..1ff9f931a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/ResourcesController.java @@ -79,7 +79,7 @@ public class ResourcesController { } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id) { + public Message get(@PathVariable String id) { Resources resource=resourcesService.get(id); return new Message(resource); } @@ -122,7 +122,7 @@ public class ResourcesController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { logger.debug("-delete ids : {} " , ids); if (resourcesService.deleteBatch(ids)) { systemLog.insert( diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RoleMemberController.java index 74f4cd7da..48464c823 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RoleMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RoleMemberController.java @@ -185,7 +185,7 @@ public class RoleMemberController { @ResponseBody @RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { _logger.debug("-delete ids : {}" , ids); if (roleMemberService.deleteBatch(ids)) { return new Message<>(Message.SUCCESS); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RolesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RolesController.java index 8bd2dedbe..83019460b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RolesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/controller/RolesController.java @@ -82,7 +82,7 @@ public class RolesController { } @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message get(@PathVariable("id") String id,@CurrentUser UserInfo currentUser) { + public Message get(@PathVariable String id,@CurrentUser UserInfo currentUser) { Roles role=rolesService.get(id); return new Message<>(role); } @@ -133,7 +133,7 @@ public class RolesController { } @DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE}) - public Message delete(@RequestParam("ids") List ids,@CurrentUser UserInfo currentUser) { + public Message delete(@RequestParam List ids,@CurrentUser UserInfo currentUser) { _logger.debug("-delete ids : {}" , ids); ids.removeAll(Arrays.asList("ROLE_ALL_USER","ROLE_ADMINISTRATORS","-1")); if (rolesService.deleteBatch(ids)) {