Commit @30d14f147f11d75588e6aa136cdecfaedd18359b

장동신 2024-12-12

패킷 전송 로직 일부 수정

@30d14f147f11d75588e6aa136cdecfaedd18359b

b3c21f0

30d14f1

src/main/java/com/munjaon/client/server/service/CollectClientService.java

--- src/main/java/com/munjaon/client/server/service/CollectClientService.java

+++ src/main/java/com/munjaon/client/server/service/CollectClientService.java


             SmsMessage.makeDataForDeliver(sendBuffer, data);
             saveLog("[MESSAGE SEND] [... ...]");
             saveLog("[MESSAGE DATA : " + data.toString() + "]");
-            socketChannel.write(sendBuffer);
+
+            while (sendBuffer.hasRemaining()) {
+                socketChannel.write(sendBuffer);
+            }
+
             long MSG_SEND_TIME = System.currentTimeMillis();
             while (true) {
                 if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {

             LmsMessage.makeDataForDeliver(sendBuffer, data);
             saveLog("[MESSAGE SEND] [... ...]");
             saveLog("[MESSAGE DATA : " + data.toString() + "]");
-            socketChannel.write(sendBuffer);
+
+            while (sendBuffer.hasRemaining()) {
+                socketChannel.write(sendBuffer);
+            }
+
             long MSG_SEND_TIME = System.currentTimeMillis();
             while (true) {
                 if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {

         }
     }
 
-    private void mmsMessageService_bak(MunjaonMsg data) throws Exception {
-        try {
-            /* 이미지 경로 디폴트 경로 사용 여부 */
-            String defaultYn = getProp("MMS", "DEFAULT_PATH_YN");
-            /* MMS Image 저장 경로 */
-            String path = null;
-            if ("Y".equals(defaultYn)) {
-                path = System.getProperty("ROOTPATH") + File.separator + "mmsfile" + File.separator;
-            } else {
-                path = getProp("MMS", "FILEPATH") + File.separator;
-            }
-
-            /* 공통 메시지 유효성 체크 */
-            int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
-            int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data);
-            int checkImageCode = MessageCheckUtil.validateMessageForImage(data, path);
-            if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkImageCode != ErrorCode.OK.getCode()) {
-                saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [IMAGE_CODE : " + checkImageCode + "]");
-                saveLog("[MESSAGE DATA : " + data.toString() + "]");
-                /* 전송처리 */
-                worker.updateToDeliver(data.getMsgId());
-                /* 실패처리 */
-                MunjaonMsg errorMsg = null;
-                if (checkCommonCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
-                }else if (checkMsgCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
-                } else {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkImageCode), MessageUtil.getTime(), "ETC");
-                }
-                worker.updateToReport(errorMsg);
-                /* 처리완료 */
-                return;
-            }
-
-            /* 정상인 경우 메시지 전송 */
-            ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH);
-            ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_ACK_BODY_LENGTH);
-            int fileCount = 0;
-            /* File check */
-            ByteBuffer file01Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename01());
-            if (file01Buffer != null) {
-                saveLog("file01Buffer : " + file01Buffer.capacity());
-                fileCount++;
-            }
-            ByteBuffer file02Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename02());
-            if (file02Buffer != null) {
-                saveLog("file02Buffer : " + file02Buffer.capacity());
-                fileCount++;
-            }
-            ByteBuffer file03Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename03());
-            if (file03Buffer != null) {
-                saveLog("file03Buffer : " + file03Buffer.capacity());
-                fileCount++;
-            }
-            /* fileCount 저장 */
-            data.setFileCount(fileCount);
-
-            Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, MmsMessage.DELIVER_MMS_BODY_LENGTH);
-            MmsMessage.makeDataForDeliver(sendBuffer, data);
-            saveLog("[MESSAGE SEND] [... ...]");
-            saveLog("[MESSAGE DATA : " + data.toString() + "]");
-
-            ByteBuffer[] byteBuffers = new ByteBuffer[fileCount + 1];
-            int index = 0;
-            int mmsBufferLength = sendBuffer.capacity();
-            byteBuffers[index] = sendBuffer;
-            socketChannel.write(sendBuffer);
-            index++;
-            if (file01Buffer != null) {
-                System.out.println("file01Buffer Last = " + file01Buffer.get(file01Buffer.capacity() - 1));
-                mmsBufferLength += file01Buffer.capacity();
-                byteBuffers[index] = file01Buffer;
-                socketChannel.write(file01Buffer);
-                index++;
-            }
-            if (file02Buffer != null) {
-                System.out.println("file02Buffer Last = " + file02Buffer.get(file02Buffer.capacity() - 1));
-                mmsBufferLength += file02Buffer.capacity();
-                byteBuffers[index] = file02Buffer;
-                socketChannel.write(file02Buffer);
-                index++;
-            }
-            if (file03Buffer != null) {
-                System.out.println("file03Buffer Last = " + file03Buffer.get(file03Buffer.capacity() - 1));
-                mmsBufferLength += file03Buffer.capacity();
-                byteBuffers[index] = file03Buffer;
-                socketChannel.write(file03Buffer);
-            }
-
-            saveSystemLog("mmsBufferLength : " + mmsBufferLength);
-            saveSystemLog("byteBuffers : " + byteBuffers.length);
-            ByteBuffer mmsSendBuffer = ByteBuffer.allocate(mmsBufferLength);
-            Packet.mergeBuffers(mmsSendBuffer, byteBuffers);
-
-            System.out.println("mmsSendBuffer Last = " + mmsSendBuffer.get(mmsSendBuffer.capacity() - 1));
-
-//            socketChannel.write(mmsSendBuffer);
-//            socketChannel.write(byteBuffers);
-            long MSG_SEND_TIME = System.currentTimeMillis();
-            while (true) {
-                if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
-                    saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
-                    throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
-                }
-                int recvCount = socketChannel.read(recvBuffer);
-                if (recvCount == -1) {
-                    saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
-                    throw new Exception("DELIVER ERROR");
-                } else if (recvCount > 0) {
-                    setDeliverMsgId(data.getMsgId());
-//                    worker.updateToDeliver(data.getMsgId());
-                    saveLog("[MESSAGE SEND] [SUCCESS]");
-                    lastPacketSendTime = System.currentTimeMillis();
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            saveSystemLog("ERROR [" + e.getMessage() + "]");
-            saveSystemLog("ERROR DETAIL");
-            saveSystemLog(e.toString());
-            throw new Exception(e);
-        }
-    }
-
     private void katMessageService(MunjaonMsg data) throws Exception {
         try {
             /* 이미지 경로 디폴트 경로 사용 여부 */

             saveLog("[MESSAGE SEND] [... ...]");
             saveLog("[MESSAGE DATA : " + data.toString() + "]");
 
-            socketChannel.write(sendBuffer);
+            while (sendBuffer.hasRemaining()) {
+                socketChannel.write(sendBuffer);
+            }
 
             /* 파일 전송 */
             ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());

 //                saveLog("bytesWritten : " + bytesWritten);
 //            }
 
-            long MSG_SEND_TIME = System.currentTimeMillis();
-            while (true) {
-                if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
-                    saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
-                    throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
-                }
-                int recvCount = socketChannel.read(recvBuffer);
-                if (recvCount == -1) {
-                    saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
-                    throw new Exception("DELIVER ERROR");
-                } else if (recvCount > 0) {
-                    setDeliverMsgId(data.getMsgId());
-//                    worker.updateToDeliver(data.getMsgId());
-                    saveLog("[MESSAGE SEND] [SUCCESS]");
-                    lastPacketSendTime = System.currentTimeMillis();
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            saveSystemLog("ERROR [" + e.getMessage() + "]");
-            saveSystemLog("ERROR DETAIL");
-            saveSystemLog(e.toString());
-            throw new Exception(e);
-        }
-    }
-
-    private void katMessageService_bak(MunjaonMsg data) throws Exception {
-        try {
-            /* 이미지 경로 디폴트 경로 사용 여부 */
-            String defaultYn = getProp("KAKAO", "DEFAULT_PATH_YN");
-            /* Kakao Json 저장 경로 */
-            String path = null;
-            if ("Y".equals(defaultYn)) {
-                path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
-            } else {
-                path = getProp("KAKAO", "FILEPATH") + File.separator;
-            }
-            /* 공통 메시지 유효성 체크 */
-            int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
-            int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data);
-            int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile());
-
-            if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) {
-                saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
-                saveLog("[MESSAGE DATA : " + data.toString() + "]");
-                /* 전송처리 */
-                worker.updateToDeliver(data.getMsgId());
-                /* 실패처리 */
-                MunjaonMsg errorMsg = null;
-                if (checkCommonCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
-                }else if (checkMsgCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
-                } else {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC");
-                }
-                worker.updateToReport(errorMsg);
-                /* 처리완료 */
-                return;
-            }
-
-            /* 정상인 경우 메시지 전송 */
-            ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
-            ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH);
-            /* File check */
-            ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile());
-
-            Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
-            KakaoMessage.makeDataForDeliver(sendBuffer, data);
-            saveLog("[MESSAGE SEND] [... ...]");
-            saveLog("[MESSAGE DATA : " + data.toString() + "]");
-
-            ByteBuffer[] byteBuffers = new ByteBuffer[2];
-            byteBuffers[0] = sendBuffer;
-            byteBuffers[1] = fileBuffer;
-
-            socketChannel.write(byteBuffers);
             long MSG_SEND_TIME = System.currentTimeMillis();
             while (true) {
                 if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {

             saveLog("[MESSAGE SEND] [... ...]");
             saveLog("[MESSAGE DATA : " + data.toString() + "]");
 
-            socketChannel.write(sendBuffer);
+            while (sendBuffer.hasRemaining()) {
+                socketChannel.write(sendBuffer);
+            }
 
             /* 파일 전송 */
             ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());

 //                saveLog("bytesWritten : " + bytesWritten);
 //            }
 
-            long MSG_SEND_TIME = System.currentTimeMillis();
-            while (true) {
-                if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
-                    saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
-                    throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
-                }
-                int recvCount = socketChannel.read(recvBuffer);
-                if (recvCount == -1) {
-                    saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
-                    throw new Exception("DELIVER ERROR");
-                } else if (recvCount > 0) {
-                    setDeliverMsgId(data.getMsgId());
-//                    worker.updateToDeliver(data.getMsgId());
-                    saveLog("[MESSAGE SEND] [SUCCESS]");
-                    lastPacketSendTime = System.currentTimeMillis();
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            saveSystemLog("ERROR [" + e.getMessage() + "]");
-            saveSystemLog("ERROR DETAIL");
-            saveSystemLog(e.toString());
-            throw new Exception(e);
-        }
-    }
-
-    private void kftMessageService_bak(MunjaonMsg data) throws Exception {
-        try {
-            /* 이미지 경로 디폴트 경로 사용 여부 */
-            String defaultYn = getProp("KAKAO", "DEFAULT_PATH_YN");
-            /* Kakao Json 저장 경로 */
-            String path = null;
-            if ("Y".equals(defaultYn)) {
-                path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
-            } else {
-                path = getProp("KAKAO", "FILEPATH") + File.separator;
-            }
-            /* 공통 메시지 유효성 체크 */
-            int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
-            int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data);
-            int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile());
-            if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) {
-                saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
-                saveLog("[MESSAGE DATA : " + data.toString() + "]");
-                /* 전송처리 */
-                worker.updateToDeliver(data.getMsgId());
-                /* 실패처리 */
-                MunjaonMsg errorMsg = null;
-                if (checkCommonCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
-                }else if (checkMsgCode != ErrorCode.OK.getCode()) {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
-                } else {
-                    errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC");
-                }
-                worker.updateToReport(errorMsg);
-                /* 처리완료 */
-                return;
-            }
-
-            /* 정상인 경우 메시지 전송 */
-            ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
-            ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH);
-            /* File check */
-            ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile());
-
-            Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
-            KakaoMessage.makeDataForDeliver(sendBuffer, data);
-            saveLog("[MESSAGE SEND] [... ...]");
-            saveLog("[MESSAGE DATA : " + data.toString() + "]");
-
-            ByteBuffer[] byteBuffers = new ByteBuffer[2];
-            byteBuffers[0] = sendBuffer;
-            byteBuffers[1] = fileBuffer;
-
-            socketChannel.write(byteBuffers);
             long MSG_SEND_TIME = System.currentTimeMillis();
             while (true) {
                 if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {

Add a comment

Open 0
Closed 0

List

...	...	@@ -272,7 +272,11 @@
272	272	SmsMessage.makeDataForDeliver(sendBuffer, data);
273	273	saveLog("[MESSAGE SEND] [... ...]");
274	274	saveLog("[MESSAGE DATA : " + data.toString() + "]");
275		- socketChannel.write(sendBuffer);
	275	+
	276	+ while (sendBuffer.hasRemaining()) {
	277	+ socketChannel.write(sendBuffer);
	278	+ }
	279	+
276	280	long MSG_SEND_TIME = System.currentTimeMillis();
277	281	while (true) {
278	282	if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
...	...	@@ -328,7 +332,11 @@
328	332	LmsMessage.makeDataForDeliver(sendBuffer, data);
329	333	saveLog("[MESSAGE SEND] [... ...]");
330	334	saveLog("[MESSAGE DATA : " + data.toString() + "]");
331		- socketChannel.write(sendBuffer);
	335	+
	336	+ while (sendBuffer.hasRemaining()) {
	337	+ socketChannel.write(sendBuffer);
	338	+ }
	339	+
332	340	long MSG_SEND_TIME = System.currentTimeMillis();
333	341	while (true) {
334	342	if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
...	...	@@ -505,132 +513,6 @@
505	513	}
506	514	}
507	515
508		- private void mmsMessageService_bak(MunjaonMsg data) throws Exception {
509		- try {
510		- /* 이미지 경로 디폴트 경로 사용 여부 */
511		- String defaultYn = getProp("MMS", "DEFAULT_PATH_YN");
512		- /* MMS Image 저장 경로 */
513		- String path = null;
514		- if ("Y".equals(defaultYn)) {
515		- path = System.getProperty("ROOTPATH") + File.separator + "mmsfile" + File.separator;
516		- } else {
517		- path = getProp("MMS", "FILEPATH") + File.separator;
518		- }
519		-
520		- /* 공통 메시지 유효성 체크 */
521		- int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
522		- int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data);
523		- int checkImageCode = MessageCheckUtil.validateMessageForImage(data, path);
524		- if (checkCommonCode != ErrorCode.OK.getCode() \|\| checkMsgCode != ErrorCode.OK.getCode() \|\| checkImageCode != ErrorCode.OK.getCode()) {
525		- saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [IMAGE_CODE : " + checkImageCode + "]");
526		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
527		- /* 전송처리 */
528		- worker.updateToDeliver(data.getMsgId());
529		- /* 실패처리 */
530		- MunjaonMsg errorMsg = null;
531		- if (checkCommonCode != ErrorCode.OK.getCode()) {
532		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
533		- }else if (checkMsgCode != ErrorCode.OK.getCode()) {
534		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
535		- } else {
536		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkImageCode), MessageUtil.getTime(), "ETC");
537		- }
538		- worker.updateToReport(errorMsg);
539		- /* 처리완료 */
540		- return;
541		- }
542		-
543		- /* 정상인 경우 메시지 전송 */
544		- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH);
545		- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_ACK_BODY_LENGTH);
546		- int fileCount = 0;
547		- /* File check */
548		- ByteBuffer file01Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename01());
549		- if (file01Buffer != null) {
550		- saveLog("file01Buffer : " + file01Buffer.capacity());
551		- fileCount++;
552		- }
553		- ByteBuffer file02Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename02());
554		- if (file02Buffer != null) {
555		- saveLog("file02Buffer : " + file02Buffer.capacity());
556		- fileCount++;
557		- }
558		- ByteBuffer file03Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename03());
559		- if (file03Buffer != null) {
560		- saveLog("file03Buffer : " + file03Buffer.capacity());
561		- fileCount++;
562		- }
563		- /* fileCount 저장 */
564		- data.setFileCount(fileCount);
565		-
566		- Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, MmsMessage.DELIVER_MMS_BODY_LENGTH);
567		- MmsMessage.makeDataForDeliver(sendBuffer, data);
568		- saveLog("[MESSAGE SEND] [... ...]");
569		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
570		-
571		- ByteBuffer[] byteBuffers = new ByteBuffer[fileCount + 1];
572		- int index = 0;
573		- int mmsBufferLength = sendBuffer.capacity();
574		- byteBuffers[index] = sendBuffer;
575		- socketChannel.write(sendBuffer);
576		- index++;
577		- if (file01Buffer != null) {
578		- System.out.println("file01Buffer Last = " + file01Buffer.get(file01Buffer.capacity() - 1));
579		- mmsBufferLength += file01Buffer.capacity();
580		- byteBuffers[index] = file01Buffer;
581		- socketChannel.write(file01Buffer);
582		- index++;
583		- }
584		- if (file02Buffer != null) {
585		- System.out.println("file02Buffer Last = " + file02Buffer.get(file02Buffer.capacity() - 1));
586		- mmsBufferLength += file02Buffer.capacity();
587		- byteBuffers[index] = file02Buffer;
588		- socketChannel.write(file02Buffer);
589		- index++;
590		- }
591		- if (file03Buffer != null) {
592		- System.out.println("file03Buffer Last = " + file03Buffer.get(file03Buffer.capacity() - 1));
593		- mmsBufferLength += file03Buffer.capacity();
594		- byteBuffers[index] = file03Buffer;
595		- socketChannel.write(file03Buffer);
596		- }
597		-
598		- saveSystemLog("mmsBufferLength : " + mmsBufferLength);
599		- saveSystemLog("byteBuffers : " + byteBuffers.length);
600		- ByteBuffer mmsSendBuffer = ByteBuffer.allocate(mmsBufferLength);
601		- Packet.mergeBuffers(mmsSendBuffer, byteBuffers);
602		-
603		- System.out.println("mmsSendBuffer Last = " + mmsSendBuffer.get(mmsSendBuffer.capacity() - 1));
604		-
605		-// socketChannel.write(mmsSendBuffer);
606		-// socketChannel.write(byteBuffers);
607		- long MSG_SEND_TIME = System.currentTimeMillis();
608		- while (true) {
609		- if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
610		- saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
611		- throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
612		- }
613		- int recvCount = socketChannel.read(recvBuffer);
614		- if (recvCount == -1) {
615		- saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
616		- throw new Exception("DELIVER ERROR");
617		- } else if (recvCount > 0) {
618		- setDeliverMsgId(data.getMsgId());
619		-// worker.updateToDeliver(data.getMsgId());
620		- saveLog("[MESSAGE SEND] [SUCCESS]");
621		- lastPacketSendTime = System.currentTimeMillis();
622		- break;
623		- }
624		- }
625		- } catch (Exception e) {
626		- e.printStackTrace();
627		- saveSystemLog("ERROR [" + e.getMessage() + "]");
628		- saveSystemLog("ERROR DETAIL");
629		- saveSystemLog(e.toString());
630		- throw new Exception(e);
631		- }
632		- }
633		-
634	516	private void katMessageService(MunjaonMsg data) throws Exception {
635	517	try {
636	518	/* 이미지 경로 디폴트 경로 사용 여부 */
...	...	@@ -675,7 +557,9 @@
675	557	saveLog("[MESSAGE SEND] [... ...]");
676	558	saveLog("[MESSAGE DATA : " + data.toString() + "]");
677	559
678		- socketChannel.write(sendBuffer);
	560	+ while (sendBuffer.hasRemaining()) {
	561	+ socketChannel.write(sendBuffer);
	562	+ }
679	563
680	564	/* 파일 전송 */
681	565	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
...	...	@@ -689,83 +573,6 @@
689	573	// saveLog("bytesWritten : " + bytesWritten);
690	574	// }
691	575
692		- long MSG_SEND_TIME = System.currentTimeMillis();
693		- while (true) {
694		- if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
695		- saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
696		- throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
697		- }
698		- int recvCount = socketChannel.read(recvBuffer);
699		- if (recvCount == -1) {
700		- saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
701		- throw new Exception("DELIVER ERROR");
702		- } else if (recvCount > 0) {
703		- setDeliverMsgId(data.getMsgId());
704		-// worker.updateToDeliver(data.getMsgId());
705		- saveLog("[MESSAGE SEND] [SUCCESS]");
706		- lastPacketSendTime = System.currentTimeMillis();
707		- break;
708		- }
709		- }
710		- } catch (Exception e) {
711		- saveSystemLog("ERROR [" + e.getMessage() + "]");
712		- saveSystemLog("ERROR DETAIL");
713		- saveSystemLog(e.toString());
714		- throw new Exception(e);
715		- }
716		- }
717		-
718		- private void katMessageService_bak(MunjaonMsg data) throws Exception {
719		- try {
720		- /* 이미지 경로 디폴트 경로 사용 여부 */
721		- String defaultYn = getProp("KAKAO", "DEFAULT_PATH_YN");
722		- /* Kakao Json 저장 경로 */
723		- String path = null;
724		- if ("Y".equals(defaultYn)) {
725		- path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
726		- } else {
727		- path = getProp("KAKAO", "FILEPATH") + File.separator;
728		- }
729		- /* 공통 메시지 유효성 체크 */
730		- int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
731		- int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data);
732		- int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile());
733		-
734		- if (checkCommonCode != ErrorCode.OK.getCode() \|\| checkMsgCode != ErrorCode.OK.getCode() \|\| checkFileCode != ErrorCode.OK.getCode()) {
735		- saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
736		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
737		- /* 전송처리 */
738		- worker.updateToDeliver(data.getMsgId());
739		- /* 실패처리 */
740		- MunjaonMsg errorMsg = null;
741		- if (checkCommonCode != ErrorCode.OK.getCode()) {
742		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
743		- }else if (checkMsgCode != ErrorCode.OK.getCode()) {
744		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
745		- } else {
746		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC");
747		- }
748		- worker.updateToReport(errorMsg);
749		- /* 처리완료 */
750		- return;
751		- }
752		-
753		- /* 정상인 경우 메시지 전송 */
754		- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
755		- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH);
756		- /* File check */
757		- ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile());
758		-
759		- Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
760		- KakaoMessage.makeDataForDeliver(sendBuffer, data);
761		- saveLog("[MESSAGE SEND] [... ...]");
762		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
763		-
764		- ByteBuffer[] byteBuffers = new ByteBuffer[2];
765		- byteBuffers[0] = sendBuffer;
766		- byteBuffers[1] = fileBuffer;
767		-
768		- socketChannel.write(byteBuffers);
769	576	long MSG_SEND_TIME = System.currentTimeMillis();
770	577	while (true) {
771	578	if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
...	...	@@ -835,7 +642,9 @@
835	642	saveLog("[MESSAGE SEND] [... ...]");
836	643	saveLog("[MESSAGE DATA : " + data.toString() + "]");
837	644
838		- socketChannel.write(sendBuffer);
	645	+ while (sendBuffer.hasRemaining()) {
	646	+ socketChannel.write(sendBuffer);
	647	+ }
839	648
840	649	/* 파일 전송 */
841	650	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
...	...	@@ -849,82 +658,6 @@
849	658	// saveLog("bytesWritten : " + bytesWritten);
850	659	// }
851	660
852		- long MSG_SEND_TIME = System.currentTimeMillis();
853		- while (true) {
854		- if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {
855		- saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]");
856		- throw new Exception("messageSendTimeOut : Expired ... ... ... ... ... ... ...");
857		- }
858		- int recvCount = socketChannel.read(recvBuffer);
859		- if (recvCount == -1) {
860		- saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
861		- throw new Exception("DELIVER ERROR");
862		- } else if (recvCount > 0) {
863		- setDeliverMsgId(data.getMsgId());
864		-// worker.updateToDeliver(data.getMsgId());
865		- saveLog("[MESSAGE SEND] [SUCCESS]");
866		- lastPacketSendTime = System.currentTimeMillis();
867		- break;
868		- }
869		- }
870		- } catch (Exception e) {
871		- saveSystemLog("ERROR [" + e.getMessage() + "]");
872		- saveSystemLog("ERROR DETAIL");
873		- saveSystemLog(e.toString());
874		- throw new Exception(e);
875		- }
876		- }
877		-
878		- private void kftMessageService_bak(MunjaonMsg data) throws Exception {
879		- try {
880		- /* 이미지 경로 디폴트 경로 사용 여부 */
881		- String defaultYn = getProp("KAKAO", "DEFAULT_PATH_YN");
882		- /* Kakao Json 저장 경로 */
883		- String path = null;
884		- if ("Y".equals(defaultYn)) {
885		- path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
886		- } else {
887		- path = getProp("KAKAO", "FILEPATH") + File.separator;
888		- }
889		- /* 공통 메시지 유효성 체크 */
890		- int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data);
891		- int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data);
892		- int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile());
893		- if (checkCommonCode != ErrorCode.OK.getCode() \|\| checkMsgCode != ErrorCode.OK.getCode() \|\| checkFileCode != ErrorCode.OK.getCode()) {
894		- saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
895		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
896		- /* 전송처리 */
897		- worker.updateToDeliver(data.getMsgId());
898		- /* 실패처리 */
899		- MunjaonMsg errorMsg = null;
900		- if (checkCommonCode != ErrorCode.OK.getCode()) {
901		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");
902		- }else if (checkMsgCode != ErrorCode.OK.getCode()) {
903		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");
904		- } else {
905		- errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC");
906		- }
907		- worker.updateToReport(errorMsg);
908		- /* 처리완료 */
909		- return;
910		- }
911		-
912		- /* 정상인 경우 메시지 전송 */
913		- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
914		- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH);
915		- /* File check */
916		- ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile());
917		-
918		- Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
919		- KakaoMessage.makeDataForDeliver(sendBuffer, data);
920		- saveLog("[MESSAGE SEND] [... ...]");
921		- saveLog("[MESSAGE DATA : " + data.toString() + "]");
922		-
923		- ByteBuffer[] byteBuffers = new ByteBuffer[2];
924		- byteBuffers[0] = sendBuffer;
925		- byteBuffers[1] = fileBuffer;
926		-
927		- socketChannel.write(byteBuffers);
928	661	long MSG_SEND_TIME = System.currentTimeMillis();
929	662	while (true) {
930	663	if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) {

Delete comment