diff --git a/build.gradle b/build.gradle index 7e5b800..f71e6b0 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,7 @@ dependencies { implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '3.5.2' implementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '12.8.1.jre8' implementation group: 'com.ibm.db2', name: 'jcc', version: '12.1.0.0' + developmentOnly 'org.springframework.boot:spring-boot-devtools' } diff --git a/src/main/java/com/bsmlab/dfx/agent/config/Settings.java b/src/main/java/com/bsmlab/dfx/agent/config/Settings.java index 88a2413..aeba75b 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/Settings.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/Settings.java @@ -70,7 +70,7 @@ public class Settings { @SuppressWarnings("unchecked") private void parseDropBoxes(Map settingMap) { List> dropBoxMapList = (List>)settingMap.get("drop-box"); - //TODO drop-box executor 개발 + //TODO drop-box executor 개발 -> ListenerController for(Map dropBoxMap : dropBoxMapList) { DropBoxDto dropBoxDto = DropBoxDto.builder() .dropBoxId(dropBoxMap.get("drop-box-id")).taskType(dropBoxMap.get("task-type")) diff --git a/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java b/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java index 3e65176..381d210 100644 --- a/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java +++ b/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java @@ -31,7 +31,7 @@ public class MessageUtils { if(map.get("sender") == null) { throw new InCompleteMessageException("sender 엘리먼트를 찾을 수 없습니다."); } - else if(map.get("sender") instanceof Map){ + else if(!(map.get("sender") instanceof Map)) { throw new InCompleteMessageException("sender 엘리먼트의 데이터가 객체타입이 아닙니다."); } Map senderMap = (Map)map.get("sender"); @@ -53,7 +53,7 @@ public class MessageUtils { throw new InCompleteMessageException("sender.timestamp 값을 찾을 수 없습니다."); } else { - String senderTimeStampString = String.valueOf(senderMap.get("host-id")); + String senderTimeStampString = String.valueOf(senderMap.get("timestamp")); try { senderTimestamp = Long.parseLong(senderTimeStampString); } catch (NumberFormatException e) { @@ -80,7 +80,7 @@ public class MessageUtils { if(map.get("recipient") == null) { throw new InCompleteMessageException("recipient 엘리먼트를 찾을 수 없습니다."); } - else if(map.get("recipient") instanceof Map){ + else if(!(map.get("recipient") instanceof Map)) { throw new InCompleteMessageException("recipient 엘리먼트의 데이터가 객체타입이 아닙니다."); } Map recipientMap = (Map)map.get("recipient"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b3369ab..3f19527 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,7 +9,8 @@ spring: web-allow-others: true datasource: driverClassName: org.h2.Driver - url: jdbc:h2:classpath:/storages/dfxagent + #url: jdbc:h2:classpath:/storages/dfxagent + url: jdbc:h2:~/dfxagent username: smbaek password: qortpals1! logging: