From 1200876da44bb01375d6f1ab00fd3207370346c6 Mon Sep 17 00:00:00 2001 From: ckx6954 Date: Tue, 31 Dec 2024 09:30:13 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=87=20=EA=B0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mybatis/MyBatisCustomLogger.java | 70 ------------------- .../CustomDynamicAuthorizationManager.java | 1 + .../service/CustomRememberMeServices.java | 6 +- .../common/wrapper/RequestMappingWrapper.java | 4 +- .../io/company/localhost/utils/CamelUtil.java | 2 +- .../company/localhost/utils/JacksonUtil.java | 2 - 6 files changed, 7 insertions(+), 78 deletions(-) delete mode 100644 src/main/java/io/company/localhost/common/config/mybatis/MyBatisCustomLogger.java diff --git a/src/main/java/io/company/localhost/common/config/mybatis/MyBatisCustomLogger.java b/src/main/java/io/company/localhost/common/config/mybatis/MyBatisCustomLogger.java deleted file mode 100644 index 2ac6218..0000000 --- a/src/main/java/io/company/localhost/common/config/mybatis/MyBatisCustomLogger.java +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************ - * - * @packageName : io.company.localhost.common.config.mybatis - * @fileName : MyBatisCustomLogger.java - * @author : 조인제 - * @date : 24.12.06 - * @description : - * - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 24.12.06 조인제 최초 생성 - * - *************************************************************/ -package io.company.localhost.common.config.mybatis; - -import org.apache.ibatis.logging.Log; -import org.apache.ibatis.logging.LogFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class MyBatisCustomLogger implements Log { - - private final Logger logger; - - public MyBatisCustomLogger(String clazz) { - this.logger = LoggerFactory.getLogger(clazz); - } - - @Override - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - @Override - public boolean isTraceEnabled() { - return logger.isTraceEnabled(); - } - - @Override - public void error(String s, Throwable e) { - logger.error(s, e); - } - - @Override - public void error(String s) { - logger.error(s); - } - - @Override - public void debug(String s) { - // 줄바꿈을 제거하고 한 줄로 로그 출력 - logger.debug(s.replaceAll("[\r\n]+", " ")); - } - - @Override - public void trace(String s) { - // 줄바꿈을 제거하고 한 줄로 로그 출력 - logger.trace(s.replaceAll("[\r\n]+", " ")); - } - - @Override - public void warn(String s) { - logger.warn(s); - } - - static { - LogFactory.useCustomLogging(MyBatisCustomLogger.class); - } -} diff --git a/src/main/java/io/company/localhost/common/security/manager/CustomDynamicAuthorizationManager.java b/src/main/java/io/company/localhost/common/security/manager/CustomDynamicAuthorizationManager.java index 1633f2f..643ae4b 100644 --- a/src/main/java/io/company/localhost/common/security/manager/CustomDynamicAuthorizationManager.java +++ b/src/main/java/io/company/localhost/common/security/manager/CustomDynamicAuthorizationManager.java @@ -68,6 +68,7 @@ public class CustomDynamicAuthorizationManager implements AuthorizationManager authentication, RequestAuthorizationContext object) { HttpServletRequest request = object.getRequest(); Authentication auth = authentication.get(); diff --git a/src/main/java/io/company/localhost/common/security/service/CustomRememberMeServices.java b/src/main/java/io/company/localhost/common/security/service/CustomRememberMeServices.java index 427b7f7..29b1386 100644 --- a/src/main/java/io/company/localhost/common/security/service/CustomRememberMeServices.java +++ b/src/main/java/io/company/localhost/common/security/service/CustomRememberMeServices.java @@ -93,12 +93,10 @@ public class CustomRememberMeServices implements RememberMeServices { @Override public void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { Object principal = successfulAuthentication.getPrincipal(); - if (!(principal instanceof MemberVo)) { + if (!(principal instanceof MemberVo member)) { return; } - MemberVo member = (MemberVo) principal; - MemberPrincipalDetails details = new MemberPrincipalDetails(member); String username = member.getLoginId(); long expiryTime = System.currentTimeMillis() + (TOKEN_VALIDITY_SECONDS * 1000); String signature = generateSignature(username, expiryTime); @@ -155,6 +153,8 @@ public class CustomRememberMeServices implements RememberMeServices { return expectedSignature.equals(signature); } + // 현재는 id만 담는디 + // 만약 바꾼다면 findById로 정보체크 하는데 idx + id 로 체크 하는 거 만들어야 할 듯 private String generateSignature(String username, long expiryTime) { try { String data = username + DELIMITER + expiryTime; diff --git a/src/main/java/io/company/localhost/common/wrapper/RequestMappingWrapper.java b/src/main/java/io/company/localhost/common/wrapper/RequestMappingWrapper.java index 3ae9529..c1f90dc 100644 --- a/src/main/java/io/company/localhost/common/wrapper/RequestMappingWrapper.java +++ b/src/main/java/io/company/localhost/common/wrapper/RequestMappingWrapper.java @@ -27,12 +27,12 @@ import java.lang.annotation.Annotation; import java.util.Objects; -//특정 어노테이션이 있는지 확인하는용 @ReqMap 확인용 +//특정 어노테이션이 있는지 확인하는용 @Slf4j @Component public class RequestMappingWrapper { - private RequestMappingHandlerMapping mapping; + private final RequestMappingHandlerMapping mapping; public RequestMappingWrapper( @Nullable @Qualifier("requestMappingHandlerMapping") RequestMappingHandlerMapping mapping) { diff --git a/src/main/java/io/company/localhost/utils/CamelUtil.java b/src/main/java/io/company/localhost/utils/CamelUtil.java index 63a0957..a708d79 100644 --- a/src/main/java/io/company/localhost/utils/CamelUtil.java +++ b/src/main/java/io/company/localhost/utils/CamelUtil.java @@ -61,7 +61,7 @@ public class CamelUtil { /** * camel case to snake case - * @param Camel 표기법 변수명 + * @param camelStr 표기법 변수명 * @return underScore - '_' 가 포함된 변수명 */ public static String camelToSnake(String camelStr) { diff --git a/src/main/java/io/company/localhost/utils/JacksonUtil.java b/src/main/java/io/company/localhost/utils/JacksonUtil.java index 0622974..b19cd94 100644 --- a/src/main/java/io/company/localhost/utils/JacksonUtil.java +++ b/src/main/java/io/company/localhost/utils/JacksonUtil.java @@ -55,7 +55,6 @@ public class JacksonUtil { /** * object -> json * - * @param Object * @return String */ public static String toJson(Object source) { @@ -101,7 +100,6 @@ public class JacksonUtil { * json -> object * * @param jsonString - * @param TypeReference - ex) new TypeReference>() {} * @return T */ public static T fromJson(String jsonString, TypeReference targetType) {