Commit @6641feb60c7332bb758f838c79d04f2530008632

장동신 2024-12-10

MMS, 카카오 알림톡, 친구톡 파일처리 로직 수정

@6641feb60c7332bb758f838c79d04f2530008632

a1f4496

6641feb

src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java

--- src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java

+++ src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java


 import java.nio.ByteBuffer;
 
 public final class KakaoMessage {
+    /* 카카오 파일 수신 분배 바이트 수 */
+    public static final int KAKAO_FILE_UNIT_BYTES = 1024;
+
     public static final int LIMIT_FILE_CAPACITY = 1024 * 50;
 
     public static final int DELIVER_JSON_FILENAME_LENGTH = 40;

a1f4496

6641feb

src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java

--- src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java

+++ src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java


 import java.nio.ByteBuffer;
 
 public final class MmsMessage {
+    /* MMS 파일 수신 분배 바이트 수 */
+    public static final int MMS_IMAGE_UNIT_BYTES = 1024;
+
     public static final int DELIVER_MMS_BODY_LENGTH = 2130;
     public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21;
 

a1f4496

6641feb

src/main/java/com/munjaon/server/server/task/CollectServerTask.java

--- src/main/java/com/munjaon/server/server/task/CollectServerTask.java

+++ src/main/java/com/munjaon/server/server/task/CollectServerTask.java


                 ByteBuffer fileBuffer = ByteBuffer.allocate(fileSize);
                 long IMAGE_RECV_TIME = System.currentTimeMillis();    // 이미지 패킷 처리 시작시간
                 while (true) {
-                    int bufferSize = 1024;
-                    if ((fileSize - recvFileSize) < 1024) {
+                    int bufferSize = MmsMessage.MMS_IMAGE_UNIT_BYTES;
+                    if ((fileSize - recvFileSize) < MmsMessage.MMS_IMAGE_UNIT_BYTES) {
                         bufferSize = fileSize - recvFileSize;
                     }
 

                     if (unitRecvCnt > 0) {
                         Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
                         recvFileSize += unitRecvCnt;
-                        saveLog("unitRecvCnt : " + unitRecvCnt);
-                        saveLog("recvFileSize : " + recvFileSize);
+//                        saveLog("unitRecvCnt : " + unitRecvCnt);
+//                        saveLog("recvFileSize : " + recvFileSize);
                     }
 
                     if (recvFileSize == fileSize) {

             int recvFileSize = 0;
             long IMAGE_RECV_TIME = System.currentTimeMillis();    // 파일 패킷 처리 시작시간
             while (true) {
-                int bufferSize = 1024;
-                if ((fileSize - recvFileSize) < 1024) {
+                int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
+                if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
                     bufferSize = fileSize - recvFileSize;
                 }
 

                 if (unitRecvCnt > 0) {
                     Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
                     recvFileSize += unitRecvCnt;
-                    saveLog("unitRecvCnt : " + unitRecvCnt);
-                    saveLog("recvFileSize : " + recvFileSize);
+//                    saveLog("unitRecvCnt : " + unitRecvCnt);
+//                    saveLog("recvFileSize : " + recvFileSize);
                 }
 
                 if (recvFileSize == fileSize) {

             int recvFileSize = 0;
             long IMAGE_RECV_TIME = System.currentTimeMillis();    // 파일 패킷 처리 시작시간
             while (true) {
-                int bufferSize = 1024;
-                if ((fileSize - recvFileSize) < 1024) {
+                int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
+                if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
                     bufferSize = fileSize - recvFileSize;
                 }
 

                 if (unitRecvCnt > 0) {
                     Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
                     recvFileSize += unitRecvCnt;
-                    saveLog("unitRecvCnt : " + unitRecvCnt);
-                    saveLog("recvFileSize : " + recvFileSize);
+//                    saveLog("unitRecvCnt : " + unitRecvCnt);
+//                    saveLog("recvFileSize : " + recvFileSize);
                 }
 
                 if (recvFileSize == fileSize) {

Add a comment

Open 0
Closed 0

List

...	...	@@ -371,8 +371,8 @@
371	371	ByteBuffer fileBuffer = ByteBuffer.allocate(fileSize);
372	372	long IMAGE_RECV_TIME = System.currentTimeMillis(); // 이미지 패킷 처리 시작시간
373	373	while (true) {
374		- int bufferSize = 1024;
375		- if ((fileSize - recvFileSize) < 1024) {
	374	+ int bufferSize = MmsMessage.MMS_IMAGE_UNIT_BYTES;
	375	+ if ((fileSize - recvFileSize) < MmsMessage.MMS_IMAGE_UNIT_BYTES) {
376	376	bufferSize = fileSize - recvFileSize;
377	377	}
378	378
...	...	@@ -381,8 +381,8 @@
381	381	if (unitRecvCnt > 0) {
382	382	Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
383	383	recvFileSize += unitRecvCnt;
384		- saveLog("unitRecvCnt : " + unitRecvCnt);
385		- saveLog("recvFileSize : " + recvFileSize);
	384	+// saveLog("unitRecvCnt : " + unitRecvCnt);
	385	+// saveLog("recvFileSize : " + recvFileSize);
386	386	}
387	387
388	388	if (recvFileSize == fileSize) {
...	...	@@ -472,8 +472,8 @@
472	472	int recvFileSize = 0;
473	473	long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간
474	474	while (true) {
475		- int bufferSize = 1024;
476		- if ((fileSize - recvFileSize) < 1024) {
	475	+ int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
	476	+ if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
477	477	bufferSize = fileSize - recvFileSize;
478	478	}
479	479
...	...	@@ -482,8 +482,8 @@
482	482	if (unitRecvCnt > 0) {
483	483	Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
484	484	recvFileSize += unitRecvCnt;
485		- saveLog("unitRecvCnt : " + unitRecvCnt);
486		- saveLog("recvFileSize : " + recvFileSize);
	485	+// saveLog("unitRecvCnt : " + unitRecvCnt);
	486	+// saveLog("recvFileSize : " + recvFileSize);
487	487	}
488	488
489	489	if (recvFileSize == fileSize) {
...	...	@@ -609,8 +609,8 @@
609	609	int recvFileSize = 0;
610	610	long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간
611	611	while (true) {
612		- int bufferSize = 1024;
613		- if ((fileSize - recvFileSize) < 1024) {
	612	+ int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
	613	+ if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
614	614	bufferSize = fileSize - recvFileSize;
615	615	}
616	616
...	...	@@ -619,8 +619,8 @@
619	619	if (unitRecvCnt > 0) {
620	620	Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
621	621	recvFileSize += unitRecvCnt;
622		- saveLog("unitRecvCnt : " + unitRecvCnt);
623		- saveLog("recvFileSize : " + recvFileSize);
	622	+// saveLog("unitRecvCnt : " + unitRecvCnt);
	623	+// saveLog("recvFileSize : " + recvFileSize);
624	624	}
625	625
626	626	if (recvFileSize == fileSize) {

...	...	@@ -6,6 +6,9 @@
6	6	import java.nio.ByteBuffer;
7	7
8	8	public final class KakaoMessage {
	9	+ /* 카카오 파일 수신 분배 바이트 수 */
	10	+ public static final int KAKAO_FILE_UNIT_BYTES = 1024;
	11	+
9	12	public static final int LIMIT_FILE_CAPACITY = 1024 * 50;
10	13
11	14	public static final int DELIVER_JSON_FILENAME_LENGTH = 40;

...	...	@@ -6,6 +6,9 @@
6	6	import java.nio.ByteBuffer;
7	7
8	8	public final class MmsMessage {
	9	+ /* MMS 파일 수신 분배 바이트 수 */
	10	+ public static final int MMS_IMAGE_UNIT_BYTES = 1024;
	11	+
9	12	public static final int DELIVER_MMS_BODY_LENGTH = 2130;
10	13	public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21;
11	14

Delete comment