Merge branch 'master' into feature/security

This commit is contained in:
codej99
2019-04-16 16:24:10 +09:00
committed by GitHub
4 changed files with 5 additions and 4 deletions

View File

@@ -27,6 +27,7 @@ public class ExceptionAdvice {
@ExceptionHandler(Exception.class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
protected CommonResult defaultException(HttpServletRequest request, Exception e) {
// 예외 처리의 메시지를 MessageSource에서 가져오도록 수정
return responseService.getFailResult(Integer.valueOf(getMessage("unKnown.code")), getMessage("unKnown.msg"));
}
@@ -54,10 +55,11 @@ public class ExceptionAdvice {
return responseService.getFailResult(Integer.valueOf(getMessage("accessDenied.code")), getMessage("accessDenied.msg"));
}
// code정보에 해당하는 메시지를 조회합니다.
private String getMessage(String code) {
return getMessage(code, null);
}
// code정보, 추가 argument로 현재 locale에 맞는 메시지를 조회합니다.
private String getMessage(String code, Object[] args) {
return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
}

View File

@@ -72,3 +72,4 @@ public class UserController {
return responseService.getSuccessResult();
}
}

View File

@@ -2,7 +2,6 @@ package com.rest.api.repo;
import com.rest.api.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface UserJpaRepo extends JpaRepository<User, Long> {

View File

@@ -12,8 +12,7 @@ public class ResponseService {
// enum으로 api 요청 결과에 대한 code, message를 정의합니다.
public enum CommonResponse {
SUCCESS(0, "성공하였습니디."),
FAIL(-1, "실패하였습니다.");
SUCCESS(0, "성공하였습니디.");
int code;
String msg;