몇 개 수정
This commit is contained in:
parent
c88349782a
commit
1200876da4
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -68,6 +68,7 @@ public class CustomDynamicAuthorizationManager implements AuthorizationManager<R
|
|||||||
|
|
||||||
// 요청에 대해 권한을 확인하는 메소드
|
// 요청에 대해 권한을 확인하는 메소드
|
||||||
@Override
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public AuthorizationResult authorize(Supplier<Authentication> authentication, RequestAuthorizationContext object) {
|
public AuthorizationResult authorize(Supplier<Authentication> authentication, RequestAuthorizationContext object) {
|
||||||
HttpServletRequest request = object.getRequest();
|
HttpServletRequest request = object.getRequest();
|
||||||
Authentication auth = authentication.get();
|
Authentication auth = authentication.get();
|
||||||
|
|||||||
@ -93,12 +93,10 @@ public class CustomRememberMeServices implements RememberMeServices {
|
|||||||
@Override
|
@Override
|
||||||
public void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
|
public void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
|
||||||
Object principal = successfulAuthentication.getPrincipal();
|
Object principal = successfulAuthentication.getPrincipal();
|
||||||
if (!(principal instanceof MemberVo)) {
|
if (!(principal instanceof MemberVo member)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MemberVo member = (MemberVo) principal;
|
|
||||||
MemberPrincipalDetails details = new MemberPrincipalDetails(member);
|
|
||||||
String username = member.getLoginId();
|
String username = member.getLoginId();
|
||||||
long expiryTime = System.currentTimeMillis() + (TOKEN_VALIDITY_SECONDS * 1000);
|
long expiryTime = System.currentTimeMillis() + (TOKEN_VALIDITY_SECONDS * 1000);
|
||||||
String signature = generateSignature(username, expiryTime);
|
String signature = generateSignature(username, expiryTime);
|
||||||
@ -155,6 +153,8 @@ public class CustomRememberMeServices implements RememberMeServices {
|
|||||||
return expectedSignature.equals(signature);
|
return expectedSignature.equals(signature);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 현재는 id만 담는디
|
||||||
|
// 만약 바꾼다면 findById로 정보체크 하는데 idx + id 로 체크 하는 거 만들어야 할 듯
|
||||||
private String generateSignature(String username, long expiryTime) {
|
private String generateSignature(String username, long expiryTime) {
|
||||||
try {
|
try {
|
||||||
String data = username + DELIMITER + expiryTime;
|
String data = username + DELIMITER + expiryTime;
|
||||||
|
|||||||
@ -27,12 +27,12 @@ import java.lang.annotation.Annotation;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
||||||
//특정 어노테이션이 있는지 확인하는용 @ReqMap 확인용
|
//특정 어노테이션이 있는지 확인하는용
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Component
|
@Component
|
||||||
public class RequestMappingWrapper {
|
public class RequestMappingWrapper {
|
||||||
|
|
||||||
private RequestMappingHandlerMapping mapping;
|
private final RequestMappingHandlerMapping mapping;
|
||||||
|
|
||||||
public RequestMappingWrapper(
|
public RequestMappingWrapper(
|
||||||
@Nullable @Qualifier("requestMappingHandlerMapping") RequestMappingHandlerMapping mapping) {
|
@Nullable @Qualifier("requestMappingHandlerMapping") RequestMappingHandlerMapping mapping) {
|
||||||
|
|||||||
@ -61,7 +61,7 @@ public class CamelUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* camel case to snake case
|
* camel case to snake case
|
||||||
* @param Camel 표기법 변수명
|
* @param camelStr 표기법 변수명
|
||||||
* @return underScore - '_' 가 포함된 변수명
|
* @return underScore - '_' 가 포함된 변수명
|
||||||
*/
|
*/
|
||||||
public static String camelToSnake(String camelStr) {
|
public static String camelToSnake(String camelStr) {
|
||||||
|
|||||||
@ -55,7 +55,6 @@ public class JacksonUtil {
|
|||||||
/**
|
/**
|
||||||
* object -> json
|
* object -> json
|
||||||
*
|
*
|
||||||
* @param Object
|
|
||||||
* @return String
|
* @return String
|
||||||
*/
|
*/
|
||||||
public static String toJson(Object source) {
|
public static String toJson(Object source) {
|
||||||
@ -101,7 +100,6 @@ public class JacksonUtil {
|
|||||||
* json -> object
|
* json -> object
|
||||||
*
|
*
|
||||||
* @param jsonString
|
* @param jsonString
|
||||||
* @param TypeReference<T> - ex) new TypeReference<List<MapDto>>() {}
|
|
||||||
* @return T
|
* @return T
|
||||||
*/
|
*/
|
||||||
public static <T> T fromJson(String jsonString, TypeReference<T> targetType) {
|
public static <T> T fromJson(String jsonString, TypeReference<T> targetType) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user