Commit @aa4fc216929aacb96a1f2c43d3d6320d78b1d771

2679d17

aa4fc21

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

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

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


 package com.munjaon.server.config;
 
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;

     @Bean(name = "datasource")
     @ConfigurationProperties(prefix = "spring.datasource.server")
     public DataSource dataSource() {
-        return DataSourceBuilder.create().build();
+        return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
 
     @Primary

2679d17

aa4fc21

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

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

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

...	...	@@ -119,6 +119,60 @@
119	119	}
120	120
121	121	@Bean
	122	+ @Order(2)
	123	+ public CommandLineRunner getRunnerBeanForKatQueue() {
	124	+ try {
	125	+ String[] svcArray = ServiceUtil.getServiceNames(serverConfig.getStringArray("KAT.SERVICE_LIST"));
	126	+ if (svcArray == null \|\| svcArray.length == 0) {
	127	+ log.info("KAT service list is empty");
	128	+ } else {
	129	+ if (ServiceUtil.isDuplicate(svcArray)) {
	130	+ log.info("KAT service list is duplicated");
	131	+ } else {
	132	+ for (String svc : svcArray) {
	133	+ log.info("SERVICE CREATE : {}", svc);
	134	+ QueueInfo queueInfo = QueueInfo.builder().queueName(svc).serviceType("KAT").queuePath(serverConfig.getString("KAT.QUEUE_PATH")).build();
	135	+ KakaoAlarmWriteQueue katWriteQueue = new KakaoAlarmWriteQueue(queueInfo);
	136	+ KakaoAlarmReadQueue katReadQueue = new KakaoAlarmReadQueue(queueInfo);
	137	+ QueueServerService queueServerService = new QueueServerService(svc, katWriteQueue, katReadQueue);
	138	+ queueServerService.start();
	139	+ }
	140	+ }
	141	+ }
	142	+ } catch (Exception e) {
	143	+ throw new RuntimeException(e);
	144	+ }
	145	+ return args -> System.out.println("Runner Bean #2");
	146	+ }
	147	+
	148	+ @Bean
	149	+ @Order(2)
	150	+ public CommandLineRunner getRunnerBeanForKftQueue() {
	151	+ try {
	152	+ String[] svcArray = ServiceUtil.getServiceNames(serverConfig.getStringArray("KFT.SERVICE_LIST"));
	153	+ if (svcArray == null \|\| svcArray.length == 0) {
	154	+ log.info("KFT service list is empty");
	155	+ } else {
	156	+ if (ServiceUtil.isDuplicate(svcArray)) {
	157	+ log.info("KFT service list is duplicated");
	158	+ } else {
	159	+ for (String svc : svcArray) {
	160	+ log.info("SERVICE CREATE : {}", svc);
	161	+ QueueInfo queueInfo = QueueInfo.builder().queueName(svc).serviceType("KFT").queuePath(serverConfig.getString("KFT.QUEUE_PATH")).build();
	162	+ KakaoFriendWriteQueue kftWriteQueue = new KakaoFriendWriteQueue(queueInfo);
	163	+ KakaoFriendReadQueue kftReadQueue = new KakaoFriendReadQueue(queueInfo);
	164	+ QueueServerService queueServerService = new QueueServerService(svc, kftWriteQueue, kftReadQueue);
	165	+ queueServerService.start();
	166	+ }
	167	+ }
	168	+ }
	169	+ } catch (Exception e) {
	170	+ throw new RuntimeException(e);
	171	+ }
	172	+ return args -> System.out.println("Runner Bean #2");
	173	+ }
	174	+
	175	+ @Bean
