Commit @4bc5fbcc262eb29eafdc36688b9043ae372eed53

48c5207

4bc5fbc

build.gradle

--- build.gradle

+++ build.gradle


     // https://mvnrepository.com/artifact/org.jdom/jdom2
     implementation 'org.jdom:jdom2:2.0.6.1'
 
+    implementation("com.slack.api:bolt:1.40.3")
+    implementation("com.slack.api:bolt-servlet:1.40.3")
+    implementation("com.slack.api:bolt-jetty:1.40.3")
+
     testCompileOnly 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
 }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/queue/pool/ReportQueue.java

--- src/main/java/com/munjaon/server/queue/pool/ReportQueue.java

+++ src/main/java/com/munjaon/server/queue/pool/ReportQueue.java


         }
     }
 
-    public boolean isTruncateQueue(int maxWriteCount) {
+    public boolean isTruncateQueue(int maxQueueCount) {
         synchronized (lockObject) {
-            if (this.writeCounter >= maxWriteCount) {
-                if (this.writeCounter == this.readCounter) {
-                    return true;
-                }
-                return false;
+            if (this.writeCounter > 0 && this.writeCounter >= maxQueueCount) {
+                return this.writeCounter == this.readCounter;
             }
             return false;
         }
     }
 
-    public boolean isWriteLimit(int maxWriteCount) {
+    public boolean isWriteLimit(int maxQueueCount) {
         synchronized (lockObject) {
-            if (this.writeCounter >= maxWriteCount) {
-                return true;
-            }
-            return false;
+            return this.writeCounter > 0 && this.writeCounter >= maxQueueCount;
         }
     }
 

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/config/ServerConfig.java

--- src/main/java/com/munjaon/server/server/config/ServerConfig.java

+++ src/main/java/com/munjaon/server/server/config/ServerConfig.java


     /* 사용자 정보 조회 체크 시간 */
     public static final long USER_STATUS_CYCLE_TIME = 60000;
     /* Deliver Thread 실행 시간 */
-    public static final long DELIVER_EXEC_CYCLE_TIME = 5000;
+    public static final long DELIVER_EXEC_CYCLE_TIME = 3000;
     /* Report Thread 실행 시간 */
-    public static final long REPORT_EXEC_CYCLE_TIME = 5000;
+    public static final long REPORT_EXEC_CYCLE_TIME = 3000;
 }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/dto/ReportUserDto.java

--- src/main/java/com/munjaon/server/server/dto/ReportUserDto.java

+++ src/main/java/com/munjaon/server/server/dto/ReportUserDto.java


     private ReportQueue reportQueue;    //ReportQueue
     private MemberDto memberDto;        //사용자 정보
     private int command;                //요청 command
-    private int maxWriteCount;                //요청 command
+    private int maxWriteCount;                //건당 Report 개수
+    private int maxQueueCount;                //Report Queue에 유지할 건수
     /* 요청을 처리중인지 여부 */
     private boolean isRunningMode;
 

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/Bind.java (Renamed from src/main/java/com/munjaon/server/server/packet/Bind.java)

--- src/main/java/com/munjaon/server/server/packet/Bind.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import java.nio.ByteBuffer;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/CommonMessage.java (Renamed from src/main/java/com/munjaon/server/server/packet/CommonMessage.java)

--- src/main/java/com/munjaon/server/server/packet/CommonMessage.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.CommonUtil;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/Header.java (Renamed from src/main/java/com/munjaon/server/server/packet/Header.java)

--- src/main/java/com/munjaon/server/server/packet/Header.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.ByteUtil;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/KakaoMessage.java (Renamed from src/main/java/com/munjaon/server/server/packet/KakaoMessage.java)

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

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.CommonUtil;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/LinkCheck.java (Renamed from src/main/java/com/munjaon/server/server/packet/LinkCheck.java)

--- src/main/java/com/munjaon/server/server/packet/LinkCheck.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import java.nio.ByteBuffer;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/LmsMessage.java (Renamed from src/main/java/com/munjaon/server/server/packet/LmsMessage.java)

--- src/main/java/com/munjaon/server/server/packet/LmsMessage.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.CommonUtil;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/MmsMessage.java (Renamed from src/main/java/com/munjaon/server/server/packet/MmsMessage.java)

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

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.CommonUtil;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/Packet.java (Renamed from src/main/java/com/munjaon/server/server/packet/Packet.java)

--- src/main/java/com/munjaon/server/server/packet/Packet.java

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


-package com.munjaon.server.server.packet;
+package com.munjaon.server.server.packet.common;
 
 import java.nio.ByteBuffer;
 
 public final class Packet {
     public static final byte SET_DEFAULT_BYTE = (byte) 0x00;
-    public static final long LINK_CHECK_CYCLE = 30000L;
+    /* LinkCheck 전송 체크 시간 간격 */
+    public static final long LINK_CHECK_CYCLE = 10000L;
+    /* 패킷 만료 시간 체크 */
+    public static final long LIMIT_PACKET_TIMEOUT = 25000L;
     public static void setDefaultByte(ByteBuffer buffer) {
         if (buffer == null) {
             return;

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/Report.java (Renamed from src/main/java/com/munjaon/server/server/packet/Report.java)

--- src/main/java/com/munjaon/server/server/packet/Report.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.server.dto.ReportDto;
4	4

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/packet/common/SmsMessage.java (Renamed from src/main/java/com/munjaon/server/server/packet/SmsMessage.java)

--- src/main/java/com/munjaon/server/server/packet/SmsMessage.java

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

...	...	@@ -1,4 +1,4 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import com.munjaon.server.util.CommonUtil;
4	4

4bc5fbc

src/main/java/com/munjaon/server/server/packet/deliver/DeliverBind.java (added)

+++ src/main/java/com/munjaon/server/server/packet/deliver/DeliverBind.java

...	...	@@ -0,0 +1,49 @@
	1	+package com.munjaon.server.server.packet.deliver;
	2	+
	3	+import com.munjaon.server.cache.dto.MemberDto;
	4	+import com.munjaon.server.server.queue.CollectUserQueue;
	5	+
	6	+public final class DeliverBind {
	7	+
	8	+ public static String checkDuplicate(CollectUserQueue collectUserQueue, String serviceType, String id) {
	9	+ if (collectUserQueue == null \|\| serviceType == null \|\| id == null) {
	10	+ return "60";
	11	+ }
	12	+ if (collectUserQueue.isExist(serviceType, id)) {
	13	+ return "60";
	14	+ }
	15	+
	16	+ return "00";
	17	+ }
	18	+
	19	+ public static String checkService(MemberDto memberDto, String serviceType, String id, String pwd) {
	20	+ if (id == null \|\| pwd == null) {
	21	+ return "50";
	22	+ }
	23	+ if (memberDto == null \|\| !pwd.equals(memberDto.getAccessKey())) {
	24	+ return "20";
	25	+ }
	26	+ /* 회원 사용 상태 */
	27	+ if (memberDto.getMberSttus() == null \|\| "N".equals(memberDto.getMberSttus())) {
	28	+ return "30";
	29	+ }
	30	+ /* 서비스 이용 상태 */
	31	+ if ("SMS".equals(serviceType) && "N".equals(memberDto.getSmsUseYn())) {
	32	+ return "30";
	33	+ }
	34	+ if ("LMS".equals(serviceType) && "N".equals(memberDto.getLmsUseYn())) {
	35	+ return "30";
	36	+ }
	37	+ if ("MMS".equals(serviceType) && "N".equals(memberDto.getMmsUseYn())) {
	38	+ return "30";
	39	+ }
	40	+ if ("KAT".equals(serviceType) && "N".equals(memberDto.getKakaoAtUseYn())) {
	41	+ return "30";
	42	+ }
	43	+ if ("KFT".equals(serviceType) && "N".equals(memberDto.getKakaoFtUseYn())) {
	44	+ return "30";
	45	+ }
	46	+
	47	+ return "00";
	48	+ }
	49	+}

4bc5fbc

src/main/java/com/munjaon/server/server/sample/SlackTest.java (added)

+++ src/main/java/com/munjaon/server/server/sample/SlackTest.java

...	...	@@ -0,0 +1,32 @@
	1	+package com.munjaon.server.server.sample;
	2	+
	3	+import com.slack.api.Slack;
	4	+import com.slack.api.methods.MethodsClient;
	5	+import com.slack.api.methods.SlackApiException;
	6	+import com.slack.api.methods.request.chat.ChatPostMessageRequest;
	7	+
	8	+import java.io.IOException;
	9	+
	10	+public class SlackTest {
	11	+ public static void main(final String[] args) {
	12	+ String token = "xoxb-7591405602163-7594011803524-gKJQfJbhRSmOFr1XFcwujWDr";
	13	+ String channelAddress = "#프로젝트";
	14	+ String message = "test";
	15	+ try{
	16	+
	17	+ MethodsClient methods = Slack.getInstance().methods(token);
	18	+
	19	+ ChatPostMessageRequest request = ChatPostMessageRequest.builder()
	20	+ .channel(channelAddress)
	21	+ .text(message)
	22	+ .build();
	23	+
	24	+ methods.chatPostMessage(request);
	25	+
	26	+// log.info("Slack " + channel + " 에 메시지 보냄");
	27	+ } catch (SlackApiException \| IOException e) {
	28	+ e.printStackTrace();
	29	+// log.error(e.getMessage());
	30	+ }
	31	+ }
	32	+}

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/CollectBackServerService.java

--- src/main/java/com/munjaon/server/server/service/CollectBackServerService.java

+++ src/main/java/com/munjaon/server/server/service/CollectBackServerService.java


 import com.munjaon.server.queue.enums.QueueTypeWorker;
 import com.munjaon.server.server.dto.ConnectUserDto;
 import com.munjaon.server.server.dto.HeaderDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.util.LogUtil;
 import lombok.Getter;
 import org.json.simple.JSONObject;

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/CollectServer.java

--- src/main/java/com/munjaon/server/server/service/CollectServer.java

+++ src/main/java/com/munjaon/server/server/service/CollectServer.java


 
 public class CollectServer extends Service {
     private final InetSocketAddress listenAddress;
-    private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
+    private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
 
     private Selector selector;
     private final String serviceType;

     }
 
     private void initCollectChannel() throws IOException {
-        saveSystemLog("COLLECT_SERVER_SERVICE : SERVER SOCKET INITIALIZING ... ...");
-        saveSystemLog("COLLECT_SERVER_SERVICE : SERVER PORT [" + listenAddress.getPort() + "]");
+        saveSystemLog("COLLECT_SERVER_SERVICE INITIALIZING : SERVER PORT [" + listenAddress.getPort() + "]");
         selector = Selector.open();
         /* 채널 생성 */
         ServerSocketChannel serverChannel = ServerSocketChannel.open();

         while (isRun()) {
             try {
                 execInterest();
+                checkInterest();
                 execUserStatus();
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                saveSystemLog(e);
+//                throw new RuntimeException(e);
             }
         }
         saveSystemLog("COLLECT_SERVER_SERVICE : SERVER SERVICE STOPPED ... ...");

                         continue;
                     }
                     /* 사용자별 Collect Thread 실행 */
-                    new CollectServerTask(selector, key, getName(), this.serviceType, logger).run();
+                    new CollectServerTask(selector, key, getName(), this.serviceType, logger).start();
+                }
+            } else {
+                expireConnectUser(key);
+            }
+        }
+    }
+
+    private void checkInterest() {
+        for (SelectionKey key : selector.keys()) {
+            if (key.isValid()) {
+                ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment();
+                if (connectUserDto == null) {
+                    continue;
+                }
+                if (connectUserDto.isAlive() == 1) { // 로그인이 완료되지 않은 경우
+                    expireConnectUser(key);
+                } else {
+                    if (connectUserDto.isRunningMode()) {
+                        continue;
+                    }
+                    connectUserDto.setRunningMode(true);
+                    /* 사용자별 Collect Thread 실행 */
+                    new CollectServerTask(selector, key, getName(), this.serviceType, logger).start();
                 }
             } else {
                 expireConnectUser(key);

             // Socket 채널을 channel에 수신 등록한다
             channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build());
         } catch (Exception e) {
+            saveSystemLog(e.toString());
             throw new RuntimeException(e);
         }
     }

             if (userDto != null && userDto.getUserId() != null) {
                 saveSystemLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]");
                 collectUserQueue.removeUser(this.serviceType, userDto.getUserId());
-//                connectUserMap.remove(userDto.getUserId());
                 key.attach(null);
             }
             // 소켓 채널 닫기

             // 키 닫기
             key.cancel();
         } catch (IOException e) {
+            saveSystemLog(e.toString());
             e.printStackTrace();
         }
     }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/QueueServerService.java

