Commit @054ee00b6de2f4be7b32475a8991c9d0f87431b9

64818ff

054ee00

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 		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());

 		sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId()));
 		sendVO.setAdFlag(kakaoVO.getAdFlag());
 		
+		sendVO.setSendKind(kakaoVO.getSendKind());
+		
 		Float eachPrice = Float.parseFloat(sendVO.getEachPrice());
 
 		Float totPrice = eachPrice * instCnt;

64818ff

054ee00

src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java


 		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()) {

64818ff

054ee00

src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java

--- src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java

+++ src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiImageUpload.java


 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;

 					.addTextBody("senderKey", kakaoVO.getSenderKey())
 					.addBinaryBody("image", new File(filePath), ContentType.MULTIPART_FORM_DATA, newName + "." + ext)
 					.build();
+;
 			
 			httpPost.setEntity(httpEntity);
 			

 				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<String, Object> returnMap = new HashMap<>();

64818ff

054ee00

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

...	...	@@ -970,14 +970,14 @@
970	970
971	971	groupedMsgList.stream().forEach(t-> log.info("t.toString() [{}]", t.toString()));
972	972
973		-
974		- if(1==1) {
975		-
976		- // 강제로 예외 발생
977		- throw new RuntimeException("강제 예외 발생 테스트");
978		- }
979		-
980		-
	973	+//
	974	+// if(1==1) {
	975	+//
	976	+// // 강제로 예외 발생
	977	+// throw new RuntimeException("강제 예외 발생 테스트");
	978	+// }
	979	+//
	980	+//
981	981
982	982
983	983	// 발송 데이터 삽입

64818ff

054ee00

src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java


 	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()); 
 		
 
 		

64818ff

054ee00

src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java

--- src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java


 		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<String, MultipartFile> files = multiRequest.getFileMap();

...	...	@@ -831,7 +831,7 @@
831	831	sendVO.setReqDate(DATE_FORMATTER.format(calendar.getTime()));
832	832
833	833	sendVO.setSenderKey(kakaoVO.getSenderKey());
834		- sendVO.setTemplateCode(kakaoVO.getTemplateCode());
	834	+// sendVO.setTemplateCode(kakaoVO.getTemplateCode());
835	835	sendVO.setUserId(kakaoVO.getUserId());
836	836	sendVO.setCallFrom(kakaoVO.getCallFrom());
837	837	sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn());
...	...	@@ -1885,6 +1885,8 @@
1885	1885	sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId()));
1886	1886	sendVO.setAdFlag(kakaoVO.getAdFlag());
1887	1887
	1888	+ sendVO.setSendKind(kakaoVO.getSendKind());
	1889	+
1888	1890	Float eachPrice = Float.parseFloat(sendVO.getEachPrice());
1889	1891
1890	1892	Float totPrice = eachPrice * instCnt;

...	...	@@ -359,6 +359,7 @@
359	359	sb.append("\n , txtReplYn=[").append(getTxtReplYn()).append("]");
360	360	sb.append("\n , atSmishingYn=[").append(getAtSmishingYn()).append("]");
361	361	sb.append("\n , atDelayYn=[").append(getAtDelayYn()).append("]");
	362	+ sb.append("\n , filePath1=[").append(getFilePath1()).append("]");
362	363	// sb.append("\n , tmpBtnSelect=[").append(getTmpBtnSelect()).append("]");
363	364	StringBuilder btnListSb = new StringBuilder("[");
364	365	if (buttonVOList != null && !buttonVOList.isEmpty()) {

...	...	@@ -19,6 +19,7 @@
19	19	import javax.swing.ImageIcon;
20	20
21	21	import org.apache.commons.io.FilenameUtils;
	22	+import org.apache.commons.io.output.ByteArrayOutputStream;
22	23	import org.apache.commons.lang3.StringUtils;
23	24	import org.apache.http.HttpEntity;
24	25	import org.apache.http.HttpResponse;
...	...	@@ -395,6 +396,7 @@
395	396	.addTextBody("senderKey", kakaoVO.getSenderKey())
396	397	.addBinaryBody("image", new File(filePath), ContentType.MULTIPART_FORM_DATA, newName + "." + ext)
397	398	.build();
	399	+;
398	400
399	401	httpPost.setEntity(httpEntity);
400	402
...	...	@@ -407,7 +409,8 @@
407	409	String result = EntityUtils.toString(response.getEntity(), "UTF-8");
408	410	JSONParser parser = new JSONParser();
409	411	JSONObject object = (JSONObject) parser.parse(result);
410		-
	412	+ log.info("object + :: [{}]", object.toJSONString());
	413	+
411	414	String code = object.get("code").toString();
412	415	if ("200".equals(code)) {
413	416	Map<String, Object> returnMap = new HashMap<>();

...	...	@@ -199,18 +199,22 @@
199	199	modelAndView.setViewName("jsonView");
200	200
201	201	try {
202		- LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
203		- String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
204	202
205		- if(StringUtils.isEmpty(userId)) { //KISA 보안취약점 조치 (2018-12-10, 이정은)
206		- return ResponseEntity.ok(
207		- new StatusResponse(HttpStatus.UNAUTHORIZED
208		- , "로그인을 하셔야 이용 가능합니다."
209		- , LocalDateTime.now()
210		- )
211		- );
	203	+ if(!"A".equals(kakaoVO.getSendKind())) {
	204	+
	205	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
	206	+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
	207	+
	208	+ if(StringUtils.isEmpty(userId)) {
	209	+ return ResponseEntity.ok(
	210	+ new StatusResponse(HttpStatus.UNAUTHORIZED
	211	+ , "로그인을 하셔야 이용 가능합니다."
	212	+ , LocalDateTime.now()
	213	+ )
	214	+ );
	215	+ }
	216	+
212	217	}
213		-
214	218
215	219
216	220	final Map<String, MultipartFile> files = multiRequest.getFileMap();

...	...	@@ -75,9 +75,9 @@
75	75	public StatusResponse insertKakaoFtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception {
76	76	StatusResponse statusResponse = new StatusResponse();
77	77
78		-// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString());
	78	+ log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString());
79	79
80		-// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString());
	80	+ log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString());
81	81
82	82
83	83

Delete comment