From a3004e5462f238df16e3e13a5492dec8753cae1c Mon Sep 17 00:00:00 2001 From: houwei Date: Fri, 28 Jun 2024 16:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/das/common/config/StpInterfaceImpl.java | 4 +--- .../java/com/das/common/exceptions/BusinessException.java | 5 ++++- .../common/interceptor/DecryptingOncePerRequestFilter.java | 4 ++-- .../main/java/com/das/common/log/RequestLogInterceptor.java | 6 +++--- das/src/main/java/com/das/common/result/R.java | 4 +--- .../main/java/com/das/common/utils/AdminRedisTemplate.java | 6 ++---- .../java/com/das/modules/auth/service/LoginService.java | 3 +-- .../das/modules/auth/service/impl/SysMenuServiceImpl.java | 5 ++--- 8 files changed, 16 insertions(+), 21 deletions(-) diff --git a/das/src/main/java/com/das/common/config/StpInterfaceImpl.java b/das/src/main/java/com/das/common/config/StpInterfaceImpl.java index 3fee17aa..c2fb236b 100644 --- a/das/src/main/java/com/das/common/config/StpInterfaceImpl.java +++ b/das/src/main/java/com/das/common/config/StpInterfaceImpl.java @@ -20,9 +20,7 @@ public class StpInterfaceImpl implements StpInterface { return Collections.emptyList(); }else{ List list = new ArrayList<>(); - currentUser.getAuthorities().forEach(item->{ - list.add(item.toString()); - }); + currentUser.getAuthorities().forEach(item-> list.add(item.toString())); return list; } diff --git a/das/src/main/java/com/das/common/exceptions/BusinessException.java b/das/src/main/java/com/das/common/exceptions/BusinessException.java index 706d707b..5e80a15d 100644 --- a/das/src/main/java/com/das/common/exceptions/BusinessException.java +++ b/das/src/main/java/com/das/common/exceptions/BusinessException.java @@ -4,6 +4,8 @@ package com.das.common.exceptions; import com.das.common.result.IResultCode; import com.das.common.result.ResultCode; +import java.io.Serial; + /** * @author chenhaojie * @Description 自定义业务异常 @@ -11,7 +13,8 @@ import com.das.common.result.ResultCode; */ public class BusinessException extends RuntimeException { - private final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); diff --git a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java index 68988cad..0fd0b186 100644 --- a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java +++ b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java @@ -82,7 +82,7 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { @Override - public ServletInputStream getInputStream() throws IOException { + public ServletInputStream getInputStream() { final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bodyData.getBytes(StandardCharsets.UTF_8)); return new ServletInputStream() { @Override @@ -101,7 +101,7 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { } @Override - public int read() throws IOException { + public int read() { return byteArrayInputStream.read(); } }; diff --git a/das/src/main/java/com/das/common/log/RequestLogInterceptor.java b/das/src/main/java/com/das/common/log/RequestLogInterceptor.java index 90959c9b..895153cc 100644 --- a/das/src/main/java/com/das/common/log/RequestLogInterceptor.java +++ b/das/src/main/java/com/das/common/log/RequestLogInterceptor.java @@ -22,12 +22,12 @@ public class RequestLogInterceptor implements HandlerInterceptor { @Override - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { } @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { String servletPath = request.getServletPath(); log.info("preHandle 后置处理----------"); @@ -60,7 +60,7 @@ public class RequestLogInterceptor implements HandlerInterceptor { } @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { String servletPath = request.getServletPath(); // 生成RequestId String requestId = this.getRequestId(); diff --git a/das/src/main/java/com/das/common/result/R.java b/das/src/main/java/com/das/common/result/R.java index 672a41b0..c6d5f350 100644 --- a/das/src/main/java/com/das/common/result/R.java +++ b/das/src/main/java/com/das/common/result/R.java @@ -63,9 +63,7 @@ public class R implements Serializable { } public static boolean isSuccess(@Nullable R result) { - return Optional.ofNullable(result).map((x) -> { - return ResultCode.SUCCESS.code == x.code; - }).orElse(Boolean.FALSE); + return Optional.ofNullable(result).map((x) -> ResultCode.SUCCESS.code == x.code).orElse(Boolean.FALSE); } public static boolean isNotSuccess(@Nullable R result) { diff --git a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java index 140e8c2e..13a57706 100644 --- a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java +++ b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java @@ -806,10 +806,8 @@ public class AdminRedisTemplate { * @return 添加成功的个数 */ public Long zAdd(String key, Map scoreMembers) { - Set> tuples = new HashSet(); - scoreMembers.forEach((k, v) -> { - tuples.add(new DefaultTypedTuple(k, v)); - }); + Set> tuples = new HashSet<>(); + scoreMembers.forEach((k, v) -> tuples.add(new DefaultTypedTuple(k, v))); return zSetOps.add(key, tuples); } diff --git a/das/src/main/java/com/das/modules/auth/service/LoginService.java b/das/src/main/java/com/das/modules/auth/service/LoginService.java index 38e1b629..7c79e6f3 100644 --- a/das/src/main/java/com/das/modules/auth/service/LoginService.java +++ b/das/src/main/java/com/das/modules/auth/service/LoginService.java @@ -6,7 +6,6 @@ import com.das.modules.auth.domain.dto.LoginDto; import com.das.modules.auth.domain.dto.RefreshTokenDto; import com.das.modules.auth.domain.vo.LoginUserDetailsVo; import com.das.modules.auth.domain.vo.LoginVo; -import com.fasterxml.jackson.core.JsonProcessingException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -23,7 +22,7 @@ public interface LoginService { * @param loginDto 登录请求 * @return 登录成功 */ - LoginUserDetailsVo login(LoginDto loginDto, HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException; + LoginUserDetailsVo login(LoginDto loginDto, HttpServletRequest request, HttpServletResponse response); /** * 退出登录 diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index b5a52794..777e83d6 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -54,7 +54,7 @@ public class SysMenuServiceImpl implements SysMenuService { PageQuery pageQuery = new PageQuery(); pageQuery.setPageNum(sysMenuQueryDto.getPageNum()); pageQuery.setPageSize(sysMenuQueryDto.getPageSize()); - if(sysMenuQueryDto == null) { + if(sysMenuQueryDto.getParentMenuId() == null) { sysMenuQueryDto.setParentMenuId(0L); } IPage iPage = sysMenuMapper.queryMenuList(pageQuery.build(), sysMenuQueryDto); @@ -66,8 +66,7 @@ public class SysMenuServiceImpl implements SysMenuService { if(sysMenuQueryDto.getRecursive()) { sysMenuQueryDto.setParentMenuId(0L); } - List list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto); - return list; + return sysMenuMapper.queryAllMenuList(sysMenuQueryDto); } @Override