tolag3/mjon_agent_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jangdongsin 2024-12-10 23:20:18 +09:00
parent a1f4496a83
commit 6641feb60c
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java
View File

@ -6,6 +6,9 @@ import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public final class KakaoMessage { 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 LIMIT_FILE_CAPACITY = 1024 * 50;
public static final int DELIVER_JSON_FILENAME_LENGTH = 40; public static final int DELIVER_JSON_FILENAME_LENGTH = 40;

3
src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java
View File

@ -6,6 +6,9 @@ import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public final class MmsMessage { 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_BODY_LENGTH = 2130;
public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21; public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21;

24
src/main/java/com/munjaon/server/server/task/CollectServerTask.java
View File

@ -371,8 +371,8 @@ public class CollectServerTask extends Thread {
ByteBuffer fileBuffer = ByteBuffer.allocate(fileSize); ByteBuffer fileBuffer = ByteBuffer.allocate(fileSize);
long IMAGE_RECV_TIME = System.currentTimeMillis(); // 이미지 패킷 처리 시작시간 long IMAGE_RECV_TIME = System.currentTimeMillis(); // 이미지 패킷 처리 시작시간
while (true) { while (true) {
int bufferSize = 1024; int bufferSize = MmsMessage.MMS_IMAGE_UNIT_BYTES;
if ((fileSize - recvFileSize) < 1024) { if ((fileSize - recvFileSize) < MmsMessage.MMS_IMAGE_UNIT_BYTES) {
bufferSize = fileSize - recvFileSize; bufferSize = fileSize - recvFileSize;
} }
@ -381,8 +381,8 @@ public class CollectServerTask extends Thread {
if (unitRecvCnt > 0) { if (unitRecvCnt > 0) {
Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
recvFileSize += unitRecvCnt; recvFileSize += unitRecvCnt;
saveLog("unitRecvCnt : " + unitRecvCnt); // saveLog("unitRecvCnt : " + unitRecvCnt);
saveLog("recvFileSize : " + recvFileSize); // saveLog("recvFileSize : " + recvFileSize);
} }
if (recvFileSize == fileSize) { if (recvFileSize == fileSize) {
@ -472,8 +472,8 @@ public class CollectServerTask extends Thread {
int recvFileSize = 0; int recvFileSize = 0;
long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간 long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간
while (true) { while (true) {
int bufferSize = 1024; int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
if ((fileSize - recvFileSize) < 1024) { if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
bufferSize = fileSize - recvFileSize; bufferSize = fileSize - recvFileSize;
} }
@ -482,8 +482,8 @@ public class CollectServerTask extends Thread {
if (unitRecvCnt > 0) { if (unitRecvCnt > 0) {
Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
recvFileSize += unitRecvCnt; recvFileSize += unitRecvCnt;
saveLog("unitRecvCnt : " + unitRecvCnt); // saveLog("unitRecvCnt : " + unitRecvCnt);
saveLog("recvFileSize : " + recvFileSize); // saveLog("recvFileSize : " + recvFileSize);
} }
if (recvFileSize == fileSize) { if (recvFileSize == fileSize) {
@ -609,8 +609,8 @@ public class CollectServerTask extends Thread {
int recvFileSize = 0; int recvFileSize = 0;
long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간 long IMAGE_RECV_TIME = System.currentTimeMillis(); // 파일 패킷 처리 시작시간
while (true) { while (true) {
int bufferSize = 1024; int bufferSize = KakaoMessage.KAKAO_FILE_UNIT_BYTES;
if ((fileSize - recvFileSize) < 1024) { if ((fileSize - recvFileSize) < KakaoMessage.KAKAO_FILE_UNIT_BYTES) {
bufferSize = fileSize - recvFileSize; bufferSize = fileSize - recvFileSize;
} }
@ -619,8 +619,8 @@ public class CollectServerTask extends Thread {
if (unitRecvCnt > 0) { if (unitRecvCnt > 0) {
Packet.mergeBuffers(fileBuffer, buffer, recvFileSize); Packet.mergeBuffers(fileBuffer, buffer, recvFileSize);
recvFileSize += unitRecvCnt; recvFileSize += unitRecvCnt;
saveLog("unitRecvCnt : " + unitRecvCnt); // saveLog("unitRecvCnt : " + unitRecvCnt);
saveLog("recvFileSize : " + recvFileSize); // saveLog("recvFileSize : " + recvFileSize);
} }
if (recvFileSize == fileSize) { if (recvFileSize == fileSize) {