--- src/main/java/com/munjaon/server/server/service/QueueServerService.java

+++ src/main/java/com/munjaon/server/server/service/QueueServerService.java


                 loadMemoryQueue();
             }
         } catch (Exception e) {
+            saveSystemLog(e.toString());
             throw new RuntimeException(e);
         }
     }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/ReportQueueServerService.java

--- src/main/java/com/munjaon/server/server/service/ReportQueueServerService.java

+++ src/main/java/com/munjaon/server/server/service/ReportQueueServerService.java


 public class ReportQueueServerService extends Service {
     private final ReportUserQueue reportUserQueue = ReportUserQueue.getInstance();
     private QueueThreadService threadService;
-    private int queueMaxCore;
-    private int maxWriteCount;
+    private final int queueMaxCore;
+    private final int maxWriteCount;
+    private final int maxQueueCount;
 
     public ReportQueueServerService(String serviceName) {
         super(serviceName);
         this.queueMaxCore = Integer.parseInt(getProp("QUEUE_MAX_CORE").trim());
         this.maxWriteCount = Integer.parseInt(getProp("MAX_WRITE_COUNT").trim());
+        this.maxQueueCount = Integer.parseInt(getProp("MAX_QUEUE_COUNT").trim());
     }
 
     @Override

 
     @Override
     public void initResources() {
+        saveSystemLog("REPORT_QUEUE_SERVICE : RESOURCES INITIALIZING ... ...");
         threadService = new QueueThreadService(queueMaxCore, logger);
+        saveSystemLog("REPORT_QUEUE_SERVICE : RESOURCES INITIALIZED ... ...");
     }
 
     @Override
     public void releaseResources() {
+        saveSystemLog("REPORT_QUEUE_SERVICE : SERVER RESOURCE RELEASING ... ...");
         threadService.close();
+        saveSystemLog("REPORT_QUEUE_SERVICE : SERVER RESOURCE RELEASED ... ...");
     }
 
     @Override
     public void doService() {
+        saveSystemLog("REPORT_QUEUE_SERVICE : SERVER SERVICE STARTED ... ...");
         while (isRun()) {
             try {
                 doQueueService();

                 throw new RuntimeException(e);
             }
         }
+        saveSystemLog("REPORT_QUEUE_SERVICE : SERVER SERVICE STOPPED ... ...");
     }
 
     private void doQueueService() {
         List<ReportUserDto> reportUserList = reportUserQueue.getUsers();
-        if (reportUserList == null || reportUserList.size() == 0) {
+        if (reportUserList == null || reportUserList.isEmpty()) {
             return;
         }
 
         for (ReportUserDto reportUserDto : reportUserList) {
             reportUserDto.setMaxWriteCount(this.maxWriteCount);
+            reportUserDto.setMaxQueueCount(this.maxQueueCount);
             threadService.execute(new ReportQueueTask(reportUserDto, logger));
         }
     }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/ReportServer.java

--- src/main/java/com/munjaon/server/server/service/ReportServer.java

+++ src/main/java/com/munjaon/server/server/service/ReportServer.java


 import com.munjaon.server.server.task.ReportServerTask;
 import org.json.simple.JSONObject;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;

     @Override
     public void initResources() {
         try {
+            saveSystemLog("REPORT_SERVER : RESOURCES INITIALIZING ... ...");
             initReportChannel();
+            saveSystemLog("REPORT_SERVER : RESOURCES INITIALIZED ... ...");
         } catch (IOException e) {
             saveSystemLog(e);
             throw new RuntimeException(e);

     }
 
     private void initReportChannel() throws IOException {
+        saveSystemLog("REPORT_SERVER INITIALIZING : SERVER PORT [" + listenAddress.getPort() + "]");
         selector = Selector.open();
         /* 채널 생성 */
         ServerSocketChannel serverChannel = ServerSocketChannel.open();

         serverChannel.socket().bind(listenAddress);
         /* 채널에 accept 대기 설정 */
         serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+        saveSystemLog("REPORT_SERVER : SERVER SOCKET INITIALIZED ... ...");
     }
 
     private void closeReportChannel() throws IOException {

 
     @Override
     public void releaseResources() {
+        saveSystemLog("REPORT_SERVER : SERVER RESOURCE RELEASING ... ...");
         try {
             closeReportChannel();
         } catch (IOException e) {
             saveSystemLog(e);
             throw new RuntimeException(e);
         }
+        saveSystemLog("REPORT_SERVER : SERVER RESOURCE RELEASED ... ...");
     }
 
     @Override
     public void doService() {
-
+        saveSystemLog("REPORT_SERVER : SERVER SERVICE STARTED ... ...");
         while (isRun()) {
             try {
                 execInterest();

                 saveSystemLog(e.toString());
             }
         }
+        saveSystemLog("REPORT_SERVER : SERVER SERVICE STOPPED ... ...");
     }
 
     private void checkInterest() throws IOException, InterruptedException {

                 if (reportUserDto == null) {
                     continue;
                 }
-                SocketChannel channel = (SocketChannel) key.channel();  // 키 채널을 가져온다.
                 if (reportUserDto.isAlive() == 1) { // 로그인이 완료되지 않은 경우
                     expireConnectUser(key);
                 } else if (reportUserDto.isAlive() == 2) {
-                    if (reportUserDto == null || reportUserDto.isRunningMode()) {
+                    if (reportUserDto.isRunningMode()) {
                         continue;
                     }
+                    reportUserDto.setRunningMode(true);
                     /* 사용자별 Report Thread 실행 */
                     new ReportServerTask(selector, key, getName(), logger).run();
                 } else {

                         if (reportUserDto.isRunningMode()) {
                             continue;
                         }
+                        reportUserDto.setRunningMode(true);
                         /* 사용자별 Report Thread 실행 */
-                        new ReportServerTask(selector, key, getName(), logger).run();
+                        new ReportServerTask(selector, key, getName(), logger).start();
                     }
                 }
             } else {

                     if (reportUserDto == null || reportUserDto.isRunningMode()) {
                         continue;
                     }
-                    if (reportUserDto.isLogin()) {
-                        saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
-                    } else {
-                        saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
-                    }
                     reportUserDto.setRunningMode(true);
                     /* 사용자별 Report Thread 실행 */
-                    new ReportServerTask(selector, key, getName(), logger).run();
+                    new ReportServerTask(selector, key, getName(), logger).start();
                 }
             } else {
                 expireConnectUser(key);

             SocketAddress remoteAddr = socket.getRemoteSocketAddress();
             saveSystemLog("Connected to: " + remoteAddr);
             // Socket 채널을 channel에 수신 등록한다
-            channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + File.separator + getProp("QUEUE_PATH")).build());
+            channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build());
         } catch (Exception e) {
+            saveSystemLog(e.toString());
             throw new RuntimeException(e);
         }
     }

             // 키 닫기
             key.cancel();
         } catch (IOException e) {
+            saveSystemLog(e.toString());
             e.printStackTrace();
         }
     }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/ReportServerService.java

--- src/main/java/com/munjaon/server/server/service/ReportServerService.java

+++ src/main/java/com/munjaon/server/server/service/ReportServerService.java


 import com.munjaon.server.server.dto.ConnectUserDto;
 import com.munjaon.server.server.dto.ReportDto;
 import com.munjaon.server.server.dto.ReportUserDto;
