diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index 0a59e33a..b84828cc 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -831,7 +831,7 @@ public class KakaoSendUtil { sendVO.setReqDate(DATE_FORMATTER.format(calendar.getTime())); sendVO.setSenderKey(kakaoVO.getSenderKey()); - sendVO.setTemplateCode(kakaoVO.getTemplateCode()); +// sendVO.setTemplateCode(kakaoVO.getTemplateCode()); sendVO.setUserId(kakaoVO.getUserId()); sendVO.setCallFrom(kakaoVO.getCallFrom()); sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn()); @@ -1885,6 +1885,8 @@ public class KakaoSendUtil { sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId())); sendVO.setAdFlag(kakaoVO.getAdFlag()); + sendVO.setSendKind(kakaoVO.getSendKind()); + Float eachPrice = Float.parseFloat(sendVO.getEachPrice()); Float totPrice = eachPrice * instCnt; diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java index f59dc2dd..c8360932 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java @@ -359,6 +359,7 @@ public class KakaoVO extends MjonMsgVO{ sb.append("\n , txtReplYn=[").append(getTxtReplYn()).append("]"); sb.append("\n , atSmishingYn=[").append(getAtSmishingYn()).append("]"); sb.append("\n , atDelayYn=[").append(getAtDelayYn()).append("]"); + sb.append("\n , filePath1=[").append(getFilePath1()).append("]"); // sb.append("\n , tmpBtnSelect=[").append(getTmpBtnSelect()).append("]"); StringBuilder btnListSb = new StringBuilder("["); if (buttonVOList != null && !buttonVOList.isEmpty()) { diff --git a/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java b/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java index 13394aeb..dbbe4a79 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java +++ b/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java @@ -19,6 +19,7 @@ import javax.imageio.ImageIO; import javax.swing.ImageIcon; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -395,6 +396,7 @@ public class KakaoApiImageUpload { .addTextBody("senderKey", kakaoVO.getSenderKey()) .addBinaryBody("image", new File(filePath), ContentType.MULTIPART_FORM_DATA, newName + "." + ext) .build(); +; httpPost.setEntity(httpEntity); @@ -407,7 +409,8 @@ public class KakaoApiImageUpload { String result = EntityUtils.toString(response.getEntity(), "UTF-8"); JSONParser parser = new JSONParser(); JSONObject object = (JSONObject) parser.parse(result); - + log.info("object + :: [{}]", object.toJSONString()); + String code = object.get("code").toString(); if ("200".equals(code)) { Map returnMap = new HashMap<>(); diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java index 8528f22a..2aa79e7f 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java @@ -970,14 +970,14 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements groupedMsgList.stream().forEach(t-> log.info("t.toString() [{}]", t.toString())); - - if(1==1) { - - // 강제로 예외 발생 - throw new RuntimeException("강제 예외 발생 테스트"); - } - - +// +// if(1==1) { +// +// // 강제로 예외 발생 +// throw new RuntimeException("강제 예외 발생 테스트"); +// } +// +// // 발송 데이터 삽입 diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java index 4be8090e..9bf5b1a2 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java @@ -75,9 +75,9 @@ public class KakaoFriendsTalkServiceImpl extends EgovAbstractServiceImpl implem public StatusResponse insertKakaoFtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception { StatusResponse statusResponse = new StatusResponse(); -// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString()); + log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString()); -// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString()); + log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString()); diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java index 8bf45081..fc002a03 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java @@ -199,19 +199,23 @@ public class KakaoFriendsTalkTemplateController { modelAndView.setViewName("jsonView"); try { - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - if(StringUtils.isEmpty(userId)) { //KISA 보안취약점 조치 (2018-12-10, 이정은) - return ResponseEntity.ok( - new StatusResponse(HttpStatus.UNAUTHORIZED - , "로그인을 하셔야 이용 가능합니다." - , LocalDateTime.now() - ) - ); + if(!"A".equals(kakaoVO.getSendKind())) { + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(StringUtils.isEmpty(userId)) { + return ResponseEntity.ok( + new StatusResponse(HttpStatus.UNAUTHORIZED + , "로그인을 하셔야 이용 가능합니다." + , LocalDateTime.now() + ) + ); + } + } - final Map files = multiRequest.getFileMap(); /* if (!files.isEmpty()){