Commit @6d2985df6fad32d0fd92e6a8cf52503dd5b60ff6

장동신 2024-11-13

카카오 json파일 전송 로직 수정

@6d2985df6fad32d0fd92e6a8cf52503dd5b60ff6

b200b75

6d2985d

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

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

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

...	...	@@ -170,4 +170,23 @@
170	170
171	171	return fileHeadBuffer;
172	172	}
	173	+
	174	+ public static ByteBuffer makeJsonBodyForDeliver(String path, String fileName) {
	175	+ if (path == null \|\| fileName == null) {
	176	+ return null;
	177	+ }
	178	+ File file = new File(path + fileName);
	179	+ if (file.exists() == false) {
	180	+ return null;
	181	+ }
	182	+
	183	+ ByteBuffer fileBodyBuffer = null;
	184	+ try {
	185	+ fileBodyBuffer = ByteBuffer.allocate((int) file.length());
	186	+ fileBodyBuffer.put(Files.readAllBytes(file.toPath()));
	187	+ } catch (IOException e) {
	188	+ }
	189	+
	190	+ return fileBodyBuffer;
	191	+ }
173	192	}

b200b75

6d2985d

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


             /* 파일 전송 */
             ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
             socketChannel.write(fileHeadBuffer);
-            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);
-            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

...	...	@@ -671,7 +671,12 @@
671	671	/* 파일 전송 */
672	672	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
673	673	socketChannel.write(fileHeadBuffer);
674		- uploadFileSend(path + data.getKakaoJsonFile());
	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	+ }
675	680
676	681	long MSG_SEND_TIME = System.currentTimeMillis();
677	682	while (true) {
...	...	@@ -824,7 +829,12 @@
824	829	/* 파일 전송 */
825	830	ByteBuffer fileHeadBuffer = KakaoMessage.makeJsonHeaderForDeliver(path, data.getKakaoJsonFile());
826	831	socketChannel.write(fileHeadBuffer);
827		- uploadFileSend(path + data.getKakaoJsonFile());
	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	+ }
828	838
829	839	long MSG_SEND_TIME = System.currentTimeMillis();
830	840	while (true) {

Delete comment