-import com.munjaon.server.server.packet.Header;
-import com.munjaon.server.server.packet.LinkCheck;
-import com.munjaon.server.server.packet.Packet;
-import com.munjaon.server.server.packet.Report;
+import com.munjaon.server.server.packet.common.Header;
+import com.munjaon.server.server.packet.common.LinkCheck;
+import com.munjaon.server.server.packet.common.Packet;
+import com.munjaon.server.server.packet.common.Report;
 import com.munjaon.server.server.queue.ReportUserQueue;
 import com.munjaon.server.server.task.ReportReadTask;
 import com.munjaon.server.util.LogUtil;

48c5207

4bc5fbc

src/main/java/com/munjaon/server/server/service/Service.java

--- src/main/java/com/munjaon/server/server/service/Service.java

+++ src/main/java/com/munjaon/server/server/service/Service.java


 
     protected void initLogFile() {
         LOG_FILE = System.getProperty("ROOTPATH") + getProp("LOG_FILE");
-        System.out.println("LOG_FILE: " + LOG_FILE);
         setLogFile( LOG_FILE );
         saveSystemLog("Service Log Initializing ... ...");
     }

48c5207

4bc5fbc

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

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

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


 import com.munjaon.server.queue.dto.BasicMessageDto;
 import com.munjaon.server.queue.enums.QueueTypeWorker;
 import com.munjaon.server.server.dto.ConnectUserDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.server.queue.CollectUserQueue;
 import com.munjaon.server.util.*;
 

48c5207

4bc5fbc

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


 import com.munjaon.server.queue.enums.QueueTypeWorker;
 import com.munjaon.server.server.config.ServerConfig;
 import com.munjaon.server.server.dto.ConnectUserDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.server.queue.CollectUserQueue;
 import com.munjaon.server.server.service.PropertyLoader;
 import com.munjaon.server.util.*;

 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-public class CollectServerTask implements Runnable {
+public class CollectServerTask extends Thread {
     public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
     public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
 
     private Selector selector;
-    private SelectionKey key;
-    private SocketChannel channel;
-    private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
-    private ConnectUserDto connectUserDto;
-    private String serviceName;
-    private String serviceType;
+    private final SelectionKey key;
+    private final SocketChannel channel;
+    private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
+    private final ConnectUserDto connectUserDto;
+    private final String serviceName;
+    private final String serviceType;
     private final LogUtil logger;
 
     private boolean IS_SERVER_RUN;          // 서버가 구동중인지 여부
     private boolean IS_RUN_YN;
     private long RUN_FLAG_CHECK_TIME;
+    private long LAST_PACKET_SEND_TIME = System.currentTimeMillis();    // 패킷 송수신 시간을 체크하기 위한 변수(최대 3초간 요청이 없는 경우 Thread 종료)
+    private boolean IS_ERROR = false;
 
     /* 클라이언트 요청 데이터 수신  */
-    private ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
+    private final ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
     /* 세션이 만료되었는지 체크 */
     private boolean isExpiredYn;
 

         this.serviceName = serviceName;
         this.serviceType = serviceType;
         this.logger = logger;
+        if (connectUserDto.isLogin()) {
+            saveSystemLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]");
+        } else {
+            saveSystemLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
+        }
     }
 
     protected String getProp(String name) {

                 break;
             }
             try {
+                /* 2. Packet Timeout Check */
+                if (checkTimeOut()) {
+                    saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]");
+                    saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
+                    expireConnectUser();
+                    break;
+                }
                 /* 3. HeadBuffer 읽기 */
                 int size = readHeader();
                 /* 4. Body 읽기 */

                         default: expireConnectUser(); break;
                     }
                 } else if (size == 0) {
-                    if (System.currentTimeMillis() - connectUserDto.getLastTrafficTime() > ServerConfig.DELIVER_EXEC_CYCLE_TIME) {
+                    if (System.currentTimeMillis() - LAST_PACKET_SEND_TIME > ServerConfig.DELIVER_EXEC_CYCLE_TIME) {
                         this.isExpiredYn = true;
                     }
                     Thread.sleep(1);

             } catch (Exception e) {
                 /* 세션 만료 여부 */
                 this.isExpiredYn = true;
-                e.printStackTrace();
+                this.IS_ERROR = true;
+                saveSystemLog(e);
             }
             /* RUN Flag 체크 */
             reloadRunFlag();
         }
         /* 중요 : 사용자 Thread 실행모드 Off */
         connectUserDto.setRunningMode(false);
+        /* 에러가 발생한 경우 세션을 종료힌다. */
+        if (IS_ERROR) {
+            expireConnectUser();
+        }
         saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
+    }
+
+    private boolean checkTimeOut() {
+        if (System.currentTimeMillis() - this.connectUserDto.getLastTrafficTime() >= Packet.LIMIT_PACKET_TIMEOUT) {
+            return true;
+        }
+
+        return false;
     }
 
     private void recvDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {

             case "KFT": recvKftDeliver(channel, headBuffer); break;
             default:break;
         }
+        /* 마지막 패킷 수신시간 체크 */
+        LAST_PACKET_SEND_TIME = System.currentTimeMillis();
     }
 
     private boolean isExpireService() {

     }
 
     private void recvLinkCheck(SocketChannel channel) throws IOException {
-        ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
-        channel.read(bodyBuffer);
-//        SocketChannel channel = (SocketChannel) key.channel();
-        channel.write(LinkCheck.makeLinkCheckAckBuffer());
-        connectUserDto.updateLastTrafficTime();
         /* 서비스 중지여부 체크 */
         if (isExpireService()) {
             expireConnectUser();
             return;
         }
+        ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
+        channel.read(bodyBuffer);
+        saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]");
+        channel.write(LinkCheck.makeLinkCheckAckBuffer());
+        saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]");
+        connectUserDto.updateLastTrafficTime();
     }
 
     private void recvBind(SocketChannel channel, ByteBuffer headBuffer) {

 
             String id = Bind.getBindId(bindBuffer);
             String pwd = Bind.getBindPwd(bindBuffer);
+            saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " +  pwd + "]");
 
             MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService();
             MemberDto memberDto = null;
             if (svc != null) {
                 memberDto = svc.get(id);
             }
-            saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " +  pwd + "]");
+
             /* Bind Check */
             resultCode = checkBind(memberDto, this.serviceType, id, pwd);
 

48c5207

4bc5fbc

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

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

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


     public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
     public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
 
