Commit @b3c21f0345425da1da0a6a6361867cfb619583e9

장동신 2024-12-10

MMS, 알림톡, 친구톡 파일전송 로직 수정

@b3c21f0345425da1da0a6a6361867cfb619583e9

6d2985d

b3c21f0

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


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

                 }
 
                 buff.flip();
-                socketChannel.write(buff);
+                while (buff.hasRemaining()) {
+                    socketChannel.write(buff);
+                }
                 buff.clear();
             }
 

             /* 파일 전송 */
             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) {

             /* 파일 전송 */
             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) {

Add a comment

Open 0
Closed 0

List

...	...	@@ -416,35 +416,42 @@
416	416	saveLog("[MESSAGE SEND] [... ...]");
417	417	saveLog("[MESSAGE DATA : " + data.toString() + "]");
418	418
419		- socketChannel.write(sendBuffer);
	419	+ while (sendBuffer.hasRemaining()) {
	420	+ socketChannel.write(sendBuffer);
	421	+ }
420	422
421	423	if (file01HeadBuffer != null) {
422	424	socketChannel.write(file01HeadBuffer);
423		-
424		- ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01());
425		- fileBodyBuffer.flip();
426		- while(fileBodyBuffer.hasRemaining()){
427		- int bytesWritten = socketChannel.write(fileBodyBuffer);
428		- saveLog("bytesWritten : " + bytesWritten);
429		- }
	425	+ uploadFileSend(path + data.getFilename01());
	426	+//
	427	+// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename01());
	428	+// fileBodyBuffer.flip();
	429	+// while(fileBodyBuffer.hasRemaining()){
	430	+// int bytesWritten = socketChannel.write(fileBodyBuffer);
	431	+// saveLog("bytesWritten : " + bytesWritten);
	432	+// }
430	433	}
431	434	if (file02HeadBuffer != null) {
432	435	socketChannel.write(file02HeadBuffer);
433		- ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02());
434		- fileBodyBuffer.flip();
435		- while(fileBodyBuffer.hasRemaining()){
436		- int bytesWritten = socketChannel.write(fileBodyBuffer);
437		- saveLog("bytesWritten : " + bytesWritten);
438		- }
	436	+ uploadFileSend(path + data.getFilename02());
	437	+
	438	+// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename02());
	439	+// fileBodyBuffer.flip();
	440	+// while(fileBodyBuffer.hasRemaining()){
	441	+// int bytesWritten = socketChannel.write(fileBodyBuffer);
	442	+// saveLog("bytesWritten : " + bytesWritten);
	443	+// }
439	444	}
440	445	if (file03HeadBuffer != null) {
441	446	socketChannel.write(file03HeadBuffer);
442		- ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03());
443		- fileBodyBuffer.flip();
444		- while(fileBodyBuffer.hasRemaining()){
445		- int bytesWritten = socketChannel.write(fileBodyBuffer);
446		- saveLog("bytesWritten : " + bytesWritten);
447		- }
	447	+ uploadFileSend(path + data.getFilename03());
	448	+
	449	+// ByteBuffer fileBodyBuffer = MmsMessage.makeImageBodyForDeliver(path, data.getFilename03());
	450	+// fileBodyBuffer.flip();
	451	+// while(fileBodyBuffer.hasRemaining()){
	452	+// int bytesWritten = socketChannel.write(fileBodyBuffer);
	453	+// saveLog("bytesWritten : " + bytesWritten);
	454	+// }
448	455	}
449	456
450	457	long MSG_SEND_TIME = System.currentTimeMillis();
...	...	@@ -487,7 +494,9 @@
487	494	}
488	495
489	496	buff.flip();
490		- socketChannel.write(buff);
	497	+ while (buff.hasRemaining()) {
	498	+ socketChannel.write(buff);
	499	+ }
491	500	buff.clear();
492	501	}
493	502
...	...	@@ -671,12 +680,14 @@
671	680	/* 파일 전송 */
672	681	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
673	682	socketChannel.write(fileHeadBuffer);
674		- ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
675		- fileBodyBuffer.flip();
676		- while(fileBodyBuffer.hasRemaining()){
677		- int bytesWritten = socketChannel.write(fileBodyBuffer);
678		- saveLog("bytesWritten : " + bytesWritten);
679		- }
	683	+ uploadFileSend(path + data.getKakaoJsonFile());
	684	+
	685	+// ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
	686	+// fileBodyBuffer.flip();
	687	+// while(fileBodyBuffer.hasRemaining()){
	688	+// int bytesWritten = socketChannel.write(fileBodyBuffer);
	689	+// saveLog("bytesWritten : " + bytesWritten);
	690	+// }
680	691
681	692	long MSG_SEND_TIME = System.currentTimeMillis();
682	693	while (true) {
...	...	@@ -829,12 +840,14 @@
829	840	/* 파일 전송 */
830	841	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
831	842	socketChannel.write(fileHeadBuffer);
832		- ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
833		- fileBodyBuffer.flip();
834		- while(fileBodyBuffer.hasRemaining()){
835		- int bytesWritten = socketChannel.write(fileBodyBuffer);
836		- saveLog("bytesWritten : " + bytesWritten);
837		- }
	843	+ uploadFileSend(path + data.getKakaoJsonFile());
	844	+
	845	+// ByteBuffer fileBodyBuffer = KakaoMessage.makeJsonBodyForDeliver(path, data.getKakaoJsonFile());
	846	+// fileBodyBuffer.flip();
	847	+// while(fileBodyBuffer.hasRemaining()){
	848	+// int bytesWritten = socketChannel.write(fileBodyBuffer);
	849	+// saveLog("bytesWritten : " + bytesWritten);
	850	+// }
838	851
839	852	long MSG_SEND_TIME = System.currentTimeMillis();
840	853	while (true) {

Delete comment