diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
deleted file mode 100644
index abcab3e..0000000
--- a/WebContent/META-INF/context.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/kjb-docs/Property 설정.md b/kjb-docs/Property 설정.md
index e6c9739..f46ea6a 100644
--- a/kjb-docs/Property 설정.md
+++ b/kjb-docs/Property 설정.md
@@ -35,5 +35,18 @@
| kjb.ums.api_key | UMS API Key | 7cca6d58-e4f7-474d-9edd-525806bc99ff | 알림톡 | |
| kjb.ums.connection_timeout | UMS 커넥션 타임아웃(seconds) | 5 | 알림톡 | |
| kjb.ums.response_timeout | UMS 응답 타임아웃(seconds) | 10 | 알림톡 | |
+| | | | | |
--
\ No newline at end of file
+```sql
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.eai_batch.url', 'http://172.31.32.111:10230/BATAppWeb/EaiBatCall');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.eai_batch.connection_timeout', '5');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.eai_batch.response_timeout', '10');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.eai_batch.send_dir', '/Data/eapim/portal/sendmail/snd');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.eai_batch.backup_dir', '/Data/eapim/portal/sendmail/bak');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.eai_batch.interface_id', 'UAGFF00001UIE');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.host_url', 'http://172.31.35.144:9021');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.api_key', '7cca6d58-e4f7-474d-9edd-525806bc99ff');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.connection_timeout', '5');
+insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.ums.response_timeout', '10');
+
+```
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/scheduler/JobHistoryService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/scheduler/JobHistoryService.java
index 6021ccc..25f2265 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/man/scheduler/JobHistoryService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/man/scheduler/JobHistoryService.java
@@ -52,7 +52,7 @@ public class JobHistoryService extends AbstractEMSDataSerivce{}, jobName-->{}, instanceName-->{}", rctStatus, jobName, instanceName);
+ // log.info("[DHJEONG]1_rctStatus-->{}, jobName-->{}, instanceName-->{}", rctStatus, jobName, instanceName);
if (!status.equals(rctStatus) || !"E".equals(jobInfo.getChkStatus())) {
// 'Y' 이면 무조건 등록, 'E' 이면 ==> Status 바뀌면 등록
diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/UmsDispatchJob.java b/src/main/java/com/eactive/eai/rms/onl/common/service/UmsDispatchJob.java
index 1492d23..993e165 100644
--- a/src/main/java/com/eactive/eai/rms/onl/common/service/UmsDispatchJob.java
+++ b/src/main/java/com/eactive/eai/rms/onl/common/service/UmsDispatchJob.java
@@ -8,6 +8,10 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
/**
* Admin Job Configuration
* ----------------------
@@ -18,30 +22,31 @@ import org.springframework.beans.factory.annotation.Autowired;
// Cron Expression: */5 * * * * ?
@Slf4j
public class UmsDispatchJob implements Job {
-
+
private final UmsDispatchService umsDispatchService;
-
+
@Autowired
public UmsDispatchJob(UmsDispatchService umsDispatchService) {
this.umsDispatchService = umsDispatchService;
}
-
+
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
log.info("Starting Message Dispatch Job...");
// inst.Name 이 지정된 경우 해당 인스턴스에서만 동작
- String jobInstName = context.getJobDetail().getJobDataMap().getString("inst.Name");
+ String jobInstName = context.getJobDetail().getJobDataMap().getString("execute.instances");
if (StringUtils.isNotEmpty(jobInstName)) {
log.debug("Job 실행 인스턴스 명이 지정되어 있음 - {}", jobInstName);
+ jobInstName = jobInstName.toLowerCase();
+ Set propInstances = Arrays.stream(jobInstName.split(",")).map(String::trim).collect(Collectors.toSet());
- jobInstName = jobInstName.trim();
String instanceName = System.getProperty("inst.Name");
if (StringUtils.isNotEmpty(instanceName)) {
log.debug("현재 인스턴스 명 : {}", instanceName);
- instanceName = instanceName.trim();
+ instanceName = instanceName.trim().toLowerCase();
- if (!jobInstName.equalsIgnoreCase(instanceName)) {
+ if (!propInstances.contains(instanceName)) {
log.debug("Job 인스턴스명과 현재 인스턴스명이 다름. 종료 처리");
return;
}