diff --git a/src/main/java/com/itn/mjonApi/cmn/aop/SendAspect.java b/src/main/java/com/itn/mjonApi/cmn/aop/SendAspect.java index 9125a48..c3e0865 100644 --- a/src/main/java/com/itn/mjonApi/cmn/aop/SendAspect.java +++ b/src/main/java/com/itn/mjonApi/cmn/aop/SendAspect.java @@ -111,7 +111,7 @@ public class SendAspect { SendSuccessRestResponse sendSuccessRestResponse = (SendSuccessRestResponse) restResponse.getObject(); resutlCode = sendSuccessRestResponse.getResultCode(); }else{ - log.info(" :: SendFailRestResponse :: "); + log.info(" :: FailRestResponse :: "); FailRestResponse failRestResponse = (FailRestResponse) restResponse.getObject(); resutlCode = failRestResponse.getResultCode(); diff --git a/src/main/java/com/itn/mjonApi/cmn/config/RestTemplateConfig.java b/src/main/java/com/itn/mjonApi/cmn/config/RestTemplateConfig.java index a683f55..2b13ec6 100644 --- a/src/main/java/com/itn/mjonApi/cmn/config/RestTemplateConfig.java +++ b/src/main/java/com/itn/mjonApi/cmn/config/RestTemplateConfig.java @@ -1,8 +1,7 @@ package com.itn.mjonApi.cmn.config; -import java.nio.charset.StandardCharsets; -import java.time.Duration; - +import com.itn.mjonApi.cmn.interceptor.RestTemplateLogInterceptor; +import lombok.extern.slf4j.Slf4j; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.springframework.beans.factory.annotation.Value; @@ -16,9 +15,8 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.web.client.RestTemplate; -import com.itn.mjonApi.cmn.interceptor.RestTemplateLogInterceptor; - -import lombok.extern.slf4j.Slf4j; +import java.nio.charset.StandardCharsets; +import java.time.Duration; /** * packageName : com.itn.mjonApi.cmn.config @@ -36,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; public class RestTemplateConfig { @Value("${api.root.url}") - private String rootUrl; + private String ROOT_URL; @Bean public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { @@ -52,7 +50,7 @@ public class RestTemplateConfig { RestTemplate restTemplate = restTemplateBuilder .requestFactory(() -> factory) - .rootUri(String.format(rootUrl)) + .rootUri(String.format(ROOT_URL)) .setReadTimeout(Duration.ofSeconds(5)) // read timeout .setConnectTimeout(Duration.ofSeconds(5)) // connection timeout .additionalMessageConverters(new StringHttpMessageConverter(StandardCharsets.UTF_8)) //메시지 컨버터 추가 diff --git a/src/main/java/com/itn/mjonApi/cmn/msg/SendSuccessRestResponse.java b/src/main/java/com/itn/mjonApi/cmn/msg/SendSuccessRestResponse.java index d4561bc..fd365d9 100644 --- a/src/main/java/com/itn/mjonApi/cmn/msg/SendSuccessRestResponse.java +++ b/src/main/java/com/itn/mjonApi/cmn/msg/SendSuccessRestResponse.java @@ -45,13 +45,12 @@ public class SendSuccessRestResponse { * @param mjonResponseVO * @return */ - public static SendSuccessRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) { + public static SendSuccessRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO, String STAT_CODE) { - String enumStr = "STAT_0"; return SendSuccessRestResponse.builder() - .resultCode(StatMsg.valueOf(enumStr).getCode()) // 성공 코드 200 - StatMsg 참고 - .message(StatMsg.valueOf(enumStr).getMsg()) // 성공은 message가 없음 - StatMsg 참고 + .resultCode(StatMsg.valueOf(STAT_CODE).getCode()) // 성공 코드 200 - StatMsg 참고 + .message(StatMsg.valueOf(STAT_CODE).getMsg()) // 성공은 message가 없음 - StatMsg 참고 .msgGroupId(mjonResponseVO.getMsgGroupId()) // 전송 메세지 그룹 ID .successCnt(mjonResponseVO.getResultSts()) // 성공 건수 .blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수 diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java index 4fe57a6..efd4baf 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java @@ -1,20 +1,18 @@ package com.itn.mjonApi.mjon.api.inqry.service.impl; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Map; - -import org.apache.ibatis.annotations.Case; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.itn.mjonApi.cmn.msg.StatMsg; import com.itn.mjonApi.mjon.api.inqry.mapper.PriceMapper; import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceResponse; import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; import com.itn.mjonApi.mjon.api.inqry.service.PriceService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Map; /** * @packageName : com.itn.mjonApi.mjon.api.inqry.service.impl @@ -34,6 +32,10 @@ public class PriceServiceImpl implements PriceService { @Autowired PriceMapper priceMapper; + // 성공 stat_code + @Value("${respone.status.success}") + private String STAT_CODE; + @Override public PriceResponse selectUserPrice(String mberId) throws Exception { @@ -45,13 +47,11 @@ public class PriceServiceImpl implements PriceService { // 이용단가, 발송가능 건수 PriceVO priceVO = price_refine(mberId, userMoney, priceMapper); - String enumStr = "STAT_0"; - //response set priceResponse = PriceResponse.builder() //defalut set - .resultCode(StatMsg.valueOf(enumStr).getCode()) - .message(StatMsg.valueOf(enumStr).getMsg()) + .resultCode(StatMsg.valueOf(STAT_CODE).getCode()) + .message(StatMsg.valueOf(STAT_CODE).getMsg()) .localDateTime(LocalDateTime.now()) //1. 잔액 .userMoney(userMoney) diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java index 54515e8..f1716e3 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.catalina.connector.Response; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -40,6 +41,9 @@ public class SendServiceImpl implements SendService { this.apiService = apiService; } + // 성공 stat_code + @Value("${respone.status.success}") + private String STAT_CODE; private static final String replaseStrList = "[*이름*],[*1*],[*2*],[*3*],[*4*]"; @Override @@ -112,7 +116,7 @@ public class SendServiceImpl implements SendService { // convertMjonDataToApiResponse => MjonResponseVO 데이터를 ApiResponse 데이터로 변환하는 메소드 if(munjaSendResponse.getResult() != "fail"){ // 성공 - return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), SendSuccessRestResponse.convertMjonDataToApiResponse(munjaSendResponse)); + return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), SendSuccessRestResponse.convertMjonDataToApiResponse(munjaSendResponse, STAT_CODE)); }else{ // 실패 return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), FailRestResponse.convertMjonDataToApiResponse(munjaSendResponse)); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c577564..1db78a7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -19,4 +19,7 @@ logging.level.jdbc.resultsettable=off spring.devtools.restart.enabled=true spring.devtools.livereload.enabled=true -server.error.whitelabel.enabled=false \ No newline at end of file +server.error.whitelabel.enabled=false + +# respone success status code +respone.status.success=STAT_0 \ No newline at end of file