-    private ReportUserDto reportUserDto;
+    private final ReportUserDto reportUserDto;
     private final LogUtil logger;
 
     public ReportQueueTask(ReportUserDto reportUserDto, LogUtil logger) {

 
         ReportQueue reportQueue = reportUserDto.getReportQueue();
         /* 리포트큐에 최대 크기까지 쓰고 모두 리포트는 전송했는지 체크 : 테스트후 적용 */
-//        if (reportQueue.isWriteLimit(reportUserDto.getMaxWriteCount())) {
-//            if (reportQueue.isTruncateQueue(reportUserDto.getMaxWriteCount())) {
-//                try {
-//                    reportQueue.truncateQueue();
-//                } catch (Exception e) {}
-//            } else {
-//                return;
-//            }
-//        }
+        if (reportQueue.isWriteLimit(reportUserDto.getMaxQueueCount())) {
+            if (reportQueue.isTruncateQueue(reportUserDto.getMaxQueueCount())) {
+                try {
+                    reportQueue.truncateQueue();
+                } catch (Exception ignored) {}
+            } else {
+                return;
+            }
+        }
         ReportService reportService = (ReportService) CacheService.REPORT_SERVICE.getService();
         List<ReportDto> list = reportService.getReportListForUser(reportUserDto.getUserId());
         if (list == null || list.isEmpty()) {

48c5207

4bc5fbc

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

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

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


 import com.munjaon.server.cache.service.MemberService;
 import com.munjaon.server.queue.pool.ReportQueue;
 import com.munjaon.server.server.dto.ReportUserDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.server.queue.ReportUserQueue;
 import com.munjaon.server.util.LogUtil;
 

48c5207

4bc5fbc

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

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

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


 import com.munjaon.server.server.config.ServerConfig;
 import com.munjaon.server.server.dto.ReportDto;
 import com.munjaon.server.server.dto.ReportUserDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.server.queue.ReportUserQueue;
 import com.munjaon.server.server.service.PropertyLoader;
 import com.munjaon.server.util.LogUtil;

 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-public class ReportServerTask implements Runnable {
+public class ReportServerTask extends Thread {
     public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
     public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
 
     private Selector selector;
-    private SelectionKey key;
-    private SocketChannel channel;
+    private final SelectionKey key;
+    private final SocketChannel channel;
     private final ReportUserQueue reportUserQueue = ReportUserQueue.getInstance();
-    private ReportUserDto reportUserDto;
-    private ReportQueue reportQueue;
-    private String serviceName;
+    private final ReportUserDto reportUserDto;
+    private final ReportQueue reportQueue;
+    private final String serviceName;
     private final LogUtil logger;
 
     private boolean IS_SERVER_RUN;          // 서버가 구동중인지 여부
     private boolean IS_RUN_YN;
     private long RUN_FLAG_CHECK_TIME;
     private long SEND_CYCLE_CHECK_TIME;
+    private boolean IS_ERROR = false;
 
     /* 세션이 만료되었는지 체크 */
     private boolean isExpiredYn;
     /* 클라이언트 요청 데이터 수신  */
-    private ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
+    private final ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
     private ReportDto reportDto;    // 전송 리포트
     /* Packet을 전송했는지 여부 */
     private boolean isPacketSendYn;

         this.serviceName = serviceName;
         this.reportQueue = reportUserDto.getReportQueue();
         this.logger = logger;
+        if (reportUserDto.isLogin()) {
+            saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
+        } else {
+            saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
+        }
     }
 
     protected String getProp(String name) {

                 if (isExpiredYn) {
                     break;
                 }
-//                saveSystemLog("ReportServerTask is Running");
-                try {
-                    sendInterest();
-                    recvInterest();
-                    /* RUN Flag 체크 */
-                    reloadRunFlag();
-                } catch (Exception e) {
-                    this.isExpiredYn = true;
-                    e.printStackTrace();
+                /* 2. Packet Timeout Check */
+                if (checkTimeOut()) {
+                    saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]");
+                    saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
+                    expireConnectUser();
+                    break;
                 }
+
+                sendInterest();
+                recvInterest();
+                /* RUN Flag 체크 */
+                reloadRunFlag();
             }
         } catch (Exception e) {
             /* 세션 만료 여부 */
             this.isExpiredYn = true;
-            e.printStackTrace();
+            this.IS_ERROR = true;
+            saveSystemLog(e);
         }
         /* 중요 : 사용자 Thread 실행모드 Off */
         reportUserDto.setRunningMode(false);
+        /* 에러가 발생한 경우 세션을 종료힌다. */
+        if (IS_ERROR) {
+            expireConnectUser();
+        }
         saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
+    }
+
+    private boolean checkTimeOut() {
+        if (System.currentTimeMillis() - this.reportUserDto.getLastTrafficTime() >= Packet.LIMIT_PACKET_TIMEOUT) {
+            return true;
+        }
+
+        return false;
     }
 
     private void initHeaderBuffer() {

         return size;
     }
 
-    private void bindInterest() throws IOException {
-//        if (reportUserDto.isLogin() && !isRun()) {
+    private void bindInterest() {
         if (reportUserDto.isLogin()) {
             return;
         }

             /* 2. Body 읽기 */
             if (size > 0) {
                 String command = Header.getCommand(this.headBuffer);
-                switch (Integer.parseInt(command)) {
-                    case 1 : recvBind(channel, headBuffer); break;
-                    default: expireConnectUser(); break;
+                if (Integer.parseInt(command) == 1) {
+                    recvBind(channel, headBuffer);
+                } else {
+                    expireConnectUser();
                 }
                 /* 패킷 수신한 경우 무조건 루프를 빠져나간다 */
                 break;

             }
         } catch (Exception e) {
             resultCode = "10";
-            e.printStackTrace();
+            saveSystemLog(e);
         }
 
         try {
             saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]");
             channel.write(Bind.makeBindAckBuffer(resultCode));
-            if ("00".equals(resultCode) == false) {
+            if (!"00".equals(resultCode)) {
                 expireConnectUser();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            saveSystemLog(e);
         }
     }
 

         return "00";
     }
 
-    private void recvInterest() throws IOException, InterruptedException, Exception {
+    private void recvInterest() throws IOException, Exception {
         while (isPacketSendYn) {
             /* 1. Head 읽기 */
             ByteBuffer headBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH);

             if (size > 0) {
                 String command = Header.getCommand(headBuffer);
                 switch (Integer.parseInt(command)) {
-                    case 6 : recvReport(channel, headBuffer); break;
-                    case 8 : recvLinkCheck(channel, headBuffer); break;
+                    case 6 : recvReport(channel); break;
+                    case 8 : recvLinkCheck(channel); break;
                     default: saveSystemLog(printTaskLog() + "[INVALID REQUEST][command : " + command + ";");
                         expireConnectUser(); break;
                 }

         }
     }
 
-    private void recvLinkCheck(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
+    private void recvLinkCheck(SocketChannel channel) throws IOException {
         ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
         int size = channel.read(bodyBuffer);
         if (size > 0) {

         }
     }
 
-    private void recvReport(SocketChannel channel, ByteBuffer headBuffer) throws Exception {
+    private void recvReport(SocketChannel channel) throws Exception {
         ByteBuffer bodyBuffer = ByteBuffer.allocate(Report.REPORT_ACK_BODY_LENGTH);
         int size = channel.read(bodyBuffer);
         if (size != Report.REPORT_ACK_BODY_LENGTH) {

         }
     }
 
-    private void sendInterest() throws IOException {
-        if (reportUserDto.isLogin() == false) {
+    private void sendInterest() throws Exception {
+        if (!reportUserDto.isLogin()) {
             return;
         }
         if (reportUserDto.isAlive() == 2) {
             channel.write(LinkCheck.makeLinkCheckBuffer());
             SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
-            /* Packet을 전송했는지 여부 */
+            /* Packet 전송했는지 여부 */
             isPacketSendYn = true;
         } else {
             if (this.reportQueue != null && this.reportQueue.isRemainReport()) {
-                try {
-                    this.reportDto = this.reportQueue.popReportFromQueue();
-                    if (reportDto == null) {
-                        return;
-                    }
-                    saveSystemLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]");
-                    ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH);
-                    Packet.setDefaultByte(reportBuffer);
-                    Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH);
-                    Report.putReport(reportBuffer, reportDto);
-                    channel.write(reportBuffer);
-                    /* Packet을 전송했는지 여부 */
-                    SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
-                    isPacketSendYn = true;
-                } catch (Exception e) {
-                    e.printStackTrace();
+                this.reportDto = this.reportQueue.popReportFromQueue();
+                if (reportDto == null) {
+                    return;
                 }
+                saveSystemLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]");
+                ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH);
+                Packet.setDefaultByte(reportBuffer);
+                Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH);
+                Report.putReport(reportBuffer, reportDto);
+                channel.write(reportBuffer);
+                /* Packet 전송했는지 여부 */
+                SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
+                isPacketSendYn = true;
             }
         }
         /* 쓰레드 완료 시점 체크 */

             // 키 닫기
             key.cancel();
         } catch (IOException e) {
-            e.printStackTrace();
+            saveSystemLog(e);
         }
     }
 

48c5207

4bc5fbc

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

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

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


 import com.munjaon.server.queue.dto.BasicMessageDto;
 import com.munjaon.server.queue.enums.QueueTypeWorker;
 import com.munjaon.server.server.dto.ConnectUserDto;
-import com.munjaon.server.server.packet.*;
+import com.munjaon.server.server.packet.common.*;
 import com.munjaon.server.server.queue.CollectUserQueue;
 import com.munjaon.server.util.*;
 

48c5207

4bc5fbc

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

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

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


     public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
     public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
 
-    private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
-    private String serviceType;
+    private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
+    private final String serviceType;
     private final LogUtil logger;
 
     public StatusCheckTask(String serviceType, LogUtil logger) {

     public void run() {
         saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]");
         List<ConnectUserDto> userList = collectUserQueue.getUsers(this.serviceType);
-        if (userList == null && userList.isEmpty()) {
+        if (userList == null || userList.isEmpty()) {
             saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]");
             saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
             return;

         for (ConnectUserDto user : userList) {
             MemberDto savedMemberDto = user.getMemberDto();
             saveSystemLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]");
-            if (savedMemberDto == null) {
-                continue;
-            }
             MemberDto newMemberDto = svc.get(savedMemberDto.getMberId());
             saveSystemLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]");
             if (newMemberDto == null) {

48c5207

4bc5fbc

src/main/java/com/munjaon/server/util/MessageUtil.java

--- src/main/java/com/munjaon/server/util/MessageUtil.java

+++ src/main/java/com/munjaon/server/util/MessageUtil.java


         buffer.position(ReportConfig.MSG_ID_POSITION);
         destArray = new byte[ReportConfig.MSG_ID_LENGTH];
         buffer.get(destArray);
-        reportDto.setMsgId(new String(destArray).trim());
+        reportDto.setMsgId(QueueConstants.getString(destArray));
         /* AGENT_CODE (Length : 2 / Position : 20) */
         buffer.position(ReportConfig.AGENT_CODE_POSITION);
         destArray = new byte[ReportConfig.AGENT_CODE_LENGTH];
         buffer.get(destArray);
-        reportDto.setAgentCode(new String(destArray).trim());
+        reportDto.setAgentCode(QueueConstants.getString(destArray));
         /* SEND_TIME (Length : 14 / Position : 22) */
         buffer.position(ReportConfig.SEND_TIME_POSITION);
         destArray = new byte[ReportConfig.SEND_TIME_LENGTH];
         buffer.get(destArray);
-        reportDto.setRsltDate(new String(destArray).trim());
+        reportDto.setRsltDate(QueueConstants.getString(destArray));
         /* TELECOM (Length : 3 / Position : 36) */
         buffer.position(ReportConfig.TELECOM_POSITION);
         destArray = new byte[ReportConfig.TELECOM_LENGTH];
         buffer.get(destArray);
-        reportDto.setRsltNet(new String(destArray).trim());
+        reportDto.setRsltNet(QueueConstants.getString(destArray));
         /* RESULT (Length : 5 / Position : 39) */
         buffer.position(ReportConfig.RESULT_POSITION);
         destArray = new byte[ReportConfig.RESULT_LENGTH];
         buffer.get(destArray);
-        reportDto.setRsltCode(new String(destArray).trim());
+        reportDto.setRsltCode(QueueConstants.getString(destArray));
 
         return reportDto;
     }

48c5207

4bc5fbc

src/main/java/com/munjaon/server/util/StringUtil.java

--- src/main/java/com/munjaon/server/util/StringUtil.java

+++ src/main/java/com/munjaon/server/util/StringUtil.java


 
 package com.munjaon.server.util;
 
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-
 /**
  * 문자열 관련 유틸리티 클래스
  * @author JDS

         }
 
         return ((String)obj).trim();
-    }
-
-    public static String ltrim(byte[] obj) {
-        return ltrim(new String(obj));
-    }
-
-    public static String ltrim(String obj) {
-        return ltrim(obj.toCharArray());
-    }
-
-    public static String ltrim(char[] obj) {
-        int len = obj.length;
-        int idx = 0;
-
-        while( idx < len && obj[idx] <= ' ' ) {
-            idx++;
-        }
-
-        return new String(obj, idx, len-idx);
-    }
-
-    public static String rtrim(byte[] obj) {
-        return rtrim(new String(obj));
-    }
-
-    public static String rtrim(String obj) {
-        return rtrim(obj.toCharArray());
-    }
-
-    public static String rtrim(char[] obj) {
-        int len = obj.length;
-        int idx = len-1;
-
-        while( idx >= 0 && obj[idx] <= ' ' ) {
-            idx--;
-        }
-
-        return new String(obj, 0, idx+1);
-    }
-
-    public static String replaceAll(String src, String from, String to) {
-        StringBuilder sbuf = new StringBuilder();
-
-        int len = from.length();
-        int idx = 0;
-        int stx = 0;
-
-        while( (idx=src.indexOf(from, stx)) > -1 ) {
-            sbuf.append(src.substring(stx, idx));
-            sbuf.append(to);
-            stx=idx+len;
-        }
-
-        sbuf.append(src.substring(stx));
-
-        return sbuf.toString();
-    }
-
-    public static String[] split(String sSrc, String sDelim) {
-        ArrayList aList = new ArrayList();
-
-        String sTmp;
-        int len = sDelim.length();
-        int idx = 0;
-        int stx = 0;
-
-        while( (idx=sSrc.indexOf(sDelim, stx)) > -1 ) {
-            sTmp = sSrc.substring(stx, idx);
-            aList.add(sTmp);
-            stx=idx+len;
-        }
-
-        if( stx <= sSrc.length() ) {
-            aList.add(sSrc.substring(stx));
-        }
-
-        String[] sRet = new String[aList.size()];
-
-        for( int i=0; i<aList.size(); i++ ) {
-            sRet[i] = (String) aList.get(i);
-        }
-
-        return sRet;
-    }
-
-    public static String substring(String obj, int idx, int length) {
-        if( obj.getBytes().length <= idx ) {
-            return "";
-        }
-
-        if( obj.getBytes().length <= length ) {
-            return obj;
-        }
-
-        int totallen=0;
-        int i=idx;
-        for( i=idx; i<obj.length(); i++ ) {
-            totallen += obj.substring(i, i+1).getBytes().length;
-
-            if( length < totallen ) {
-                break;
-            }
-        }
-
-        return obj.substring(idx, i);
-    }
-
-    public static String substring(String obj, int length) {
-        return substring(obj, 0, length);
-    }
-
-    public static String numFilter(String src) {
-        return src.replaceAll("[^0-9]", "");
-    }
-
-    public static String toNumberFormat(Object obj, String fmt) {
-        DecimalFormat df = new DecimalFormat(fmt);
-        return df.format(obj);
-    }
-
-    public static String pad0(String str, int size) {
-        char[] zeros = new char[size - str.length()];
-        for (int i = 0; i < zeros.length; i++)
-            zeros[i] = '0';
-        return new String(zeros) + str;
     }
 }

48c5207

4bc5fbc

src/main/resources/dev/application-dev.yml

--- src/main/resources/dev/application-dev.yml

+++ src/main/resources/dev/application-dev.yml


 #      jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
       username: mjonUr_agent
       password: mjagent123$
+      connectionTimeout: 30000
+      maximumPoolSize: 15
+      maxLifetime: 1800000
+      poolName: HikariCP
+      connectionTestQuery: SELECT 1
 
 server:
   port: 8090

48c5207

4bc5fbc

src/main/resources/local/application-local.yml

--- src/main/resources/local/application-local.yml

+++ src/main/resources/local/application-local.yml


   datasource:
     server:
       driver-class-name: org.mariadb.jdbc.Driver
-      url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
-      jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
-      username: mjonUr_agent
-      password: mjagent123$
+      url: jdbc:mariadb://localhost:3306/mjon
+      jdbc-url: jdbc:mariadb://localhost:3306/mjon
+      username: root
+      password: 1234
+      connectionTimeout: 30000
+      maximumPoolSize: 15
+      maxLifetime: 1800000
+      poolName: HikariCP
+      connectionTestQuery: SELECT 1
 
 server:
   port: 8090

48c5207

4bc5fbc

src/main/resources/prod/application-prod.yml

--- src/main/resources/prod/application-prod.yml

+++ src/main/resources/prod/application-prod.yml


       jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent
       username: mjonUr_agent
       password: mjagent123$
+      connectionTimeout: 30000
+      maximumPoolSize: 20
+      maxLifetime: 1800000
+      poolName: HikariCP
+      connectionTestQuery: SELECT 1
 
 server:
   port: 8090

...	...	@@ -79,6 +79,7 @@
79	79	loadMemoryQueue();
80	80	}
81	81	} catch (Exception e) {
	82	+ saveSystemLog(e.toString());
82	83	throw new RuntimeException(e);
83	84	}
84	85	}

...	...	@@ -477,27 +477,27 @@
477	477	buffer.position(ReportConfig.MSG_ID_POSITION);
478	478	destArray = new byte[ReportConfig.MSG_ID_LENGTH];
479	479	buffer.get(destArray);
480		- reportDto.setMsgId(new String(destArray).trim());
	480	+ reportDto.setMsgId(QueueConstants.getString(destArray));
481	481	/* AGENT_CODE (Length : 2 / Position : 20) */
482	482	buffer.position(ReportConfig.AGENT_CODE_POSITION);
483	483	destArray = new byte[ReportConfig.AGENT_CODE_LENGTH];
484	484	buffer.get(destArray);
485		- reportDto.setAgentCode(new String(destArray).trim());
	485	+ reportDto.setAgentCode(QueueConstants.getString(destArray));
486	486	/* SEND_TIME (Length : 14 / Position : 22) */
487	487	buffer.position(ReportConfig.SEND_TIME_POSITION);
488	488	destArray = new byte[ReportConfig.SEND_TIME_LENGTH];
489	489	buffer.get(destArray);
490		- reportDto.setRsltDate(new String(destArray).trim());
	490	+ reportDto.setRsltDate(QueueConstants.getString(destArray));
491	491	/* TELECOM (Length : 3 / Position : 36) */
492	492	buffer.position(ReportConfig.TELECOM_POSITION);
493	493	destArray = new byte[ReportConfig.TELECOM_LENGTH];
494	494	buffer.get(destArray);
495		- reportDto.setRsltNet(new String(destArray).trim());
	495	+ reportDto.setRsltNet(QueueConstants.getString(destArray));
496	496	/* RESULT (Length : 5 / Position : 39) */
497	497	buffer.position(ReportConfig.RESULT_POSITION);
498	498	destArray = new byte[ReportConfig.RESULT_LENGTH];
499	499	buffer.get(destArray);
500		- reportDto.setRsltCode(new String(destArray).trim());
	500	+ reportDto.setRsltCode(QueueConstants.getString(destArray));
501	501
502	502	return reportDto;
503	503	}

...	...	@@ -50,6 +50,10 @@
50	50	// https://mvnrepository.com/artifact/org.jdom/jdom2
51	51	implementation 'org.jdom:jdom2:2.0.6.1'
52	52
	53	+ implementation("com.slack.api:bolt:1.40.3")
	54	+ implementation("com.slack.api:bolt-servlet:1.40.3")
	55	+ implementation("com.slack.api:bolt-jetty:1.40.3")
	56	+
53	57	testCompileOnly 'org.projectlombok:lombok'
54	58	testAnnotationProcessor 'org.projectlombok:lombok'
55	59	}

