From 0858957a716cb40e5300971ede47667f3da1821c Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 12 May 2023 18:29:39 +0900 Subject: [PATCH 01/10] refactor: munja send success --- .../com/itn/mjonApi/cmn/config/WebConfig.java | 2 + .../cmn/interceptor/CertifInterceptor.java | 6 +- .../com/itn/mjonApi/cmn/msg/MjonResponse.java | 27 ++++++ .../api/send/mapper/domain/MjonMsgVO.java | 2 +- .../mjon/api/send/service/SendService.java | 10 +++ .../send/service/impl/SendServiceImpl.java | 48 ++++++++++ .../mjon/api/send/web/SendRestController.java | 89 +++++++++++++++---- 7 files changed, 161 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java diff --git a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java index 2acf08e..90a4a13 100644 --- a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java +++ b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java @@ -22,6 +22,7 @@ import com.itn.mjonApi.cmn.interceptor.CertifInterceptor; @Configuration public class WebConfig implements WebMvcConfigurer { + @Bean public CertifInterceptor certificationInterceptor(){ return new CertifInterceptor(); @@ -29,6 +30,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(certificationInterceptor()) .addPathPatterns("/api/**"); //.excludePathPatterns("/css/**", "/images/**", "/js/**"); diff --git a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java index 8791e4d..eeb7d7a 100644 --- a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java +++ b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java @@ -45,7 +45,7 @@ public class CertifInterceptor implements HandlerInterceptor{ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { //HttpSession session = request.getSession(); - + System.out.println("=====preHandle=4=apikey=="); System.out.println("=====preHandle=4=apikey=="+request.getRequestURI()); @@ -112,7 +112,7 @@ public class CertifInterceptor implements HandlerInterceptor{ response.setCharacterEncoding("UTF-8"); response.getWriter().write("{\"resultCode\":\"403\",\"message\":\"Forbidden\"}"); - return false; + return false; } }catch(Exception ex) { @@ -148,7 +148,7 @@ public class CertifInterceptor implements HandlerInterceptor{ return false; } - } + } return true; } diff --git a/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java b/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java new file mode 100644 index 0000000..db18a40 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java @@ -0,0 +1,27 @@ +package com.itn.mjonApi.cmn.msg; + +import lombok.Getter; +import lombok.Setter; + +/** + * packageName : com.itn.mjonApi.cmn.msg + * fileName : mjonResponse + * author : hylee + * date : 2023-05-12 + * description : + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 2023-05-12 hylee 최초 생성 + */ +@Getter +@Setter +public class MjonResponse { + + private String message; + private String result; + private String resultSts; // 수신거부 갯수 + private String resultBlockSts; // 수신거부 갯수 + private String afterCash; + +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java index 22815a1..3c069f3 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java @@ -165,7 +165,7 @@ public class MjonMsgVO implements Serializable { private Float agentPrice; private float smsPrice; // sms 단가 - private float mmsPrice; // mms 단가 +// private float mmsPrice; // mms 단가 private float kakaoAtPrice; // 카카오 알림톡 단가 private float kakaoFtPrice; // 카카오 친구톡 단가 private float kakaoFtImgPrice;// 카카오 이미지 단가 diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java b/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java new file mode 100644 index 0000000..499e495 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java @@ -0,0 +1,10 @@ +package com.itn.mjonApi.mjon.api.send.service; + +import com.itn.mjonApi.cmn.msg.MjonResponse; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; + +public interface SendService { + + + MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception; +} 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 new file mode 100644 index 0000000..e3dc27a --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java @@ -0,0 +1,48 @@ +package com.itn.mjonApi.mjon.api.send.service.impl; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.itn.mjonApi.cmn.msg.MjonResponse; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; +import com.itn.mjonApi.mjon.api.send.service.SendService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +@Slf4j +@Service +public class SendServiceImpl implements SendService { + + private final RestTemplate restTemplate; + + public SendServiceImpl(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + } + + @Override + public MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception { + + ResponseEntity stringResponseEntity = restTemplate.postForEntity( + "/web/user/login/sendMsgDataAjax.do" + , mjonMsgVO + , String.class + ); + MjonResponse mjonResponse = getMjonResponse(stringResponseEntity); + + return mjonResponse; + } + + /** + * + * @param stringResponseEntity + * @return ResponseEntity vo convert + * @throws JsonProcessingException + */ + private static MjonResponse getMjonResponse(ResponseEntity stringResponseEntity) throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + + MjonResponse mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); + return mjonResponse; + } +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java index d91180a..423ce8c 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java @@ -1,13 +1,19 @@ package com.itn.mjonApi.mjon.api.send.web; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.itn.mjonApi.cmn.msg.MjonResponse; import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; +import com.itn.mjonApi.mjon.api.send.service.SendService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; + /** * packageName : com.itn.mjonApi.mjon.send.web * fileName : SendRestController @@ -20,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView; * 2023-02-15 hylee 최초 생성 */ +// 치환문자가 있으면 , => §로 치환 @Slf4j @RestController @@ -31,6 +38,9 @@ public class SendRestController { this.restTemplate = restTemplate; } + @Autowired + private SendService sendService; + /** * @@ -39,13 +49,11 @@ public class SendRestController { * @return */ @PostMapping("/api/sendTest") - public Object sendTest(MjonMsgVO mjonMsgVO){ + public MjonResponse sendTest(MjonMsgVO mjonMsgVO) throws Exception { + + + return sendService.sendMsgData(mjonMsgVO); - return restTemplate.postForEntity( - "/web/user/login/sendMsgDataAjax.do" - ,mjonMsgVO - , Object.class - ); } /** * @@ -55,12 +63,31 @@ public class SendRestController { */ @PostMapping("/api/selectSpamTxtChkAjax") public Object selectSpamTxtChkAjax(MjonMsgVO mjonMsgVO){ - log.info(" :: START/api/selectSpamTxtChkAjax"); - return restTemplate.postForEntity( - "/web/user/login/selectSpamTxtChkAjax.do" - ,mjonMsgVO - , Object.class - ); + log.info(" :: START/api/selectSpamTxtChkAjax smsTxt :: [{}]", mjonMsgVO.getSmsTxt()); + + ResponseEntity stringResponseEntity = restTemplate.postForEntity( + "http://localhost:8080/web/user/login/selectSpamTxtChkAjax.do" + , mjonMsgVO + , String.class + ); + + ObjectMapper objectMapper = new ObjectMapper(); + MjonResponse mjonResponse = new MjonResponse(); + + log.info("stringResponseEntity :: [{}]", stringResponseEntity.getBody()); + log.info("stringResponseEntity :: [{}]", stringResponseEntity); + + try { + mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); + + } catch (IOException e) { + e.printStackTrace(); + } + + return mjonResponse; + + + } @@ -71,13 +98,37 @@ public class SendRestController { * @return */ @PostMapping("/api/returnTest") - public Object returnTest(MjonMsgVO mjonMsgVO){ + public Object returnTest(MjonMsgVO mjonMsgVO) throws IOException { - return restTemplate.postForEntity( - "/web/user/login/returnTest.do" - , mjonMsgVO - , Object.class - ); + System.out.println("test !!!"); + + + + + // API에 요청할 URL + String apiUrl = "http://localhost:8080/web/user/login/returnTest.do"; + + // RestTemplate 객체 생성 + RestTemplate restTemplate = new RestTemplate(); + + // API로부터 ResponseEntity 응답 받기 + ResponseEntity response = restTemplate.getForEntity(apiUrl, ModelAndView.class); + + // ModelAndView 추출 및 데이터 출력 + ModelAndView modelAndView = response.getBody(); + System.out.println("View Name: " + modelAndView.getViewName()); + System.out.println("Model: " + modelAndView.getModel()); + + +// ResponseEntity objectResponseEntity = restTemplate.postForEntity( +// "/web/user/login/returnTest.do" +// , mjonMsgVO +// , Object.class +// ); + +// System.out.println("objectResponseEntity :: " + objectResponseEntity); + + return modelAndView; } From 3b0001618f96d3e3cedc88cc9911ab4ddbd1b418 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 15 May 2023 14:23:33 +0900 Subject: [PATCH 02/10] =?UTF-8?q?refactor:=20restTemplate=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/mjonApi/cmn/apiServer/ApiService.java | 44 +++++++++++++++++ .../com/itn/mjonApi/cmn/msg/MjonResponse.java | 19 +++++++ .../send/service/impl/SendServiceImpl.java | 43 ++++++++-------- .../mjon/api/send/web/SendRestController.java | 49 ------------------- src/main/resources/application-dev.properties | 2 +- .../resources/application-prod.properties | 3 +- 6 files changed, 86 insertions(+), 74 deletions(-) create mode 100644 src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java diff --git a/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java new file mode 100644 index 0000000..5dcab9f --- /dev/null +++ b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java @@ -0,0 +1,44 @@ +package com.itn.mjonApi.cmn.apiServer; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.itn.mjonApi.cmn.msg.MjonResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +/** + * packageName : com.itn.mjonApi.cmn.apiServer + * fileName : ApiService + * author : hylee + * date : 2023-05-15 + * description : + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 2023-05-15 hylee 최초 생성 + */ +@Service +public class ApiService { + + private RestTemplate restTemplate; + + @Autowired + public ApiService(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + } + + public MjonResponse postForEntity(String url, Object request, Class responseType) throws JsonProcessingException { + ResponseEntity spamChkEntity = (ResponseEntity) restTemplate.postForEntity( + url + , request + , responseType + ); + + MjonResponse spamResponse = MjonResponse.getMjonResponse(spamChkEntity); + + + return spamResponse; + } + +} diff --git a/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java b/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java index db18a40..1114f60 100644 --- a/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java +++ b/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java @@ -1,7 +1,10 @@ package com.itn.mjonApi.cmn.msg; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Getter; import lombok.Setter; +import org.springframework.http.ResponseEntity; /** * packageName : com.itn.mjonApi.cmn.msg @@ -24,4 +27,20 @@ public class MjonResponse { private String resultBlockSts; // 수신거부 갯수 private String afterCash; + + + + /** + * + * @param stringResponseEntity + * @return ResponseEntity vo convert + * @throws JsonProcessingException + */ + public static MjonResponse getMjonResponse(ResponseEntity stringResponseEntity) throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + + MjonResponse mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); + return mjonResponse; + } + } 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 e3dc27a..387ef13 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 @@ -1,48 +1,47 @@ package com.itn.mjonApi.mjon.api.send.service.impl; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.itn.mjonApi.cmn.apiServer.ApiService; import com.itn.mjonApi.cmn.msg.MjonResponse; import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; import com.itn.mjonApi.mjon.api.send.service.SendService; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; +import org.apache.catalina.connector.Response; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; + @Slf4j @Service public class SendServiceImpl implements SendService { - private final RestTemplate restTemplate; + private ApiService apiService; - public SendServiceImpl(RestTemplate restTemplate) { - this.restTemplate = restTemplate; + @Autowired + public SendServiceImpl(ApiService apiService) { + this.apiService = apiService; } + @Override public MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception { - ResponseEntity stringResponseEntity = restTemplate.postForEntity( + // 스팸체크 하는 부분 + MjonResponse spamChkEntity = apiService.postForEntity( + "/web/user/login/selectSpamTxtChkAjax.do" + , mjonMsgVO + , String.class + ); + + // 문자 전송하는 부분 + MjonResponse munjaSendResponse = apiService.postForEntity( "/web/user/login/sendMsgDataAjax.do" , mjonMsgVO , String.class ); - MjonResponse mjonResponse = getMjonResponse(stringResponseEntity); - return mjonResponse; + + + return spamChkEntity; } - /** - * - * @param stringResponseEntity - * @return ResponseEntity vo convert - * @throws JsonProcessingException - */ - private static MjonResponse getMjonResponse(ResponseEntity stringResponseEntity) throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - - MjonResponse mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); - return mjonResponse; - } } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java index 423ce8c..8b97eda 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java @@ -10,7 +10,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import org.springframework.web.servlet.ModelAndView; import java.io.IOException; @@ -51,7 +50,6 @@ public class SendRestController { @PostMapping("/api/sendTest") public MjonResponse sendTest(MjonMsgVO mjonMsgVO) throws Exception { - return sendService.sendMsgData(mjonMsgVO); } @@ -83,57 +81,10 @@ public class SendRestController { } catch (IOException e) { e.printStackTrace(); } - return mjonResponse; - - - } - /** - * - * @param mjonMsgVO - * @Discription 리턴 데이터 테스트 - * @return - */ - @PostMapping("/api/returnTest") - public Object returnTest(MjonMsgVO mjonMsgVO) throws IOException { - - System.out.println("test !!!"); - - - - - // API에 요청할 URL - String apiUrl = "http://localhost:8080/web/user/login/returnTest.do"; - - // RestTemplate 객체 생성 - RestTemplate restTemplate = new RestTemplate(); - - // API로부터 ResponseEntity 응답 받기 - ResponseEntity response = restTemplate.getForEntity(apiUrl, ModelAndView.class); - - // ModelAndView 추출 및 데이터 출력 - ModelAndView modelAndView = response.getBody(); - System.out.println("View Name: " + modelAndView.getViewName()); - System.out.println("Model: " + modelAndView.getModel()); - - -// ResponseEntity objectResponseEntity = restTemplate.postForEntity( -// "/web/user/login/returnTest.do" -// , mjonMsgVO -// , Object.class -// ); - -// System.out.println("objectResponseEntity :: " + objectResponseEntity); - - return modelAndView; - } - - - - diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 3eefb21..ff78813 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -14,4 +14,4 @@ server.port=8088 logging.level.root=info -api.root.url=http://localhost:8080 \ No newline at end of file +api.root.url=http://192.168.0.125:8095/ \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 1b4fd3a..cbba34f 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -10,9 +10,8 @@ spring.datasource.url=jdbc:log4jdbc:mysql://192.168.0.125:3306/mjon?serverTimezo spring.datasource.username=mjonUr spring.datasource.password=mjon!@#$ - server.port=9100 logging.level.root=info -api.root.url=http://localhost:8080 +api.root.url=http://192.168.0.125:8095/ From c3068bb83a914e5f9b31d2fd82953a17ede3bb8f Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 15 May 2023 18:16:57 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=98=A8API=20=EC=BB=A4=EB=B0=8B=20=20-=20inqry=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjon/api/inqry/service/PriceService.java | 16 +++++++ .../inqry/service/impl/PriceServiceImpl.java | 21 +++++++++ .../api/inqry/service/mapper/PriceMapper.java | 20 +++++++++ .../api/inqry/web/PriceRestController.java | 45 +++++++++++++++++++ src/main/resources/application.properties | 2 + 5 files changed, 104 insertions(+) create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/PriceMapper.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java new file mode 100644 index 0000000..45c3f17 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java @@ -0,0 +1,16 @@ +package com.itn.mjonApi.mjon.api.inqry.service; + +/** +* @packageName : com.itn.mjonApi.mjon.api.inqry.service +* @fileName : PriceService.java +* @author : JunHo Lee +* @date : 2023.05.15 +* @description : +* =========================================================== +* DATE AUTHOR NOTE +* ----------------------------------------------------------- +* 2023.05.15 JunHo Lee 최초 생성 +*/ +public interface PriceService { + +} 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 new file mode 100644 index 0000000..423af99 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java @@ -0,0 +1,21 @@ +package com.itn.mjonApi.mjon.api.inqry.service.impl; + +import org.springframework.stereotype.Service; + +import com.itn.mjonApi.mjon.api.inqry.service.PriceService; + +/** +* @packageName : com.itn.mjonApi.mjon.api.inqry.service.impl +* @fileName : PriceServiceImpl.java +* @author : JunHo Lee +* @date : 2023.05.15 +* @description : +* =========================================================== +* DATE AUTHOR NOTE +* ----------------------------------------------------------- +* 2023.05.15 JunHo Lee 최초 생성 +*/ +@Service +public class PriceServiceImpl implements PriceService { + +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/PriceMapper.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/PriceMapper.java new file mode 100644 index 0000000..f330266 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/PriceMapper.java @@ -0,0 +1,20 @@ +package com.itn.mjonApi.mjon.api.inqry.service.mapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* @packageName : com.itn.mjonApi.mjon.api.inqry.service.mapper +* @fileName : PriceMapper.java +* @author : JunHo Lee +* @date : 2023.05.15 +* @description : +* =========================================================== +* DATE AUTHOR NOTE +* ----------------------------------------------------------- +* 2023.05.15 JunHo Lee 최초 생성 +*/ +@Mapper +public interface PriceMapper { + + +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java new file mode 100644 index 0000000..db83a73 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java @@ -0,0 +1,45 @@ +package com.itn.mjonApi.mjon.api.inqry.web; + +import java.time.LocalDateTime; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.itn.mjonApi.cmn.msg.PlainResponse; +import com.itn.mjonApi.cmn.msg.RestResponse; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; + +import lombok.extern.slf4j.Slf4j; + +/** +* @packageName : com.itn.mjonApi.mjon.api.inqry.web +* @fileName : PriceRestController.java +* @author : JunHo Lee +* @date : 2023.05.15 +* @description : +* =========================================================== +* DATE AUTHOR NOTE +* ----------------------------------------------------------- +* 2023.05.15 JunHo Lee 최초 생성 +*/ +@Slf4j +@RestController +public class PriceRestController { + + /** + * @methodName : selectSpamTxtChkAjax + * @author : JunHo Lee + * @date : 2023.05.15 + * @param mjonMsgVO + * @return + */ + @PostMapping("/api/selectPrice") + public ResponseEntity selectPrice(MjonMsgVO mjonMsgVO){ + + + return ResponseEntity.ok(new PlainResponse(HttpStatus.OK, "test" , LocalDateTime.now(), null)); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f05530d..c577564 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,3 +18,5 @@ 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 From 083be7100446296a89a069c464c2c5f10e91cabf Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 16 May 2023 09:53:27 +0900 Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/mjonApi/cmn/apiServer/ApiService.java | 6 ++-- .../cmn/interceptor/CertifInterceptor.java | 4 +-- .../api/access/service/AccessKeyService.java | 2 +- .../access/service/AccessTokenService.java | 2 +- .../service/impl/AccessKeyServiceImpl.java | 2 +- .../service/impl/AccessTokenServiceImpl.java | 2 +- .../service/mapper/AccessKeyMapper.java | 2 +- .../service/mapper/AccessTokenMapper.java | 2 +- .../service}/mapper/domain/AccessKeyVO.java | 2 +- .../service}/mapper/domain/SendMsgVO.java | 2 +- .../access/web/AccessKeyRestController.java | 2 +- .../send/mapper/domain/MjonResponseVO.java} | 13 ++++---- .../{MjonMsgVO.java => MsgRequestVO.java} | 2 +- .../mjon/api/send/service/SendService.java | 6 ++-- .../send/service/impl/SendServiceImpl.java | 20 ++++++----- .../mjon/api/send/web/SendRestController.java | 24 +++++++------- .../log/service/LettnLoginLogService.java | 2 +- .../impl/LettnLoginLogServiceImpl.java | 15 ++++----- .../service/mapper/LettnLoginLogMapper.java | 5 ++- .../mapper/domain/LettnApiSendMsgLogVO.java | 30 +++++++++++++++++ .../mapper/domain/LettnLoginLogVO.java | 2 +- .../mjon/member/mapper/MyMsgMapper.java | 17 ---------- .../mjon/member/mapper/domain/MyMsgVO.java | 33 ------------------- .../mjon/member/service/MemberService.java | 11 ------- .../service/impl/MemberServiceImpl.java | 32 ------------------ .../mjon/member/web/MemberRestController.java | 26 --------------- src/main/resources/application-dev.properties | 3 +- .../resources/mapper/api/AccessKeyMapper.xml | 8 ++--- .../mapper/api/AccessTokenMapper.xml | 6 ++-- .../resources/mapper/log/LettnLoginLog.xml | 6 ++-- .../resources/mapper/member/MyMsgMapper.xml | 14 -------- 31 files changed, 101 insertions(+), 202 deletions(-) rename src/main/java/com/itn/mjonApi/{cmn/idgen => mjon/api/access/service}/mapper/domain/AccessKeyVO.java (93%) rename src/main/java/com/itn/mjonApi/{cmn/idgen => mjon/api/access/service}/mapper/domain/SendMsgVO.java (96%) rename src/main/java/com/itn/mjonApi/{cmn/msg/MjonResponse.java => mjon/api/send/mapper/domain/MjonResponseVO.java} (68%) rename src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/{MjonMsgVO.java => MsgRequestVO.java} (99%) create mode 100644 src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnApiSendMsgLogVO.java rename src/main/java/com/itn/mjonApi/{cmn/idgen => mjon/log/service}/mapper/domain/LettnLoginLogVO.java (92%) delete mode 100644 src/main/java/com/itn/mjonApi/mjon/member/mapper/MyMsgMapper.java delete mode 100644 src/main/java/com/itn/mjonApi/mjon/member/mapper/domain/MyMsgVO.java delete mode 100644 src/main/java/com/itn/mjonApi/mjon/member/service/MemberService.java delete mode 100644 src/main/java/com/itn/mjonApi/mjon/member/service/impl/MemberServiceImpl.java delete mode 100644 src/main/java/com/itn/mjonApi/mjon/member/web/MemberRestController.java delete mode 100644 src/main/resources/mapper/member/MyMsgMapper.xml diff --git a/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java index 5dcab9f..8fd693d 100644 --- a/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java +++ b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java @@ -1,7 +1,7 @@ package com.itn.mjonApi.cmn.apiServer; import com.fasterxml.jackson.core.JsonProcessingException; -import com.itn.mjonApi.cmn.msg.MjonResponse; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -28,14 +28,14 @@ public class ApiService { this.restTemplate = restTemplate; } - public MjonResponse postForEntity(String url, Object request, Class responseType) throws JsonProcessingException { + public MjonResponseVO postForEntity(String url, Object request, Class responseType) throws JsonProcessingException { ResponseEntity spamChkEntity = (ResponseEntity) restTemplate.postForEntity( url , request , responseType ); - MjonResponse spamResponse = MjonResponse.getMjonResponse(spamChkEntity); + MjonResponseVO spamResponse = MjonResponseVO.getMjonResponse(spamChkEntity); return spamResponse; diff --git a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java index c4a402f..e0acdc1 100644 --- a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java +++ b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java @@ -2,8 +2,8 @@ package com.itn.mjonApi.cmn.interceptor; //import java.sql.Date; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; -import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO; import com.itn.mjonApi.cmn.idgen.service.IdgenService; import com.itn.mjonApi.mjon.api.access.service.AccessKeyService; import com.itn.mjonApi.mjon.log.service.LettnLoginLogService; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessKeyService.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessKeyService.java index 3c53ce0..db14191 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessKeyService.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessKeyService.java @@ -1,6 +1,6 @@ package com.itn.mjonApi.mjon.api.access.service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import com.itn.mjonApi.cmn.msg.RestResponse; public interface AccessKeyService { diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessTokenService.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessTokenService.java index eb7040f..5945ecf 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessTokenService.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/AccessTokenService.java @@ -1,6 +1,6 @@ package com.itn.mjonApi.mjon.api.access.service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import com.itn.mjonApi.cmn.msg.RestResponse; public interface AccessTokenService { diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessKeyServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessKeyServiceImpl.java index 1a06efb..e2bfaf9 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessKeyServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessKeyServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import com.itn.mjonApi.cmn.msg.RestResponse; import com.itn.mjonApi.mjon.api.access.service.AccessKeyService; import com.itn.mjonApi.mjon.api.access.service.mapper.AccessKeyMapper; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessTokenServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessTokenServiceImpl.java index 0f5d99a..09f8683 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessTokenServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/impl/AccessTokenServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO; import com.itn.mjonApi.cmn.msg.RestResponse; import com.itn.mjonApi.mjon.api.access.service.AccessTokenService; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessKeyMapper.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessKeyMapper.java index 175337a..f86f46c 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessKeyMapper.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessKeyMapper.java @@ -1,6 +1,6 @@ package com.itn.mjonApi.mjon.api.access.service.mapper; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessTokenMapper.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessTokenMapper.java index 69896b0..d85a628 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessTokenMapper.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/AccessTokenMapper.java @@ -1,6 +1,6 @@ package com.itn.mjonApi.mjon.api.access.service.mapper; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO; import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/AccessKeyVO.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java similarity index 93% rename from src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/AccessKeyVO.java rename to src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java index dddbcf0..f207ec6 100644 --- a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/AccessKeyVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java @@ -1,4 +1,4 @@ -package com.itn.mjonApi.cmn.idgen.mapper.domain; +package com.itn.mjonApi.mjon.api.access.service.mapper.domain; /* table : mj_mymsg comment : '내문자 보관함'; diff --git a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/SendMsgVO.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/SendMsgVO.java similarity index 96% rename from src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/SendMsgVO.java rename to src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/SendMsgVO.java index b4f515c..146e663 100644 --- a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/SendMsgVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/SendMsgVO.java @@ -1,4 +1,4 @@ -package com.itn.mjonApi.cmn.idgen.mapper.domain; +package com.itn.mjonApi.mjon.api.access.service.mapper.domain; /* table : mj_mymsg comment : '내문자 보관함'; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/web/AccessKeyRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/access/web/AccessKeyRestController.java index 32d7059..68645ee 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/web/AccessKeyRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/web/AccessKeyRestController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.itn.mjonApi.cmn.idgen.mapper.domain.SendMsgVO; +import com.itn.mjonApi.mjon.api.access.service.mapper.domain.SendMsgVO; import com.itn.mjonApi.cmn.msg.PlainResponse; import com.itn.mjonApi.cmn.msg.RestResponse; import com.itn.mjonApi.mjon.api.access.service.AccessKeyService; diff --git a/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonResponseVO.java similarity index 68% rename from src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java rename to src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonResponseVO.java index 1114f60..398b7c4 100644 --- a/src/main/java/com/itn/mjonApi/cmn/msg/MjonResponse.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonResponseVO.java @@ -1,4 +1,4 @@ -package com.itn.mjonApi.cmn.msg; +package com.itn.mjonApi.mjon.api.send.mapper.domain; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -19,12 +19,13 @@ import org.springframework.http.ResponseEntity; */ @Getter @Setter -public class MjonResponse { +public class MjonResponseVO { private String message; private String result; - private String resultSts; // 수신거부 갯수 + private String resultSts; // 전송결과 갯수 private String resultBlockSts; // 수신거부 갯수 + private String msgGroupId; private String afterCash; @@ -36,11 +37,11 @@ public class MjonResponse { * @return ResponseEntity vo convert * @throws JsonProcessingException */ - public static MjonResponse getMjonResponse(ResponseEntity stringResponseEntity) throws JsonProcessingException { + public static MjonResponseVO getMjonResponse(ResponseEntity stringResponseEntity) throws JsonProcessingException { ObjectMapper objectMapper = new ObjectMapper(); - MjonResponse mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); - return mjonResponse; + MjonResponseVO mjonResponseVO = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponseVO.class); + return mjonResponseVO; } } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MsgRequestVO.java similarity index 99% rename from src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java rename to src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MsgRequestVO.java index 3c069f3..ff43ee7 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MjonMsgVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MsgRequestVO.java @@ -23,7 +23,7 @@ import java.util.List; @Setter @NoArgsConstructor @AllArgsConstructor -public class MjonMsgVO implements Serializable { +public class MsgRequestVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java b/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java index 499e495..d9f7a28 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/service/SendService.java @@ -1,10 +1,10 @@ package com.itn.mjonApi.mjon.api.send.service; -import com.itn.mjonApi.cmn.msg.MjonResponse; -import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO; public interface SendService { - MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception; + MjonResponseVO sendMsgData(MsgRequestVO msgRequestVO) throws Exception; } 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 387ef13..a0b1700 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 @@ -1,8 +1,8 @@ package com.itn.mjonApi.mjon.api.send.service.impl; import com.itn.mjonApi.cmn.apiServer.ApiService; -import com.itn.mjonApi.cmn.msg.MjonResponse; -import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO; import com.itn.mjonApi.mjon.api.send.service.SendService; import lombok.extern.slf4j.Slf4j; import org.apache.catalina.connector.Response; @@ -23,25 +23,29 @@ public class SendServiceImpl implements SendService { @Override - public MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception { + public MjonResponseVO sendMsgData(MsgRequestVO msgRequestVO) throws Exception { // 스팸체크 하는 부분 - MjonResponse spamChkEntity = apiService.postForEntity( + MjonResponseVO spamChkEntity = apiService.postForEntity( "/web/user/login/selectSpamTxtChkAjax.do" - , mjonMsgVO + , msgRequestVO , String.class ); + if("spams".equals(spamChkEntity.getResult())){ + msgRequestVO.setSpamStatus("Y"); + }; + // 문자 전송하는 부분 - MjonResponse munjaSendResponse = apiService.postForEntity( + MjonResponseVO munjaSendResponse = apiService.postForEntity( "/web/user/login/sendMsgDataAjax.do" - , mjonMsgVO + , msgRequestVO , String.class ); - return spamChkEntity; + return munjaSendResponse; } } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java index 8b97eda..a0e29ce 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java @@ -1,8 +1,8 @@ package com.itn.mjonApi.mjon.api.send.web; import com.fasterxml.jackson.databind.ObjectMapper; -import com.itn.mjonApi.cmn.msg.MjonResponse; -import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO; +import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO; import com.itn.mjonApi.mjon.api.send.service.SendService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -43,45 +43,45 @@ public class SendRestController { /** * - * @param mjonMsgVO + * @param msgRequestVO * @Discription 문자 발송 테스트 * @return */ @PostMapping("/api/sendTest") - public MjonResponse sendTest(MjonMsgVO mjonMsgVO) throws Exception { + public MjonResponseVO sendTest(MsgRequestVO msgRequestVO) throws Exception { - return sendService.sendMsgData(mjonMsgVO); + return sendService.sendMsgData(msgRequestVO); } /** * - * @param mjonMsgVO + * @param msgRequestVO * @Discription 스팸문자 테스트 * @return */ @PostMapping("/api/selectSpamTxtChkAjax") - public Object selectSpamTxtChkAjax(MjonMsgVO mjonMsgVO){ - log.info(" :: START/api/selectSpamTxtChkAjax smsTxt :: [{}]", mjonMsgVO.getSmsTxt()); + public Object selectSpamTxtChkAjax(MsgRequestVO msgRequestVO){ + log.info(" :: START/api/selectSpamTxtChkAjax smsTxt :: [{}]", msgRequestVO.getSmsTxt()); ResponseEntity stringResponseEntity = restTemplate.postForEntity( "http://localhost:8080/web/user/login/selectSpamTxtChkAjax.do" - , mjonMsgVO + , msgRequestVO , String.class ); ObjectMapper objectMapper = new ObjectMapper(); - MjonResponse mjonResponse = new MjonResponse(); + MjonResponseVO mjonResponseVO = new MjonResponseVO(); log.info("stringResponseEntity :: [{}]", stringResponseEntity.getBody()); log.info("stringResponseEntity :: [{}]", stringResponseEntity); try { - mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class); + mjonResponseVO = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponseVO.class); } catch (IOException e) { e.printStackTrace(); } - return mjonResponse; + return mjonResponseVO; } diff --git a/src/main/java/com/itn/mjonApi/mjon/log/service/LettnLoginLogService.java b/src/main/java/com/itn/mjonApi/mjon/log/service/LettnLoginLogService.java index 46ab367..3e7b9a3 100644 --- a/src/main/java/com/itn/mjonApi/mjon/log/service/LettnLoginLogService.java +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/LettnLoginLogService.java @@ -1,6 +1,6 @@ package com.itn.mjonApi.mjon.log.service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO; +import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO; import com.itn.mjonApi.cmn.msg.RestResponse; public interface LettnLoginLogService { diff --git a/src/main/java/com/itn/mjonApi/mjon/log/service/impl/LettnLoginLogServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/log/service/impl/LettnLoginLogServiceImpl.java index 276d696..6f6216c 100644 --- a/src/main/java/com/itn/mjonApi/mjon/log/service/impl/LettnLoginLogServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/impl/LettnLoginLogServiceImpl.java @@ -1,18 +1,15 @@ package com.itn.mjonApi.mjon.log.service.impl; -import java.time.LocalDateTime; -import java.util.List; - +import com.itn.mjonApi.cmn.msg.RestResponse; +import com.itn.mjonApi.mjon.log.service.LettnLoginLogService; +import com.itn.mjonApi.mjon.log.service.mapper.LettnLoginLogMapper; +import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO; -import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO; -import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO; -import com.itn.mjonApi.cmn.msg.RestResponse; -import com.itn.mjonApi.mjon.log.service.LettnLoginLogService; -import com.itn.mjonApi.mjon.log.service.mapper.LettnLoginLogMapper; +import java.time.LocalDateTime; +import java.util.List; @Service public class LettnLoginLogServiceImpl implements LettnLoginLogService { diff --git a/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/LettnLoginLogMapper.java b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/LettnLoginLogMapper.java index f59038f..7baf9ec 100644 --- a/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/LettnLoginLogMapper.java +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/LettnLoginLogMapper.java @@ -1,10 +1,9 @@ package com.itn.mjonApi.mjon.log.service.mapper; -import java.util.List; - +import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO; import org.apache.ibatis.annotations.Mapper; -import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO; +import java.util.List; @Mapper public interface LettnLoginLogMapper { diff --git a/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnApiSendMsgLogVO.java b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnApiSendMsgLogVO.java new file mode 100644 index 0000000..ed05ecd --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnApiSendMsgLogVO.java @@ -0,0 +1,30 @@ +package com.itn.mjonApi.mjon.log.service.mapper.domain; +/* + table : mj_mymsg + comment : '내문자 보관함'; +*/ + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class LettnApiSendMsgLogVO implements Serializable { + + + + private String LOG_NO; // access log 고유번호 + private String MBER_ID; // 일반회원ID + private String MSG_GROUP_ID; // 문자 그룹 ID + private String REQ_REGIST_PNTTM; // 요청등록일시 + private String REQ_REGISTER_ID; // 요청등록자ID + private String RES_UPDT_PNTTM; // 응답수정일시 + private String RES_UPDUSR_ID;//응답수정자ID + +} \ No newline at end of file diff --git a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/LettnLoginLogVO.java b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java similarity index 92% rename from src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/LettnLoginLogVO.java rename to src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java index a2d86d0..438b3cc 100644 --- a/src/main/java/com/itn/mjonApi/cmn/idgen/mapper/domain/LettnLoginLogVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java @@ -1,4 +1,4 @@ -package com.itn.mjonApi.cmn.idgen.mapper.domain; +package com.itn.mjonApi.mjon.log.service.mapper.domain; /* table : mj_mymsg comment : '내문자 보관함'; diff --git a/src/main/java/com/itn/mjonApi/mjon/member/mapper/MyMsgMapper.java b/src/main/java/com/itn/mjonApi/mjon/member/mapper/MyMsgMapper.java deleted file mode 100644 index 9a8bb1d..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/member/mapper/MyMsgMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.itn.mjonApi.mjon.member.mapper; - -import com.itn.mjonApi.mjon.member.mapper.domain.MyMsgVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -@Mapper -public interface MyMsgMapper { - - /**/ - List findAll(); - - @Select("select * from MJ_MYMSG") - List findAll_2(); -} diff --git a/src/main/java/com/itn/mjonApi/mjon/member/mapper/domain/MyMsgVO.java b/src/main/java/com/itn/mjonApi/mjon/member/mapper/domain/MyMsgVO.java deleted file mode 100644 index 1b21568..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/member/mapper/domain/MyMsgVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.itn.mjonApi.mjon.member.mapper.domain; -/* - table : mj_mymsg - comment : '내문자 보관함'; -*/ - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.io.Serializable; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class MyMsgVO implements Serializable { - - - private Integer msgId; /*auto_increment comment '문자 고유아이디' primary key*/ - private String mberId; /*comment '회원 아이디'*/ - private String esntlId; /*null comment '회원고유 아이디'*/ - private String subject; /*null comment '문자 제목'*/ - private String smsTxt; /*null comment '문자 내용'*/ - private String smsLen; /*null comment '문자 길이'*/ - private String atchFileId1; /*null comment '첨부파일번호'*/ - private String atchFileId2; /*null comment '첨부파일번호'*/ - private String atchFileId3; /*null comment '첨부파일번호'*/ - private String regdate; /*null comment '등록일자'*/ - private String msgType; /*default 'S' null comment '문자종류'*/ - -} diff --git a/src/main/java/com/itn/mjonApi/mjon/member/service/MemberService.java b/src/main/java/com/itn/mjonApi/mjon/member/service/MemberService.java deleted file mode 100644 index eab656d..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/member/service/MemberService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.itn.mjonApi.mjon.member.service; - -import com.itn.mjonApi.cmn.msg.RestResponse; - -public interface MemberService { - - - RestResponse findAll(); - - RestResponse findAll2(); -} diff --git a/src/main/java/com/itn/mjonApi/mjon/member/service/impl/MemberServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/member/service/impl/MemberServiceImpl.java deleted file mode 100644 index ba0abf5..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/member/service/impl/MemberServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.itn.mjonApi.mjon.member.service.impl; - -import com.itn.mjonApi.cmn.msg.RestResponse; -import com.itn.mjonApi.mjon.member.mapper.MyMsgMapper; -import com.itn.mjonApi.mjon.member.mapper.domain.MyMsgVO; -import com.itn.mjonApi.mjon.member.service.MemberService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -public class MemberServiceImpl implements MemberService { - - @Autowired - MyMsgMapper myMsgMapper; - - @Override - public RestResponse findAll() { - List MyMsgListVO = myMsgMapper.findAll(); - return new RestResponse(HttpStatus.OK, "성공", LocalDateTime.now(), MyMsgListVO); - } - - @Override - public RestResponse findAll2() { - List MyMsgListVO = myMsgMapper.findAll_2(); - return new RestResponse(HttpStatus.OK, "성공", LocalDateTime.now(), MyMsgListVO); - } - -} diff --git a/src/main/java/com/itn/mjonApi/mjon/member/web/MemberRestController.java b/src/main/java/com/itn/mjonApi/mjon/member/web/MemberRestController.java deleted file mode 100644 index a4d956c..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/member/web/MemberRestController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.itn.mjonApi.mjon.member.web; - -import com.itn.mjonApi.cmn.msg.RestResponse; -import com.itn.mjonApi.mjon.member.service.MemberService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class MemberRestController { - - @Autowired - private MemberService memberService; - - @GetMapping("/member/mymsg") - public ResponseEntity mymsg(){ - return ResponseEntity.ok(memberService.findAll()); - } - - @GetMapping("/member/mymsg_2") - public ResponseEntity mymsg2(){ - return ResponseEntity.ok(memberService.findAll2()); - } - -} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index ff78813..61f331a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -14,4 +14,5 @@ server.port=8088 logging.level.root=info -api.root.url=http://192.168.0.125:8095/ \ No newline at end of file +#api.root.url=http://192.168.0.125:8095/ +api.root.url=http://localhost:8080/ \ No newline at end of file diff --git a/src/main/resources/mapper/api/AccessKeyMapper.xml b/src/main/resources/mapper/api/AccessKeyMapper.xml index daf0c34..45e6ccc 100644 --- a/src/main/resources/mapper/api/AccessKeyMapper.xml +++ b/src/main/resources/mapper/api/AccessKeyMapper.xml @@ -5,7 +5,7 @@ - SELECT * FROM lettngnrlmber_access_key @@ -74,7 +74,7 @@ - SELECT FROM @@ -84,7 +84,7 @@ - SELECT FROM @@ -129,5 +129,5 @@ WHERE ACCESS_NO = #{accessNo} - + \ No newline at end of file diff --git a/src/main/resources/mapper/api/AccessTokenMapper.xml b/src/main/resources/mapper/api/AccessTokenMapper.xml index e24e2aa..bbc47d5 100644 --- a/src/main/resources/mapper/api/AccessTokenMapper.xml +++ b/src/main/resources/mapper/api/AccessTokenMapper.xml @@ -5,7 +5,7 @@ - SELECT * FROM lettngnrlmber_access_token @@ -74,7 +74,7 @@ - SELECT FROM @@ -85,7 +85,7 @@ - SELECT FROM diff --git a/src/main/resources/mapper/log/LettnLoginLog.xml b/src/main/resources/mapper/log/LettnLoginLog.xml index 05d5a2f..a964ce5 100644 --- a/src/main/resources/mapper/log/LettnLoginLog.xml +++ b/src/main/resources/mapper/log/LettnLoginLog.xml @@ -63,7 +63,7 @@ - SELECT FROM @@ -73,7 +73,7 @@ - SELECT FROM @@ -115,7 +115,7 @@ LOG_ID = #{logId} - SELECT COUNT(A.IGNORE_NO) AS CNT FROM mj_ignore_ip A diff --git a/src/main/resources/mapper/member/MyMsgMapper.xml b/src/main/resources/mapper/member/MyMsgMapper.xml deleted file mode 100644 index 202ce55..0000000 --- a/src/main/resources/mapper/member/MyMsgMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - \ No newline at end of file From cf7ccbc87006aa476c3067bf36811d29857e76f7 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 16 May 2023 10:34:19 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=98=A8API=20=EC=BB=A4=EB=B0=8B=20=20-=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=EC=85=89=ED=84=B0=20url=ED=8C=A8=ED=84=B4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=20-=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java | 4 ++-- .../itn/mjonApi/mjon/api/inqry/web/PriceRestController.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java index f95837b..c7c35e6 100644 --- a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java +++ b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java @@ -30,8 +30,8 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(certifInterceptor()) - .addPathPatterns("/api/accessKey/**") - //.addPathPatterns("/api/accessTest/**") + .addPathPatterns("/api/**") + .excludePathPatterns("/api/accessTest/**") ; //.excludePathPatterns("/css/**", "/images/**", "/js/**"); } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java index db83a73..31c0410 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java @@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import com.itn.mjonApi.cmn.msg.PlainResponse; -import com.itn.mjonApi.cmn.msg.RestResponse; -import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO; import lombok.extern.slf4j.Slf4j; @@ -36,10 +34,10 @@ public class PriceRestController { * @return */ @PostMapping("/api/selectPrice") - public ResponseEntity selectPrice(MjonMsgVO mjonMsgVO){ + public ResponseEntity selectPrice(){ - return ResponseEntity.ok(new PlainResponse(HttpStatus.OK, "test" , LocalDateTime.now(), null)); + return ResponseEntity.ok(new PlainResponse(HttpStatus.OK, "test" , LocalDateTime.now(), "")); } } From 6c46010f47731054e7921eb7d77cd1602d114e1d Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 16 May 2023 10:46:01 +0900 Subject: [PATCH 06/10] =?UTF-8?q?refactor:=20ApiService=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java index 8fd693d..d6d9378 100644 --- a/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java +++ b/src/main/java/com/itn/mjonApi/cmn/apiServer/ApiService.java @@ -12,7 +12,7 @@ import org.springframework.web.client.RestTemplate; * fileName : ApiService * author : hylee * date : 2023-05-15 - * description : + * description : API 서버 호출 Service - 호출 후 데이터 정제 까지 구현 * =========================================================== * DATE AUTHOR NOTE * ----------------------------------------------------------- From 43d5afdc8b1c2a8126c2856e685047ac6105a2e5 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 16 May 2023 12:18:43 +0900 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=EC=9E=84=EC=8B=9C=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=20=20=20=20=20AND=09b.CALL=5FINFO=09LIKE=20CONCAT(?= =?UTF-8?q?#{callInfo},=20'%')=20=20=20=20=20=20lettngnrlmber=5Faccess=5Fc?= =?UTF-8?q?all=5Finfo=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=97=90=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=ED=98=84=EC=9E=AC=20=EC=97=86?= =?UTF-8?q?=EC=96=B4=EC=84=9C=20=20=20=20=20=20=EC=97=90=EB=9F=AC=EA=B0=80?= =?UTF-8?q?=20=EB=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/api/AccessKeyMapper.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/api/AccessKeyMapper.xml b/src/main/resources/mapper/api/AccessKeyMapper.xml index 45e6ccc..477a155 100644 --- a/src/main/resources/mapper/api/AccessKeyMapper.xml +++ b/src/main/resources/mapper/api/AccessKeyMapper.xml @@ -95,7 +95,12 @@ AND a.ACCESS_KEY = #{accessKey} AND a.MBER_ID = #{mberId} AND a.ACCESS_no = b.ACCESS_NO - AND b.CALL_INFO LIKE CONCAT(#{callInfo}, '%') + /* + 임시 주석 + AND b.CALL_INFO LIKE CONCAT(#{callInfo}, '%') + lettngnrlmber_access_call_info 테이블에 데이터가 현재 없어서 에러가 남 + */ + limit 1 From 595763deaf63b9d996ec3928b7a052931df1ba21 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 16 May 2023 12:19:52 +0900 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20Builder=20=ED=8C=A8=ED=84=B4?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmn/interceptor/CertifInterceptor.java | 81 ++++++++++++------- .../service/mapper/domain/AccessKeyVO.java | 1 + .../mapper/domain/LettnLoginLogVO.java | 1 + 3 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java index e0acdc1..e8fb090 100644 --- a/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java +++ b/src/main/java/com/itn/mjonApi/cmn/interceptor/CertifInterceptor.java @@ -7,6 +7,7 @@ import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO; import com.itn.mjonApi.cmn.idgen.service.IdgenService; import com.itn.mjonApi.mjon.api.access.service.AccessKeyService; import com.itn.mjonApi.mjon.log.service.LettnLoginLogService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.context.request.RequestContextHolder; @@ -30,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; * 2023-02-15 hylee 최초 생성 */ //@Component +@Slf4j public class CertifInterceptor implements HandlerInterceptor{ @Autowired @@ -46,6 +48,7 @@ public class CertifInterceptor implements HandlerInterceptor{ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + // URL 접속정보 String referer = request.getHeader("Referer"); //System.out.println("=====preHandle=5=apikey=refer="+referer); @@ -55,42 +58,59 @@ public class CertifInterceptor implements HandlerInterceptor{ { try{ //step0-1.log 남기기 - LettnLoginLogVO lettnLoginLogVO = new LettnLoginLogVO(); //ip HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); String ip = req.getHeader("X-FORWARDED-FOR"); if (ip == null){ ip = req.getRemoteAddr();} - - lettnLoginLogVO.setConectIp(ip); + + + +// lettnLoginLogVO.setConectIp(ip); //사용자 여부 - lettnLoginLogVO.setUserAt("U"); - +// lettnLoginLogVO.setUserAt("U"); + //사용자 ID - lettnLoginLogVO.setConectId(request.getParameter("mberId")); +// lettnLoginLogVO.setConectId(request.getParameter("mberId")); //device type - if(_isMobile(request)){ - lettnLoginLogVO.setDeviceType("M"); - }else{ - lettnLoginLogVO.setDeviceType("P"); - } +// if(_isMobile(request)){ +// lettnLoginLogVO.setDeviceType("M"); +// }else{ +// lettnLoginLogVO.setDeviceType("P"); +// } - //program_nm - API 값 고정 - lettnLoginLogVO.setProgrmFileNm("API"); - lettnLoginLogVO.setMenuNm("API"); - lettnLoginLogVO.setMenuNo("100"); + +// lettnLoginLogVO.setProgrmFileNm("API"); +// lettnLoginLogVO.setMenuNm("API"); +// lettnLoginLogVO.setMenuNo("100"); //url - lettnLoginLogVO.setUrl(request.getRequestURI()); +// lettnLoginLogVO.setUrl(request.getRequestURI()); + + // hylee Builder 패턴으로 변경 => 20230516 + LettnLoginLogVO lettnLoginLogVO = + new LettnLoginLogVO() + .builder() + .logId(idgenApiLogId.getNextStringId()) // idgen ID + .conectId(request.getParameter("mberId")) //사용자 ID + .userAt("U") //사용자 여부 + .conectIp(ip) + .deviceType(_isMobile(request) ? "M" : "P") //device type + .progrmFileNm("API") //program_nm, menuNm, menuNo - API 값 고정 + .menuNm("API") + .menuNo("100") + .url(request.getRequestURI()) + .build(); + //IP 컬럼 길이를 늘려서 비교 조건 제거함 2023-04-05 if (lettnLoginLogVO.getUrl().length()>200){ //길이문제로 오류가 발생하는 경우도 처리하도록 수정 lettnLoginLogVO.setUrl(lettnLoginLogVO.getUrl().substring(0,199)); } // logId :: idgen 사용으로 수정 => 2023-04-25 - lettnLoginLogVO.setLogId(idgenApiLogId.getNextStringId()); +// lettnLoginLogVO.setLogId(idgenApiLogId.getNextStringId()); lettnLoginLogService.insert(lettnLoginLogVO); @@ -118,19 +138,26 @@ public class CertifInterceptor implements HandlerInterceptor{ //step1.키 검증 - accessKey & mberId 는 검증을 위한 필수값 { try{ - AccessKeyVO accessKeyVO = new AccessKeyVO(); - accessKeyVO.setAccessKey(request.getParameter("accessKey")); - accessKeyVO.setMberId(request.getParameter("mberId")); - accessKeyVO.setCallInfo(referer); - - accessKeyVO = accessKeyService.selectRKey(accessKeyVO); +// AccessKeyVO accessKeyVO = new AccessKeyVO(); +// accessKeyVO.setAccessKey(request.getParameter("accessKey")); +// accessKeyVO.setMberId(request.getParameter("mberId")); +// accessKeyVO.setCallInfo(referer); + + // hylee Builder 패턴으로 변경 => 20230516 + AccessKeyVO accessKeyVO = accessKeyService.selectRKey( + new AccessKeyVO().builder() + .accessKey(request.getParameter("accessKey")) + .mberId(request.getParameter("mberId")) + .callInfo(referer) + .build() + ); //인증 실패 if (accessKeyVO ==null) { - - this._jsonResult(response, HttpStatus.UNAUTHORIZED); - return false; - } + + this._jsonResult(response, HttpStatus.UNAUTHORIZED); + return false; + } }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java index f207ec6..dd1d8d5 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/access/service/mapper/domain/AccessKeyVO.java @@ -12,6 +12,7 @@ import java.io.Serializable; @Setter @NoArgsConstructor @AllArgsConstructor +@Builder public class AccessKeyVO implements Serializable { private static final long serialVersionUID = -7865729705175845268L; diff --git a/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java index 438b3cc..2526faa 100644 --- a/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java +++ b/src/main/java/com/itn/mjonApi/mjon/log/service/mapper/domain/LettnLoginLogVO.java @@ -12,6 +12,7 @@ import java.io.Serializable; @Setter @NoArgsConstructor @AllArgsConstructor +@Builder public class LettnLoginLogVO implements Serializable { private static final long serialVersionUID = -7865729705175845268L; From c50db989934b5e5343173d98c17e0c0f7e197572 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 16 May 2023 12:20:38 +0900 Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=EB=AC=B8=EC=9E=90=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20interceptor=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/itn/mjonApi/cmn/config/WebConfig.java | 13 +++++++++++++ .../mjon/api/send/web/SendRestController.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java index c7c35e6..a829b8f 100644 --- a/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java +++ b/src/main/java/com/itn/mjonApi/cmn/config/WebConfig.java @@ -29,10 +29,23 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { + + /** + * 모든 api 요청에 대한 key 인증 밑 lettnloginlog Insert + */ registry.addInterceptor(certifInterceptor()) .addPathPatterns("/api/**") .excludePathPatterns("/api/accessTest/**") ; + + /** + * 2023-05-16 + * send에 대한 interceptor 설정 - lettngnrlmber_access_log Insert + * 진행중 + */ +// registry.addInterceptor(certifInterceptor()) +// .addPathPatterns("/api/send/**") +// ; //.excludePathPatterns("/css/**", "/images/**", "/js/**"); } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java index a0e29ce..5ff598d 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java @@ -47,7 +47,7 @@ public class SendRestController { * @Discription 문자 발송 테스트 * @return */ - @PostMapping("/api/sendTest") + @PostMapping("/api/send/sendTest") public MjonResponseVO sendTest(MsgRequestVO msgRequestVO) throws Exception { return sendService.sendMsgData(msgRequestVO); From b5a078ed4021cc98c9819179d5462c3a1396efc8 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 16 May 2023 15:58:06 +0900 Subject: [PATCH 10/10] test commit --- .../mjon/api/inqry/service/PriceService.java | 2 + .../service/mapper/domain/PriceResponse.java | 58 +++++++++++++++++++ .../inqry/service/mapper/domain/PriceVO.java | 24 ++++++++ .../api/inqry/web/PriceRestController.java | 19 ++++-- .../mapper/api/inqry/PriceMapper.xml | 8 +++ 5 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java create mode 100644 src/main/resources/mapper/api/inqry/PriceMapper.xml diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java index 45c3f17..5393094 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java @@ -13,4 +13,6 @@ package com.itn.mjonApi.mjon.api.inqry.service; */ public interface PriceService { + + } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java new file mode 100644 index 0000000..e86abcb --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java @@ -0,0 +1,58 @@ +package com.itn.mjonApi.mjon.api.inqry.service.mapper.domain; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.http.HttpStatus; + +import java.time.LocalDateTime; +import java.util.List; + +@Setter +@Getter +public class PriceResponse { + + //private HttpStatus status; + private int resultCode; + + private String message; + + private LocalDateTime localDateTime; + + private Object object; + + private List objectList; + + /* + * 200-OK : 정상접속 + * 401-Unauthorized : 인증실패 + * + * */ + + public PriceResponse(HttpStatus status, String message, LocalDateTime timestamp) { + this.resultCode = status.value(); + checkMessage(status, message); + this.localDateTime = timestamp; + } + + public PriceResponse(HttpStatus status, String message, LocalDateTime timestamp, Object object) { + this.resultCode = status.value(); + checkMessage(status, message); + + this.object= object; + this.localDateTime = timestamp; + } + + public PriceResponse(HttpStatus status, String message, LocalDateTime timestamp, List objectList) { + this.resultCode = status.value(); + checkMessage(status, message); + + this.objectList = objectList; + this.localDateTime = timestamp; + + } + + private void checkMessage(HttpStatus status, String message) { + if ("".equals(message)){ this.message = status.name(); + }else { this.message = message; } + } +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java new file mode 100644 index 0000000..a250862 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java @@ -0,0 +1,24 @@ +package com.itn.mjonApi.mjon.api.inqry.service.mapper.domain; + +import java.io.Serializable; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class PriceVO implements Serializable{ + + private static final long serialVersionUID = -7865729705175845268L; + + private String mberId; // 사용자 ID + +// private double shortPrice; // 단문 이용단가 +// private double longPrice; // 장문 이용단가 +// private double picturePrice; // 그림 이용단가 + +// private double userMoney; // 잔액 + +// private int sendPsbltEa; //발송 가능건 수 + +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java index 31c0410..e52bac1 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import com.itn.mjonApi.cmn.msg.PlainResponse; +import com.itn.mjonApi.mjon.api.inqry.service.mapper.domain.PriceVO; import lombok.extern.slf4j.Slf4j; @@ -27,16 +28,22 @@ import lombok.extern.slf4j.Slf4j; public class PriceRestController { /** - * @methodName : selectSpamTxtChkAjax + * @methodName : selectPrice * @author : JunHo Lee - * @date : 2023.05.15 - * @param mjonMsgVO + * @date : 2023.05.16 * @return */ - @PostMapping("/api/selectPrice") - public ResponseEntity selectPrice(){ + @PostMapping("/api/inqry/selectPrice") + public ResponseEntity selectPrice(PriceVO priceVO){ + + + System.out.println(priceVO.getMberId()); + //1. 잔액 + + //2. 이용단가 + + //3. 발송가능건수 - return ResponseEntity.ok(new PlainResponse(HttpStatus.OK, "test" , LocalDateTime.now(), "")); } diff --git a/src/main/resources/mapper/api/inqry/PriceMapper.xml b/src/main/resources/mapper/api/inqry/PriceMapper.xml new file mode 100644 index 0000000..b70a728 --- /dev/null +++ b/src/main/resources/mapper/api/inqry/PriceMapper.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file