MMS, 알림톡, 친구톡 기능 추가
@50cccb9bdc08d7b42e1fe69f5aadad16703de382
--- src/main/java/com/munjaon/client/config/DataSourceConfig.java
+++ src/main/java/com/munjaon/client/config/DataSourceConfig.java
... | ... | @@ -1,5 +1,6 @@ |
| 1 | 1 |
package com.munjaon.client.config; |
| 2 | 2 |
|
| 3 |
+import com.zaxxer.hikari.HikariDataSource; |
|
| 3 | 4 |
import lombok.Getter; |
| 4 | 5 |
import lombok.RequiredArgsConstructor; |
| 5 | 6 |
import lombok.extern.slf4j.Slf4j; |
... | ... | @@ -39,7 +40,7 @@ |
| 39 | 40 |
System.out.println("MARIADB.URL : " + serverConfig.getString(dbms + ".URL"));
|
| 40 | 41 |
System.out.println("MARIADB.USER : " + serverConfig.getString(dbms + ".USER"));
|
| 41 | 42 |
System.out.println("MARIADB.PASSWORD : " + serverConfig.getString(dbms + ".PASSWORD"));
|
| 42 |
- return DataSourceBuilder.create() |
|
| 43 |
+ return DataSourceBuilder.create().type(HikariDataSource.class) |
|
| 43 | 44 |
.driverClassName(serverConfig.getString(dbms + ".DRIVER")) |
| 44 | 45 |
.url(serverConfig.getString(dbms + ".URL")) |
| 45 | 46 |
.username(serverConfig.getString(dbms + ".USER")) |
--- src/main/java/com/munjaon/client/config/RunnerConfiguration.java
+++ src/main/java/com/munjaon/client/config/RunnerConfiguration.java
... | ... | @@ -81,6 +81,34 @@ |
| 81 | 81 |
|
| 82 | 82 |
@Bean |
| 83 | 83 |
@Order(2) |
| 84 |
+ public CommandLineRunner getRunnerBeanForKat() {
|
|
| 85 |
+ try {
|
|
| 86 |
+ String serviceName = "KAT"; |
|
| 87 |
+ String serviceType = serverConfig.getString(serviceName + ".SERVICE_TYPE"); |
|
| 88 |
+ CollectClientService collectClientService = new CollectClientService(serviceName, serviceType); |
|
| 89 |
+ collectClientService.start(); |
|
| 90 |
+ } catch (Exception e) {
|
|
| 91 |
+ throw new RuntimeException(e); |
|
| 92 |
+ } |
|
| 93 |
+ return args -> System.out.println("Runner Bean #2");
|
|
| 94 |
+ } |
|
| 95 |
+ |
|
| 96 |
+ @Bean |
|
| 97 |
+ @Order(2) |
|
| 98 |
+ public CommandLineRunner getRunnerBeanForKft() {
|
|
| 99 |
+ try {
|
|
| 100 |
+ String serviceName = "KFT"; |
|
| 101 |
+ String serviceType = serverConfig.getString(serviceName + ".SERVICE_TYPE"); |
|
| 102 |
+ CollectClientService collectClientService = new CollectClientService(serviceName, serviceType); |
|
| 103 |
+ collectClientService.start(); |
|
| 104 |
+ } catch (Exception e) {
|
|
| 105 |
+ throw new RuntimeException(e); |
|
| 106 |
+ } |
|
| 107 |
+ return args -> System.out.println("Runner Bean #2");
|
|
| 108 |
+ } |
|
| 109 |
+ |
|
| 110 |
+ @Bean |
|
| 111 |
+ @Order(2) |
|
| 84 | 112 |
public CommandLineRunner getRunnerBeanForReport() {
|
| 85 | 113 |
try {
|
| 86 | 114 |
String serviceName = "REPORT"; |
--- src/main/java/com/munjaon/client/mariadb/service/MariaDBService.java
+++ src/main/java/com/munjaon/client/mariadb/service/MariaDBService.java
... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 |
try {
|
| 20 | 20 |
int msgCount = mariaDBMapper.checkTableForMessage(); |
| 21 | 21 |
int logCount = mariaDBMapper.checkTableForLog(); |
| 22 |
- if (msgCount == 1 && logCount == 1) {
|
|
| 22 |
+ if (msgCount > 0 && logCount > 0) {
|
|
| 23 | 23 |
isExist = true; |
| 24 | 24 |
} |
| 25 | 25 |
} catch (Exception e) {
|
--- src/main/java/com/munjaon/client/model/MunjaonMsg.java
+++ src/main/java/com/munjaon/client/model/MunjaonMsg.java
... | ... | @@ -23,6 +23,9 @@ |
| 23 | 23 |
private String filename02; |
| 24 | 24 |
private String filename03; |
| 25 | 25 |
private String deliverDate; |
| 26 |
+ private String kakaoSenderKey; |
|
| 27 |
+ private String kakaoTemplateCode; |
|
| 28 |
+ private String kakaoJsonFile; |
|
| 26 | 29 |
private String sendDate; |
| 27 | 30 |
private String reportDate; |
| 28 | 31 |
private int fileCount = 0; |
--- src/main/java/com/munjaon/client/server/config/ErrorCode.java
+++ src/main/java/com/munjaon/client/server/config/ErrorCode.java
... | ... | @@ -5,9 +5,43 @@ |
| 5 | 5 |
@Getter |
| 6 | 6 |
public enum ErrorCode {
|
| 7 | 7 |
OK(200, "Success"), |
| 8 |
- ERROR_DATA_IS_NULL(300, "Msg is null"), |
|
| 9 |
- ERROR_SUBJECT_IS_NULL(310, "Subject is null"), |
|
| 10 |
- ERROR_MESSAGE_IS_NULL(320, "Message is null"), |
|
| 8 |
+ ERROR_DATA_IS_NULL(300, "DATA is null"), |
|
| 9 |
+ /* MSG_ID : 31X */ |
|
| 10 |
+ ERROR_MSGID_IS_NULL(310, "MSG_ID is null"), |
|
| 11 |
+ ERROR_MSGID_IS_CAPACITY(311, "MSG_ID : SIZE is Zero Or Over"), |
|
| 12 |
+ /* SENDER : 32X */ |
|
| 13 |
+ ERROR_SENDER_IS_NULL(320, "SENDER is null"), |
|
| 14 |
+ ERROR_SENDER_IS_CAPACITY(321, "SENDER : SIZE is Zero Or Over"), |
|
| 15 |
+ /* RECEIVER : 33X */ |
|
| 16 |
+ ERROR_RECEIVER_IS_NULL(330, "RECEIVER is null"), |
|
| 17 |
+ ERROR_RECEIVER_IS_CAPACITY(331, "RECEIVER : SIZE is Zero Or Over"), |
|
| 18 |
+ ERROR_RECEIVER_IS_INVALID(332, "RECEIVER is invalid number"), |
|
| 19 |
+ /* SMS MESSAGE : 34X */ |
|
| 20 |
+ ERROR_SMS_MSG_IS_NULL(340, "SMS MESSAGE is null"), |
|
| 21 |
+ ERROR_SMS_MSG_IS_CAPACITY(341, "SMS MESSAGE : SIZE is Zero Or Over"), |
|
| 22 |
+ /* LMS, MMS SUBJECT : 35X */ |
|
| 23 |
+ ERROR_SUBJECT_IS_NULL(350, "Subject is null"), |
|
| 24 |
+ ERROR_SUBJECT_OVER_CAPACITY(351, "Subject is over capacity"), |
|
| 25 |
+ /* LMS, MMS MESSAGE : 36X */ |
|
| 26 |
+ ERROR_MULTI_MESSAGE_IS_NULL(360, "Multimedia Message is null"), |
|
| 27 |
+ ERROR_MULTI_MESSAGE_OVER_CAPACITY(361, "Multimedia Message is over capacity"), |
|
| 28 |
+ /* MMS IMAGE : 37X */ |
|
| 29 |
+ ERROR_MMS_IMAGE_IS_NULL(370, "MMS_IMAGE is not exist"), |
|
| 30 |
+ ERROR_MMS_IMAGE_IS_EXT(371, "MMS_IMAGE is not support extension"), |
|
| 31 |
+ ERROR_MMS_IMAGE_IS_NOT_PATH(372, "MMS_IMAGE is not exists"), |
|
| 32 |
+ ERROR_MMS_IMAGE_IS_OVER_CAPACITY(373, "MMS_IMAGE is over capacity"), |
|
| 33 |
+ /* KAKAO_SENDER_KEY : 38X */ |
|
| 34 |
+ ERROR_KAKAO_SENDER_KEY_IS_NULL(380, "KAKAO_SENDER_KEY is null"), |
|
| 35 |
+ ERROR_KAKAO_SENDER_KEY_OVER_CAPACITY(381, "KAKAO_SENDER_KEY is over capacity"), |
|
| 36 |
+ /* KAKAO_TEMPLATE_CODE : 39X */ |
|
| 37 |
+ ERROR_KAKAO_TEMPLATE_CODE_IS_NULL(390, "KAKAO_TEMPLATE_CODE is null"), |
|
| 38 |
+ ERROR_KAKAO_TEMPLATE_CODE_OVER_CAPACITY(391, "KAKAO_TEMPLATE_CODE is over capacity"), |
|
| 39 |
+ /* KAKAO_JSON_FILE : 40X */ |
|
| 40 |
+ ERROR_KAKAO_JSON_FILE_IS_NULL(400, "KAKAO_JSON_FILE is not exist"), |
|
| 41 |
+ ERROR_KAKAO_JSON_FILE_IS_EXT(401, "KAKAO_JSON_FILE is not support extension"), |
|
| 42 |
+ ERROR_KAKAO_JSON_FILE_IS_NOT_PATH(402, "KAKAO_JSON_FILE is not exists"), |
|
| 43 |
+ ERROR_KAKAO_JSON_FILE_IS_OVER_CAPACITY(403, "KAKAO_JSON_FILE is over capacity"), |
|
| 44 |
+ |
|
| 11 | 45 |
ERROR_FILE_NOT_FOUND(390, "File Not Found"), |
| 12 | 46 |
ERROR_FILE_CAPACITY_EXCEED(391, "File capacity exceeded"); |
| 13 | 47 |
|
+++ src/main/java/com/munjaon/client/server/packet/KakaoMessage.java
... | ... | @@ -0,0 +1,157 @@ |
| 1 | +package com.munjaon.client.server.packet; | |
| 2 | + | |
| 3 | +import com.munjaon.client.model.MunjaonMsg; | |
| 4 | +import com.munjaon.client.util.CommonUtil; | |
| 5 | + | |
| 6 | +import java.io.File; | |
| 7 | +import java.io.IOException; | |
| 8 | +import java.nio.ByteBuffer; | |
| 9 | +import java.nio.file.Files; | |
| 10 | + | |
| 11 | +public final class KakaoMessage { | |
| 12 | + public static final int LIMIT_FILE_CAPACITY = 1024 * 50; | |
| 13 | + | |
| 14 | + public static final int DELIVER_JSON_FILENAME_LENGTH = 40; | |
| 15 | + public static final int DELIVER_JSON_FILENAME_POSITION = 0; | |
| 16 | + | |
| 17 | + public static final int DELIVER_JSON_FILESIZE_LENGTH = 8; | |
| 18 | + public static final int DELIVER_JSON_FILESIZE_POSITION = DELIVER_JSON_FILENAME_POSITION + DELIVER_JSON_FILENAME_LENGTH; | |
| 19 | + | |
| 20 | + public static final int DELIVER_KAKAO_BODY_LENGTH = 2233; | |
| 21 | + public static final int DELIVER_KAKAO_ACK_BODY_LENGTH = 21; | |
| 22 | + | |
| 23 | + /* DELIVER */ | |
| 24 | + /* SUBJECT */ | |
| 25 | + public static final int DELIVER_SUBJECT_LENGTH = 40; | |
| 26 | + public static final int DELIVER_SUBJECT_POSITION = CommonMessage.DELIVER_MSG_TYPE_POSITION + CommonMessage.DELIVER_MSG_TYPE_LENGTH; | |
| 27 | + /* MESSAGE */ | |
| 28 | + public static final int DELIVER_MESSAGE_LENGTH = 2000; | |
| 29 | + public static final int DELIVER_MESSAGE_POSITION = DELIVER_SUBJECT_POSITION + DELIVER_SUBJECT_LENGTH; | |
| 30 | + /* KAKAO_SENDER_KEY */ | |
| 31 | + public static final int DELIVER_KAKAO_SENDER_KEY_LENGTH = 40; | |
| 32 | + public static final int DELIVER_KAKAO_SENDER_KEY_POSITION = DELIVER_MESSAGE_POSITION + DELIVER_MESSAGE_LENGTH; | |
| 33 | + /* KAKAO_TEMPLATE_CODE */ | |
| 34 | + public static final int DELIVER_KAKAO_TEMPLATE_CODE_LENGTH = 64; | |
| 35 | + public static final int DELIVER_KAKAO_TEMPLATE_CODE_POSITION = DELIVER_KAKAO_SENDER_KEY_POSITION + DELIVER_KAKAO_SENDER_KEY_LENGTH; | |
| 36 | + | |
| 37 | + public static void putSubjectForDeliver(ByteBuffer buffer, String subject) { | |
| 38 | + if (buffer == null || subject == null) { | |
| 39 | + return; | |
| 40 | + } | |
| 41 | + subject = CommonUtil.cutString(subject, DELIVER_SUBJECT_LENGTH); | |
| 42 | + buffer.put(DELIVER_SUBJECT_POSITION, subject.getBytes()); | |
| 43 | + } | |
| 44 | + public static String getSubjectForDeliver(ByteBuffer buffer) { | |
| 45 | + if (buffer == null) { | |
| 46 | + return null; | |
| 47 | + } | |
| 48 | + | |
| 49 | + buffer.position(DELIVER_SUBJECT_POSITION); | |
| 50 | + byte[] destArray = new byte[DELIVER_SUBJECT_LENGTH]; | |
| 51 | + buffer.get(destArray); | |
| 52 | + | |
| 53 | + return Packet.getString(destArray); | |
| 54 | + } | |
| 55 | + | |
| 56 | + public static void putMessageForDeliver(ByteBuffer buffer, String message) { | |
| 57 | + if (buffer == null || message == null) { | |
| 58 | + return; | |
| 59 | + } | |
| 60 | + message = CommonUtil.cutString(message, DELIVER_MESSAGE_LENGTH); | |
| 61 | + buffer.put(DELIVER_MESSAGE_POSITION, message.getBytes()); | |
| 62 | + } | |
| 63 | + public static String getMessageForDeliver(ByteBuffer buffer) { | |
| 64 | + if (buffer == null) { | |
| 65 | + return null; | |
| 66 | + } | |
| 67 | + | |
| 68 | + buffer.position(DELIVER_MESSAGE_POSITION); | |
| 69 | + byte[] destArray = new byte[DELIVER_MESSAGE_LENGTH]; | |
| 70 | + buffer.get(destArray); | |
| 71 | + | |
| 72 | + return Packet.getString(destArray); | |
| 73 | + } | |
| 74 | + public static void putKakaoSenderKeyForDeliver(ByteBuffer buffer, String kakaoSenderKey) { | |
| 75 | + if (buffer == null || kakaoSenderKey == null) { | |
| 76 | + return; | |
| 77 | + } | |
| 78 | + kakaoSenderKey = CommonUtil.cutString(kakaoSenderKey, DELIVER_KAKAO_SENDER_KEY_LENGTH); | |
| 79 | + buffer.put(DELIVER_KAKAO_SENDER_KEY_POSITION, kakaoSenderKey.getBytes()); | |
| 80 | + } | |
| 81 | + public static String getKakaoSenderKeyForDeliver(ByteBuffer buffer) { | |
| 82 | + if (buffer == null) { | |
| 83 | + return null; | |
| 84 | + } | |
| 85 | + | |
| 86 | + buffer.position(DELIVER_KAKAO_SENDER_KEY_POSITION); | |
| 87 | + byte[] destArray = new byte[DELIVER_KAKAO_SENDER_KEY_LENGTH]; | |
| 88 | + buffer.get(destArray); | |
| 89 | + | |
| 90 | + return Packet.getString(destArray); | |
| 91 | + } | |
| 92 | + public static void putKakaoTemplateCodeForDeliver(ByteBuffer buffer, String kakaoTemplateCode) { | |
| 93 | + if (buffer == null || kakaoTemplateCode == null) { | |
| 94 | + return; | |
| 95 | + } | |
| 96 | + kakaoTemplateCode = CommonUtil.cutString(kakaoTemplateCode, DELIVER_KAKAO_TEMPLATE_CODE_LENGTH); | |
| 97 | + buffer.put(DELIVER_KAKAO_TEMPLATE_CODE_POSITION, kakaoTemplateCode.getBytes()); | |
| 98 | + } | |
| 99 | + public static String getKakaoTemplateCodeForDeliver(ByteBuffer buffer) { | |
| 100 | + if (buffer == null) { | |
| 101 | + return null; | |
| 102 | + } | |
| 103 | + | |
| 104 | + buffer.position(DELIVER_KAKAO_TEMPLATE_CODE_POSITION); | |
| 105 | + byte[] destArray = new byte[DELIVER_KAKAO_TEMPLATE_CODE_LENGTH]; | |
| 106 | + buffer.get(destArray); | |
| 107 | + | |
| 108 | + return Packet.getString(destArray); | |
| 109 | + } | |
| 110 | + public static void makeDataForDeliver(ByteBuffer buffer, MunjaonMsg data) { | |
| 111 | + if (buffer == null || data == null) { | |
| 112 | + return; | |
| 113 | + } | |
| 114 | + /* MSG_ID */ | |
| 115 | + CommonMessage.putMessageIdForDeliver(buffer, data.getMsgId()); | |
| 116 | + /* SENDER */ | |
| 117 | + CommonMessage.putSenderForDeliver(buffer, data.getSendPhone()); | |
| 118 | + /* RECEIVER */ | |
| 119 | + CommonMessage.putReceiverForDeliver(buffer, data.getRecvPhone()); | |
| 120 | + /* RESERVE_TIME */ | |
| 121 | + CommonMessage.putReserveTimeForDeliver(buffer, data.getReserveDate()); | |
| 122 | + /* REQUEST_TIME */ | |
| 123 | + CommonMessage.putRequestTimeForDeliver(buffer, data.getRequestDate()); | |
| 124 | + /* MSG_TYPE */ | |
| 125 | + CommonMessage.putMsgTypeForDeliver(buffer, data.getMsgType()); | |
| 126 | + /* Subject */ | |
| 127 | + putSubjectForDeliver(buffer, data.getSubject()); | |
| 128 | + /* MSG */ | |
| 129 | + putMessageForDeliver(buffer, data.getMessage()); | |
| 130 | + /* KAKAO_SENDER_KEY */ | |
| 131 | + putKakaoSenderKeyForDeliver(buffer, data.getKakaoSenderKey()); | |
| 132 | + /* KAKAO_TEMPLATE_CODE */ | |
| 133 | + putKakaoTemplateCodeForDeliver(buffer, data.getKakaoTemplateCode()); | |
| 134 | + } | |
| 135 | + | |
| 136 | + public static ByteBuffer makeJsonForDeliver(String path, String fileName) { | |
| 137 | + if (path == null || fileName == null) { | |
| 138 | + return null; | |
| 139 | + } | |
| 140 | + File file = new File(path + fileName); | |
| 141 | + if (file.exists() == false) { | |
| 142 | + return null; | |
| 143 | + } | |
| 144 | + ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH); | |
| 145 | + fileHeadBuffer.put(DELIVER_JSON_FILENAME_POSITION, fileName.getBytes()); | |
| 146 | + fileHeadBuffer.put(DELIVER_JSON_FILESIZE_POSITION, String.valueOf(file.length()).getBytes()); | |
| 147 | + ByteBuffer fileBodyBuffer = ByteBuffer.allocate((int) file.length()); | |
| 148 | + ByteBuffer fileBuffer = null; | |
| 149 | + try { | |
| 150 | + fileBodyBuffer.put(Files.readAllBytes(file.toPath())); | |
| 151 | + fileBuffer = ByteBuffer.allocate(fileHeadBuffer.capacity() + fileBodyBuffer.capacity()); | |
| 152 | + Packet.mergeBuffers(fileBuffer, fileHeadBuffer, fileBodyBuffer); | |
| 153 | + } catch (IOException e) {} | |
| 154 | + | |
| 155 | + return fileBuffer; | |
| 156 | + } | |
| 157 | +} |
--- src/main/java/com/munjaon/client/server/packet/LmsMessage.java
+++ src/main/java/com/munjaon/client/server/packet/LmsMessage.java
... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 |
import java.nio.ByteBuffer; |
| 7 | 7 |
|
| 8 | 8 |
public final class LmsMessage {
|
| 9 |
- public static final int DELIVER_LMS_BODY_LENGTH = 2091; |
|
| 9 |
+ public static final int DELIVER_LMS_BODY_LENGTH = 2129; |
|
| 10 | 10 |
public static final int DELIVER_LMS_ACK_BODY_LENGTH = 21; |
| 11 | 11 |
|
| 12 | 12 |
/* DELIVER */ |
--- src/main/java/com/munjaon/client/server/packet/MmsMessage.java
+++ src/main/java/com/munjaon/client/server/packet/MmsMessage.java
... | ... | @@ -3,7 +3,10 @@ |
| 3 | 3 |
import com.munjaon.client.model.MunjaonMsg; |
| 4 | 4 |
import com.munjaon.client.util.CommonUtil; |
| 5 | 5 |
|
| 6 |
+import java.io.File; |
|
| 7 |
+import java.io.IOException; |
|
| 6 | 8 |
import java.nio.ByteBuffer; |
| 9 |
+import java.nio.file.Files; |
|
| 7 | 10 |
|
| 8 | 11 |
public final class MmsMessage {
|
| 9 | 12 |
public static final int LIMIT_FILE_CAPACITY = 1024 * 300; |
... | ... | @@ -14,7 +17,7 @@ |
| 14 | 17 |
public static final int DELIVER_MMS_FILESIZE_LENGTH = 8; |
| 15 | 18 |
public static final int DELIVER_MMS_FILESIZE_POSITION = DELIVER_MMS_FILENAME_POSITION + DELIVER_MMS_FILENAME_LENGTH; |
| 16 | 19 |
|
| 17 |
- public static final int DELIVER_MMS_BODY_LENGTH = 2092; |
|
| 20 |
+ public static final int DELIVER_MMS_BODY_LENGTH = 2130; |
|
| 18 | 21 |
public static final int DELIVER_MMS_ACK_BODY_LENGTH = 21; |
| 19 | 22 |
|
| 20 | 23 |
/* DELIVER */ |
... | ... | @@ -110,4 +113,26 @@ |
| 110 | 113 |
/* FileCount */ |
| 111 | 114 |
putFileCountForDeliver(buffer, data.getFileCount()); |
| 112 | 115 |
} |
| 116 |
+ |
|
| 117 |
+ public static ByteBuffer makeImageForDeliver(String path, String fileName) {
|
|
| 118 |
+ if (path == null || fileName == null) {
|
|
| 119 |
+ return null; |
|
| 120 |
+ } |
|
| 121 |
+ File file = new File(path + fileName); |
|
| 122 |
+ if (file.exists() == false) {
|
|
| 123 |
+ return null; |
|
| 124 |
+ } |
|
| 125 |
+ ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH); |
|
| 126 |
+ fileHeadBuffer.put(DELIVER_MMS_FILENAME_POSITION, fileName.getBytes()); |
|
| 127 |
+ fileHeadBuffer.put(DELIVER_MMS_FILESIZE_POSITION, String.valueOf(file.length()).getBytes()); |
|
| 128 |
+ ByteBuffer fileBodyBuffer = ByteBuffer.allocate((int) file.length()); |
|
| 129 |
+ ByteBuffer fileBuffer = null; |
|
| 130 |
+ try {
|
|
| 131 |
+ fileBodyBuffer.put(Files.readAllBytes(file.toPath())); |
|
| 132 |
+ fileBuffer = ByteBuffer.allocate(fileHeadBuffer.capacity() + fileBodyBuffer.capacity()); |
|
| 133 |
+ Packet.mergeBuffers(fileBuffer, fileHeadBuffer, fileBodyBuffer); |
|
| 134 |
+ } catch (IOException e) {}
|
|
| 135 |
+ |
|
| 136 |
+ return fileBuffer; |
|
| 137 |
+ } |
|
| 113 | 138 |
} |
--- src/main/java/com/munjaon/client/server/packet/SmsMessage.java
+++ src/main/java/com/munjaon/client/server/packet/SmsMessage.java
... | ... | @@ -12,6 +12,7 @@ |
| 12 | 12 |
|
| 13 | 13 |
/* DELIVER */ |
| 14 | 14 |
/* MESSAGE */ |
| 15 |
+ public static final int DELIVER_MESSAGE_TRANS_LENGTH = 90; |
|
| 15 | 16 |
public static final int DELIVER_MESSAGE_LENGTH = 160; |
| 16 | 17 |
public static final int DELIVER_MESSAGE_POSITION = CommonMessage.DELIVER_MSG_TYPE_POSITION + CommonMessage.DELIVER_MSG_TYPE_LENGTH; |
| 17 | 18 |
|
--- src/main/java/com/munjaon/client/server/service/CollectClientService.java
+++ src/main/java/com/munjaon/client/server/service/CollectClientService.java
... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 |
import com.munjaon.client.server.config.ErrorCode; |
| 5 | 5 |
import com.munjaon.client.server.packet.*; |
| 6 | 6 |
import com.munjaon.client.service.DatabaseTypeWorker; |
| 7 |
+import com.munjaon.client.util.MessageCheckUtil; |
|
| 7 | 8 |
import com.munjaon.client.util.MessageUtil; |
| 8 | 9 |
import org.json.simple.JSONObject; |
| 9 | 10 |
|
... | ... | @@ -34,23 +35,28 @@ |
| 34 | 35 |
public void checkReady() {
|
| 35 | 36 |
worker = DatabaseTypeWorker.find(System.getProperty("DBMS"));
|
| 36 | 37 |
if (worker == null) {
|
| 38 |
+ saveSystemLog("[checkReady][DBMS : " + System.getProperty("DBMS") + " is not ready]");
|
|
| 37 | 39 |
return; |
| 38 | 40 |
} |
| 41 |
+ |
|
| 42 |
+ saveSystemLog("[checkReady][DBMS : " + System.getProperty("DBMS") + " is ready]");
|
|
| 39 | 43 |
this.IS_READY_YN = worker.checkTableExists(); |
| 40 | 44 |
} |
| 41 | 45 |
|
| 42 | 46 |
@Override |
| 43 | 47 |
public void initResources() {
|
| 48 |
+ saveSystemLog("Resource is initializing ... ...");
|
|
| 44 | 49 |
this.address = getProp("HOST");
|
| 45 | 50 |
this.port = Integer.parseInt(getProp("DELIVER.PORT"));
|
| 46 | 51 |
this.id = getProp("ID");
|
| 47 | 52 |
this.pwd = getProp("PASSWORD");
|
| 48 |
- saveSystemLog("Try Connect to " + this.address + ":" + this.port);
|
|
| 53 |
+ saveSystemLog("Try Connect to [ADDRESS : " + this.address + "] [PORT : " + this.port + "] [ID : " + this.id + "]");
|
|
| 49 | 54 |
try {
|
| 50 | 55 |
socketChannel = SocketChannel.open(new InetSocketAddress(this.address, this.port)); |
| 51 | 56 |
socketChannel.configureBlocking(false); |
| 52 | 57 |
} catch (IOException e) {
|
| 53 |
- saveSystemLog("Connect Fail " + this.address + ":" + this.port);
|
|
| 58 |
+ saveSystemLog("Connect Fail to [ADDRESS : " + this.address + "] [PORT : " + this.port + "] [ID : " + this.id + "]");
|
|
| 59 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 54 | 60 |
throw new RuntimeException(e); |
| 55 | 61 |
} |
| 56 | 62 |
} |
... | ... | @@ -61,6 +67,7 @@ |
| 61 | 67 |
try {
|
| 62 | 68 |
socketChannel.close(); |
| 63 | 69 |
} catch (IOException e) {
|
| 70 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 64 | 71 |
throw new RuntimeException(e); |
| 65 | 72 |
} |
| 66 | 73 |
} |
... | ... | @@ -75,6 +82,9 @@ |
| 75 | 82 |
messageService(); |
| 76 | 83 |
linkCheckService(); |
| 77 | 84 |
} catch (Exception e) {
|
| 85 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 86 |
+ saveSystemLog("ERROR DETAIL");
|
|
| 87 |
+ saveSystemLog(e.toString()); |
|
| 78 | 88 |
throw new RuntimeException(e); |
| 79 | 89 |
} |
| 80 | 90 |
} |
... | ... | @@ -84,29 +94,30 @@ |
| 84 | 94 |
ByteBuffer sendBuffer = Bind.makeBindBuffer(id, pwd); |
| 85 | 95 |
ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Bind.BIND_ACK_BODY_LENGTH); |
| 86 | 96 |
try {
|
| 87 |
- saveSystemLog("sendBuffer " + sendBuffer.position() + ":" + sendBuffer.limit());
|
|
| 88 |
- saveSystemLog("Bind Try Connect to " + this.address + ":" + this.port);
|
|
| 97 |
+ saveSystemLog("[BIND REQUEST] [IP : " + this.address + "] [PORT : " + this.port + "] [ID : " + this.id + "]");
|
|
| 89 | 98 |
socketChannel.write(sendBuffer); |
| 90 |
- saveSystemLog("Bind Read to " + this.address + ":" + this.port);
|
|
| 91 | 99 |
while (true) {
|
| 92 | 100 |
int recvCount = socketChannel.read(recvBuffer); |
| 93 | 101 |
if (recvCount == -1) {
|
| 102 |
+ saveSystemLog("[BIND ERROR] [CONNECTION CLOSED]");
|
|
| 94 | 103 |
throw new RuntimeException("BIND ERROR");
|
| 95 | 104 |
} else if (recvCount > 0) {
|
| 96 | 105 |
String resultCode = Bind.getBindAckResultCode(recvBuffer); |
| 97 | 106 |
saveSystemLog("resultCode " + resultCode);
|
| 98 | 107 |
if ("00".equals(resultCode)) {
|
| 99 | 108 |
lastPacketSendTime = System.currentTimeMillis(); |
| 100 |
- saveSystemLog("Bind OK");
|
|
| 109 |
+ saveSystemLog("[BIND SUCCESS] [CONNECTION IS ESTABLISHED]");
|
|
| 101 | 110 |
break; |
| 102 | 111 |
} else {
|
| 103 |
- saveSystemLog("Bind FAIL");
|
|
| 112 |
+ saveSystemLog("[BIND FAIL] [RESULT CODE : " + resultCode + "]");
|
|
| 104 | 113 |
throw new RuntimeException("Bind FAIL");
|
| 105 | 114 |
} |
| 106 | 115 |
} |
| 107 | 116 |
} |
| 108 |
- |
|
| 109 | 117 |
} catch (Exception e) {
|
| 118 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 119 |
+ saveSystemLog("ERROR DETAIL");
|
|
| 120 |
+ saveSystemLog(e.toString()); |
|
| 110 | 121 |
throw new RuntimeException(e); |
| 111 | 122 |
} |
| 112 | 123 |
} |
... | ... | @@ -130,13 +141,10 @@ |
| 130 | 141 |
private void messageService() {
|
| 131 | 142 |
List<MunjaonMsg> list = selectToDeliver(); |
| 132 | 143 |
if (list == null || list.isEmpty()) {
|
| 133 |
- try {
|
|
| 134 |
- Thread.sleep(1000); |
|
| 135 |
- } catch (InterruptedException e) {
|
|
| 136 |
- throw new RuntimeException(e); |
|
| 137 |
- } |
|
| 144 |
+ try {Thread.sleep(1000);} catch (InterruptedException e) {throw new RuntimeException(e);}
|
|
| 138 | 145 |
return; |
| 139 | 146 |
} |
| 147 |
+ |
|
| 140 | 148 |
for (MunjaonMsg data : list) {
|
| 141 | 149 |
switch (this.serviceType) {
|
| 142 | 150 |
case "SMS": smsMessageService(data); break; |
... | ... | @@ -146,28 +154,94 @@ |
| 146 | 154 |
case "KFT": kftMessageService(data); break; |
| 147 | 155 |
default:break; |
| 148 | 156 |
} |
| 149 |
- |
|
| 150 | 157 |
} |
| 151 | 158 |
} |
| 152 | 159 |
|
| 153 |
- private void lmsMessageService(MunjaonMsg data) {
|
|
| 154 |
- if (data == null) {
|
|
| 155 |
- return; |
|
| 156 |
- } |
|
| 157 |
- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LmsMessage.DELIVER_LMS_BODY_LENGTH); |
|
| 158 |
- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LmsMessage.DELIVER_LMS_ACK_BODY_LENGTH); |
|
| 160 |
+ private void smsMessageService(MunjaonMsg data) {
|
|
| 159 | 161 |
try {
|
| 160 |
- Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, LmsMessage.DELIVER_LMS_BODY_LENGTH); |
|
| 161 |
- LmsMessage.makeDataForDeliver(sendBuffer, data); |
|
| 162 |
- saveSystemLog("Deliver Send");
|
|
| 162 |
+ /* 공통 메시지 유효성 체크 */ |
|
| 163 |
+ int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); |
|
| 164 |
+ int checkMsgCode = MessageCheckUtil.validateMessageForSms(data); |
|
| 165 |
+ if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode()) {
|
|
| 166 |
+ saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]");
|
|
| 167 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 168 |
+ /* 전송처리 */ |
|
| 169 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 170 |
+ /* 실패처리 */ |
|
| 171 |
+ MunjaonMsg errorMsg = null; |
|
| 172 |
+ if (checkCommonCode != ErrorCode.OK.getCode()) {
|
|
| 173 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");; |
|
| 174 |
+ } else {
|
|
| 175 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");; |
|
| 176 |
+ } |
|
| 177 |
+ worker.updateToReport(errorMsg); |
|
| 178 |
+ /* 처리완료 */ |
|
| 179 |
+ return; |
|
| 180 |
+ } |
|
| 181 |
+ |
|
| 182 |
+ /* 정상인 경우 메시지 전송 */ |
|
| 183 |
+ ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + SmsMessage.DELIVER_SMS_BODY_LENGTH); |
|
| 184 |
+ ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + SmsMessage.DELIVER_SMS_ACK_BODY_LENGTH); |
|
| 185 |
+ Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, SmsMessage.DELIVER_SMS_BODY_LENGTH); |
|
| 186 |
+ SmsMessage.makeDataForDeliver(sendBuffer, data); |
|
| 187 |
+ saveSystemLog("[MESSAGE SEND] [... ...]");
|
|
| 188 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 163 | 189 |
socketChannel.write(sendBuffer); |
| 164 | 190 |
while (true) {
|
| 165 | 191 |
int recvCount = socketChannel.read(recvBuffer); |
| 166 | 192 |
if (recvCount == -1) {
|
| 193 |
+ saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 167 | 194 |
throw new RuntimeException("DELIVER ERROR");
|
| 168 | 195 |
} else if (recvCount > 0) {
|
| 169 | 196 |
worker.updateToDeliver(data.getMsgId()); |
| 170 |
- saveSystemLog("Deliver OK");
|
|
| 197 |
+ saveSystemLog("[MESSAGE SEND] [SUCCESS]");
|
|
| 198 |
+ lastPacketSendTime = System.currentTimeMillis(); |
|
| 199 |
+ break; |
|
| 200 |
+ } |
|
| 201 |
+ } |
|
| 202 |
+ } catch (IOException e) {
|
|
| 203 |
+ throw new RuntimeException(e); |
|
| 204 |
+ } |
|
| 205 |
+ } |
|
| 206 |
+ |
|
| 207 |
+ private void lmsMessageService(MunjaonMsg data) {
|
|
| 208 |
+ try {
|
|
| 209 |
+ /* 공통 메시지 유효성 체크 */ |
|
| 210 |
+ int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); |
|
| 211 |
+ int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data); |
|
| 212 |
+ if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode()) {
|
|
| 213 |
+ saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]");
|
|
| 214 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 215 |
+ /* 전송처리 */ |
|
| 216 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 217 |
+ /* 실패처리 */ |
|
| 218 |
+ MunjaonMsg errorMsg = null; |
|
| 219 |
+ if (checkCommonCode != ErrorCode.OK.getCode()) {
|
|
| 220 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC");; |
|
| 221 |
+ } else {
|
|
| 222 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC");; |
|
| 223 |
+ } |
|
| 224 |
+ worker.updateToReport(errorMsg); |
|
| 225 |
+ /* 처리완료 */ |
|
| 226 |
+ return; |
|
| 227 |
+ } |
|
| 228 |
+ |
|
| 229 |
+ /* 정상인 경우 메시지 전송 */ |
|
| 230 |
+ ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LmsMessage.DELIVER_LMS_BODY_LENGTH); |
|
| 231 |
+ ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LmsMessage.DELIVER_LMS_ACK_BODY_LENGTH); |
|
| 232 |
+ Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, LmsMessage.DELIVER_LMS_BODY_LENGTH); |
|
| 233 |
+ LmsMessage.makeDataForDeliver(sendBuffer, data); |
|
| 234 |
+ saveSystemLog("[MESSAGE SEND] [... ...]");
|
|
| 235 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 236 |
+ socketChannel.write(sendBuffer); |
|
| 237 |
+ while (true) {
|
|
| 238 |
+ int recvCount = socketChannel.read(recvBuffer); |
|
| 239 |
+ if (recvCount == -1) {
|
|
| 240 |
+ saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 241 |
+ throw new RuntimeException("DELIVER ERROR");
|
|
| 242 |
+ } else if (recvCount > 0) {
|
|
| 243 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 244 |
+ saveSystemLog("[MESSAGE SEND] [SUCCESS]");
|
|
| 171 | 245 |
lastPacketSendTime = System.currentTimeMillis(); |
| 172 | 246 |
break; |
| 173 | 247 |
} |
... | ... | @@ -178,68 +252,65 @@ |
| 178 | 252 |
} |
| 179 | 253 |
|
| 180 | 254 |
private void mmsMessageService(MunjaonMsg data) {
|
| 181 |
- if (data == null) {
|
|
| 182 |
- return; |
|
| 183 |
- } |
|
| 184 |
- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH); |
|
| 185 |
- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_ACK_BODY_LENGTH); |
|
| 186 | 255 |
try {
|
| 256 |
+ /* MMS Image 저장 경로 */ |
|
| 187 | 257 |
String path = System.getProperty("ROOTPATH") + File.separator + "mmsfile" + File.separator;
|
| 188 |
- int fileCount = 0; |
|
| 189 |
- int errorCode = validateErrorCodeForMms(data); |
|
| 190 |
- if (errorCode != ErrorCode.OK.getCode()) {
|
|
| 191 |
- MunjaonMsg errorMsg = new MunjaonMsg(); |
|
| 192 |
- errorMsg.setMsgId(data.getMsgId()); |
|
| 193 |
- errorMsg.setAgentCode("00");
|
|
| 194 |
- errorMsg.setSendStatus(String.valueOf(errorCode)); |
|
| 195 |
- errorMsg.setSendDate(MessageUtil.getTime()); |
|
| 196 |
- errorMsg.setTelecom("ETC");
|
|
| 258 |
+ /* 공통 메시지 유효성 체크 */ |
|
| 259 |
+ int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); |
|
| 260 |
+ int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data); |
|
| 261 |
+ int checkImageCode = MessageCheckUtil.validateMessageForImage(data, path); |
|
| 262 |
+ if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkImageCode != ErrorCode.OK.getCode()) {
|
|
| 263 |
+ saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [IMAGE_CODE : " + checkImageCode + "]");
|
|
| 264 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 265 |
+ /* 전송처리 */ |
|
| 197 | 266 |
worker.updateToDeliver(data.getMsgId()); |
| 267 |
+ /* 실패처리 */ |
|
| 268 |
+ MunjaonMsg errorMsg = null; |
|
| 269 |
+ if (checkCommonCode != ErrorCode.OK.getCode()) {
|
|
| 270 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC"); |
|
| 271 |
+ }else if (checkMsgCode != ErrorCode.OK.getCode()) {
|
|
| 272 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC"); |
|
| 273 |
+ } else {
|
|
| 274 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkImageCode), MessageUtil.getTime(), "ETC"); |
|
| 275 |
+ } |
|
| 198 | 276 |
worker.updateToReport(errorMsg); |
| 277 |
+ /* 처리완료 */ |
|
| 278 |
+ return; |
|
| 199 | 279 |
} |
| 280 |
+ |
|
| 281 |
+ /* 정상인 경우 메시지 전송 */ |
|
| 282 |
+ ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_BODY_LENGTH); |
|
| 283 |
+ ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + MmsMessage.DELIVER_MMS_ACK_BODY_LENGTH); |
|
| 284 |
+ int fileCount = 0; |
|
| 200 | 285 |
/* File check */ |
| 201 |
- ByteBuffer file01Buffer = null; |
|
| 202 |
- if (data.getFilename01() != null) {
|
|
| 203 |
- File file = new File(path + data.getFilename01()); |
|
| 204 |
- if (file.exists()) {
|
|
| 205 |
- fileCount++; |
|
| 206 |
- ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH); |
|
| 207 |
- ByteBuffer fileBodyBuffer = ByteBuffer.allocate((int) file.length()); |
|
| 208 |
- fileBodyBuffer.put(Files.readAllBytes(file.toPath())); |
|
| 209 |
- file01Buffer = ByteBuffer.allocate(fileHeadBuffer.capacity() + fileBodyBuffer.capacity()); |
|
| 210 |
- Packet.mergeBuffers(file01Buffer, fileHeadBuffer, fileBodyBuffer); |
|
| 211 |
- } |
|
| 286 |
+ ByteBuffer file01Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename01()); |
|
| 287 |
+ if (file01Buffer != null) {
|
|
| 288 |
+ saveSystemLog("file01Buffer : " + file01Buffer.capacity());
|
|
| 212 | 289 |
} |
| 213 |
- ByteBuffer file02Buffer = null; |
|
| 214 |
- if (data.getFilename02() != null) {
|
|
| 215 |
- File file = new File(path + data.getFilename02()); |
|
| 216 |
- if (file.exists()) {
|
|
| 217 |
- fileCount++; |
|
| 218 |
- ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH); |
|
| 219 |
- ByteBuffer fileBodyBuffer = ByteBuffer.allocate((int) file.length()); |
|
| 220 |
- fileBodyBuffer.put(Files.readAllBytes(file.toPath())); |
|
| 221 |
- file02Buffer = ByteBuffer.allocate(fileHeadBuffer.capacity() + fileBodyBuffer.capacity()); |
|
| 222 |
- Packet.mergeBuffers(file02Buffer, fileHeadBuffer, fileBodyBuffer); |
|
| 223 |
- } |
|
| 290 |
+ if (file01Buffer != null) {
|
|
| 291 |
+ fileCount++; |
|
| 224 | 292 |
} |
| 225 |
- ByteBuffer file03Buffer = null; |
|
| 226 |
- if (data.getFilename03() != null) {
|
|
| 227 |
- File file = new File(path + data.getFilename03()); |
|
| 228 |
- if (file.exists()) {
|
|
| 229 |
- fileCount++; |
|
| 230 |
- ByteBuffer fileHeadBuffer = ByteBuffer.allocate(MmsMessage.DELIVER_MMS_FILENAME_LENGTH + MmsMessage.DELIVER_MMS_FILESIZE_LENGTH); |
|
| 231 |
- ByteBuffer fileBodyBuffer = ByteBuffer.allocate((int) file.length()); |
|
| 232 |
- fileBodyBuffer.put(Files.readAllBytes(file.toPath())); |
|
| 233 |
- file03Buffer = ByteBuffer.allocate(fileHeadBuffer.capacity() + fileBodyBuffer.capacity()); |
|
| 234 |
- Packet.mergeBuffers(file03Buffer, fileHeadBuffer, fileBodyBuffer); |
|
| 235 |
- } |
|
| 293 |
+ ByteBuffer file02Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename02()); |
|
| 294 |
+ if (file02Buffer != null) {
|
|
| 295 |
+ saveSystemLog("file02Buffer : " + file02Buffer.capacity());
|
|
| 296 |
+ } |
|
| 297 |
+ if (file02Buffer != null) {
|
|
| 298 |
+ fileCount++; |
|
| 299 |
+ } |
|
| 300 |
+ ByteBuffer file03Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename03()); |
|
| 301 |
+ if (file03Buffer != null) {
|
|
| 302 |
+ saveSystemLog("file03Buffer : " + file03Buffer.capacity());
|
|
| 303 |
+ } |
|
| 304 |
+ if (file03Buffer != null) {
|
|
| 305 |
+ fileCount++; |
|
| 236 | 306 |
} |
| 237 | 307 |
/* fileCount 저장 */ |
| 238 | 308 |
data.setFileCount(fileCount); |
| 239 | 309 |
|
| 240 | 310 |
Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, MmsMessage.DELIVER_MMS_BODY_LENGTH); |
| 241 | 311 |
MmsMessage.makeDataForDeliver(sendBuffer, data); |
| 242 |
- saveSystemLog("Deliver Send");
|
|
| 312 |
+ saveSystemLog("[MESSAGE SEND] [... ...]");
|
|
| 313 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 243 | 314 |
|
| 244 | 315 |
ByteBuffer[] byteBuffers = new ByteBuffer[fileCount + 1]; |
| 245 | 316 |
int index = 0; |
... | ... | @@ -263,96 +334,142 @@ |
| 263 | 334 |
while (true) {
|
| 264 | 335 |
int recvCount = socketChannel.read(recvBuffer); |
| 265 | 336 |
if (recvCount == -1) {
|
| 337 |
+ saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 266 | 338 |
throw new RuntimeException("DELIVER ERROR");
|
| 267 | 339 |
} else if (recvCount > 0) {
|
| 268 | 340 |
worker.updateToDeliver(data.getMsgId()); |
| 269 |
- saveSystemLog("Deliver OK");
|
|
| 341 |
+ saveSystemLog("[MESSAGE SEND] [SUCCESS]");
|
|
| 270 | 342 |
lastPacketSendTime = System.currentTimeMillis(); |
| 271 | 343 |
break; |
| 272 | 344 |
} |
| 273 | 345 |
} |
| 274 | 346 |
} catch (IOException e) {
|
| 347 |
+ e.printStackTrace(); |
|
| 275 | 348 |
throw new RuntimeException(e); |
| 276 | 349 |
} |
| 277 | 350 |
} |
| 278 | 351 |
|
| 279 |
- private int validateErrorCodeForMms(MunjaonMsg data) {
|
|
| 280 |
- if (data == null) {
|
|
| 281 |
- return ErrorCode.ERROR_DATA_IS_NULL.getCode(); |
|
| 282 |
- } |
|
| 283 |
- if (data.getSubject() == null) {
|
|
| 284 |
- return ErrorCode.ERROR_SUBJECT_IS_NULL.getCode(); |
|
| 285 |
- } |
|
| 286 |
- if (data.getMessage() == null) {
|
|
| 287 |
- return ErrorCode.ERROR_MESSAGE_IS_NULL.getCode(); |
|
| 288 |
- } |
|
| 289 |
- /* 파일 체크 */ |
|
| 290 |
- String path = System.getProperty("ROOTPATH") + File.separator + "mmsfile" + File.separator;
|
|
| 291 |
- int fileCount = 0; |
|
| 292 |
- if (data.getFilename01() != null) {
|
|
| 293 |
- File file = new File(path + data.getFilename01()); |
|
| 294 |
- if (file.exists()) {
|
|
| 295 |
- if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) {
|
|
| 296 |
- return ErrorCode.ERROR_FILE_CAPACITY_EXCEED.getCode(); |
|
| 297 |
- } else {
|
|
| 298 |
- fileCount++; |
|
| 299 |
- } |
|
| 300 |
- } |
|
| 301 |
- } |
|
| 302 |
- if (data.getFilename02() != null) {
|
|
| 303 |
- File file = new File(path + data.getFilename02()); |
|
| 304 |
- if (file.exists()) {
|
|
| 305 |
- if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) {
|
|
| 306 |
- return ErrorCode.ERROR_FILE_CAPACITY_EXCEED.getCode(); |
|
| 307 |
- } else {
|
|
| 308 |
- fileCount++; |
|
| 309 |
- } |
|
| 310 |
- } |
|
| 311 |
- } |
|
| 312 |
- if (data.getFilename03() != null) {
|
|
| 313 |
- File file = new File(path + data.getFilename03()); |
|
| 314 |
- if (file.exists()) {
|
|
| 315 |
- if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) {
|
|
| 316 |
- return ErrorCode.ERROR_FILE_CAPACITY_EXCEED.getCode(); |
|
| 317 |
- } else {
|
|
| 318 |
- fileCount++; |
|
| 319 |
- } |
|
| 320 |
- } |
|
| 321 |
- } |
|
| 322 |
- if (fileCount == 0) {
|
|
| 323 |
- return ErrorCode.ERROR_FILE_NOT_FOUND.getCode(); |
|
| 324 |
- } |
|
| 325 |
- return ErrorCode.OK.getCode(); |
|
| 326 |
- } |
|
| 327 |
- |
|
| 328 | 352 |
private void katMessageService(MunjaonMsg data) {
|
| 329 |
- |
|
| 330 |
- } |
|
| 331 |
- |
|
| 332 |
- private void kftMessageService(MunjaonMsg data) {
|
|
| 333 |
- |
|
| 334 |
- } |
|
| 335 |
- |
|
| 336 |
- private void smsMessageService(MunjaonMsg data) {
|
|
| 337 |
- ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + SmsMessage.DELIVER_SMS_BODY_LENGTH); |
|
| 338 |
- ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + SmsMessage.DELIVER_SMS_ACK_BODY_LENGTH); |
|
| 339 | 353 |
try {
|
| 340 |
- Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, SmsMessage.DELIVER_SMS_BODY_LENGTH); |
|
| 341 |
- SmsMessage.makeDataForDeliver(sendBuffer, data); |
|
| 342 |
- saveSystemLog("Deliver Send");
|
|
| 343 |
- socketChannel.write(sendBuffer); |
|
| 354 |
+ /* Kakao Json 저장 경로 */ |
|
| 355 |
+ String path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
|
|
| 356 |
+ /* 공통 메시지 유효성 체크 */ |
|
| 357 |
+ int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); |
|
| 358 |
+ int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data); |
|
| 359 |
+ int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile()); |
|
| 360 |
+ |
|
| 361 |
+ if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) {
|
|
| 362 |
+ saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
|
|
| 363 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 364 |
+ /* 전송처리 */ |
|
| 365 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 366 |
+ /* 실패처리 */ |
|
| 367 |
+ MunjaonMsg errorMsg = null; |
|
| 368 |
+ if (checkCommonCode != ErrorCode.OK.getCode()) {
|
|
| 369 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC"); |
|
| 370 |
+ }else if (checkMsgCode != ErrorCode.OK.getCode()) {
|
|
| 371 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC"); |
|
| 372 |
+ } else {
|
|
| 373 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC"); |
|
| 374 |
+ } |
|
| 375 |
+ worker.updateToReport(errorMsg); |
|
| 376 |
+ /* 처리완료 */ |
|
| 377 |
+ return; |
|
| 378 |
+ } |
|
| 379 |
+ |
|
| 380 |
+ /* 정상인 경우 메시지 전송 */ |
|
| 381 |
+ ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); |
|
| 382 |
+ ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH); |
|
| 383 |
+ /* File check */ |
|
| 384 |
+ ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile()); |
|
| 385 |
+ |
|
| 386 |
+ Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); |
|
| 387 |
+ KakaoMessage.makeDataForDeliver(sendBuffer, data); |
|
| 388 |
+ saveSystemLog("[MESSAGE SEND] [... ...]");
|
|
| 389 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 390 |
+ |
|
| 391 |
+ ByteBuffer[] byteBuffers = new ByteBuffer[2]; |
|
| 392 |
+ byteBuffers[0] = sendBuffer; |
|
| 393 |
+ byteBuffers[1] = fileBuffer; |
|
| 394 |
+ |
|
| 395 |
+ socketChannel.write(byteBuffers); |
|
| 396 |
+ |
|
| 344 | 397 |
while (true) {
|
| 345 | 398 |
int recvCount = socketChannel.read(recvBuffer); |
| 346 | 399 |
if (recvCount == -1) {
|
| 400 |
+ saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 347 | 401 |
throw new RuntimeException("DELIVER ERROR");
|
| 348 | 402 |
} else if (recvCount > 0) {
|
| 349 | 403 |
worker.updateToDeliver(data.getMsgId()); |
| 350 |
- saveSystemLog("Deliver OK");
|
|
| 404 |
+ saveSystemLog("[MESSAGE SEND] [SUCCESS]");
|
|
| 351 | 405 |
lastPacketSendTime = System.currentTimeMillis(); |
| 352 | 406 |
break; |
| 353 | 407 |
} |
| 354 | 408 |
} |
| 355 | 409 |
} catch (IOException e) {
|
| 410 |
+ e.printStackTrace(); |
|
| 411 |
+ throw new RuntimeException(e); |
|
| 412 |
+ } |
|
| 413 |
+ } |
|
| 414 |
+ |
|
| 415 |
+ private void kftMessageService(MunjaonMsg data) {
|
|
| 416 |
+ try {
|
|
| 417 |
+ /* Kakao Json 저장 경로 */ |
|
| 418 |
+ String path = System.getProperty("ROOTPATH") + File.separator + "kakaofile" + File.separator;
|
|
| 419 |
+ /* 공통 메시지 유효성 체크 */ |
|
| 420 |
+ int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); |
|
| 421 |
+ int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data); |
|
| 422 |
+ int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile()); |
|
| 423 |
+ if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) {
|
|
| 424 |
+ saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]");
|
|
| 425 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 426 |
+ /* 전송처리 */ |
|
| 427 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 428 |
+ /* 실패처리 */ |
|
| 429 |
+ MunjaonMsg errorMsg = null; |
|
| 430 |
+ if (checkCommonCode != ErrorCode.OK.getCode()) {
|
|
| 431 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkCommonCode), MessageUtil.getTime(), "ETC"); |
|
| 432 |
+ }else if (checkMsgCode != ErrorCode.OK.getCode()) {
|
|
| 433 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkMsgCode), MessageUtil.getTime(), "ETC"); |
|
| 434 |
+ } else {
|
|
| 435 |
+ errorMsg = MessageCheckUtil.setReportMessage(data.getMsgId(), "00", String.valueOf(checkFileCode), MessageUtil.getTime(), "ETC"); |
|
| 436 |
+ } |
|
| 437 |
+ worker.updateToReport(errorMsg); |
|
| 438 |
+ /* 처리완료 */ |
|
| 439 |
+ return; |
|
| 440 |
+ } |
|
| 441 |
+ |
|
| 442 |
+ /* 정상인 경우 메시지 전송 */ |
|
| 443 |
+ ByteBuffer sendBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); |
|
| 444 |
+ ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + KakaoMessage.DELIVER_KAKAO_ACK_BODY_LENGTH); |
|
| 445 |
+ /* File check */ |
|
| 446 |
+ ByteBuffer fileBuffer = KakaoMessage.makeJsonForDeliver(path, data.getKakaoJsonFile()); |
|
| 447 |
+ |
|
| 448 |
+ Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); |
|
| 449 |
+ KakaoMessage.makeDataForDeliver(sendBuffer, data); |
|
| 450 |
+ saveSystemLog("[MESSAGE SEND] [... ...]");
|
|
| 451 |
+ saveSystemLog("[MESSAGE DATA : " + data.toString() + "]");
|
|
| 452 |
+ |
|
| 453 |
+ ByteBuffer[] byteBuffers = new ByteBuffer[2]; |
|
| 454 |
+ byteBuffers[0] = sendBuffer; |
|
| 455 |
+ byteBuffers[1] = fileBuffer; |
|
| 456 |
+ |
|
| 457 |
+ socketChannel.write(byteBuffers); |
|
| 458 |
+ |
|
| 459 |
+ while (true) {
|
|
| 460 |
+ int recvCount = socketChannel.read(recvBuffer); |
|
| 461 |
+ if (recvCount == -1) {
|
|
| 462 |
+ saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 463 |
+ throw new RuntimeException("DELIVER ERROR");
|
|
| 464 |
+ } else if (recvCount > 0) {
|
|
| 465 |
+ worker.updateToDeliver(data.getMsgId()); |
|
| 466 |
+ saveSystemLog("[MESSAGE SEND] [SUCCESS]");
|
|
| 467 |
+ lastPacketSendTime = System.currentTimeMillis(); |
|
| 468 |
+ break; |
|
| 469 |
+ } |
|
| 470 |
+ } |
|
| 471 |
+ } catch (IOException e) {
|
|
| 472 |
+ e.printStackTrace(); |
|
| 356 | 473 |
throw new RuntimeException(e); |
| 357 | 474 |
} |
| 358 | 475 |
} |
... | ... | @@ -365,14 +482,15 @@ |
| 365 | 482 |
|
| 366 | 483 |
ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); |
| 367 | 484 |
try {
|
| 368 |
- saveSystemLog("LinkCheck Send");
|
|
| 485 |
+ saveSystemLog("[LINK_CHECK SEND] [... ...]");
|
|
| 369 | 486 |
socketChannel.write(LinkCheck.makeLinkCheckBuffer()); |
| 370 | 487 |
while (true) {
|
| 371 | 488 |
int recvCount = socketChannel.read(recvBuffer); |
| 372 | 489 |
if (recvCount == -1) {
|
| 490 |
+ saveSystemLog("[LINK_CHECK SEND] [FAIL] [SOCKET IS CLOSED]");
|
|
| 373 | 491 |
throw new RuntimeException("LINK_CHECK ERROR");
|
| 374 | 492 |
} else if (recvCount > 0) {
|
| 375 |
- saveSystemLog("LinkCheck OK");
|
|
| 493 |
+ saveSystemLog("[LINK_CHECK SEND] [SUCCESS]");
|
|
| 376 | 494 |
lastPacketSendTime = System.currentTimeMillis(); |
| 377 | 495 |
break; |
| 378 | 496 |
} |
--- src/main/java/com/munjaon/client/server/service/ReportClientService.java
+++ src/main/java/com/munjaon/client/server/service/ReportClientService.java
... | ... | @@ -33,8 +33,11 @@ |
| 33 | 33 |
public void checkReady() {
|
| 34 | 34 |
worker = DatabaseTypeWorker.find(System.getProperty("DBMS"));
|
| 35 | 35 |
if (worker == null) {
|
| 36 |
+ saveSystemLog("[checkReady][DBMS : " + System.getProperty("DBMS") + " is not ready]");
|
|
| 36 | 37 |
return; |
| 37 | 38 |
} |
| 39 |
+ |
|
| 40 |
+ saveSystemLog("[checkReady][DBMS : " + System.getProperty("DBMS") + " is ready]");
|
|
| 38 | 41 |
this.IS_READY_YN = worker.checkTableExists(); |
| 39 | 42 |
} |
| 40 | 43 |
|
... | ... | @@ -44,12 +47,15 @@ |
| 44 | 47 |
this.port = Integer.parseInt(getProp("PORT"));
|
| 45 | 48 |
this.id = getProp("ID");
|
| 46 | 49 |
this.pwd = getProp("PASSWORD");
|
| 47 |
- saveSystemLog("Try Connect to " + this.address + ":" + this.port);
|
|
| 50 |
+ saveSystemLog("Try Connect to [ADDRESS : " + this.address + "] [PORT : " + this.port + "] [ID : " + this.id + "]");
|
|
| 48 | 51 |
try {
|
| 49 | 52 |
socketChannel = SocketChannel.open(new InetSocketAddress(this.address, this.port)); |
| 50 | 53 |
socketChannel.configureBlocking(false); |
| 51 | 54 |
} catch (IOException e) {
|
| 52 |
- saveSystemLog("Connect Fail " + this.address + ":" + this.port);
|
|
| 55 |
+ saveSystemLog("Connect Fail to [ADDRESS : " + this.address + "] [PORT : " + this.port + "] [ID : " + this.id + "]");
|
|
| 56 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 57 |
+ saveSystemLog("ERROR DETAIL");
|
|
| 58 |
+ saveSystemLog(e.toString()); |
|
| 53 | 59 |
throw new RuntimeException(e); |
| 54 | 60 |
} |
| 55 | 61 |
} |
... | ... | @@ -60,6 +66,9 @@ |
| 60 | 66 |
try {
|
| 61 | 67 |
socketChannel.close(); |
| 62 | 68 |
} catch (IOException e) {
|
| 69 |
+ saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 70 |
+ saveSystemLog("ERROR DETAIL");
|
|
| 71 |
+ saveSystemLog(e.toString()); |
|
| 63 | 72 |
throw new RuntimeException(e); |
| 64 | 73 |
} |
| 65 | 74 |
} |
--- src/main/java/com/munjaon/client/server/service/Service.java
+++ src/main/java/com/munjaon/client/server/service/Service.java
... | ... | @@ -108,7 +108,7 @@ |
| 108 | 108 |
initLogFile(); |
| 109 | 109 |
/* 3. Runflag reload */ |
| 110 | 110 |
reloadCheckRun(); |
| 111 |
- |
|
| 111 |
+ saveSystemLog("[SERVICE_READY : " + IS_READY_YN + " || SERVICE_RUN : " + IS_RUN_YN);
|
|
| 112 | 112 |
if (isRun() && isReady()) {
|
| 113 | 113 |
/* 3. 서비스 초기화 */ |
| 114 | 114 |
initResources(); |
... | ... | @@ -116,9 +116,9 @@ |
| 116 | 116 |
doService(); |
| 117 | 117 |
/* 5. 서비스 자원 해제 */ |
| 118 | 118 |
releaseResources(); |
| 119 |
- saveSystemLog("Service Stopped.");
|
|
| 119 |
+ saveSystemLog("[SERVICE IS STOPPED] [... ...]");
|
|
| 120 | 120 |
} else {
|
| 121 |
- saveSystemLog("Service is Not Running.");
|
|
| 121 |
+ saveSystemLog("[SERVICE IS NOT RUNNING] [... ...]");
|
|
| 122 | 122 |
} |
| 123 | 123 |
/* 6. 3초간 sleep */ |
| 124 | 124 |
Thread.sleep(3000); |
+++ src/main/java/com/munjaon/client/util/MessageCheckUtil.java
... | ... | @@ -0,0 +1,277 @@ |
| 1 | +package com.munjaon.client.util; | |
| 2 | + | |
| 3 | +import com.munjaon.client.model.MunjaonMsg; | |
| 4 | +import com.munjaon.client.server.config.ErrorCode; | |
| 5 | +import com.munjaon.client.server.packet.*; | |
| 6 | + | |
| 7 | +import java.io.File; | |
| 8 | + | |
| 9 | +public class MessageCheckUtil { | |
| 10 | + public static int validateMessageForCommon(MunjaonMsg data) { | |
| 11 | + int code = isNullMessageForCommon(data); | |
| 12 | + if (code != ErrorCode.OK.getCode()) { | |
| 13 | + return code; | |
| 14 | + } | |
| 15 | + | |
| 16 | + return isLengthMessageForCommon(data); | |
| 17 | + } | |
| 18 | + public static int isLengthMessageForCommon(MunjaonMsg data) { | |
| 19 | + /* MSG_ID */ | |
| 20 | + String value = data.getMsgId().trim(); | |
| 21 | + if (value.length() == 0 || value.getBytes().length > CommonMessage.DELIVER_MESSAGE_ID_LENGTH) { | |
| 22 | + return ErrorCode.ERROR_MSGID_IS_CAPACITY.getCode(); | |
| 23 | + } | |
| 24 | + /* SENDER */ | |
| 25 | + value = MessageUtil.doNumber(data.getSendPhone()); | |
| 26 | + if (value.getBytes().length < 8 || value.getBytes().length > CommonMessage.DELIVER_SENDER_LENGTH) { | |
| 27 | + return ErrorCode.ERROR_SENDER_IS_CAPACITY.getCode(); | |
| 28 | + } | |
| 29 | + /* RECEIVER */ | |
| 30 | + value = MessageUtil.doNumber(data.getRecvPhone()); | |
| 31 | + if (value.getBytes().length < 10 || value.getBytes().length > CommonMessage.DELIVER_RECEIVER_LENGTH) { | |
| 32 | + return ErrorCode.ERROR_RECEIVER_IS_CAPACITY.getCode(); | |
| 33 | + } | |
| 34 | + if ("01".equals(value.substring(0, 2)) == false) { | |
| 35 | + return ErrorCode.ERROR_RECEIVER_IS_INVALID.getCode(); | |
| 36 | + } | |
| 37 | + | |
| 38 | + return ErrorCode.OK.getCode(); | |
| 39 | + } | |
| 40 | + | |
| 41 | + public static int isNullMessageForCommon(MunjaonMsg data) { | |
| 42 | + if (data == null) { | |
| 43 | + return ErrorCode.ERROR_DATA_IS_NULL.getCode(); | |
| 44 | + } | |
| 45 | + if (data.getMsgId() == null || data.getMsgId().isEmpty()) { | |
| 46 | + return ErrorCode.ERROR_MSGID_IS_NULL.getCode(); | |
| 47 | + } | |
| 48 | + if (data.getSendPhone() == null || data.getSendPhone().isEmpty()) { | |
| 49 | + return ErrorCode.ERROR_SENDER_IS_NULL.getCode(); | |
| 50 | + } | |
| 51 | + if (data.getRecvPhone() == null || data.getRecvPhone().isEmpty()) { | |
| 52 | + return ErrorCode.ERROR_RECEIVER_IS_NULL.getCode(); | |
| 53 | + } | |
| 54 | + | |
| 55 | + return ErrorCode.OK.getCode(); | |
| 56 | + } | |
| 57 | + | |
| 58 | + public static int validateMessageForSms(MunjaonMsg data) { | |
| 59 | + if (data.getMessage() == null || data.getMessage().isEmpty()) { | |
| 60 | + return ErrorCode.ERROR_SMS_MSG_IS_NULL.getCode(); | |
| 61 | + } | |
| 62 | + if (data.getMessage().getBytes().length > SmsMessage.DELIVER_MESSAGE_TRANS_LENGTH) { | |
| 63 | + return ErrorCode.ERROR_SMS_MSG_IS_CAPACITY.getCode(); | |
| 64 | + } | |
| 65 | + | |
| 66 | + return ErrorCode.OK.getCode(); | |
| 67 | + } | |
| 68 | + | |
| 69 | + public static int validateMessageForMedia(MunjaonMsg data) { | |
| 70 | + if (data == null) { | |
| 71 | + return ErrorCode.ERROR_DATA_IS_NULL.getCode(); | |
| 72 | + } | |
| 73 | + if (data.getSubject() == null) { | |
| 74 | + return ErrorCode.ERROR_SUBJECT_IS_NULL.getCode(); | |
| 75 | + } | |
| 76 | + if (data.getMessage() == null) { | |
| 77 | + return ErrorCode.ERROR_MULTI_MESSAGE_IS_NULL.getCode(); | |
| 78 | + } | |
| 79 | + if (data.getSubject().getBytes().length > LmsMessage.DELIVER_SUBJECT_LENGTH) { | |
| 80 | + return ErrorCode.ERROR_SUBJECT_OVER_CAPACITY.getCode(); | |
| 81 | + } | |
| 82 | + if (data.getMessage().getBytes().length > LmsMessage.DELIVER_MESSAGE_LENGTH) { | |
| 83 | + return ErrorCode.ERROR_MULTI_MESSAGE_OVER_CAPACITY.getCode(); | |
| 84 | + } | |
| 85 | + | |
| 86 | + return ErrorCode.OK.getCode(); | |
| 87 | + } | |
| 88 | + | |
| 89 | + public static int validateMessageForImage(MunjaonMsg data, String path) { | |
| 90 | + if (imageFileCount(data) == 0) { | |
| 91 | + return ErrorCode.ERROR_MMS_IMAGE_IS_NULL.getCode(); | |
| 92 | + } | |
| 93 | + if (imageExtErrorCount(data) > 0) { | |
| 94 | + return ErrorCode.ERROR_MMS_IMAGE_IS_EXT.getCode(); | |
| 95 | + } | |
| 96 | + if (imagePathErrorCount(data, path) > 0) { | |
| 97 | + return ErrorCode.ERROR_MMS_IMAGE_IS_NOT_PATH.getCode(); | |
| 98 | + } | |
| 99 | + if (imageSizeErrorCount(data, path) > 0) { | |
| 100 | + return ErrorCode.ERROR_MMS_IMAGE_IS_OVER_CAPACITY.getCode(); | |
| 101 | + } | |
| 102 | + return ErrorCode.OK.getCode(); | |
| 103 | + } | |
| 104 | + | |
| 105 | + public static int imageSizeErrorCount(MunjaonMsg data, String path) { | |
| 106 | + int errorCount = 0; | |
| 107 | + if (data.getFilename01() != null) { | |
| 108 | + File file = new File(path + data.getFilename01()); | |
| 109 | + if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) { | |
| 110 | + errorCount++; | |
| 111 | + } | |
| 112 | + } | |
| 113 | + if (data.getFilename02() != null) { | |
| 114 | + File file = new File(path + data.getFilename02()); | |
| 115 | + if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) { | |
| 116 | + errorCount++; | |
| 117 | + } | |
| 118 | + } | |
| 119 | + if (data.getFilename03() != null) { | |
| 120 | + File file = new File(path + data.getFilename03()); | |
| 121 | + if (file.length() > MmsMessage.LIMIT_FILE_CAPACITY) { | |
| 122 | + errorCount++; | |
| 123 | + } | |
| 124 | + } | |
| 125 | + return errorCount; | |
| 126 | + } | |
| 127 | + | |
| 128 | + public static int imagePathErrorCount(MunjaonMsg data, String path) { | |
| 129 | + int errorCount = 0; | |
| 130 | + if (data.getFilename01() != null) { | |
| 131 | + File file = new File(path + data.getFilename01()); | |
| 132 | + if (file.exists() == false) { | |
| 133 | + errorCount++; | |
| 134 | + } | |
| 135 | + } | |
| 136 | + if (data.getFilename02() != null) { | |
| 137 | + File file = new File(path + data.getFilename02()); | |
| 138 | + if (file.exists() == false) { | |
| 139 | + errorCount++; | |
| 140 | + } | |
| 141 | + } | |
| 142 | + if (data.getFilename03() != null) { | |
| 143 | + File file = new File(path + data.getFilename03()); | |
| 144 | + if (file.exists() == false) { | |
| 145 | + errorCount++; | |
| 146 | + } | |
| 147 | + } | |
| 148 | + return errorCount; | |
| 149 | + } | |
| 150 | + | |
| 151 | + public static int imageExtErrorCount(MunjaonMsg data) { | |
| 152 | + int errorCount = 0; | |
| 153 | + if (data.getFilename01() != null && checkImageFileForExtension(data.getFilename01()) == false) { | |
| 154 | + errorCount++; | |
| 155 | + } | |
| 156 | + if (data.getFilename02() != null && checkImageFileForExtension(data.getFilename02()) == false) { | |
| 157 | + errorCount++; | |
| 158 | + } | |
| 159 | + if (data.getFilename03() != null && checkImageFileForExtension(data.getFilename03()) == false) { | |
| 160 | + errorCount++; | |
| 161 | + } | |
| 162 | + return errorCount; | |
| 163 | + } | |
| 164 | + | |
| 165 | + public static int imageFileCount(MunjaonMsg data) { | |
| 166 | + if (data == null) { | |
| 167 | + return 0; | |
| 168 | + } | |
| 169 | + int count = 0; | |
| 170 | + if (data.getFilename01() != null) { | |
| 171 | + count++; | |
| 172 | + } | |
| 173 | + if (data.getFilename02() != null) { | |
| 174 | + count++; | |
| 175 | + } | |
| 176 | + if (data.getFilename03() != null) { | |
| 177 | + count++; | |
| 178 | + } | |
| 179 | + | |
| 180 | + return count; | |
| 181 | + } | |
| 182 | + | |
| 183 | + public static boolean checkImageFileForExtension(String fileName) { | |
| 184 | + int lastIndex = fileName.lastIndexOf("."); | |
| 185 | + if (lastIndex == -1) { | |
| 186 | + return false; | |
| 187 | + } | |
| 188 | + String extension = fileName.substring(lastIndex + 1).toUpperCase(); | |
| 189 | + if ("JPG".equals(extension) || "PNG".equals(extension) || "GIF".equals(extension) || "JPEG".equals(extension)) { | |
| 190 | + return true; | |
| 191 | + } | |
| 192 | + | |
| 193 | + return false; | |
| 194 | + } | |
| 195 | + | |
| 196 | + public static int validateMessageForKakao(MunjaonMsg data) { | |
| 197 | + if (data == null) { | |
| 198 | + return ErrorCode.ERROR_DATA_IS_NULL.getCode(); | |
| 199 | + } | |
| 200 | + if (data.getSubject() == null) { | |
| 201 | + return ErrorCode.ERROR_SUBJECT_IS_NULL.getCode(); | |
| 202 | + } | |
| 203 | + if (data.getMessage() == null) { | |
| 204 | + return ErrorCode.ERROR_MULTI_MESSAGE_IS_NULL.getCode(); | |
| 205 | + } | |
| 206 | + if (data.getKakaoSenderKey() == null) { | |
| 207 | + return ErrorCode.ERROR_KAKAO_SENDER_KEY_IS_NULL.getCode(); | |
| 208 | + } | |
| 209 | + if (data.getKakaoTemplateCode() == null) { | |
| 210 | + return ErrorCode.ERROR_KAKAO_TEMPLATE_CODE_IS_NULL.getCode(); | |
| 211 | + } | |
| 212 | + if (data.getKakaoJsonFile() == null) { | |
| 213 | + return ErrorCode.ERROR_KAKAO_JSON_FILE_IS_NULL.getCode(); | |
| 214 | + } | |
| 215 | + if (data.getSubject().getBytes().length > LmsMessage.DELIVER_SUBJECT_LENGTH) { | |
| 216 | + return ErrorCode.ERROR_SUBJECT_OVER_CAPACITY.getCode(); | |
| 217 | + } | |
| 218 | + if (data.getMessage().getBytes().length > LmsMessage.DELIVER_MESSAGE_LENGTH) { | |
| 219 | + return ErrorCode.ERROR_MULTI_MESSAGE_OVER_CAPACITY.getCode(); | |
| 220 | + } | |
| 221 | + if (data.getKakaoSenderKey().getBytes().length > KakaoMessage.DELIVER_KAKAO_SENDER_KEY_LENGTH) { | |
| 222 | + return ErrorCode.ERROR_KAKAO_SENDER_KEY_OVER_CAPACITY.getCode(); | |
| 223 | + } | |
| 224 | + if (data.getKakaoTemplateCode().getBytes().length > KakaoMessage.DELIVER_KAKAO_TEMPLATE_CODE_LENGTH) { | |
| 225 | + return ErrorCode.ERROR_KAKAO_TEMPLATE_CODE_OVER_CAPACITY.getCode(); | |
| 226 | + } | |
| 227 | + | |
| 228 | + return ErrorCode.OK.getCode(); | |
| 229 | + } | |
| 230 | + | |
| 231 | + public static int validateJsonFile(String path, String fileName) { | |
| 232 | + int lastIndex = fileName.lastIndexOf("."); | |
| 233 | + if (lastIndex == -1) { | |
| 234 | + return ErrorCode.ERROR_KAKAO_JSON_FILE_IS_EXT.getCode(); | |
| 235 | + } | |
| 236 | + String extension = fileName.substring(lastIndex + 1).toUpperCase(); | |
| 237 | + if ("JSON".equals(extension) == false) { | |
| 238 | + return ErrorCode.ERROR_KAKAO_JSON_FILE_IS_EXT.getCode(); | |
| 239 | + } | |
| 240 | + File file = new File(path + fileName); | |
| 241 | + if (file.exists() == false) { | |
| 242 | + return ErrorCode.ERROR_KAKAO_JSON_FILE_IS_NOT_PATH.getCode(); | |
| 243 | + } | |
| 244 | + if (file.length() > KakaoMessage.LIMIT_FILE_CAPACITY) { | |
| 245 | + return ErrorCode.ERROR_KAKAO_JSON_FILE_IS_OVER_CAPACITY.getCode(); | |
| 246 | + } | |
| 247 | + | |
| 248 | + return ErrorCode.OK.getCode(); | |
| 249 | + } | |
| 250 | + | |
| 251 | + public static int validateMessageForJson(MunjaonMsg data) { | |
| 252 | + return ErrorCode.OK.getCode(); | |
| 253 | + } | |
| 254 | + | |
| 255 | + public static MunjaonMsg setReportMessage(String msgId, String agentCode, String sendStatus, String sendDate, String telecom) { | |
| 256 | + MunjaonMsg msg = new MunjaonMsg(); | |
| 257 | + msg.setMsgId(msgId); | |
| 258 | + msg.setAgentCode(agentCode); | |
| 259 | + msg.setSendStatus(sendStatus); | |
| 260 | + msg.setSendDate(sendDate); | |
| 261 | + msg.setTelecom(telecom); | |
| 262 | + | |
| 263 | + return msg; | |
| 264 | + } | |
| 265 | + | |
| 266 | + | |
| 267 | + public static void main(String[] args) { | |
| 268 | + String fileName = " .dat"; | |
| 269 | + int lastIndex = fileName.lastIndexOf("."); | |
| 270 | + if (lastIndex < 0) { | |
| 271 | + System.out.println("EXT is not "); | |
| 272 | + } else { | |
| 273 | + System.out.println("EXT : " + fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length())); | |
| 274 | + } | |
| 275 | + System.out.println("NM :" + fileName.substring(0, lastIndex) + "<<"); | |
| 276 | + } | |
| 277 | +} |
--- src/main/resources/sqlmap/mariadb/mariadb_sql.xml
+++ src/main/resources/sqlmap/mariadb/mariadb_sql.xml
... | ... | @@ -33,6 +33,9 @@ |
| 33 | 33 |
, FILENAME01 |
| 34 | 34 |
, FILENAME02 |
| 35 | 35 |
, FILENAME03 |
| 36 |
+ , KAKAO_SENDER_KEY |
|
| 37 |
+ , KAKAO_TEMPLATE_CODE |
|
| 38 |
+ , KAKAO_JSON_FILE |
|
| 36 | 39 |
FROM MUNJAON_MSG |
| 37 | 40 |
WHERE SEND_STATUS = '0' |
| 38 | 41 |
AND MSG_TYPE = #{msgType}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?