...	...	@@ -88,24 +88,18 @@
88	88	}
89	89	}
90	90
91		- public boolean isTruncateQueue(int maxWriteCount) {
	91	+ public boolean isTruncateQueue(int maxQueueCount) {
92	92	synchronized (lockObject) {
93		- if (this.writeCounter >= maxWriteCount) {
94		- if (this.writeCounter == this.readCounter) {
95		- return true;
96		- }
97		- return false;
	93	+ if (this.writeCounter > 0 && this.writeCounter >= maxQueueCount) {
	94	+ return this.writeCounter == this.readCounter;
98	95	}
99	96	return false;
100	97	}
101	98	}
102	99
103		- public boolean isWriteLimit(int maxWriteCount) {
	100	+ public boolean isWriteLimit(int maxQueueCount) {
104	101	synchronized (lockObject) {
105		- if (this.writeCounter >= maxWriteCount) {
106		- return true;
107		- }
108		- return false;
	102	+ return this.writeCounter > 0 && this.writeCounter >= maxQueueCount;
109	103	}
110	104	}
111	105

...	...	@@ -13,7 +13,7 @@
13	13	/* 사용자 정보 조회 체크 시간 */
14	14	public static final long USER_STATUS_CYCLE_TIME = 60000;
15	15	/* Deliver Thread 실행 시간 */
16		- public static final long DELIVER_EXEC_CYCLE_TIME = 5000;
	16	+ public static final long DELIVER_EXEC_CYCLE_TIME = 3000;
17	17	/* Report Thread 실행 시간 */
18		- public static final long REPORT_EXEC_CYCLE_TIME = 5000;
	18	+ public static final long REPORT_EXEC_CYCLE_TIME = 3000;
19	19	}

...	...	@@ -21,7 +21,8 @@
21	21	private ReportQueue reportQueue; //ReportQueue
22	22	private MemberDto memberDto; //사용자 정보
23	23	private int command; //요청 command
24		- private int maxWriteCount; //요청 command
	24	+ private int maxWriteCount; //건당 Report 개수
	25	+ private int maxQueueCount; //Report Queue에 유지할 건수
25	26	/* 요청을 처리중인지 여부 */
26	27	private boolean isRunningMode;
27	28

...	...	@@ -1,10 +1,13 @@
1		-package com.munjaon.server.server.packet;
	1	+package com.munjaon.server.server.packet.common;
2	2
3	3	import java.nio.ByteBuffer;
4	4
5	5	public final class Packet {
6	6	public static final byte SET_DEFAULT_BYTE = (byte) 0x00;
7		- public static final long LINK_CHECK_CYCLE = 30000L;
	7	+ /* LinkCheck 전송 체크 시간 간격 */
	8	+ public static final long LINK_CHECK_CYCLE = 10000L;
	9	+ /* 패킷 만료 시간 체크 */
	10	+ public static final long LIMIT_PACKET_TIMEOUT = 25000L;
8	11	public static void setDefaultByte(ByteBuffer buffer) {
9	12	if (buffer == null) {
10	13	return;

...	...	@@ -7,7 +7,7 @@
7	7	import com.munjaon.server.queue.enums.QueueTypeWorker;
8	8	import com.munjaon.server.server.dto.ConnectUserDto;
9	9	import com.munjaon.server.server.dto.HeaderDto;
10		-import com.munjaon.server.server.packet.*;
	10	+import com.munjaon.server.server.packet.common.*;
11	11	import com.munjaon.server.util.LogUtil;
12	12	import lombok.Getter;
13	13	import org.json.simple.JSONObject;

...	...	@@ -20,7 +20,7 @@
20	20
21	21	public class CollectServer extends Service {
22	22	private final InetSocketAddress listenAddress;
23		- private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
	23	+ private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
24	24
25	25	private Selector selector;
26	26	private final String serviceType;
...	...	@@ -58,8 +58,7 @@
58	58	}
59	59
60	60	private void initCollectChannel() throws IOException {
61		- saveSystemLog("COLLECT_SERVER_SERVICE : SERVER SOCKET INITIALIZING ... ...");
62		- saveSystemLog("COLLECT_SERVER_SERVICE : SERVER PORT [" + listenAddress.getPort() + "]");
	61	+ saveSystemLog("COLLECT_SERVER_SERVICE INITIALIZING : SERVER PORT [" + listenAddress.getPort() + "]");
63	62	selector = Selector.open();
64	63	/* 채널 생성 */
65	64	ServerSocketChannel serverChannel = ServerSocketChannel.open();
...	...	@@ -94,9 +93,11 @@
94	93	while (isRun()) {
95	94	try {
96	95	execInterest();
	96	+ checkInterest();
97	97	execUserStatus();
98	98	} catch (Exception e) {
99		- throw new RuntimeException(e);
	99	+ saveSystemLog(e);
	100	+// throw new RuntimeException(e);
100	101	}
101	102	}
102	103	saveSystemLog("COLLECT_SERVER_SERVICE : SERVER SERVICE STOPPED ... ...");
...	...	@@ -122,7 +123,30 @@
122	123	continue;
123	124	}
124	125	/* 사용자별 Collect Thread 실행 */
125		- new CollectServerTask(selector, key, getName(), this.serviceType, logger).run();
	126	+ new CollectServerTask(selector, key, getName(), this.serviceType, logger).start();
	127	+ }
	128	+ } else {
	129	+ expireConnectUser(key);
	130	+ }
	131	+ }
	132	+ }
	133	+
	134	+ private void checkInterest() {
	135	+ for (SelectionKey key : selector.keys()) {
	136	+ if (key.isValid()) {
	137	+ ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment();
	138	+ if (connectUserDto == null) {
	139	+ continue;
	140	+ }
	141	+ if (connectUserDto.isAlive() == 1) { // 로그인이 완료되지 않은 경우
	142	+ expireConnectUser(key);
	143	+ } else {
	144	+ if (connectUserDto.isRunningMode()) {
	145	+ continue;
	146	+ }
	147	+ connectUserDto.setRunningMode(true);
	148	+ /* 사용자별 Collect Thread 실행 */
	149	+ new CollectServerTask(selector, key, getName(), this.serviceType, logger).start();
126	150	}
127	151	} else {
128	152	expireConnectUser(key);
...	...	@@ -151,6 +175,7 @@
151	175	// Socket 채널을 channel에 수신 등록한다
152	176	channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build());
153	177	} catch (Exception e) {
	178	+ saveSystemLog(e.toString());
154	179	throw new RuntimeException(e);
155	180	}
156	181	}
...	...	@@ -165,7 +190,6 @@
165	190	if (userDto != null && userDto.getUserId() != null) {
166	191	saveSystemLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]");
167	192	collectUserQueue.removeUser(this.serviceType, userDto.getUserId());
168		-// connectUserMap.remove(userDto.getUserId());
169	193	key.attach(null);
170	194	}
171	195	// 소켓 채널 닫기
...	...	@@ -173,6 +197,7 @@
173	197	// 키 닫기
174	198	key.cancel();
175	199	} catch (IOException e) {
	200	+ saveSystemLog(e.toString());
176	201	e.printStackTrace();
177	202	}
178	203	}

