From 48d6b1b85e0b267899e5e0eaab6048da478e22ce Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 26 Mar 2023 22:39:41 +0800 Subject: [PATCH] style: [auth] optimize code --- .../server/auth/interceptor/PowerJobAuthInterceptor.java | 2 +- .../tech/powerjob/server/auth/service/PowerJobAuthService.java | 2 +- .../powerjob/server/auth/service/PowerJobLoginServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/interceptor/PowerJobAuthInterceptor.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/interceptor/PowerJobAuthInterceptor.java index 8444b0f2..7db6af57 100644 --- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/interceptor/PowerJobAuthInterceptor.java +++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/interceptor/PowerJobAuthInterceptor.java @@ -43,7 +43,7 @@ public class PowerJobAuthInterceptor implements HandlerInterceptor { } // 尝试直接解析登陆 - final Optional loginUserOpt = powerJobAuthService.parse(request); + final Optional loginUserOpt = powerJobAuthService.ifLogin(request); // 未登录前先使用302重定向到登录页面 if (!loginUserOpt.isPresent()) { diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobAuthService.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobAuthService.java index be709d3b..23a381bf 100644 --- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobAuthService.java +++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobAuthService.java @@ -28,7 +28,7 @@ public interface PowerJobAuthService { * @param httpServletRequest httpServletRequest * @return PowerJob 用户 */ - Optional parse(HttpServletRequest httpServletRequest); + Optional ifLogin(HttpServletRequest httpServletRequest); /** * 判断用户是否有访问权限 diff --git a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobLoginServiceImpl.java b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobLoginServiceImpl.java index 6d8a0cdc..2125f8ba 100644 --- a/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobLoginServiceImpl.java +++ b/powerjob-server/powerjob-server-auth/src/main/java/tech/powerjob/server/auth/service/PowerJobLoginServiceImpl.java @@ -88,7 +88,7 @@ public class PowerJobLoginServiceImpl implements PowerJobAuthService { } @Override - public Optional parse(HttpServletRequest httpServletRequest) { + public Optional ifLogin(HttpServletRequest httpServletRequest) { final Optional userIdOpt = parseUserId(httpServletRequest); return userIdOpt.flatMap(aLong -> userInfoRepository.findById(aLong).map(userInfoDO -> {