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