...	...	@@ -16,13 +16,15 @@
16	16	public class ReportQueueServerService extends Service {
17	17	private final ReportUserQueue reportUserQueue = ReportUserQueue.getInstance();
18	18	private QueueThreadService threadService;
19		- private int queueMaxCore;
20		- private int maxWriteCount;
	19	+ private final int queueMaxCore;
	20	+ private final int maxWriteCount;
	21	+ private final int maxQueueCount;
21	22
22	23	public ReportQueueServerService(String serviceName) {
23	24	super(serviceName);
24	25	this.queueMaxCore = Integer.parseInt(getProp("QUEUE_MAX_CORE").trim());
25	26	this.maxWriteCount = Integer.parseInt(getProp("MAX_WRITE_COUNT").trim());
	27	+ this.maxQueueCount = Integer.parseInt(getProp("MAX_QUEUE_COUNT").trim());
26	28	}
27	29
28	30	@Override
...	...	@@ -32,16 +34,21 @@
32	34
33	35	@Override
34	36	public void initResources() {
	37	+ saveSystemLog("REPORT_QUEUE_SERVICE : RESOURCES INITIALIZING ... ...");
35	38	threadService = new QueueThreadService(queueMaxCore, logger);
	39	+ saveSystemLog("REPORT_QUEUE_SERVICE : RESOURCES INITIALIZED ... ...");
36	40	}
37	41
38	42	@Override
39	43	public void releaseResources() {
	44	+ saveSystemLog("REPORT_QUEUE_SERVICE : SERVER RESOURCE RELEASING ... ...");
40	45	threadService.close();
	46	+ saveSystemLog("REPORT_QUEUE_SERVICE : SERVER RESOURCE RELEASED ... ...");
41	47	}
42	48
43	49	@Override
44	50	public void doService() {
	51	+ saveSystemLog("REPORT_QUEUE_SERVICE : SERVER SERVICE STARTED ... ...");
45	52	while (isRun()) {
46	53	try {
47	54	doQueueService();
...	...	@@ -50,16 +57,18 @@
50	57	throw new RuntimeException(e);
51	58	}
52	59	}
	60	+ saveSystemLog("REPORT_QUEUE_SERVICE : SERVER SERVICE STOPPED ... ...");
53	61	}
54	62
55	63	private void doQueueService() {
56	64	List<ReportUserDto> reportUserList = reportUserQueue.getUsers();
57		- if (reportUserList == null \|\| reportUserList.size() == 0) {
	65	+ if (reportUserList == null \|\| reportUserList.isEmpty()) {
58	66	return;
59	67	}
60	68
61	69	for (ReportUserDto reportUserDto : reportUserList) {
62	70	reportUserDto.setMaxWriteCount(this.maxWriteCount);
	71	+ reportUserDto.setMaxQueueCount(this.maxQueueCount);
63	72	threadService.execute(new ReportQueueTask(reportUserDto, logger));
64	73	}
65	74	}

...	...	@@ -6,7 +6,6 @@
6	6	import com.munjaon.server.server.task.ReportServerTask;
7	7	import org.json.simple.JSONObject;
8	8
9		-import java.io.File;
10	9	import java.io.IOException;
11	10	import java.net.InetSocketAddress;
12	11	import java.net.Socket;
...	...	@@ -38,7 +37,9 @@
38	37	@Override
39	38	public void initResources() {
40	39	try {
	40	+ saveSystemLog("REPORT_SERVER : RESOURCES INITIALIZING ... ...");
41	41	initReportChannel();
	42	+ saveSystemLog("REPORT_SERVER : RESOURCES INITIALIZED ... ...");
42	43	} catch (IOException e) {
43	44	saveSystemLog(e);
44	45	throw new RuntimeException(e);
...	...	@@ -46,6 +47,7 @@
46	47	}
47	48
48	49	private void initReportChannel() throws IOException {
	50	+ saveSystemLog("REPORT_SERVER INITIALIZING : SERVER PORT [" + listenAddress.getPort() + "]");
49	51	selector = Selector.open();
50	52	/* 채널 생성 */
51	53	ServerSocketChannel serverChannel = ServerSocketChannel.open();
...	...	@@ -55,6 +57,7 @@
55	57	serverChannel.socket().bind(listenAddress);
56	58	/* 채널에 accept 대기 설정 */
57	59	serverChannel.register(selector, SelectionKey.OP_ACCEPT);
	60	+ saveSystemLog("REPORT_SERVER : SERVER SOCKET INITIALIZED ... ...");
58	61	}
59	62
60	63	private void closeReportChannel() throws IOException {
...	...	@@ -63,17 +66,19 @@
63	66
64	67	@Override
65	68	public void releaseResources() {
	69	+ saveSystemLog("REPORT_SERVER : SERVER RESOURCE RELEASING ... ...");
66	70	try {
67	71	closeReportChannel();
68	72	} catch (IOException e) {
69	73	saveSystemLog(e);
70	74	throw new RuntimeException(e);
71	75	}
	76	+ saveSystemLog("REPORT_SERVER : SERVER RESOURCE RELEASED ... ...");
72	77	}
73	78
74	79	@Override
75	80	public void doService() {
76		-
	81	+ saveSystemLog("REPORT_SERVER : SERVER SERVICE STARTED ... ...");
77	82	while (isRun()) {
78	83	try {
79	84	execInterest();
...	...	@@ -82,6 +87,7 @@
82	87	saveSystemLog(e.toString());
83	88	}
84	89	}
	90	+ saveSystemLog("REPORT_SERVER : SERVER SERVICE STOPPED ... ...");
85	91	}
86	92
87	93	private void checkInterest() throws IOException, InterruptedException {
...	...	@@ -93,13 +99,13 @@
93	99	if (reportUserDto == null) {
94	100	continue;
95	101	}
96		- SocketChannel channel = (SocketChannel) key.channel(); // 키 채널을 가져온다.
97	102	if (reportUserDto.isAlive() == 1) { // 로그인이 완료되지 않은 경우
98	103	expireConnectUser(key);
99	104	} else if (reportUserDto.isAlive() == 2) {
100		- if (reportUserDto == null \|\| reportUserDto.isRunningMode()) {
	105	+ if (reportUserDto.isRunningMode()) {
101	106	continue;
102	107	}
	108	+ reportUserDto.setRunningMode(true);
103	109	/* 사용자별 Report Thread 실행 */
104	110	new ReportServerTask(selector, key, getName(), logger).run();
105	111	} else {
...	...	@@ -108,8 +114,9 @@
108	114	if (reportUserDto.isRunningMode()) {
109	115	continue;
110	116	}
	117	+ reportUserDto.setRunningMode(true);
111	118	/* 사용자별 Report Thread 실행 */
112		- new ReportServerTask(selector, key, getName(), logger).run();
	119	+ new ReportServerTask(selector, key, getName(), logger).start();
113	120	}
114	121	}
115	122	} else {
...	...	@@ -138,14 +145,9 @@
138	145	if (reportUserDto == null \|\| reportUserDto.isRunningMode()) {
139	146	continue;
140	147	}
141		- if (reportUserDto.isLogin()) {
142		- saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
143		- } else {
144		- saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
145		- }
146	148	reportUserDto.setRunningMode(true);
147	149	/* 사용자별 Report Thread 실행 */
148		- new ReportServerTask(selector, key, getName(), logger).run();
	150	+ new ReportServerTask(selector, key, getName(), logger).start();
149	151	}
150	152	} else {
151	153	expireConnectUser(key);
...	...	@@ -165,8 +167,9 @@
165	167	SocketAddress remoteAddr = socket.getRemoteSocketAddress();
166	168	saveSystemLog("Connected to: " + remoteAddr);
167	169	// Socket 채널을 channel에 수신 등록한다
168		- channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + File.separator + getProp("QUEUE_PATH")).build());
	170	+ channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build());
169	171	} catch (Exception e) {
	172	+ saveSystemLog(e.toString());
170	173	throw new RuntimeException(e);
171	174	}
172	175	}
...	...	@@ -189,6 +192,7 @@
189	192	// 키 닫기
190	193	key.cancel();
191	194	} catch (IOException e) {
	195	+ saveSystemLog(e.toString());
192	196	e.printStackTrace();
193	197	}
194	198	}