122	176	@Order(3)
123	177	public CommandLineRunner getRunnerBeanForSmsCollector() {
124	178	try {
...	...	@@ -152,6 +206,54 @@
152	206
153	207	@Bean
154	208	@Order(3)
	209	+ public CommandLineRunner getRunnerBeanForMmsCollector() {
	210	+ try {
	211	+ String serviceName = "MMS_COLLECTOR";
	212	+ String serviceType = serverConfig.getString(serviceName + ".SERVICE_TYPE");
	213	+ int port = serverConfig.getInt(serviceName + ".SERVICE_PORT");
	214	+// CollectBackServerService collectServerService = new CollectBackServerService(serviceName, serviceType, port);
	215	+ CollectServerService collectServerService = new CollectServerService(serviceName, serviceType, port);
	216	+ collectServerService.start();
	217	+ } catch (Exception e) {
	218	+ throw new RuntimeException(e);
	219	+ }
	220	+ return args -> System.out.println("Runner Bean SmsCollector #3");
	221	+ }
	222	+
	223	+ @Bean
	224	+ @Order(3)
	225	+ public CommandLineRunner getRunnerBeanForKatCollector() {
	226	+ try {
	227	+ String serviceName = "KAT_COLLECTOR";
	228	+ String serviceType = serverConfig.getString(serviceName + ".SERVICE_TYPE");
	229	+ int port = serverConfig.getInt(serviceName + ".SERVICE_PORT");
	230	+// CollectBackServerService collectServerService = new CollectBackServerService(serviceName, serviceType, port);
	231	+ CollectServerService collectServerService = new CollectServerService(serviceName, serviceType, port);
	232	+ collectServerService.start();
	233	+ } catch (Exception e) {
	234	+ throw new RuntimeException(e);
	235	+ }
	236	+ return args -> System.out.println("Runner Bean SmsCollector #3");
	237	+ }
	238	+
	239	+ @Bean
	240	+ @Order(3)
	241	+ public CommandLineRunner getRunnerBeanForKftCollector() {
	242	+ try {
	243	+ String serviceName = "KFT_COLLECTOR";
	244	+ String serviceType = serverConfig.getString(serviceName + ".SERVICE_TYPE");
	245	+ int port = serverConfig.getInt(serviceName + ".SERVICE_PORT");
	246	+// CollectBackServerService collectServerService = new CollectBackServerService(serviceName, serviceType, port);
	247	+ CollectServerService collectServerService = new CollectServerService(serviceName, serviceType, port);
	248	+ collectServerService.start();
	249	+ } catch (Exception e) {
	250	+ throw new RuntimeException(e);
	251	+ }
	252	+ return args -> System.out.println("Runner Bean SmsCollector #3");
	253	+ }
	254	+
	255	+ @Bean
	256	+ @Order(3)
155	257	public CommandLineRunner getRunnerBeanForReporter() {
156	258	try {
157	259	String serviceName = "REPORTER";

2679d17

aa4fc21

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

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

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


     /* SMS 메시지 */
     MSG_ERROR_SMS_MESSAGE(400, "SMS Message is Null OR is Over Limit Byte"),
 
-    /* LMS, MMS 제목, 메시지 */
-    MSG_ERROR_MEDIA_SUBJECT(500, "LMS, MMS Subject is Null OR is Over Limit Byte"),
-    MSG_ERROR_MEDIA_MESSAGE(501, "LMS, MMS Message is Null OR is Over Limit Byte"),
+    /* LMS, MMS, KAKAO 제목, 메시지 */
+    MSG_ERROR_MEDIA_SUBJECT(500, "LMS, MMS, KAKAO Subject is Null OR is Over Limit Byte"),
+    MSG_ERROR_MEDIA_MESSAGE(501, "LMS, MMS, KAKAO Message is Null OR is Over Limit Byte"),
 
-    /* 카카오 알림톡, 친구톡 메시지 */
+    /* 카카오 알림톡, 친구톡 메시지, KAKAO_SENDER_KEY, KAKAO_TEMPLATE_CODE */
+    MSG_ERROR_KAKAO_SENDER_KEY(600, "KAKAO_SENDER_KEY is Null OR is Over Limit Byte"),
+    MSG_ERROR_KAKAO_TEMPLATE_CODE(601, "KAKAO_TEMPLATE_CODE is Null OR is Over Limit Byte"),
 
     /* 리포트 관련 에러 메시지 */
     MSG_ERROR_REPORT(800, "REPORT DATA is Null OR is invalid"),

aa4fc21

src/main/java/com/munjaon/server/queue/config/KakaoBodyConfig.java (added)

+++ src/main/java/com/munjaon/server/queue/config/KakaoBodyConfig.java

...	...	@@ -0,0 +1,22 @@
	1	+package com.munjaon.server.queue.config;
	2	+
	3	+public final class KakaoBodyConfig {
	4	+ /* 제목 (Length : 60 / Position : 161) */
	5	+ public static final int SUBJECT_BYTE_LENGTH = 60;
	6	+ public static final int SUBJECT_BYTE_POSITION = BodyCommonConfig.AGENT_CODE_BYTE_POSITION + BodyCommonConfig.AGENT_CODE_BYTE_LENGTH;
	7	+ /* LMS/MMS Message (Length : 2000 / Position : 221) */
	8	+ public static final int MEDIA_MSG_BYTE_LENGTH = 2000;
	9	+ public static final int MEDIA_MSG_BYTE_POSITION = SUBJECT_BYTE_POSITION + SUBJECT_BYTE_LENGTH;
	10	+ /* KAKAO_SENDER_KEY (Length : 40 / Position : 2221) */
	11	+ public static final int KAKAO_SENDER_KEY_BYTE_LENGTH = 40;
	12	+ public static final int KAKAO_SENDER_KEY_BYTE_POSITION = MEDIA_MSG_BYTE_POSITION + MEDIA_MSG_BYTE_LENGTH;
	13	+ /* KAKAO_TEMPLATE_CODE (Length : 64 / Position : 2261) */
	14	+ public static final int KAKAO_TEMPLATE_CODE_BYTE_LENGTH = 64;
	15	+ public static final int KAKAO_TEMPLATE_CODE_BYTE_POSITION = KAKAO_SENDER_KEY_BYTE_POSITION + KAKAO_SENDER_KEY_BYTE_LENGTH;
	16	+ /* JSON 파일 (Length : 128 / Position : 2222) */
	17	+ public static final int FILENAME_JSON_BYTE_LENGTH = 128;
	18	+ public static final int FILENAME_JSON_BYTE_POSITION = KAKAO_TEMPLATE_CODE_BYTE_POSITION + KAKAO_TEMPLATE_CODE_BYTE_LENGTH;
	19	+
	20	+ /* KAKAO Body 길이 */
	21	+ public static final int KAKAO_SUM_BYTE_LENGTH = BodyCommonConfig.COMMON_SUM_BYTE_LENGTH + SUBJECT_BYTE_LENGTH + MEDIA_MSG_BYTE_LENGTH + KAKAO_SENDER_KEY_BYTE_LENGTH + KAKAO_TEMPLATE_CODE_BYTE_LENGTH + FILENAME_JSON_BYTE_LENGTH;
	22	+}

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/config/QueueConstants.java

--- src/main/java/com/munjaon/server/queue/config/QueueConstants.java

+++ src/main/java/com/munjaon/server/queue/config/QueueConstants.java

...	...	@@ -76,5 +76,31 @@
76	76	public static final int REPORT_TELECOM_LENGTH = 7;
77	77
78	78	// 큐에 저장하기전에 바이트를 채울 문자
79		- public static final byte SET_DEFAULT_BYTE = (byte) 0x20;
	79	+ public static final byte SET_DEFAULT_BYTE = (byte) 0x00;
	80	+
	81	+ public static String getString(byte[] srcArray) {
	82	+ if (srcArray == null) {
	83	+ return null;
	84	+ }
	85	+ int size = 0;
	86	+ for (int i = 0, len = srcArray.length; i < len; i++) {
	87	+ if (srcArray[i] == SET_DEFAULT_BYTE) {
	88	+ continue;
	89	+ }
	90	+ size++;
	91	+ }
	92	+ byte[] destArray = null;
	93	+ if (size > 0) {
	94	+ destArray = new byte[size];
	95	+ int index = 0;
	96	+ for (int i = 0, len = srcArray.length; i < len; i++) {
	97	+ if (srcArray[i] == SET_DEFAULT_BYTE) {
	98	+ continue;
	99	+ }
	100	+ destArray[index++] = srcArray[i];
	101	+ }
	102	+ }
	103	+
	104	+ return destArray == null ? null : new String(destArray);
	105	+ }
80	106	}

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/dto/BasicMessageDto.java

--- src/main/java/com/munjaon/server/queue/dto/BasicMessageDto.java

+++ src/main/java/com/munjaon/server/queue/dto/BasicMessageDto.java

...	...	@@ -35,4 +35,8 @@
35	35	protected int userFileSize01 = 0;
36	36	protected int userFileSize02 = 0;
37	37	protected int userFileSize03 = 0;
	38	+
	39	+ private String kakaoSenderKey;
	40	+ private String kakaoTemplateCode;
	41	+ private String kakaoJsonFile;
38	42	}

aa4fc21

src/main/java/com/munjaon/server/queue/mapper/KatMapper.java (added)

+++ src/main/java/com/munjaon/server/queue/mapper/KatMapper.java

...	...	@@ -0,0 +1,9 @@
	1	+package com.munjaon.server.queue.mapper;
	2	+
	3	+import com.munjaon.server.queue.dto.BasicMessageDto;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+@Mapper
	7	+public interface KatMapper {
	8	+ int insert(BasicMessageDto messageDto);
	9	+}

aa4fc21

src/main/java/com/munjaon/server/queue/mapper/KftMapper.java (added)

+++ src/main/java/com/munjaon/server/queue/mapper/KftMapper.java

...	...	@@ -0,0 +1,9 @@
	1	+package com.munjaon.server.queue.mapper;
	2	+
	3	+import com.munjaon.server.queue.dto.BasicMessageDto;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+@Mapper
	7	+public interface KftMapper {
	8	+ int insert(BasicMessageDto messageDto);
	9	+}

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/mapper/LmsMapper.java

--- src/main/java/com/munjaon/server/queue/mapper/LmsMapper.java

+++ src/main/java/com/munjaon/server/queue/mapper/LmsMapper.java


 package com.munjaon.server.queue.mapper;
 
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface LmsMapper {
     int insert(BasicMessageDto messageDto);
 }

aa4fc21

src/main/java/com/munjaon/server/queue/mapper/MmsMapper.java (added)

+++ src/main/java/com/munjaon/server/queue/mapper/MmsMapper.java

...	...	@@ -0,0 +1,9 @@
	1	+package com.munjaon.server.queue.mapper;
	2	+
	3	+import com.munjaon.server.queue.dto.BasicMessageDto;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+@Mapper
	7	+public interface MmsMapper {
	8	+ int insert(BasicMessageDto messageDto);
	9	+}

2679d17

aa4fc21

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

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

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


 
     private KakaoAlarmQueuePool() {}
 
-    public synchronized static KakaoAlarmQueuePool getInstance(){
+    public synchronized static KakaoAlarmQueuePool getInstance() {
         if(queueInstance == null){
             queueInstance = new KakaoAlarmQueuePool();
         }

aa4fc21

src/main/java/com/munjaon/server/queue/pool/KakaoAlarmReadQueue.java (added)

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

...	...	@@ -0,0 +1,39 @@
	1	+package com.munjaon.server.queue.pool;
	2	+
	3	+import com.munjaon.server.queue.config.KakaoBodyConfig;
	4	+import com.munjaon.server.queue.config.QueueConstants;
	5	+import com.munjaon.server.queue.dto.BasicMessageDto;
	6	+import com.munjaon.server.queue.dto.QueueInfo;
	7	+import com.munjaon.server.util.MessageUtil;
	8	+
	9	+import java.nio.ByteBuffer;
	10	+
	11	+public class KakaoAlarmReadQueue extends ReadQueue {
	12	+ public KakaoAlarmReadQueue(QueueInfo queueInfo) throws Exception {
	13	+ this.queueInfo = queueInfo;
	14	+// initQueue();
	15	+ }
	16	+
	17	+ @Override
	18	+ void popBuffer() throws Exception {
	19	+ this.channel.position(MessageUtil.calcReadPosition(this.popCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
	20	+ this.channel.read(this.dataBuffer);
	21	+ }
	22	+
	23	+ @Override
	24	+ void getBytesForExtendMessage(BasicMessageDto messageDto) {
	25	+ MessageUtil.getBytesForKakaoMessage(this.dataBuffer, messageDto);
	26	+ }
	27	+
	28	+ @Override
	29	+ void initDataBuffer() {
	30	+ if (this.dataBuffer == null) {
	31	+ this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
	32	+ }
	33	+ this.dataBuffer.clear();
	34	+ for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
	35	+ this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
	36	+ }
	37	+ this.dataBuffer.position(0);
	38	+ }
	39	+}

2679d17

aa4fc21

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

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

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


 package com.munjaon.server.queue.pool;
 
+import com.munjaon.server.config.ServiceCode;
+import com.munjaon.server.queue.config.KakaoBodyConfig;
+import com.munjaon.server.queue.config.QueueConstants;
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import com.munjaon.server.queue.dto.QueueInfo;
+import com.munjaon.server.util.MessageUtil;
+
+import java.nio.ByteBuffer;
 
 public class KakaoAlarmWriteQueue extends WriteQueue {
+    public KakaoAlarmWriteQueue(QueueInfo queueInfo) throws Exception {
+        this.queueInfo = queueInfo;
+        /* 큐초기화 */
+//        initQueue();
+    }
 
     @Override
     public int isValidateMessageForExtend(BasicMessageDto messageDto) {
-        return 0;
+        /* 13. 제목 */
+        if (MessageUtil.isEmptyForMessage(messageDto.getUserSubject(), true) || MessageUtil.isOverByteForMessage(messageDto.getUserSubject(), KakaoBodyConfig.SUBJECT_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_SUBJECT.getCode();
+        }
+        /* 14. 메시지 */
+        if (MessageUtil.isEmptyForMessage(messageDto.getUserMessage(), true) || MessageUtil.isOverByteForMessage(messageDto.getUserMessage(), KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+        /* 15. KAKAO_SENDER_KEY */
+        if (MessageUtil.isEmptyForMessage(messageDto.getKakaoSenderKey(), true) || MessageUtil.isOverByteForMessage(messageDto.getKakaoSenderKey(), KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+        /* 16. KAKAO_TEMPLATE_CODE */
+        if (MessageUtil.isEmptyForMessage(messageDto.getKakaoTemplateCode(), true) || MessageUtil.isOverByteForMessage(messageDto.getKakaoTemplateCode(), KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+
+        return ServiceCode.OK.getCode();
     }
 
     @Override
     public void pushMessageToBuffer(BasicMessageDto messageDto) throws Exception {
-
+        if (isValidateMessage(messageDto) == ServiceCode.OK.getCode()) {
+            /* 1. dataBuffer 초기화 */
+            initDataBuffer();
+            /* 2. messageDto >> dataBuffer */
+            MessageUtil.setBytesForCommonMessage(this.dataBuffer, messageDto);
+            MessageUtil.setBytesForKakaoMessage(this.dataBuffer, messageDto);
+            /* 3. 파일큐에 적재 */
+            /* 3.1 Header 정보 다시 일기 */
+            readHeader();
+            if (this.dataBuffer != null){
+                this.channel.position(MessageUtil.calcWritePosition(this.pushCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
+                this.dataBuffer.flip();
+                this.channel.write(this.dataBuffer);
+                /* 3.2 Push 카운터 증가 */
+                this.pushCounter = this.pushCounter + 1;
+                /* 3.3 Header 정보 변경 */
+                writeHeader();
+            }
+        }
     }
 
     @Override
     public void initDataBuffer() {
-
+        if (this.dataBuffer == null) {
+            this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
+        }
+        this.dataBuffer.clear();
+        for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
+            this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
+        }
+        this.dataBuffer.position(0);
     }
 }

aa4fc21

src/main/java/com/munjaon/server/queue/pool/KakaoFriendReadQueue.java (added)

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

...	...	@@ -0,0 +1,39 @@
	1	+package com.munjaon.server.queue.pool;
	2	+
	3	+import com.munjaon.server.queue.config.KakaoBodyConfig;
	4	+import com.munjaon.server.queue.config.QueueConstants;
	5	+import com.munjaon.server.queue.dto.BasicMessageDto;
	6	+import com.munjaon.server.queue.dto.QueueInfo;
	7	+import com.munjaon.server.util.MessageUtil;
	8	+
	9	+import java.nio.ByteBuffer;
	10	+
	11	+public class KakaoFriendReadQueue extends ReadQueue {
	12	+ public KakaoFriendReadQueue(QueueInfo queueInfo) throws Exception {
	13	+ this.queueInfo = queueInfo;
	14	+// initQueue();
	15	+ }
	16	+
	17	+ @Override
	18	+ void popBuffer() throws Exception {
	19	+ this.channel.position(MessageUtil.calcReadPosition(this.popCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
	20	+ this.channel.read(this.dataBuffer);
	21	+ }
	22	+
	23	+ @Override
	24	+ void getBytesForExtendMessage(BasicMessageDto messageDto) {
	25	+ MessageUtil.getBytesForKakaoMessage(this.dataBuffer, messageDto);
	26	+ }
	27	+
	28	+ @Override
	29	+ void initDataBuffer() {
	30	+ if (this.dataBuffer == null) {
	31	+ this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
	32	+ }
	33	+ this.dataBuffer.clear();
	34	+ for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
	35	+ this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
	36	+ }
	37	+ this.dataBuffer.position(0);
	38	+ }
	39	+}

2679d17

aa4fc21

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

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

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


 package com.munjaon.server.queue.pool;
 
+import com.munjaon.server.config.ServiceCode;
+import com.munjaon.server.queue.config.KakaoBodyConfig;
+import com.munjaon.server.queue.config.QueueConstants;
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import com.munjaon.server.queue.dto.QueueInfo;
+import com.munjaon.server.util.MessageUtil;
+
+import java.nio.ByteBuffer;
 
 public class KakaoFriendWriteQueue extends WriteQueue {
+    public KakaoFriendWriteQueue(QueueInfo queueInfo) throws Exception {
+        this.queueInfo = queueInfo;
+        /* 큐초기화 */
+//        initQueue();
+    }
+
     @Override
     public int isValidateMessageForExtend(BasicMessageDto messageDto) {
-        return 0;
+        /* 13. 제목 */
+        if (MessageUtil.isEmptyForMessage(messageDto.getUserSubject(), true) || MessageUtil.isOverByteForMessage(messageDto.getUserSubject(), KakaoBodyConfig.SUBJECT_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_SUBJECT.getCode();
+        }
+        /* 14. 메시지 */
+        if (MessageUtil.isEmptyForMessage(messageDto.getUserMessage(), true) || MessageUtil.isOverByteForMessage(messageDto.getUserMessage(), KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+        /* 15. KAKAO_SENDER_KEY */
+        if (MessageUtil.isEmptyForMessage(messageDto.getKakaoSenderKey(), true) || MessageUtil.isOverByteForMessage(messageDto.getKakaoSenderKey(), KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+        /* 16. KAKAO_TEMPLATE_CODE */
+        if (MessageUtil.isEmptyForMessage(messageDto.getKakaoTemplateCode(), true) || MessageUtil.isOverByteForMessage(messageDto.getKakaoTemplateCode(), KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH, false)) {
+            return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
+        }
+
+        return ServiceCode.OK.getCode();
     }
 
     @Override
     public void pushMessageToBuffer(BasicMessageDto messageDto) throws Exception {
-
+        if (isValidateMessage(messageDto) == ServiceCode.OK.getCode()) {
+            /* 1. dataBuffer 초기화 */
+            initDataBuffer();
+            /* 2. messageDto >> dataBuffer */
+            MessageUtil.setBytesForCommonMessage(this.dataBuffer, messageDto);
+            MessageUtil.setBytesForKakaoMessage(this.dataBuffer, messageDto);
+            /* 3. 파일큐에 적재 */
+            /* 3.1 Header 정보 다시 일기 */
+            readHeader();
+            if (this.dataBuffer != null){
+                this.channel.position(MessageUtil.calcWritePosition(this.pushCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
+                this.dataBuffer.flip();
+                this.channel.write(this.dataBuffer);
+                /* 3.2 Push 카운터 증가 */
+                this.pushCounter = this.pushCounter + 1;
+                /* 3.3 Header 정보 변경 */
+                writeHeader();
+            }
+        }
     }
 
     @Override
     public void initDataBuffer() {
-
+        if (this.dataBuffer == null) {
+            this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
+        }
+        this.dataBuffer.clear();
+        for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
+            this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
+        }
+        this.dataBuffer.position(0);
     }
 }

2679d17

aa4fc21

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

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

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


             // 생성날짜 가져오기 - 생성날짜(10) / 읽은카운트(10) / 쓴카운트(10)
             this.headerBuffer.position(QueueHeaderConfig.CREATE_DATE_POSITION);
             this.headerBuffer.get(this.headerArray);
-            this.createDate = (new String(this.headerArray)).trim();
+            this.createDate = QueueConstants.getString(this.headerArray);
             // 쓴 카운트 가져오기
             this.headerArray = new byte[QueueHeaderConfig.PUSH_COUNT_LENGTH];
             this.headerBuffer.position(QueueHeaderConfig.PUSH_COUNT_POSITION);
             this.headerBuffer.get(this.headerArray);
-            this.pushCounter = Integer.parseInt((new String(this.headerArray)).trim());
+            this.pushCounter = Integer.parseInt(QueueConstants.getString(this.headerArray));
         } catch(Exception e) {
             throw e;
         }

2679d17

aa4fc21

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

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

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


             // 생성날짜 가져오기 - 생성날짜(10) / 읽은카운트(10) / 쓴카운트(10)
             this.headerBuffer.position(QueueHeaderConfig.CREATE_DATE_POSITION);
             this.headerBuffer.get(this.headerArray);
-            this.createDate = (new String(this.headerArray)).trim();
+            this.createDate = QueueConstants.getString(this.headerArray);
             // 쓴 카운트 가져오기
             this.headerArray = new byte[QueueHeaderConfig.PUSH_COUNT_LENGTH];
             this.headerBuffer.position(QueueHeaderConfig.PUSH_COUNT_POSITION);
             this.headerBuffer.get(this.headerArray);
-            this.pushCounter = Integer.parseInt((new String(this.headerArray)).trim());
+            this.pushCounter = Integer.parseInt(QueueConstants.getString(this.headerArray));
         } catch(Exception e) {
             throw e;
         }

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java

--- src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java

+++ src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java


 package com.munjaon.server.queue.service;
 
+import com.munjaon.server.cache.service.SerialNoService;
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import com.munjaon.server.queue.mapper.KatMapper;
 import com.munjaon.server.queue.pool.KakaoAlarmMemoryQueue;
+import com.munjaon.server.queue.pool.KakaoAlarmQueuePool;
 import com.munjaon.server.queue.pool.WriteQueue;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

 @Service
 @RequiredArgsConstructor
 public class KakaoAlarmQueueService implements QueueAction {
+    private final KatMapper katMapper;
+    private final KakaoAlarmQueuePool queueInstance = KakaoAlarmQueuePool.getInstance();
     private final KakaoAlarmMemoryQueue memoryQueue = KakaoAlarmMemoryQueue.getInstance();
+    private final SerialNoService serialNoService;
 
     @Override
     public int getQueueSize() {
-        return 0;
+        return queueInstance.getQueueSize();
     }
 
     @Override
     public boolean isExistQueue(String name) {
-        return false;
+        return queueInstance.isExistQueue(name);
     }
 
     @Override
     public void removeQueue(String name) {
-
+        queueInstance.removeQueue(name);
     }
 
     @Override
     public void addQueue(WriteQueue queue) {
-
+        queueInstance.addQueue(queue);
     }
 
     @Override
     public void pushQueue(BasicMessageDto data) {
-
+        boolean isError = false;
+        try {
+            queueInstance.pushQueue(data);
+        } catch (Exception e) {
+            isError = true;
+//            throw new RuntimeException(e);
+        }
+        if (isError) {
+            log.error("Push queue failed");
+        }
     }
 
     @Override
     public int saveMessageToTable(BasicMessageDto data) {
-        return 0;
+        String serialNo = serialNoService.getSerialNo();
+        String groupSerialNo = serialNo.replace("MSGID", "MGRP");
+        data.setId(serialNo);
+        data.setMsgGroupID(groupSerialNo);
+        log.debug("Save message to table : {}", data);
+        return katMapper.insert(data);
     }
 
     @Override

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java

--- src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java

+++ src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java


 package com.munjaon.server.queue.service;
 
+import com.munjaon.server.cache.service.SerialNoService;
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import com.munjaon.server.queue.mapper.KftMapper;
 import com.munjaon.server.queue.pool.KakaoAlarmMemoryQueue;
+import com.munjaon.server.queue.pool.KakaoFriendQueuePool;
 import com.munjaon.server.queue.pool.WriteQueue;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

 @Service
 @RequiredArgsConstructor
 public class KakaoFriendQueueService implements QueueAction {
+    private final KftMapper kftMapper;
+    private final KakaoFriendQueuePool queueInstance = KakaoFriendQueuePool.getInstance();
     private final KakaoAlarmMemoryQueue memoryQueue = KakaoAlarmMemoryQueue.getInstance();
+    private final SerialNoService serialNoService;
 
     @Override
     public int getQueueSize() {
-        return 0;
+        return queueInstance.getQueueSize();
     }
 
     @Override
     public boolean isExistQueue(String name) {
-        return false;
+        return queueInstance.isExistQueue(name);
     }
 
     @Override
     public void removeQueue(String name) {
-
+        queueInstance.removeQueue(name);
     }
 
     @Override
     public void addQueue(WriteQueue queue) {
-
+        queueInstance.addQueue(queue);
     }
 
     @Override
     public void pushQueue(BasicMessageDto data) {
-
+        boolean isError = false;
+        try {
+            queueInstance.pushQueue(data);
+        } catch (Exception e) {
+            isError = true;
+//            throw new RuntimeException(e);
+        }
+        if (isError) {
+            log.error("Push queue failed");
+        }
     }
 
     @Override
     public int saveMessageToTable(BasicMessageDto data) {
-        return 0;
+        String serialNo = serialNoService.getSerialNo();
+        String groupSerialNo = serialNo.replace("MSGID", "MGRP");
+        data.setId(serialNo);
+        data.setMsgGroupID(groupSerialNo);
+        log.debug("Save message to table : {}", data);
+        return kftMapper.insert(data);
     }
 
     @Override

2679d17

aa4fc21

src/main/java/com/munjaon/server/queue/service/MmsQueueService.java

--- src/main/java/com/munjaon/server/queue/service/MmsQueueService.java

+++ src/main/java/com/munjaon/server/queue/service/MmsQueueService.java


 package com.munjaon.server.queue.service;
 
+import com.munjaon.server.cache.service.SerialNoService;
 import com.munjaon.server.queue.dto.BasicMessageDto;
+import com.munjaon.server.queue.mapper.MmsMapper;
 import com.munjaon.server.queue.pool.MmsMemoryQueue;
 import com.munjaon.server.queue.pool.MmsQueuePool;
 import com.munjaon.server.queue.pool.WriteQueue;

 @Service
 @RequiredArgsConstructor
 public class MmsQueueService implements QueueAction {
+    private final MmsMapper mmsMapper;
     private final MmsQueuePool queueInstance = MmsQueuePool.getInstance();
     private final MmsMemoryQueue memoryQueue = MmsMemoryQueue.getInstance();
+    private final SerialNoService serialNoService;
 
     @Override
     public int getQueueSize() {

 
     @Override
     public int saveMessageToTable(BasicMessageDto data) {
-        return 0;
+        String serialNo = serialNoService.getSerialNo();
+        String groupSerialNo = serialNo.replace("MSGID", "MGRP");
+        data.setId(serialNo);
+        data.setMsgGroupID(groupSerialNo);
+        log.debug("Save message to table : {}", data);
+        return mmsMapper.insert(data);
     }
 
     @Override

aa4fc21

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

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

...	...	@@ -0,0 +1,140 @@
	1	+package com.munjaon.server.server.packet;
	2	+
	3	+import com.munjaon.server.util.CommonUtil;
	4	+
	5	+import java.nio.ByteBuffer;
	6	+
	7	+public final class KakaoMessage {
	8	+ public static final int LIMIT_FILE_CAPACITY = 1024 * 50;
	9	+
	10	+ public static final int DELIVER_JSON_FILENAME_LENGTH = 40;
	11	+ public static final int DELIVER_JSON_FILENAME_POSITION = 0;
	12	+
	13	+ public static final int DELIVER_JSON_FILESIZE_LENGTH = 8;
	14	+ public static final int DELIVER_JSON_FILESIZE_POSITION = DELIVER_JSON_FILENAME_POSITION + DELIVER_JSON_FILENAME_LENGTH;
	15	+
	16	+ public static final int DELIVER_KAKAO_BODY_LENGTH = 2233;
	17	+ public static final int DELIVER_KAKAO_ACK_BODY_LENGTH = 21;
	18	+
	19	+ /* DELIVER */
	20	+ /* SUBJECT */
	21	+ public static final int DELIVER_SUBJECT_LENGTH = 40;
	22	+ public static final int DELIVER_SUBJECT_POSITION = CommonMessage.DELIVER_MSG_TYPE_POSITION + CommonMessage.DELIVER_MSG_TYPE_LENGTH;
	23	+ /* MESSAGE */
	24	+ public static final int DELIVER_MESSAGE_LENGTH = 2000;
	25	+ public static final int DELIVER_MESSAGE_POSITION = DELIVER_SUBJECT_POSITION + DELIVER_SUBJECT_LENGTH;
	26	+ /* KAKAO_SENDER_KEY */
	27	+ public static final int DELIVER_KAKAO_SENDER_KEY_LENGTH = 40;
	28	+ public static final int DELIVER_KAKAO_SENDER_KEY_POSITION = DELIVER_MESSAGE_POSITION + DELIVER_MESSAGE_LENGTH;
	29	+ /* KAKAO_TEMPLATE_CODE */
	30	+ public static final int DELIVER_KAKAO_TEMPLATE_CODE_LENGTH = 64;
	31	+ public static final int DELIVER_KAKAO_TEMPLATE_CODE_POSITION = DELIVER_KAKAO_SENDER_KEY_POSITION + DELIVER_KAKAO_SENDER_KEY_LENGTH;
	32	+
	33	+ public static void putSubjectForDeliver(ByteBuffer buffer, String subject) {
	34	+ if (buffer == null \|\| subject == null) {
	35	+ return;
	36	+ }
	37	+ subject = CommonUtil.cutString(subject, DELIVER_SUBJECT_LENGTH);
	38	+ buffer.put(DELIVER_SUBJECT_POSITION, subject.getBytes());
	39	+ }
	40	+ public static String getSubjectForDeliver(ByteBuffer buffer) {
	41	+ if (buffer == null) {
	42	+ return null;
	43	+ }
	44	+
	45	+ buffer.position(DELIVER_SUBJECT_POSITION);
	46	+ byte[] destArray = new byte[DELIVER_SUBJECT_LENGTH];
	47	+ buffer.get(destArray);
	48	+
	49	+ return Packet.getString(destArray);
	50	+ }
	51	+
	52	+ public static void putMessageForDeliver(ByteBuffer buffer, String message) {
	53	+ if (buffer == null \|\| message == null) {
	54	+ return;
	55	+ }
	56	+ message = CommonUtil.cutString(message, DELIVER_MESSAGE_LENGTH);
	57	+ buffer.put(DELIVER_MESSAGE_POSITION, message.getBytes());
	58	+ }
	59	+ public static String getMessageForDeliver(ByteBuffer buffer) {
	60	+ if (buffer == null) {
	61	+ return null;
	62	+ }
	63	+
	64	+ buffer.position(DELIVER_MESSAGE_POSITION);
	65	+ byte[] destArray = new byte[DELIVER_MESSAGE_LENGTH];
	66	+ buffer.get(destArray);
	67	+
	68	+ return Packet.getString(destArray);
	69	+ }
	70	+ public static void putKakaoSenderKeyForDeliver(ByteBuffer buffer, String kakaoSenderKey) {
	71	+ if (buffer == null \|\| kakaoSenderKey == null) {
	72	+ return;
	73	+ }
	74	+ kakaoSenderKey = CommonUtil.cutString(kakaoSenderKey, DELIVER_KAKAO_SENDER_KEY_LENGTH);
	75	+ buffer.put(DELIVER_KAKAO_SENDER_KEY_POSITION, kakaoSenderKey.getBytes());
	76	+ }
	77	+ public static String getKakaoSenderKeyForDeliver(ByteBuffer buffer) {
	78	+ if (buffer == null) {
	79	+ return null;
	80	+ }
	81	+
	82	+ buffer.position(DELIVER_KAKAO_SENDER_KEY_POSITION);
	83	+ byte[] destArray = new byte[DELIVER_KAKAO_SENDER_KEY_LENGTH];
	84	+ buffer.get(destArray);
	85	+
	86	+ return Packet.getString(destArray);
	87	+ }
	88	+ public static void putKakaoTemplateCodeForDeliver(ByteBuffer buffer, String kakaoTemplateCode) {
	89	+ if (buffer == null \|\| kakaoTemplateCode == null) {
	90	+ return;
	91	+ }
	92	+ kakaoTemplateCode = CommonUtil.cutString(kakaoTemplateCode, DELIVER_KAKAO_TEMPLATE_CODE_LENGTH);
	93	+ buffer.put(DELIVER_KAKAO_TEMPLATE_CODE_POSITION, kakaoTemplateCode.getBytes());
	94	+ }
	95	+ public static String getKakaoTemplateCodeForDeliver(ByteBuffer buffer) {
	96	+ if (buffer == null) {
	97	+ return null;
	98	+ }
	99	+
	100	+ buffer.position(DELIVER_KAKAO_TEMPLATE_CODE_POSITION);
	101	+ byte[] destArray = new byte[DELIVER_KAKAO_TEMPLATE_CODE_LENGTH];
	102	+ buffer.get(destArray);
	103	+
	104	+ return Packet.getString(destArray);
	105	+ }
	106	+
	107	+ public static String getFileNameForDeliver(ByteBuffer buffer) {
	108	+ if (buffer == null) {
	109	+ return null;
	110	+ }
	111	+
	112	+ buffer.position(DELIVER_JSON_FILENAME_POSITION);
	113	+ byte[] destArray = new byte[DELIVER_JSON_FILENAME_LENGTH];
	114	+ buffer.get(destArray);
	115	+
	116	+ return Packet.getString(destArray);
	117	+ }
	118	+
	119	+ public static String getFileSizeForDeliver(ByteBuffer buffer) {
	120	+ if (buffer == null) {
	121	+ return null;
	122	+ }
	123	+
	124	+ buffer.position(DELIVER_JSON_FILESIZE_POSITION);
	125	+ byte[] destArray = new byte[DELIVER_JSON_FILESIZE_LENGTH];
	126	+ buffer.get(destArray);
	127	+
	128	+ return Packet.getString(destArray);
	129	+ }
	130	+
	131	+ public static ByteBuffer makeDeliverAckBuffer(String msgId, String status) {
	132	+ ByteBuffer buffer = ByteBuffer.allocate(Header.HEADER_LENGTH + DELIVER_KAKAO_ACK_BODY_LENGTH);
	133	+ Packet.setDefaultByte(buffer);
	134	+ Header.putHeader(buffer, Header.COMMAND_DELIVER_ACK, DELIVER_KAKAO_ACK_BODY_LENGTH);
	135	+ buffer.put(CommonMessage.DELIVER_ACK_MESSAGE_ID_POSITION, msgId.getBytes());
	136	+ buffer.put(CommonMessage.DELIVER_ACK_RESULT_POSITION, status.getBytes());
	137	+
	138	+ return buffer;
	139	+ }
	140	+}

2679d17

aa4fc21

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/LmsMessage.java


 import java.nio.ByteBuffer;
 
 public final class LmsMessage {
-    public static final int DELIVER_LMS_BODY_LENGTH = 2119;
+    public static final int DELIVER_LMS_BODY_LENGTH = 2129;
     public static final int DELIVER_LMS_ACK_BODY_LENGTH = 21;
 
     /* DELIVER */

2679d17

aa4fc21

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/MmsMessage.java


 import java.nio.ByteBuffer;
 
 public final class MmsMessage {
-    public static final int DELIVER_MMS_BODY_LENGTH = 2120;
+    public static final int DELIVER_MMS_BODY_LENGTH = 2130;
     public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21;
 
     /* DELIVER */

     /* FILECOUNT */
     public static final int DELIVER_FILECOUNT_LENGTH = 1;
     public static final int DELIVER_FILECOUNT_POSITION = DELIVER_MESSAGE_POSITION + DELIVER_MESSAGE_LENGTH;
+
+    public static final int LIMIT_FILE_CAPACITY = 1024 * 300;
+
+    public static final int DELIVER_MMS_FILENAME_LENGTH = 40;
+    public static final int DELIVER_MMS_FILENAME_POSITION = 0;
+
+    public static final int DELIVER_MMS_FILESIZE_LENGTH = 8;
+    public static final int DELIVER_MMS_FILESIZE_POSITION = DELIVER_MMS_FILENAME_POSITION + DELIVER_MMS_FILENAME_LENGTH;
 
     public static void putSubjectForDeliver(ByteBuffer buffer, String subject) {
         if (buffer == null || subject == null) {

 
         return Packet.getString(destArray);
     }
+
+    public static String getFileNameForDeliver(ByteBuffer buffer) {
+        if (buffer == null) {
+            return null;
+        }
+
+        buffer.position(DELIVER_MMS_FILENAME_POSITION);
+        byte[] destArray = new byte[DELIVER_MMS_FILENAME_LENGTH];
+        buffer.get(destArray);
+
+        return Packet.getString(destArray);
+    }
+
+    public static String getFileSizeForDeliver(ByteBuffer buffer) {
+        if (buffer == null) {
+            return null;
+        }
+
+        buffer.position(DELIVER_MMS_FILESIZE_POSITION);
+        byte[] destArray = new byte[DELIVER_MMS_FILESIZE_LENGTH];
+        buffer.get(destArray);
+
+        return Packet.getString(destArray);
+    }
+
+    public static ByteBuffer makeDeliverAckBuffer(String msgId, String status) {
+        ByteBuffer buffer = ByteBuffer.allocate(Header.HEADER_LENGTH + DELIVER_MMS_ACK_BODY_LENGTH);
+        Packet.setDefaultByte(buffer);
+        Header.putHeader(buffer, Header.COMMAND_DELIVER_ACK, DELIVER_MMS_ACK_BODY_LENGTH);
+        buffer.put(CommonMessage.DELIVER_ACK_MESSAGE_ID_POSITION, msgId.getBytes());
+        buffer.put(CommonMessage.DELIVER_ACK_RESULT_POSITION, status.getBytes());
+
+        return buffer;
+    }
 //    public static void makeDataForDeliver(ByteBuffer buffer, MunjaonMsg data) {
 //        if (buffer == null || data == null) {
 //            return;

2679d17

aa4fc21

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

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

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


         } else {
             this.IS_READY_YN = false;
         }
+        saveSystemLog("CollectServerService ready : " + this.IS_READY_YN);
     }
 
     @Override

2679d17

aa4fc21

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.server.dto.ConnectUserDto;
 import com.munjaon.server.server.packet.*;
 import com.munjaon.server.server.queue.CollectUserQueue;
-import com.munjaon.server.util.LogUtil;
+import com.munjaon.server.util.*;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;

     }
 
     private void recvMmsDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
+        try {
+            ByteBuffer bodyBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_BODY_LENGTH);
+            channel.read(bodyBuffer);
+            ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH);
+            Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
 
+            BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
+            messageDto.setUserSubject(MmsMessage.getSubjectForDeliver(deliverBuffer));
+            messageDto.setUserMessage(MmsMessage.getMessageForDeliver(deliverBuffer));
+            String fileCount = MessageUtil.doNumber(MmsMessage.getFileCountForDeliver(deliverBuffer));
+            int recvFileCount = 0;
+            if (fileCount != null && fileCount.length() > 0) {
+                recvFileCount = Integer.parseInt(fileCount);
+                messageDto.setUserFileCnt(recvFileCount);
+                saveSystemLog("recvFileCount : " + recvFileCount);
+            }
+
+            saveSystemLog("messageDto : " + messageDto.toString());
+
+            String imagePath = System.getProperty("ROOTPATH") + File.separator + "mmsfile";
+            imagePath = imagePath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
+            FileUtil.mkdirs(imagePath);
+
+            for (int i = 0; i < recvFileCount; i++) {
+                ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH);
+                channel.read(fileHeadBuffer);
+                String fileName = MmsMessage.getFileNameForDeliver(fileHeadBuffer);
+                String fileSize = MmsMessage.getFileSizeForDeliver(fileHeadBuffer);
+                ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
+                channel.read(fileBuffer);
+                fileBuffer.flip();
+                JobFileFactory.saveFileForByteBuffer(imagePath, fileName, fileBuffer);
+                if (i == 0) {
+                    messageDto.setUserFileName01(imagePath + File.separator + fileName);
+                } else if (i == 1) {
+                    messageDto.setUserFileName02(imagePath + File.separator + fileName);
+                } else if (i == 2) {
+                    messageDto.setUserFileName03(imagePath + File.separator + fileName);
+                }
+                saveSystemLog("File : " + fileName + ", Size : " + fileSize);
+            }
+
+            QueueTypeWorker worker = QueueTypeWorker.find("MMS");
+            if (worker != null) {
+                worker.pushQueue(messageDto);
+                channel.write(MmsMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void recvKatDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
+        try {
+            ByteBuffer bodyBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
+            channel.read(bodyBuffer);
+            ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
+            Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
 
+            BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
+            messageDto.setUserSubject(KakaoMessage.getSubjectForDeliver(deliverBuffer));
+            messageDto.setUserMessage(KakaoMessage.getMessageForDeliver(deliverBuffer));
+            messageDto.setKakaoSenderKey(KakaoMessage.getKakaoSenderKeyForDeliver(deliverBuffer));
+            messageDto.setKakaoTemplateCode(KakaoMessage.getKakaoTemplateCodeForDeliver(deliverBuffer));
+
+            saveSystemLog("messageDto : " + messageDto.toString());
+
+            String jsonPath = System.getProperty("ROOTPATH") + File.separator + "kakaofile";
+            jsonPath = jsonPath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
+            FileUtil.mkdirs(jsonPath);
+
+            ByteBuffer fileHeadBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_JSON_FILENAME_LENGTH + KakaoMessage.DELIVER_JSON_FILESIZE_LENGTH);
+            channel.read(fileHeadBuffer);
+
+            String fileName = KakaoMessage.getFileNameForDeliver(fileHeadBuffer);
+            String fileSize = KakaoMessage.getFileSizeForDeliver(fileHeadBuffer);
+
+            ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
+            channel.read(fileBuffer);
+            fileBuffer.flip();
+            JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
+
+            messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
+            saveSystemLog("File : " + fileName + ", Size : " + fileSize);
+
+            QueueTypeWorker worker = QueueTypeWorker.find("KAT");
+            if (worker != null) {
+                worker.pushQueue(messageDto);
+                channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
+            } else {
+                saveSystemLog("worker is null");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void recvKftDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
+        try {
+            ByteBuffer bodyBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
+            channel.read(bodyBuffer);
+            ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
+            Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
 
+            BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
+            messageDto.setUserSubject(KakaoMessage.getSubjectForDeliver(deliverBuffer));
+            messageDto.setUserMessage(KakaoMessage.getMessageForDeliver(deliverBuffer));
+            messageDto.setKakaoSenderKey(KakaoMessage.getKakaoSenderKeyForDeliver(deliverBuffer));
+            messageDto.setKakaoTemplateCode(KakaoMessage.getKakaoTemplateCodeForDeliver(deliverBuffer));
+
+            saveSystemLog("messageDto : " + messageDto.toString());
+
+            String jsonPath = System.getProperty("ROOTPATH") + File.separator + "kakaofile";
+            jsonPath = jsonPath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
+            FileUtil.mkdirs(jsonPath);
+
+            ByteBuffer fileHeadBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_JSON_FILENAME_LENGTH + KakaoMessage.DELIVER_JSON_FILESIZE_LENGTH);
+            channel.read(fileHeadBuffer);
+
+            String fileName = KakaoMessage.getFileNameForDeliver(fileHeadBuffer);
+            String fileSize = KakaoMessage.getFileSizeForDeliver(fileHeadBuffer);
+
+            ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
+            channel.read(fileBuffer);
+            fileBuffer.flip();
+            JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
+
+            messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
+            saveSystemLog("File : " + fileName + ", Size : " + fileSize);
+
+            QueueTypeWorker worker = QueueTypeWorker.find("KFT");
+            if (worker != null) {
+                worker.pushQueue(messageDto);
+                channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void recvLinkCheck(SocketChannel channel) throws IOException {

2679d17

aa4fc21

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

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

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


 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;

         return transferStatus;
     }
 
+    public static void saveFileForByteBuffer(final String path, final String fileName, final ByteBuffer buffer) throws IOException {
+        FileChannel fileChannel = FileChannel.open(
+                Paths.get(path + File.separator + fileName),
+                StandardOpenOption.CREATE_NEW,
+                StandardOpenOption.READ,
+                StandardOpenOption.WRITE
+        );
+        fileChannel.write(buffer);
+        fileChannel.close();
+    }
+
     public static String getJobDirectory(final String rootDirectory, final String orderNo, final String companyNo, final String date) {
         return rootDirectory + File.separator + orderNo + File.separator + orderNo + "_" + companyNo + File.separator + date;
     }

2679d17

aa4fc21

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(BodyCommonConfig.USERID_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.USERID_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserId(new String(destArray));
+        messageDto.setUserId(QueueConstants.getString(destArray));
+//        messageDto.setUserId(new String(destArray));
         /* 2. 요금제(선불 : P / 후불 : A) : final : 아무작업도 하지 않음 */
         /* 3. 단가 */
         buffer.position(BodyCommonConfig.UNITCOST_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.UNITCOST_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUnitCost(new String(destArray));
+        messageDto.setUnitCost(QueueConstants.getString(destArray));
+//        messageDto.setUnitCost(new String(destArray));
         /* 4. MSG Group ID */
         buffer.position(BodyCommonConfig.MSGGROUPID_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.MSGGROUPID_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setMsgGroupID(new String(destArray));
+        messageDto.setMsgGroupID(QueueConstants.getString(destArray));
+//        messageDto.setMsgGroupID(new String(destArray));
         /* 5. MSG ID */
         buffer.position(BodyCommonConfig.MSGID_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.MSGID_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserMsgID(new String(destArray));
+        messageDto.setUserMsgID(QueueConstants.getString(destArray));
+//        messageDto.setUserMsgID(new String(destArray));
         /* 6. Service Type */
         buffer.position(BodyCommonConfig.SERVICETYPE_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.SERVICETYPE_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setServiceType(new String(destArray));
+        messageDto.setServiceType(QueueConstants.getString(destArray));
+//        messageDto.setServiceType(new String(destArray));
         /* 7. 메시지 전송 결과 >> 성공 : 0 / 필터링 : 기타값  */
         buffer.position(BodyCommonConfig.SENDSTATUS_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.SENDSTATUS_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setSendStatus(new String(destArray));
+        messageDto.setSendStatus(QueueConstants.getString(destArray));
+//        messageDto.setSendStatus(new String(destArray));
         /* 8. 회신번호 */
         buffer.position(BodyCommonConfig.SENDER_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.SENDER_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserSender(new String(destArray));
+        messageDto.setUserSender(QueueConstants.getString(destArray));
+//        messageDto.setUserSender(new String(destArray));
         /* 9. 수신번호 */
         buffer.position(BodyCommonConfig.RECEIVER_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.RECEIVER_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserReceiver(new String(destArray));
+        messageDto.setUserReceiver(QueueConstants.getString(destArray));
+//        messageDto.setUserReceiver(new String(destArray));
         /* 10. 예약시간 */
         buffer.position(BodyCommonConfig.RESERVEDT_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.RESERVEDT_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setReserveDt(new String(destArray));
+        messageDto.setReserveDt(QueueConstants.getString(destArray));
+//        messageDto.setReserveDt(new String(destArray));
         /* 11. 요청시간 */
         buffer.position(BodyCommonConfig.REQUESTDT_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.REQUESTDT_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setRequestDt(new String(destArray));
+        messageDto.setRequestDt(QueueConstants.getString(destArray));
+//        messageDto.setRequestDt(new String(destArray));
         /* 12. 원격 주소 */
         buffer.position(BodyCommonConfig.REMOTEIP_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.REMOTEIP_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setRemoteIP(new String(destArray));
+        messageDto.setRemoteIP(QueueConstants.getString(destArray));
+//        messageDto.setRemoteIP(new String(destArray));
         /* 13. 발송망 */
         buffer.position(BodyCommonConfig.AGENT_CODE_BYTE_POSITION);
         destArray = new byte[BodyCommonConfig.AGENT_CODE_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setRouterSeq(new String(destArray));
+        messageDto.setRouterSeq(QueueConstants.getString(destArray));
+//        messageDto.setRouterSeq(new String(destArray));
     }
 
     public static void setBytesForSmsMessage(ByteBuffer buffer, BasicMessageDto messageDto) {

         buffer.position(SmsBodyConfig.SMS_MSG_BYTE_POSITION);
         destArray = new byte[SmsBodyConfig.SMS_MSG_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserMessage(new String(destArray));
+        messageDto.setUserMessage(QueueConstants.getString(destArray));
+//        messageDto.setUserMessage(new String(destArray));
     }
 
     public static void setBytesForMediaMessage(ByteBuffer buffer, BasicMessageDto messageDto) {

         buffer.put(messageDto.getUserMessage().getBytes());
     }
 
+    public static void setBytesForKakaoMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
+        /* 14. 제목 */
+        buffer.position(KakaoBodyConfig.SUBJECT_BYTE_POSITION);
+        buffer.put(messageDto.getUserSubject().getBytes());
+        /* 15. 메시지 */
+        buffer.position(KakaoBodyConfig.MEDIA_MSG_BYTE_POSITION);
+        buffer.put(messageDto.getUserMessage().getBytes());
+        /* 16. KAKAO_SENDER_KEY */
+        buffer.position(KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_POSITION);
+        buffer.put(messageDto.getKakaoSenderKey().getBytes());
+        /* 17. KAKAO_TEMPLATE_CODE */
+        buffer.position(KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_POSITION);
+        buffer.put(messageDto.getKakaoTemplateCode().getBytes());
+        /* 18. KAKAO_JSON_FILE */
+        buffer.position(KakaoBodyConfig.FILENAME_JSON_BYTE_POSITION);
+        buffer.put(messageDto.getKakaoJsonFile().getBytes());
+    }
+
+    public static void getBytesForKakaoMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
+        byte[] destArray = null;
+        if (buffer == null || messageDto == null) {
+            return;
+        }
+        /* 14. 제목 */
+        buffer.position(KakaoBodyConfig.SUBJECT_BYTE_POSITION);
+        destArray = new byte[KakaoBodyConfig.SUBJECT_BYTE_LENGTH];
+        buffer.get(destArray);
+        messageDto.setUserSubject(QueueConstants.getString(destArray));
+//        messageDto.setUserSubject(new String(destArray));
+        /* 15. 메시지 */
+        buffer.position(KakaoBodyConfig.MEDIA_MSG_BYTE_POSITION);
+        destArray = new byte[KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH];
+        buffer.get(destArray);
+        messageDto.setUserMessage(QueueConstants.getString(destArray));
+//        messageDto.setUserMessage(new String(destArray));
+        /* 16. KAKAO_SENDER_KEY */
+        buffer.position(KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_POSITION);
+        destArray = new byte[KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH];
+        buffer.get(destArray);
+        messageDto.setKakaoSenderKey(QueueConstants.getString(destArray));
+//        messageDto.setUserSubject(new String(destArray));\
+        /* 17. KAKAO_TEMPLATE_CODE */
+        buffer.position(KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_POSITION);
+        destArray = new byte[KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH];
+        buffer.get(destArray);
+        messageDto.setKakaoTemplateCode(QueueConstants.getString(destArray));
+//        messageDto.setUserSubject(new String(destArray));
+        /* 18. KAKAO_JSON_FILE */
+        buffer.position(KakaoBodyConfig.FILENAME_JSON_BYTE_POSITION);
+        destArray = new byte[KakaoBodyConfig.FILENAME_JSON_BYTE_LENGTH];
+        buffer.get(destArray);
+        messageDto.setKakaoJsonFile(QueueConstants.getString(destArray));
+//        messageDto.setUserSubject(new String(destArray));
+    }
+
     public static void getBytesForMediaMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
         byte[] destArray = null;
         if (buffer == null || messageDto == null) {

         buffer.position(MediaBodyConfig.SUBJECT_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.SUBJECT_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserSubject(new String(destArray));
+        messageDto.setUserSubject(QueueConstants.getString(destArray));
+//        messageDto.setUserSubject(new String(destArray));
         /* 15. 메시지 */
         buffer.position(MediaBodyConfig.MEDIA_MSG_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.MEDIA_MSG_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserMessage(new String(destArray));
+        messageDto.setUserMessage(QueueConstants.getString(destArray));
+//        messageDto.setUserMessage(new String(destArray));
     }
 
     public static void setBytesForMmsMessage(ByteBuffer buffer, BasicMessageDto messageDto) {

         buffer.position(MediaBodyConfig.FILECNT_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.FILECNT_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserFileCnt(Integer.parseInt(new String(destArray)));
+        messageDto.setUserFileCnt(Integer.parseInt(QueueConstants.getString(destArray)));
+//        messageDto.setUserFileCnt(Integer.parseInt(new String(destArray)));
         /* 17. 파일명 #1 */
         buffer.position(MediaBodyConfig.FILENAME_ONE_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.FILENAME_ONE_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserFileName01(new String(destArray));
+        messageDto.setUserFileName01(QueueConstants.getString(destArray));
+//        messageDto.setUserFileName01(new String(destArray));
         /* 18. 파일명 #2 */
         buffer.position(MediaBodyConfig.FILENAME_TWO_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.FILENAME_TWO_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserFileName02(new String(destArray));
+        messageDto.setUserFileName02(QueueConstants.getString(destArray));
+//        messageDto.setUserFileName02(new String(destArray));
         /* 19. 파일명 #3 */
         buffer.position(MediaBodyConfig.FILENAME_THREE_BYTE_POSITION);
         destArray = new byte[MediaBodyConfig.FILENAME_THREE_BYTE_LENGTH];
         buffer.get(destArray);
-        messageDto.setUserFileName03(new String(destArray));
+        messageDto.setUserFileName03(QueueConstants.getString(destArray));
+//        messageDto.setUserFileName03(new String(destArray));
     }
 
     public static int isValidateMessageForReport(ReportDto reportDto) {

2679d17

aa4fc21

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

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

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


   datasource:
     server:
       driver-class-name: org.mariadb.jdbc.Driver
-      jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent
+      jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
       username: mjonUr_agent
       password: mjagent123$
 

 
 # ### 에이전트 설정 관련 ####################################################################################
 agent:
-  root-path: C:/apps/agent_server
-  server-property-file: C:/apps/agent_server/config/server.properties
+  root-path: /home/mjon_server_agent
+  server-property-file: /home/mjon_server_agent/config/server.properties
   db-name: mjon_agent_back

2679d17

aa4fc21

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$

aa4fc21

src/main/resources/sqlmap/kat_sql.xml (added)

+++ src/main/resources/sqlmap/kat_sql.xml

...	...	@@ -0,0 +1,26 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.server.queue.mapper.KatMapper">
	4	+ <insert id="insert">
	5	+ INSERT INTO MJ_MSG_DATA (
	6	+ MSG_ID
	7	+ , MSG_GROUP_ID
	8	+ , USER_ID
	9	+ , AGENT_MSG_ID
	10	+ , AGENT_CODE
	11	+ , CUR_STATE
	12	+ , MSG_NOTICETALK_SENDER_KEY
	13	+ , MSG_NOTICETALK_TMP_KEY
	14	+ , REQ_DATE
	15	+ , CALL_TO
	16	+ , CALL_FROM
	17	+ , SMS_TXT
	18	+ , BIZ_KAKAO_TITLE
	19	+ , MSG_TYPE
	20	+ , BIZ_KAKAO_RESEND_YN
	21	+ , BIZ_KAKAO_RESEND_DATA
	22	+ , BIZ_KAKAO_RESEND_TYPE
	23	+ , BIZ_KAKAO_JSON_FILE
	24	+ ) VALUES (#{id}, #{msgGroupID}, #{userId}, #{userMsgID}, '04', 0, #{kakaoSenderKey}, #{kakaoTemplateCode}, NOW(), #{userReceiver}, #{userSender}, #{userMessage}, #{userSubject}, '8', 'N', null, null, #{kakaoJsonFile})
	25	+ </insert>
	26	+</mapper>(No newline at end of file)

aa4fc21

src/main/resources/sqlmap/kft_sql.xml (added)

+++ src/main/resources/sqlmap/kft_sql.xml

...	...	@@ -0,0 +1,25 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.server.queue.mapper.KftMapper">
	4	+ <insert id="insert">
	5	+ INSERT INTO MJ_MSG_DATA (MSG_ID
	6	+ , MSG_GROUP_ID
	7	+ , USER_ID
	8	+ , AGENT_MSG_ID
	9	+ , AGENT_CODE
	10	+ , CUR_STATE
	11	+ , MSG_NOTICETALK_SENDER_KEY
	12	+ , MSG_NOTICETALK_TMP_KEY
	13	+ , REQ_DATE
	14	+ , CALL_TO
	15	+ , CALL_FROM
	16	+ , SMS_TXT
	17	+ , BIZ_KAKAO_TITLE
	18	+ , MSG_TYPE
	19	+ , BIZ_KAKAO_RESEND_YN
	20	+ , BIZ_KAKAO_RESEND_DATA
	21	+ , BIZ_KAKAO_RESEND_TYPE
	22	+ , BIZ_KAKAO_JSON_FILE
	23	+ ) VALUES (#{id}, #{msgGroupID}, #{userId}, #{userMsgID}, '04', 0, #{kakaoSenderKey}, #{kakaoTemplateCode}, NOW(), #{userReceiver}, #{userSender}, #{userMessage}, #{userSubject}, '9', 'N', null, null, #{kakaoJsonFile})
	24	+ </insert>
	25	+</mapper>(No newline at end of file)

aa4fc21

src/main/resources/sqlmap/mms_sql.xml (added)

+++ src/main/resources/sqlmap/mms_sql.xml

...	...	@@ -0,0 +1,26 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.server.queue.mapper.MmsMapper">
	4	+ <insert id="insert">
	5	+ INSERT INTO MJ_MSG_DATA (
	6	+ MSG_ID
	7	+ , MSG_GROUP_ID
	8	+ , USER_ID
	9	+ , AGENT_MSG_ID
	10	+ , AGENT_CODE
	11	+ , CUR_STATE
	12	+ , REQ_DATE
	13	+ , CALL_TO
	14	+ , CALL_FROM
	15	+ , SUBJECT
	16	+ , SMS_TXT
	17	+ , MSG_TYPE
	18	+ , CONT_SEQ
	19	+ , FILE_CNT
	20	+ , FILE_PATH1
	21	+ , FILE_PATH2
	22	+ , FILE_PATH3
	23	+ , NEO_TYPE
	24	+ ) VALUES (#{id}, #{msgGroupID}, #{userId}, #{userMsgID}, '04', 0, NOW(), #{userReceiver}, #{userSender}, #{userSubject}, #{userMessage}, '6', null, #{userFileCnt}, #{userFileName01}, #{userFileName02}, #{userFileName03}, null)
	25	+ </insert>
	26	+</mapper>(No newline at end of file)

...	...	@@ -1,5 +1,6 @@
1	1	package com.munjaon.server.config;
2	2
	3	+import com.zaxxer.hikari.HikariDataSource;
3	4	import org.apache.ibatis.session.SqlSessionFactory;
4	5	import org.mybatis.spring.SqlSessionFactoryBean;
5	6	import org.mybatis.spring.SqlSessionTemplate;
...	...	@@ -28,7 +29,7 @@
28	29	@Bean(name = "datasource")
29	30	@ConfigurationProperties(prefix = "spring.datasource.server")
30	31	public DataSource dataSource() {
31		- return DataSourceBuilder.create().build();
	32	+ return DataSourceBuilder.create().type(HikariDataSource.class).build();
32	33	}
33	34
34	35	@Primary

...	...	@@ -21,11 +21,13 @@
21	21	/* SMS 메시지 */
22	22	MSG_ERROR_SMS_MESSAGE(400, "SMS Message is Null OR is Over Limit Byte"),
23	23
24		- /* LMS, MMS 제목, 메시지 */
25		- MSG_ERROR_MEDIA_SUBJECT(500, "LMS, MMS Subject is Null OR is Over Limit Byte"),
26		- MSG_ERROR_MEDIA_MESSAGE(501, "LMS, MMS Message is Null OR is Over Limit Byte"),
	24	+ /* LMS, MMS, KAKAO 제목, 메시지 */
	25	+ MSG_ERROR_MEDIA_SUBJECT(500, "LMS, MMS, KAKAO Subject is Null OR is Over Limit Byte"),
	26	+ MSG_ERROR_MEDIA_MESSAGE(501, "LMS, MMS, KAKAO Message is Null OR is Over Limit Byte"),
27	27
28		- /* 카카오 알림톡, 친구톡 메시지 */
	28	+ /* 카카오 알림톡, 친구톡 메시지, KAKAO_SENDER_KEY, KAKAO_TEMPLATE_CODE */
	29	+ MSG_ERROR_KAKAO_SENDER_KEY(600, "KAKAO_SENDER_KEY is Null OR is Over Limit Byte"),
	30	+ MSG_ERROR_KAKAO_TEMPLATE_CODE(601, "KAKAO_TEMPLATE_CODE is Null OR is Over Limit Byte"),
29	31
30	32	/* 리포트 관련 에러 메시지 */
31	33	MSG_ERROR_REPORT(800, "REPORT DATA is Null OR is invalid"),

...	...	@@ -1,7 +1,9 @@
1	1	package com.munjaon.server.queue.mapper;
2	2
3	3	import com.munjaon.server.queue.dto.BasicMessageDto;
	4	+import org.apache.ibatis.annotations.Mapper;
4	5
	6	+@Mapper
5	7	public interface LmsMapper {
6	8	int insert(BasicMessageDto messageDto);
7	9	}

...	...	@@ -6,7 +6,7 @@
6	6
7	7	private KakaoAlarmQueuePool() {}
8	8
9		- public synchronized static KakaoAlarmQueuePool getInstance(){
	9	+ public synchronized static KakaoAlarmQueuePool getInstance() {
10	10	if(queueInstance == null){
11	11	queueInstance = new KakaoAlarmQueuePool();
12	12	}

...	...	@@ -1,21 +1,75 @@
1	1	package com.munjaon.server.queue.pool;
2	2
	3	+import com.munjaon.server.config.ServiceCode;
	4	+import com.munjaon.server.queue.config.KakaoBodyConfig;
	5	+import com.munjaon.server.queue.config.QueueConstants;
3	6	import com.munjaon.server.queue.dto.BasicMessageDto;
	7	+import com.munjaon.server.queue.dto.QueueInfo;
	8	+import com.munjaon.server.util.MessageUtil;
	9	+
	10	+import java.nio.ByteBuffer;
4	11
5	12	public class KakaoAlarmWriteQueue extends WriteQueue {
	13	+ public KakaoAlarmWriteQueue(QueueInfo queueInfo) throws Exception {
	14	+ this.queueInfo = queueInfo;
	15	+ /* 큐초기화 */
	16	+// initQueue();
	17	+ }
6	18
7	19	@Override
8	20	public int isValidateMessageForExtend(BasicMessageDto messageDto) {
9		- return 0;
	21	+ /* 13. 제목 */
	22	+ if (MessageUtil.isEmptyForMessage(messageDto.getUserSubject(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getUserSubject(), KakaoBodyConfig.SUBJECT_BYTE_LENGTH, false)) {
	23	+ return ServiceCode.MSG_ERROR_MEDIA_SUBJECT.getCode();
	24	+ }
	25	+ /* 14. 메시지 */
	26	+ if (MessageUtil.isEmptyForMessage(messageDto.getUserMessage(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getUserMessage(), KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH, false)) {
	27	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	28	+ }
	29	+ /* 15. KAKAO_SENDER_KEY */
	30	+ if (MessageUtil.isEmptyForMessage(messageDto.getKakaoSenderKey(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getKakaoSenderKey(), KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH, false)) {
	31	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	32	+ }
	33	+ /* 16. KAKAO_TEMPLATE_CODE */
	34	+ if (MessageUtil.isEmptyForMessage(messageDto.getKakaoTemplateCode(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getKakaoTemplateCode(), KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH, false)) {
	35	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	36	+ }
	37	+
	38	+ return ServiceCode.OK.getCode();
10	39	}
11	40
12	41	@Override
13	42	public void pushMessageToBuffer(BasicMessageDto messageDto) throws Exception {
14		-
	43	+ if (isValidateMessage(messageDto) == ServiceCode.OK.getCode()) {
	44	+ /* 1. dataBuffer 초기화 */
	45	+ initDataBuffer();
	46	+ /* 2. messageDto >> dataBuffer */
	47	+ MessageUtil.setBytesForCommonMessage(this.dataBuffer, messageDto);
	48	+ MessageUtil.setBytesForKakaoMessage(this.dataBuffer, messageDto);
	49	+ /* 3. 파일큐에 적재 */
	50	+ /* 3.1 Header 정보 다시 일기 */
	51	+ readHeader();
	52	+ if (this.dataBuffer != null){
	53	+ this.channel.position(MessageUtil.calcWritePosition(this.pushCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
	54	+ this.dataBuffer.flip();
	55	+ this.channel.write(this.dataBuffer);
	56	+ /* 3.2 Push 카운터 증가 */
	57	+ this.pushCounter = this.pushCounter + 1;
	58	+ /* 3.3 Header 정보 변경 */
	59	+ writeHeader();
	60	+ }
	61	+ }
15	62	}
16	63
17	64	@Override
18	65	public void initDataBuffer() {
19		-
	66	+ if (this.dataBuffer == null) {
	67	+ this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
	68	+ }
	69	+ this.dataBuffer.clear();
	70	+ for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
	71	+ this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
	72	+ }
	73	+ this.dataBuffer.position(0);
20	74	}
21	75	}

...	...	@@ -1,20 +1,75 @@
1	1	package com.munjaon.server.queue.pool;
2	2
	3	+import com.munjaon.server.config.ServiceCode;
	4	+import com.munjaon.server.queue.config.KakaoBodyConfig;
	5	+import com.munjaon.server.queue.config.QueueConstants;
3	6	import com.munjaon.server.queue.dto.BasicMessageDto;
	7	+import com.munjaon.server.queue.dto.QueueInfo;
	8	+import com.munjaon.server.util.MessageUtil;
	9	+
	10	+import java.nio.ByteBuffer;
4	11
5	12	public class KakaoFriendWriteQueue extends WriteQueue {
	13	+ public KakaoFriendWriteQueue(QueueInfo queueInfo) throws Exception {
	14	+ this.queueInfo = queueInfo;
	15	+ /* 큐초기화 */
	16	+// initQueue();
	17	+ }
	18	+
6	19	@Override
7	20	public int isValidateMessageForExtend(BasicMessageDto messageDto) {
8		- return 0;
	21	+ /* 13. 제목 */
	22	+ if (MessageUtil.isEmptyForMessage(messageDto.getUserSubject(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getUserSubject(), KakaoBodyConfig.SUBJECT_BYTE_LENGTH, false)) {
	23	+ return ServiceCode.MSG_ERROR_MEDIA_SUBJECT.getCode();
	24	+ }
	25	+ /* 14. 메시지 */
	26	+ if (MessageUtil.isEmptyForMessage(messageDto.getUserMessage(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getUserMessage(), KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH, false)) {
	27	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	28	+ }
	29	+ /* 15. KAKAO_SENDER_KEY */
	30	+ if (MessageUtil.isEmptyForMessage(messageDto.getKakaoSenderKey(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getKakaoSenderKey(), KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH, false)) {
	31	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	32	+ }
	33	+ /* 16. KAKAO_TEMPLATE_CODE */
	34	+ if (MessageUtil.isEmptyForMessage(messageDto.getKakaoTemplateCode(), true) \|\| MessageUtil.isOverByteForMessage(messageDto.getKakaoTemplateCode(), KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH, false)) {
	35	+ return ServiceCode.MSG_ERROR_MEDIA_MESSAGE.getCode();
	36	+ }
	37	+
	38	+ return ServiceCode.OK.getCode();
9	39	}
10	40
11	41	@Override
12	42	public void pushMessageToBuffer(BasicMessageDto messageDto) throws Exception {
13		-
	43	+ if (isValidateMessage(messageDto) == ServiceCode.OK.getCode()) {
	44	+ /* 1. dataBuffer 초기화 */
	45	+ initDataBuffer();
	46	+ /* 2. messageDto >> dataBuffer */
	47	+ MessageUtil.setBytesForCommonMessage(this.dataBuffer, messageDto);
	48	+ MessageUtil.setBytesForKakaoMessage(this.dataBuffer, messageDto);
	49	+ /* 3. 파일큐에 적재 */
	50	+ /* 3.1 Header 정보 다시 일기 */
	51	+ readHeader();
	52	+ if (this.dataBuffer != null){
	53	+ this.channel.position(MessageUtil.calcWritePosition(this.pushCounter, KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH));
	54	+ this.dataBuffer.flip();
	55	+ this.channel.write(this.dataBuffer);
	56	+ /* 3.2 Push 카운터 증가 */
	57	+ this.pushCounter = this.pushCounter + 1;
	58	+ /* 3.3 Header 정보 변경 */
	59	+ writeHeader();
	60	+ }
	61	+ }
14	62	}
15	63
16	64	@Override
17	65	public void initDataBuffer() {
18		-
	66	+ if (this.dataBuffer == null) {
	67	+ this.dataBuffer = ByteBuffer.allocateDirect(KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH);
	68	+ }
	69	+ this.dataBuffer.clear();
	70	+ for(int loopCnt = 0; loopCnt < KakaoBodyConfig.KAKAO_SUM_BYTE_LENGTH; loopCnt++){
	71	+ this.dataBuffer.put(QueueConstants.SET_DEFAULT_BYTE);
	72	+ }
	73	+ this.dataBuffer.position(0);
19	74	}
20	75	}

...	...	@@ -150,12 +150,12 @@
150	150	// 생성날짜 가져오기 - 생성날짜(10) / 읽은카운트(10) / 쓴카운트(10)
151	151	this.headerBuffer.position(QueueHeaderConfig.CREATE_DATE_POSITION);
152	152	this.headerBuffer.get(this.headerArray);
153		- this.createDate = (new String(this.headerArray)).trim();
	153	+ this.createDate = QueueConstants.getString(this.headerArray);
154	154	// 쓴 카운트 가져오기
155	155	this.headerArray = new byte[QueueHeaderConfig.PUSH_COUNT_LENGTH];
156	156	this.headerBuffer.position(QueueHeaderConfig.PUSH_COUNT_POSITION);
157	157	this.headerBuffer.get(this.headerArray);
158		- this.pushCounter = Integer.parseInt((new String(this.headerArray)).trim());
	158	+ this.pushCounter = Integer.parseInt(QueueConstants.getString(this.headerArray));
159	159	} catch(Exception e) {
160	160	throw e;
161	161	}

...	...	@@ -93,12 +93,12 @@
93	93	// 생성날짜 가져오기 - 생성날짜(10) / 읽은카운트(10) / 쓴카운트(10)
94	94	this.headerBuffer.position(QueueHeaderConfig.CREATE_DATE_POSITION);
95	95	this.headerBuffer.get(this.headerArray);
96		- this.createDate = (new String(this.headerArray)).trim();
	96	+ this.createDate = QueueConstants.getString(this.headerArray);
97	97	// 쓴 카운트 가져오기
98	98	this.headerArray = new byte[QueueHeaderConfig.PUSH_COUNT_LENGTH];
99	99	this.headerBuffer.position(QueueHeaderConfig.PUSH_COUNT_POSITION);
100	100	this.headerBuffer.get(this.headerArray);
101		- this.pushCounter = Integer.parseInt((new String(this.headerArray)).trim());
	101	+ this.pushCounter = Integer.parseInt(QueueConstants.getString(this.headerArray));
102	102	} catch(Exception e) {
103	103	throw e;
104	104	}

...	...	@@ -1,7 +1,10 @@
1	1	package com.munjaon.server.queue.service;
2	2
	3	+import com.munjaon.server.cache.service.SerialNoService;
3	4	import com.munjaon.server.queue.dto.BasicMessageDto;
	5	+import com.munjaon.server.queue.mapper.KatMapper;
4	6	import com.munjaon.server.queue.pool.KakaoAlarmMemoryQueue;
	7	+import com.munjaon.server.queue.pool.KakaoAlarmQueuePool;
5	8	import com.munjaon.server.queue.pool.WriteQueue;
6	9	import lombok.RequiredArgsConstructor;
7	10	import lombok.extern.slf4j.Slf4j;
...	...	@@ -11,36 +14,53 @@
11	14	@Service
12	15	@RequiredArgsConstructor
13	16	public class KakaoAlarmQueueService implements QueueAction {
	17	+ private final KatMapper katMapper;
	18	+ private final KakaoAlarmQueuePool queueInstance = KakaoAlarmQueuePool.getInstance();
14	19	private final KakaoAlarmMemoryQueue memoryQueue = KakaoAlarmMemoryQueue.getInstance();
	20	+ private final SerialNoService serialNoService;
15	21
16	22	@Override
17	23	public int getQueueSize() {
18		- return 0;
	24	+ return queueInstance.getQueueSize();
19	25	}
20	26
21	27	@Override
22	28	public boolean isExistQueue(String name) {
23		- return false;
	29	+ return queueInstance.isExistQueue(name);
24	30	}
25	31
26	32	@Override
27	33	public void removeQueue(String name) {
28		-
	34	+ queueInstance.removeQueue(name);
29	35	}
30	36
31	37	@Override
32	38	public void addQueue(WriteQueue queue) {
33		-
	39	+ queueInstance.addQueue(queue);
34	40	}
35	41
36	42	@Override
37	43	public void pushQueue(BasicMessageDto data) {
38		-
	44	+ boolean isError = false;
	45	+ try {
	46	+ queueInstance.pushQueue(data);
	47	+ } catch (Exception e) {
	48	+ isError = true;
	49	+// throw new RuntimeException(e);
	50	+ }
	51	+ if (isError) {
	52	+ log.error("Push queue failed");
	53	+ }
39	54	}
40	55
41	56	@Override
42	57	public int saveMessageToTable(BasicMessageDto data) {
43		- return 0;
	58	+ String serialNo = serialNoService.getSerialNo();
	59	+ String groupSerialNo = serialNo.replace("MSGID", "MGRP");
	60	+ data.setId(serialNo);
	61	+ data.setMsgGroupID(groupSerialNo);
	62	+ log.debug("Save message to table : {}", data);
	63	+ return katMapper.insert(data);
44	64	}
45	65
46	66	@Override

...	...	@@ -1,6 +1,8 @@
1	1	package com.munjaon.server.queue.service;
2	2
	3	+import com.munjaon.server.cache.service.SerialNoService;
3	4	import com.munjaon.server.queue.dto.BasicMessageDto;
	5	+import com.munjaon.server.queue.mapper.MmsMapper;
4	6	import com.munjaon.server.queue.pool.MmsMemoryQueue;
5	7	import com.munjaon.server.queue.pool.MmsQueuePool;
6	8	import com.munjaon.server.queue.pool.WriteQueue;
...	...	@@ -12,8 +14,10 @@
12	14	@Service
13	15	@RequiredArgsConstructor
14	16	public class MmsQueueService implements QueueAction {
	17	+ private final MmsMapper mmsMapper;
15	18	private final MmsQueuePool queueInstance = MmsQueuePool.getInstance();
16	19	private final MmsMemoryQueue memoryQueue = MmsMemoryQueue.getInstance();
	20	+ private final SerialNoService serialNoService;
17	21
18	22	@Override
19	23	public int getQueueSize() {
...	...	@@ -51,7 +55,12 @@
51	55
52	56	@Override
53	57	public int saveMessageToTable(BasicMessageDto data) {
54		- return 0;
	58	+ String serialNo = serialNoService.getSerialNo();
	59	+ String groupSerialNo = serialNo.replace("MSGID", "MGRP");
	60	+ data.setId(serialNo);
	61	+ data.setMsgGroupID(groupSerialNo);
	62	+ log.debug("Save message to table : {}", data);
	63	+ return mmsMapper.insert(data);
55	64	}
56	65
57	66	@Override

...	...	@@ -5,7 +5,7 @@
5	5	import java.nio.ByteBuffer;
6	6
7	7	public final class LmsMessage {
8		- public static final int DELIVER_LMS_BODY_LENGTH = 2119;
	8	+ public static final int DELIVER_LMS_BODY_LENGTH = 2129;
9	9	public static final int DELIVER_LMS_ACK_BODY_LENGTH = 21;
10	10
11	11	/* DELIVER */

...	...	@@ -5,7 +5,7 @@
5	5	import java.nio.ByteBuffer;
6	6
7	7	public final class MmsMessage {
8		- public static final int DELIVER_MMS_BODY_LENGTH = 2120;
	8	+ public static final int DELIVER_MMS_BODY_LENGTH = 2130;
9	9	public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21;
10	10
11	11	/* DELIVER */
...	...	@@ -18,6 +18,14 @@
18	18	/* FILECOUNT */
19	19	public static final int DELIVER_FILECOUNT_LENGTH = 1;
20	20	public static final int DELIVER_FILECOUNT_POSITION = DELIVER_MESSAGE_POSITION + DELIVER_MESSAGE_LENGTH;
	21	+
	22	+ public static final int LIMIT_FILE_CAPACITY = 1024 * 300;
	23	+
	24	+ public static final int DELIVER_MMS_FILENAME_LENGTH = 40;
	25	+ public static final int DELIVER_MMS_FILENAME_POSITION = 0;
	26	+
	27	+ public static final int DELIVER_MMS_FILESIZE_LENGTH = 8;
	28	+ public static final int DELIVER_MMS_FILESIZE_POSITION = DELIVER_MMS_FILENAME_POSITION + DELIVER_MMS_FILENAME_LENGTH;
21	29
22	30	public static void putSubjectForDeliver(ByteBuffer buffer, String subject) {
23	31	if (buffer == null \|\| subject == null) {
...	...	@@ -78,6 +86,40 @@
78	86
79	87	return Packet.getString(destArray);
80	88	}
	89	+
	90	+ public static String getFileNameForDeliver(ByteBuffer buffer) {
	91	+ if (buffer == null) {
	92	+ return null;
	93	+ }
	94	+
	95	+ buffer.position(DELIVER_MMS_FILENAME_POSITION);
	96	+ byte[] destArray = new byte[DELIVER_MMS_FILENAME_LENGTH];
	97	+ buffer.get(destArray);
	98	+
	99	+ return Packet.getString(destArray);
	100	+ }
	101	+
	102	+ public static String getFileSizeForDeliver(ByteBuffer buffer) {
	103	+ if (buffer == null) {
	104	+ return null;
	105	+ }
	106	+
	107	+ buffer.position(DELIVER_MMS_FILESIZE_POSITION);
	108	+ byte[] destArray = new byte[DELIVER_MMS_FILESIZE_LENGTH];
	109	+ buffer.get(destArray);
	110	+
	111	+ return Packet.getString(destArray);
	112	+ }
	113	+
	114	+ public static ByteBuffer makeDeliverAckBuffer(String msgId, String status) {
	115	+ ByteBuffer buffer = ByteBuffer.allocate(Header.HEADER_LENGTH + DELIVER_MMS_ACK_BODY_LENGTH);
	116	+ Packet.setDefaultByte(buffer);
	117	+ Header.putHeader(buffer, Header.COMMAND_DELIVER_ACK, DELIVER_MMS_ACK_BODY_LENGTH);
	118	+ buffer.put(CommonMessage.DELIVER_ACK_MESSAGE_ID_POSITION, msgId.getBytes());
	119	+ buffer.put(CommonMessage.DELIVER_ACK_RESULT_POSITION, status.getBytes());
	120	+
	121	+ return buffer;
	122	+ }
81	123	// public static void makeDataForDeliver(ByteBuffer buffer, MunjaonMsg data) {
82	124	// if (buffer == null \|\| data == null) {
83	125	// return;

...	...	@@ -47,6 +47,7 @@
47	47	} else {
48	48	this.IS_READY_YN = false;
49	49	}
	50	+ saveSystemLog("CollectServerService ready : " + this.IS_READY_YN);
50	51	}
51	52
52	53	@Override

...	...	@@ -8,8 +8,9 @@
8	8	import com.munjaon.server.server.dto.ConnectUserDto;
9	9	import com.munjaon.server.server.packet.*;
10	10	import com.munjaon.server.server.queue.CollectUserQueue;
11		-import com.munjaon.server.util.LogUtil;
	11	+import com.munjaon.server.util.*;
12	12
	13	+import java.io.File;
13	14	import java.io.IOException;
14	15	import java.nio.ByteBuffer;
15	16	import java.nio.channels.SelectionKey;
...	...	@@ -158,15 +159,144 @@
158	159	}
159	160
160	161	private void recvMmsDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
	162	+ try {
	163	+ ByteBuffer bodyBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_BODY_LENGTH);
	164	+ channel.read(bodyBuffer);
	165	+ ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH);
	166	+ Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
161	167
	168	+ BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
	169	+ messageDto.setUserSubject(MmsMessage.getSubjectForDeliver(deliverBuffer));
	170	+ messageDto.setUserMessage(MmsMessage.getMessageForDeliver(deliverBuffer));
	171	+ String fileCount = MessageUtil.doNumber(MmsMessage.getFileCountForDeliver(deliverBuffer));
	172	+ int recvFileCount = 0;
	173	+ if (fileCount != null && fileCount.length() > 0) {
	174	+ recvFileCount = Integer.parseInt(fileCount);
	175	+ messageDto.setUserFileCnt(recvFileCount);
	176	+ saveSystemLog("recvFileCount : " + recvFileCount);
	177	+ }
	178	+
	179	+ saveSystemLog("messageDto : " + messageDto.toString());
	180	+
	181	+ String imagePath = System.getProperty("ROOTPATH") + File.separator + "mmsfile";
	182	+ imagePath = imagePath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
	183	+ FileUtil.mkdirs(imagePath);
	184	+
	185	+ for (int i = 0; i < recvFileCount; i++) {
	186	+ ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH);
	187	+ channel.read(fileHeadBuffer);
	188	+ String fileName = MmsMessage.getFileNameForDeliver(fileHeadBuffer);
	189	+ String fileSize = MmsMessage.getFileSizeForDeliver(fileHeadBuffer);
	190	+ ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
	191	+ channel.read(fileBuffer);
	192	+ fileBuffer.flip();
	193	+ JobFileFactory.saveFileForByteBuffer(imagePath, fileName, fileBuffer);
	194	+ if (i == 0) {
	195	+ messageDto.setUserFileName01(imagePath + File.separator + fileName);
	196	+ } else if (i == 1) {
	197	+ messageDto.setUserFileName02(imagePath + File.separator + fileName);
	198	+ } else if (i == 2) {
	199	+ messageDto.setUserFileName03(imagePath + File.separator + fileName);
	200	+ }
	201	+ saveSystemLog("File : " + fileName + ", Size : " + fileSize);
	202	+ }
	203	+
	204	+ QueueTypeWorker worker = QueueTypeWorker.find("MMS");
	205	+ if (worker != null) {
	206	+ worker.pushQueue(messageDto);
	207	+ channel.write(MmsMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
	208	+ }
	209	+ } catch (Exception e) {
	210	+ e.printStackTrace();
	211	+ }
162	212	}
163	213
164	214	private void recvKatDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
	215	+ try {
	216	+ ByteBuffer bodyBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
	217	+ channel.read(bodyBuffer);
	218	+ ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
	219	+ Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
165	220
	221	+ BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
	222	+ messageDto.setUserSubject(KakaoMessage.getSubjectForDeliver(deliverBuffer));
	223	+ messageDto.setUserMessage(KakaoMessage.getMessageForDeliver(deliverBuffer));
	224	+ messageDto.setKakaoSenderKey(KakaoMessage.getKakaoSenderKeyForDeliver(deliverBuffer));
	225	+ messageDto.setKakaoTemplateCode(KakaoMessage.getKakaoTemplateCodeForDeliver(deliverBuffer));
	226	+
	227	+ saveSystemLog("messageDto : " + messageDto.toString());
	228	+
	229	+ String jsonPath = System.getProperty("ROOTPATH") + File.separator + "kakaofile";
	230	+ jsonPath = jsonPath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
	231	+ FileUtil.mkdirs(jsonPath);
	232	+
	233	+ ByteBuffer fileHeadBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_JSON_FILENAME_LENGTH + KakaoMessage.DELIVER_JSON_FILESIZE_LENGTH);
	234	+ channel.read(fileHeadBuffer);
	235	+
	236	+ String fileName = KakaoMessage.getFileNameForDeliver(fileHeadBuffer);
	237	+ String fileSize = KakaoMessage.getFileSizeForDeliver(fileHeadBuffer);
	238	+
	239	+ ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
	240	+ channel.read(fileBuffer);
	241	+ fileBuffer.flip();
	242	+ JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
	243	+
	244	+ messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
	245	+ saveSystemLog("File : " + fileName + ", Size : " + fileSize);
	246	+
	247	+ QueueTypeWorker worker = QueueTypeWorker.find("KAT");
	248	+ if (worker != null) {
	249	+ worker.pushQueue(messageDto);
	250	+ channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
	251	+ } else {
	252	+ saveSystemLog("worker is null");
	253	+ }
	254	+ } catch (Exception e) {
	255	+ e.printStackTrace();
	256	+ }
166	257	}
167	258
168	259	private void recvKftDeliver(SocketChannel channel, ByteBuffer headBuffer) throws IOException {
	260	+ try {
	261	+ ByteBuffer bodyBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
	262	+ channel.read(bodyBuffer);
	263	+ ByteBuffer deliverBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH);
	264	+ Packet.mergeBuffers(deliverBuffer, headBuffer, bodyBuffer);
169	265
	266	+ BasicMessageDto messageDto = recvCommonMessage(deliverBuffer);
	267	+ messageDto.setUserSubject(KakaoMessage.getSubjectForDeliver(deliverBuffer));
	268	+ messageDto.setUserMessage(KakaoMessage.getMessageForDeliver(deliverBuffer));
	269	+ messageDto.setKakaoSenderKey(KakaoMessage.getKakaoSenderKeyForDeliver(deliverBuffer));
	270	+ messageDto.setKakaoTemplateCode(KakaoMessage.getKakaoTemplateCodeForDeliver(deliverBuffer));
	271	+
	272	+ saveSystemLog("messageDto : " + messageDto.toString());
	273	+
	274	+ String jsonPath = System.getProperty("ROOTPATH") + File.separator + "kakaofile";
	275	+ jsonPath = jsonPath + File.separator + MessageUtil.getDate() + File.separator + SerialNoUtil.getSerialNo();
	276	+ FileUtil.mkdirs(jsonPath);
	277	+
	278	+ ByteBuffer fileHeadBuffer = ByteBuffer.allocate(KakaoMessage.DELIVER_JSON_FILENAME_LENGTH + KakaoMessage.DELIVER_JSON_FILESIZE_LENGTH);
	279	+ channel.read(fileHeadBuffer);
	280	+
	281	+ String fileName = KakaoMessage.getFileNameForDeliver(fileHeadBuffer);
	282	+ String fileSize = KakaoMessage.getFileSizeForDeliver(fileHeadBuffer);
	283	+
	284	+ ByteBuffer fileBuffer = ByteBuffer.allocate(Integer.parseInt(fileSize));
	285	+ channel.read(fileBuffer);
	286	+ fileBuffer.flip();
	287	+ JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
	288	+
	289	+ messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
	290	+ saveSystemLog("File : " + fileName + ", Size : " + fileSize);
	291	+
	292	+ QueueTypeWorker worker = QueueTypeWorker.find("KFT");
	293	+ if (worker != null) {
	294	+ worker.pushQueue(messageDto);
	295	+ channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
	296	+ }
	297	+ } catch (Exception e) {
	298	+ e.printStackTrace();
	299	+ }
170	300	}
171	301
172	302	private void recvLinkCheck(SocketChannel channel) throws IOException {

...	...	@@ -8,7 +8,10 @@
8	8	import java.io.FileInputStream;
9	9	import java.io.FileOutputStream;
10	10	import java.io.IOException;
	11	+import java.nio.ByteBuffer;
11	12	import java.nio.channels.FileChannel;
	13	+import java.nio.file.Paths;
	14	+import java.nio.file.StandardOpenOption;
12	15	import java.time.LocalDateTime;
13	16	import java.time.format.DateTimeFormatter;
14	17	import java.util.ArrayList;
...	...	@@ -346,6 +349,17 @@
346	349	return transferStatus;
347	350	}
348	351
	352	+ public static void saveFileForByteBuffer(final String path, final String fileName, final ByteBuffer buffer) throws IOException {
	353	+ FileChannel fileChannel = FileChannel.open(
	354	+ Paths.get(path + File.separator + fileName),
	355	+ StandardOpenOption.CREATE_NEW,
	356	+ StandardOpenOption.READ,
	357	+ StandardOpenOption.WRITE
	358	+ );
	359	+ fileChannel.write(buffer);
	360	+ fileChannel.close();
	361	+ }
	362	+
349	363	public static String getJobDirectory(final String rootDirectory, final String orderNo, final String companyNo, final String date) {
350	364	return rootDirectory + File.separator + orderNo + File.separator + orderNo + "_" + companyNo + File.separator + date;
351	365	}

...	...	@@ -171,63 +171,75 @@
171	171	buffer.position(BodyCommonConfig.USERID_BYTE_POSITION);
172	172	destArray = new byte[BodyCommonConfig.USERID_BYTE_LENGTH];
173	173	buffer.get(destArray);
174		- messageDto.setUserId(new String(destArray));
	174	+ messageDto.setUserId(QueueConstants.getString(destArray));
	175	+// messageDto.setUserId(new String(destArray));
175	176	/* 2. 요금제(선불 : P / 후불 : A) : final : 아무작업도 하지 않음 */
176	177	/* 3. 단가 */
177	178	buffer.position(BodyCommonConfig.UNITCOST_BYTE_POSITION);
178	179	destArray = new byte[BodyCommonConfig.UNITCOST_BYTE_LENGTH];
179	180	buffer.get(destArray);
180		- messageDto.setUnitCost(new String(destArray));
	181	+ messageDto.setUnitCost(QueueConstants.getString(destArray));
	182	+// messageDto.setUnitCost(new String(destArray));
181	183	/* 4. MSG Group ID */
182	184	buffer.position(BodyCommonConfig.MSGGROUPID_BYTE_POSITION);
183	185	destArray = new byte[BodyCommonConfig.MSGGROUPID_BYTE_LENGTH];
184	186	buffer.get(destArray);
185		- messageDto.setMsgGroupID(new String(destArray));
	187	+ messageDto.setMsgGroupID(QueueConstants.getString(destArray));
	188	+// messageDto.setMsgGroupID(new String(destArray));
186	189	/* 5. MSG ID */
187	190	buffer.position(BodyCommonConfig.MSGID_BYTE_POSITION);
188	191	destArray = new byte[BodyCommonConfig.MSGID_BYTE_LENGTH];
189	192	buffer.get(destArray);
190		- messageDto.setUserMsgID(new String(destArray));
	193	+ messageDto.setUserMsgID(QueueConstants.getString(destArray));
	194	+// messageDto.setUserMsgID(new String(destArray));
191	195	/* 6. Service Type */
192	196	buffer.position(BodyCommonConfig.SERVICETYPE_BYTE_POSITION);
193	197	destArray = new byte[BodyCommonConfig.SERVICETYPE_BYTE_LENGTH];
194	198	buffer.get(destArray);
195		- messageDto.setServiceType(new String(destArray));
	199	+ messageDto.setServiceType(QueueConstants.getString(destArray));
	200	+// messageDto.setServiceType(new String(destArray));
196	201	/* 7. 메시지 전송 결과 >> 성공 : 0 / 필터링 : 기타값 */
197	202	buffer.position(BodyCommonConfig.SENDSTATUS_BYTE_POSITION);
198	203	destArray = new byte[BodyCommonConfig.SENDSTATUS_BYTE_LENGTH];
199	204	buffer.get(destArray);
200		- messageDto.setSendStatus(new String(destArray));
	205	+ messageDto.setSendStatus(QueueConstants.getString(destArray));
	206	+// messageDto.setSendStatus(new String(destArray));
201	207	/* 8. 회신번호 */
202	208	buffer.position(BodyCommonConfig.SENDER_BYTE_POSITION);
203	209	destArray = new byte[BodyCommonConfig.SENDER_BYTE_LENGTH];
204	210	buffer.get(destArray);
205		- messageDto.setUserSender(new String(destArray));
	211	+ messageDto.setUserSender(QueueConstants.getString(destArray));
	212	+// messageDto.setUserSender(new String(destArray));
206	213	/* 9. 수신번호 */
207	214	buffer.position(BodyCommonConfig.RECEIVER_BYTE_POSITION);
208	215	destArray = new byte[BodyCommonConfig.RECEIVER_BYTE_LENGTH];
209	216	buffer.get(destArray);
210		- messageDto.setUserReceiver(new String(destArray));
	217	+ messageDto.setUserReceiver(QueueConstants.getString(destArray));
	218	+// messageDto.setUserReceiver(new String(destArray));
211	219	/* 10. 예약시간 */
212	220	buffer.position(BodyCommonConfig.RESERVEDT_BYTE_POSITION);
213	221	destArray = new byte[BodyCommonConfig.RESERVEDT_BYTE_LENGTH];
214	222	buffer.get(destArray);
215		- messageDto.setReserveDt(new String(destArray));
	223	+ messageDto.setReserveDt(QueueConstants.getString(destArray));
	224	+// messageDto.setReserveDt(new String(destArray));
216	225	/* 11. 요청시간 */
217	226	buffer.position(BodyCommonConfig.REQUESTDT_BYTE_POSITION);
218	227	destArray = new byte[BodyCommonConfig.REQUESTDT_BYTE_LENGTH];
219	228	buffer.get(destArray);
220		- messageDto.setRequestDt(new String(destArray));
	229	+ messageDto.setRequestDt(QueueConstants.getString(destArray));
	230	+// messageDto.setRequestDt(new String(destArray));
221	231	/* 12. 원격 주소 */
222	232	buffer.position(BodyCommonConfig.REMOTEIP_BYTE_POSITION);
223	233	destArray = new byte[BodyCommonConfig.REMOTEIP_BYTE_LENGTH];
224	234	buffer.get(destArray);
225		- messageDto.setRemoteIP(new String(destArray));
	235	+ messageDto.setRemoteIP(QueueConstants.getString(destArray));
	236	+// messageDto.setRemoteIP(new String(destArray));
226	237	/* 13. 발송망 */
227	238	buffer.position(BodyCommonConfig.AGENT_CODE_BYTE_POSITION);
228	239	destArray = new byte[BodyCommonConfig.AGENT_CODE_BYTE_LENGTH];
229	240	buffer.get(destArray);
230		- messageDto.setRouterSeq(new String(destArray));
	241	+ messageDto.setRouterSeq(QueueConstants.getString(destArray));
	242	+// messageDto.setRouterSeq(new String(destArray));
231	243	}
232	244
233	245	public static void setBytesForSmsMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
...	...	@@ -245,7 +257,8 @@
245	257	buffer.position(SmsBodyConfig.SMS_MSG_BYTE_POSITION);
246	258	destArray = new byte[SmsBodyConfig.SMS_MSG_BYTE_LENGTH];
247	259	buffer.get(destArray);
248		- messageDto.setUserMessage(new String(destArray));
	260	+ messageDto.setUserMessage(QueueConstants.getString(destArray));
	261	+// messageDto.setUserMessage(new String(destArray));
249	262	}
250	263
251	264	public static void setBytesForMediaMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
...	...	@@ -257,6 +270,61 @@
257	270	buffer.put(messageDto.getUserMessage().getBytes());
258	271	}
259	272
	273	+ public static void setBytesForKakaoMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
	274	+ /* 14. 제목 */
	275	+ buffer.position(KakaoBodyConfig.SUBJECT_BYTE_POSITION);
	276	+ buffer.put(messageDto.getUserSubject().getBytes());
	277	+ /* 15. 메시지 */
	278	+ buffer.position(KakaoBodyConfig.MEDIA_MSG_BYTE_POSITION);
	279	+ buffer.put(messageDto.getUserMessage().getBytes());
	280	+ /* 16. KAKAO_SENDER_KEY */
	281	+ buffer.position(KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_POSITION);
	282	+ buffer.put(messageDto.getKakaoSenderKey().getBytes());
	283	+ /* 17. KAKAO_TEMPLATE_CODE */
	284	+ buffer.position(KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_POSITION);
	285	+ buffer.put(messageDto.getKakaoTemplateCode().getBytes());
	286	+ /* 18. KAKAO_JSON_FILE */
	287	+ buffer.position(KakaoBodyConfig.FILENAME_JSON_BYTE_POSITION);
	288	+ buffer.put(messageDto.getKakaoJsonFile().getBytes());
	289	+ }
	290	+
	291	+ public static void getBytesForKakaoMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
	292	+ byte[] destArray = null;
	293	+ if (buffer == null \|\| messageDto == null) {
	294	+ return;
	295	+ }
	296	+ /* 14. 제목 */
	297	+ buffer.position(KakaoBodyConfig.SUBJECT_BYTE_POSITION);
	298	+ destArray = new byte[KakaoBodyConfig.SUBJECT_BYTE_LENGTH];
	299	+ buffer.get(destArray);
	300	+ messageDto.setUserSubject(QueueConstants.getString(destArray));
	301	+// messageDto.setUserSubject(new String(destArray));
	302	+ /* 15. 메시지 */
	303	+ buffer.position(KakaoBodyConfig.MEDIA_MSG_BYTE_POSITION);
	304	+ destArray = new byte[KakaoBodyConfig.MEDIA_MSG_BYTE_LENGTH];
	305	+ buffer.get(destArray);
	306	+ messageDto.setUserMessage(QueueConstants.getString(destArray));
	307	+// messageDto.setUserMessage(new String(destArray));
	308	+ /* 16. KAKAO_SENDER_KEY */
	309	+ buffer.position(KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_POSITION);
	310	+ destArray = new byte[KakaoBodyConfig.KAKAO_SENDER_KEY_BYTE_LENGTH];
	311	+ buffer.get(destArray);
	312	+ messageDto.setKakaoSenderKey(QueueConstants.getString(destArray));
	313	+// messageDto.setUserSubject(new String(destArray));\
	314	+ /* 17. KAKAO_TEMPLATE_CODE */
	315	+ buffer.position(KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_POSITION);
	316	+ destArray = new byte[KakaoBodyConfig.KAKAO_TEMPLATE_CODE_BYTE_LENGTH];
	317	+ buffer.get(destArray);
	318	+ messageDto.setKakaoTemplateCode(QueueConstants.getString(destArray));
	319	+// messageDto.setUserSubject(new String(destArray));
	320	+ /* 18. KAKAO_JSON_FILE */
	321	+ buffer.position(KakaoBodyConfig.FILENAME_JSON_BYTE_POSITION);
	322	+ destArray = new byte[KakaoBodyConfig.FILENAME_JSON_BYTE_LENGTH];
	323	+ buffer.get(destArray);
	324	+ messageDto.setKakaoJsonFile(QueueConstants.getString(destArray));
	325	+// messageDto.setUserSubject(new String(destArray));
	326	+ }
	327	+
260	328	public static void getBytesForMediaMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
261	329	byte[] destArray = null;
262	330	if (buffer == null \|\| messageDto == null) {
...	...	@@ -266,12 +334,14 @@
266	334	buffer.position(MediaBodyConfig.SUBJECT_BYTE_POSITION);
267	335	destArray = new byte[MediaBodyConfig.SUBJECT_BYTE_LENGTH];
268	336	buffer.get(destArray);
269		- messageDto.setUserSubject(new String(destArray));
	337	+ messageDto.setUserSubject(QueueConstants.getString(destArray));
	338	+// messageDto.setUserSubject(new String(destArray));
270	339	/* 15. 메시지 */
271	340	buffer.position(MediaBodyConfig.MEDIA_MSG_BYTE_POSITION);
272	341	destArray = new byte[MediaBodyConfig.MEDIA_MSG_BYTE_LENGTH];
273	342	buffer.get(destArray);
274		- messageDto.setUserMessage(new String(destArray));
	343	+ messageDto.setUserMessage(QueueConstants.getString(destArray));
	344	+// messageDto.setUserMessage(new String(destArray));
275	345	}
276	346
277	347	public static void setBytesForMmsMessage(ByteBuffer buffer, BasicMessageDto messageDto) {
...	...	@@ -304,22 +374,26 @@
304	374	buffer.position(MediaBodyConfig.FILECNT_BYTE_POSITION);
305	375	destArray = new byte[MediaBodyConfig.FILECNT_BYTE_LENGTH];
306	376	buffer.get(destArray);
307		- messageDto.setUserFileCnt(Integer.parseInt(new String(destArray)));
	377	+ messageDto.setUserFileCnt(Integer.parseInt(QueueConstants.getString(destArray)));
	378	+// messageDto.setUserFileCnt(Integer.parseInt(new String(destArray)));
308	379	/* 17. 파일명 #1 */
309	380	buffer.position(MediaBodyConfig.FILENAME_ONE_BYTE_POSITION);
310	381	destArray = new byte[MediaBodyConfig.FILENAME_ONE_BYTE_LENGTH];
311	382	buffer.get(destArray);
312		- messageDto.setUserFileName01(new String(destArray));
	383	+ messageDto.setUserFileName01(QueueConstants.getString(destArray));
	384	+// messageDto.setUserFileName01(new String(destArray));
313	385	/* 18. 파일명 #2 */
314	386	buffer.position(MediaBodyConfig.FILENAME_TWO_BYTE_POSITION);
315	387	destArray = new byte[MediaBodyConfig.FILENAME_TWO_BYTE_LENGTH];
316	388	buffer.get(destArray);
317		- messageDto.setUserFileName02(new String(destArray));
	389	+ messageDto.setUserFileName02(QueueConstants.getString(destArray));
	390	+// messageDto.setUserFileName02(new String(destArray));
318	391	/* 19. 파일명 #3 */
319	392	buffer.position(MediaBodyConfig.FILENAME_THREE_BYTE_POSITION);
320	393	destArray = new byte[MediaBodyConfig.FILENAME_THREE_BYTE_LENGTH];
321	394	buffer.get(destArray);
322		- messageDto.setUserFileName03(new String(destArray));
	395	+ messageDto.setUserFileName03(QueueConstants.getString(destArray));
	396	+// messageDto.setUserFileName03(new String(destArray));
323	397	}
324	398
325	399	public static int isValidateMessageForReport(ReportDto reportDto) {

...	...	@@ -2,7 +2,7 @@
2	2	datasource:
3	3	server:
4	4	driver-class-name: org.mariadb.jdbc.Driver
5		- jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent
	5	+ jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
6	6	username: mjonUr_agent
7	7	password: mjagent123$
8	8
...	...	@@ -12,6 +12,6 @@
12	12
13	13	# ### 에이전트 설정 관련 ####################################################################################
14	14	agent:
15		- root-path: C:/apps/agent_server
16		- server-property-file: C:/apps/agent_server/config/server.properties
	15	+ root-path: /home/mjon_server_agent
	16	+ server-property-file: /home/mjon_server_agent/config/server.properties
17	17	db-name: mjon_agent_back (No newline at end of file)

...	...	@@ -2,6 +2,7 @@
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
5	6	jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
6	7	username: mjonUr_agent
7	8	password: mjagent123$

Delete comment