From b3c21f0345425da1da0a6a6361867cfb619583e9 Mon Sep 17 00:00:00 2001 From: jangdongsin Date: Tue, 10 Dec 2024 23:19:40 +0900 Subject: [PATCH] =?UTF-8?q?MMS,=20=EC=95=8C=EB=A6=BC=ED=86=A1,=20=EC=B9=9C?= =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=ED=8C=8C=EC=9D=BC=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/CollectClientService.java | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/munjaon/client/server/service/CollectClientService.java b/src/main/java/com/munjaon/client/server/service/CollectClientService.java index 25a5ac1..a1a30db 100644 --- a/src/main/java/com/munjaon/client/server/service/CollectClientService.java +++ b/src/main/java/com/munjaon/client/server/service/CollectClientService.java @@ -416,35 +416,42 @@ public class CollectClientService extends Service { saveLog("[MESSAGE SEND] [... ...]"); saveLog("[MESSAGE DATA : " + data.toString() + "]"); - socketChannel.write(sendBuffer); + while (sendBuffer.hasRemaining()) { + socketChannel.write(sendBuffer); + } if (file01HeadBuffer != null) { socketChannel.write(file01HeadBuffer); - - ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01()); - fileBodyBuffer.flip(); - while(fileBodyBuffer.hasRemaining()){ - int bytesWritten = socketChannel.write(fileBodyBuffer); - saveLog("bytesWritten : " + bytesWritten); - } + uploadFileSend(path + data.getFilename01()); +// +// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01()); +// fileBodyBuffer.flip(); +// while(fileBodyBuffer.hasRemaining()){ +// int bytesWritten = socketChannel.write(fileBodyBuffer); +// saveLog("bytesWritten : " + bytesWritten); +// } } if (file02HeadBuffer != null) { socketChannel.write(file02HeadBuffer); - ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02()); - fileBodyBuffer.flip(); - while(fileBodyBuffer.hasRemaining()){ - int bytesWritten = socketChannel.write(fileBodyBuffer); - saveLog("bytesWritten : " + bytesWritten); - } + uploadFileSend(path + data.getFilename02()); + +// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02()); +// fileBodyBuffer.flip(); +// while(fileBodyBuffer.hasRemaining()){ +// int bytesWritten = socketChannel.write(fileBodyBuffer); +// saveLog("bytesWritten : " + bytesWritten); +// } } if (file03HeadBuffer != null) { socketChannel.write(file03HeadBuffer); - ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03()); - fileBodyBuffer.flip(); - while(fileBodyBuffer.hasRemaining()){ - int bytesWritten = socketChannel.write(fileBodyBuffer); - saveLog("bytesWritten : " + bytesWritten); - } + uploadFileSend(path + data.getFilename03()); + +// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03()); +// fileBodyBuffer.flip(); +// while(fileBodyBuffer.hasRemaining()){ +// int bytesWritten = socketChannel.write(fileBodyBuffer); +// saveLog("bytesWritten : " + bytesWritten); +// } } long MSG_SEND_TIME = System.currentTimeMillis(); @@ -487,7 +494,9 @@ public class CollectClientService extends Service { } buff.flip(); - socketChannel.write(buff); + while (buff.hasRemaining()) { + socketChannel.write(buff); + } buff.clear(); } @@ -671,12 +680,14 @@ public class CollectClientService extends Service { /* 파일 전송 */ ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile()); socketChannel.write(fileHeadBuffer); - ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); - fileBodyBuffer.flip(); - while(fileBodyBuffer.hasRemaining()){ - int bytesWritten = socketChannel.write(fileBodyBuffer); - saveLog("bytesWritten : " + bytesWritten); - } + uploadFileSend(path + data.getKakaoJsonFile()); + +// ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); +// fileBodyBuffer.flip(); +// while(fileBodyBuffer.hasRemaining()){ +// int bytesWritten = socketChannel.write(fileBodyBuffer); +// saveLog("bytesWritten : " + bytesWritten); +// } long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { @@ -829,12 +840,14 @@ public class CollectClientService extends Service { /* 파일 전송 */ ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile()); socketChannel.write(fileHeadBuffer); - ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); - fileBodyBuffer.flip(); - while(fileBodyBuffer.hasRemaining()){ - int bytesWritten = socketChannel.write(fileBodyBuffer); - saveLog("bytesWritten : " + bytesWritten); - } + uploadFileSend(path + data.getKakaoJsonFile()); + +// ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile()); +// fileBodyBuffer.flip(); +// while(fileBodyBuffer.hasRemaining()){ +// int bytesWritten = socketChannel.write(fileBodyBuffer); +// saveLog("bytesWritten : " + bytesWritten); +// } long MSG_SEND_TIME = System.currentTimeMillis(); while (true) {