...	...	@@ -4,10 +4,10 @@
4	4	import com.munjaon.server.server.dto.ConnectUserDto;
5	5	import com.munjaon.server.server.dto.ReportDto;
6	6	import com.munjaon.server.server.dto.ReportUserDto;
7		-import com.munjaon.server.server.packet.Header;
8		-import com.munjaon.server.server.packet.LinkCheck;
9		-import com.munjaon.server.server.packet.Packet;
10		-import com.munjaon.server.server.packet.Report;
	7	+import com.munjaon.server.server.packet.common.Header;
	8	+import com.munjaon.server.server.packet.common.LinkCheck;
	9	+import com.munjaon.server.server.packet.common.Packet;
	10	+import com.munjaon.server.server.packet.common.Report;
11	11	import com.munjaon.server.server.queue.ReportUserQueue;
12	12	import com.munjaon.server.server.task.ReportReadTask;
13	13	import com.munjaon.server.util.LogUtil;

...	...	@@ -93,7 +93,6 @@
93	93
94	94	protected void initLogFile() {
95	95	LOG_FILE = System.getProperty("ROOTPATH") + getProp("LOG_FILE");
96		- System.out.println("LOG_FILE: " + LOG_FILE);
97	96	setLogFile( LOG_FILE );
98	97	saveSystemLog("Service Log Initializing ... ...");
99	98	}

...	...	@@ -6,7 +6,7 @@
6	6	import com.munjaon.server.queue.dto.BasicMessageDto;
7	7	import com.munjaon.server.queue.enums.QueueTypeWorker;
8	8	import com.munjaon.server.server.dto.ConnectUserDto;
9		-import com.munjaon.server.server.packet.*;
	9	+import com.munjaon.server.server.packet.common.*;
10	10	import com.munjaon.server.server.queue.CollectUserQueue;
11	11	import com.munjaon.server.util.*;
12	12

...	...	@@ -7,7 +7,7 @@
7	7	import com.munjaon.server.queue.enums.QueueTypeWorker;
8	8	import com.munjaon.server.server.config.ServerConfig;
9	9	import com.munjaon.server.server.dto.ConnectUserDto;
10		-import com.munjaon.server.server.packet.*;
	10	+import com.munjaon.server.server.packet.common.*;
11	11	import com.munjaon.server.server.queue.CollectUserQueue;
12	12	import com.munjaon.server.server.service.PropertyLoader;
13	13	import com.munjaon.server.util.*;
...	...	@@ -22,25 +22,27 @@
22	22	import java.time.LocalDateTime;
23	23	import java.time.format.DateTimeFormatter;
24	24
25		-public class CollectServerTask implements Runnable {
	25	+public class CollectServerTask extends Thread {
26	26	public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
27	27	public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
28	28
29	29	private Selector selector;
30		- private SelectionKey key;
31		- private SocketChannel channel;
32		- private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
33		- private ConnectUserDto connectUserDto;
34		- private String serviceName;
35		- private String serviceType;
	30	+ private final SelectionKey key;
	31	+ private final SocketChannel channel;
	32	+ private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
	33	+ private final ConnectUserDto connectUserDto;
	34	+ private final String serviceName;
	35	+ private final String serviceType;
36	36	private final LogUtil logger;
37	37
38	38	private boolean IS_SERVER_RUN; // 서버가 구동중인지 여부
39	39	private boolean IS_RUN_YN;
40	40	private long RUN_FLAG_CHECK_TIME;
	41	+ private long LAST_PACKET_SEND_TIME = System.currentTimeMillis(); // 패킷 송수신 시간을 체크하기 위한 변수(최대 3초간 요청이 없는 경우 Thread 종료)
	42	+ private boolean IS_ERROR = false;
41	43
42	44	/* 클라이언트 요청 데이터 수신 */
43		- private ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
	45	+ private final ByteBuffer headBuffer = ByteBuffer.allocateDirect(Header.HEADER_LENGTH);
44	46	/* 세션이 만료되었는지 체크 */
45	47	private boolean isExpiredYn;
46	48
...	...	@@ -53,6 +55,11 @@
53	55	this.serviceName = serviceName;
54	56	this.serviceType = serviceType;
55	57	this.logger = logger;
	58	+ if (connectUserDto.isLogin()) {
	59	+ saveSystemLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]");
	60	+ } else {
	61	+ saveSystemLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
	62	+ }
56	63	}
57	64
58	65	protected String getProp(String name) {
...	...	@@ -121,6 +128,13 @@
121	128	break;
122	129	}
123	130	try {
	131	+ /* 2. Packet Timeout Check */
	132	+ if (checkTimeOut()) {
	133	+ saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]");
	134	+ saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
	135	+ expireConnectUser();
	136	+ break;
	137	+ }
124	138	/* 3. HeadBuffer 읽기 */
125	139	int size = readHeader();
126	140	/* 4. Body 읽기 */
...	...	@@ -133,7 +147,7 @@
133	147	default: expireConnectUser(); break;
134	148	}
135	149	} else if (size == 0) {
136		- if (System.currentTimeMillis() - connectUserDto.getLastTrafficTime() > ServerConfig.DELIVER_EXEC_CYCLE_TIME) {
	150	+ if (System.currentTimeMillis() - LAST_PACKET_SEND_TIME > ServerConfig.DELIVER_EXEC_CYCLE_TIME) {
137	151	this.isExpiredYn = true;
138	152	}
139	153	Thread.sleep(1);
...	...	@@ -143,14 +157,27 @@
143	157	} catch (Exception e) {
144	158	/* 세션 만료 여부 */
145	159	this.isExpiredYn = true;
146		- e.printStackTrace();
	160	+ this.IS_ERROR = true;
	161	+ saveSystemLog(e);
147	162	}
148	163	/* RUN Flag 체크 */
149	164	reloadRunFlag();
150	165	}
151	166	/* 중요 : 사용자 Thread 실행모드 Off */
152	167	connectUserDto.setRunningMode(false);
	168	+ /* 에러가 발생한 경우 세션을 종료힌다. */
	169	+ if (IS_ERROR) {
	170	+ expireConnectUser();
	171	+ }
153	172	saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
	173	+ }
	174	+
	175	+ private boolean checkTimeOut() {
	176	+ if (System.currentTimeMillis() - this.connectUserDto.getLastTrafficTime() >= Packet.LIMIT_PACKET_TIMEOUT) {
	177	+ return true;
	178	+ }
	179	+
	180	+ return false;
154	181	}
155	182
156	183	private void recvDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
...	...	@@ -168,6 +195,8 @@
168	195	case "KFT": recvKftDeliver(channel, headBuffer); break;
169	196	default:break;
170	197	}
	198	+ /* 마지막 패킷 수신시간 체크 */
	199	+ LAST_PACKET_SEND_TIME = System.currentTimeMillis();
171	200	}
172	201
173	202	private boolean isExpireService() {
...	...	@@ -468,16 +497,17 @@
468	497	}
469	498
470	499	private void recvLinkCheck(SocketChannel channel) throws IOException {
471		- ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
472		- channel.read(bodyBuffer);
473		-// SocketChannel channel = (SocketChannel) key.channel();
474		- channel.write(LinkCheck.makeLinkCheckAckBuffer());
475		- connectUserDto.updateLastTrafficTime();
476	500	/* 서비스 중지여부 체크 */
477	501	if (isExpireService()) {
478	502	expireConnectUser();
479	503	return;
480	504	}
	505	+ ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
	506	+ channel.read(bodyBuffer);
	507	+ saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]");
	508	+ channel.write(LinkCheck.makeLinkCheckAckBuffer());
	509	+ saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]");
	510	+ connectUserDto.updateLastTrafficTime();
481	511	}
482	512
483	513	private void recvBind(SocketChannel channel, ByteBuffer headBuffer) {
...	...	@@ -490,13 +520,14 @@
490	520
491	521	String id = Bind.getBindId(bindBuffer);
492	522	String pwd = Bind.getBindPwd(bindBuffer);
	523	+ saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
493	524
494	525	MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService();
495	526	MemberDto memberDto = null;
496	527	if (svc != null) {
497	528	memberDto = svc.get(id);
498	529	}
499		- saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
	530	+
500	531	/* Bind Check */
501	532	resultCode = checkBind(memberDto, this.serviceType, id, pwd);
502	533

...	...	@@ -18,7 +18,7 @@
18	18	public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
19	19	public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
20	20
21		- private ReportUserDto reportUserDto;
	21	+ private final ReportUserDto reportUserDto;
22	22	private final LogUtil logger;
23	23
24	24	public ReportQueueTask(ReportUserDto reportUserDto, LogUtil logger) {
...	...	@@ -37,15 +37,15 @@
37	37
38	38	ReportQueue reportQueue = reportUserDto.getReportQueue();
39	39	/* 리포트큐에 최대 크기까지 쓰고 모두 리포트는 전송했는지 체크 : 테스트후 적용 */
40		-// if (reportQueue.isWriteLimit(reportUserDto.getMaxWriteCount())) {
41		-// if (reportQueue.isTruncateQueue(reportUserDto.getMaxWriteCount())) {
42		-// try {
43		-// reportQueue.truncateQueue();
44		-// } catch (Exception e) {}
45		-// } else {
46		-// return;
47		-// }
48		-// }
	40	+ if (reportQueue.isWriteLimit(reportUserDto.getMaxQueueCount())) {
	41	+ if (reportQueue.isTruncateQueue(reportUserDto.getMaxQueueCount())) {
	42	+ try {
	43	+ reportQueue.truncateQueue();
	44	+ } catch (Exception ignored) {}
	45	+ } else {
	46	+ return;
	47	+ }
	48	+ }
49	49	ReportService reportService = (ReportService) CacheService.REPORT_SERVICE.getService();
50	50	List<ReportDto> list = reportService.getReportListForUser(reportUserDto.getUserId());
51	51	if (list == null \|\| list.isEmpty()) {

...	...	@@ -5,7 +5,7 @@
5	5	import com.munjaon.server.cache.service.MemberService;
6	6	import com.munjaon.server.queue.pool.ReportQueue;
7	7	import com.munjaon.server.server.dto.ReportUserDto;
8		-import com.munjaon.server.server.packet.*;
	8	+import com.munjaon.server.server.packet.common.*;
9	9	import com.munjaon.server.server.queue.ReportUserQueue;
10	10	import com.munjaon.server.util.LogUtil;
11	11

...	...	@@ -16,8 +16,8 @@
16	16	public static final SimpleDateFormat sdf = new SimpleDateFormat("[MM-dd HH:mm:ss]");
17	17	public static final String LOG_DATE_FORMAT = "[MM-dd HH:mm:ss]";
18	18
19		- private CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
20		- private String serviceType;
	19	+ private final CollectUserQueue collectUserQueue = CollectUserQueue.getInstance();
	20	+ private final String serviceType;
21	21	private final LogUtil logger;
22	22
23	23	public StatusCheckTask(String serviceType, LogUtil logger) {
...	...	@@ -29,7 +29,7 @@
29	29	public void run() {
30	30	saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]");
31	31	List<ConnectUserDto> userList = collectUserQueue.getUsers(this.serviceType);
32		- if (userList == null && userList.isEmpty()) {
	32	+ if (userList == null \|\| userList.isEmpty()) {
33	33	saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]");
34	34	saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
35	35	return;
...	...	@@ -39,9 +39,6 @@
39	39	for (ConnectUserDto user : userList) {
40	40	MemberDto savedMemberDto = user.getMemberDto();
41	41	saveSystemLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]");
42		- if (savedMemberDto == null) {
43		- continue;
44		- }
45	42	MemberDto newMemberDto = svc.get(savedMemberDto.getMberId());
46	43	saveSystemLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]");
47	44	if (newMemberDto == null) {

...	...	@@ -5,9 +5,6 @@
5	5
6	6	package com.munjaon.server.util;
7	7
8		-import java.text.DecimalFormat;
9		-import java.util.ArrayList;
10		-
11	8	/**
12	9	* 문자열 관련 유틸리티 클래스
13	10	* @author JDS
...	...	@@ -38,130 +35,5 @@
38	35	}
39	36
40	37	return ((String)obj).trim();
41		- }
42		-
43		- public static String ltrim(byte[] obj) {
44		- return ltrim(new String(obj));
45		- }
46		-
47		- public static String ltrim(String obj) {
48		- return ltrim(obj.toCharArray());
49		- }
50		-
51		- public static String ltrim(char[] obj) {
52		- int len = obj.length;
53		- int idx = 0;
54		-
55		- while( idx < len && obj[idx] <= ' ' ) {
56		- idx++;
57		- }
58		-
59		- return new String(obj, idx, len-idx);
60		- }
61		-
62		- public static String rtrim(byte[] obj) {
63		- return rtrim(new String(obj));
64		- }
65		-
66		- public static String rtrim(String obj) {
67		- return rtrim(obj.toCharArray());
68		- }
69		-
70		- public static String rtrim(char[] obj) {
71		- int len = obj.length;
72		- int idx = len-1;
73		-
74		- while( idx >= 0 && obj[idx] <= ' ' ) {
75		- idx--;
76		- }
77		-
78		- return new String(obj, 0, idx+1);
79		- }
80		-
81		- public static String replaceAll(String src, String from, String to) {
82		- StringBuilder sbuf = new StringBuilder();
83		-
84		- int len = from.length();
85		- int idx = 0;
86		- int stx = 0;
87		-
88		- while( (idx=src.indexOf(from, stx)) > -1 ) {
89		- sbuf.append(src.substring(stx, idx));
90		- sbuf.append(to);
91		- stx=idx+len;
92		- }
93		-
94		- sbuf.append(src.substring(stx));
95		-
96		- return sbuf.toString();
97		- }
98		-
99		- public static String[] split(String sSrc, String sDelim) {
100		- ArrayList aList = new ArrayList();
101		-
102		- String sTmp;
103		- int len = sDelim.length();
104		- int idx = 0;
105		- int stx = 0;
106		-
107		- while( (idx=sSrc.indexOf(sDelim, stx)) > -1 ) {
108		- sTmp = sSrc.substring(stx, idx);
109		- aList.add(sTmp);
110		- stx=idx+len;
111		- }
112		-
113		- if( stx <= sSrc.length() ) {
114		- aList.add(sSrc.substring(stx));
115		- }
116		-
117		- String[] sRet = new String[aList.size()];
118		-
119		- for( int i=0; i<aList.size(); i++ ) {
120		- sRet[i] = (String) aList.get(i);
121		- }
122		-
123		- return sRet;
124		- }
125		-
126		- public static String substring(String obj, int idx, int length) {
127		- if( obj.getBytes().length <= idx ) {
128		- return "";
129		- }
130		-
131		- if( obj.getBytes().length <= length ) {
132		- return obj;
133		- }
134		-
135		- int totallen=0;
136		- int i=idx;
137		- for( i=idx; i<obj.length(); i++ ) {
138		- totallen += obj.substring(i, i+1).getBytes().length;
139		-
140		- if( length < totallen ) {
141		- break;
142		- }
143		- }
144		-
145		- return obj.substring(idx, i);
146		- }
147		-
148		- public static String substring(String obj, int length) {
149		- return substring(obj, 0, length);
150		- }
151		-
152		- public static String numFilter(String src) {
153		- return src.replaceAll("[^0-9]", "");
154		- }
155		-
156		- public static String toNumberFormat(Object obj, String fmt) {
157		- DecimalFormat df = new DecimalFormat(fmt);
158		- return df.format(obj);
159		- }
160		-
161		- public static String pad0(String str, int size) {
162		- char[] zeros = new char[size - str.length()];
163		- for (int i = 0; i < zeros.length; i++)
164		- zeros[i] = '0';
165		- return new String(zeros) + str;
166	38	}
167	39	}

...	...	@@ -7,6 +7,11 @@
7	7	# jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
8	8	username: mjonUr_agent
9	9	password: mjagent123$
	10	+ connectionTimeout: 30000
	11	+ maximumPoolSize: 15
	12	+ maxLifetime: 1800000
	13	+ poolName: HikariCP
	14	+ connectionTestQuery: SELECT 1
10	15
11	16	server:
12	17	port: 8090

...	...	@@ -2,10 +2,15 @@
2	2	datasource:
3	3	server:
4	4	driver-class-name: org.mariadb.jdbc.Driver
5		- url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
6		- jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
7		- username: mjonUr_agent
8		- password: mjagent123$
	5	+ url: jdbc:mariadb://localhost:3306/mjon
	6	+ jdbc-url: jdbc:mariadb://localhost:3306/mjon
	7	+ username: root
	8	+ password: 1234
	9	+ connectionTimeout: 30000
	10	+ maximumPoolSize: 15
	11	+ maxLifetime: 1800000
	12	+ poolName: HikariCP
	13	+ connectionTestQuery: SELECT 1
9	14
10	15	server:
11	16	port: 8090

...	...	@@ -6,6 +6,11 @@
6	6	jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent
7	7	username: mjonUr_agent
8	8	password: mjagent123$
	9	+ connectionTimeout: 30000
	10	+ maximumPoolSize: 20
	11	+ maxLifetime: 1800000
	12	+ poolName: HikariCP
	13	+ connectionTestQuery: SELECT 1
9	14
10	15	server:
11	16	port: 8090

Delete comment