From 10075649a18926a790d3bbf26342eef1e97ac667 Mon Sep 17 00:00:00 2001 From: "semin.baek" Date: Mon, 1 Sep 2025 20:18:01 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=EC=86=94=EB=A1=9C=EC=9D=98=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=86=A1=EC=8B=A0=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EB=B0=9C=20=20-=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=ED=99=94=EB=A9=B4=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/settings-examples/dfxagent-ami-dev.json | 4 ++-- src/docs/settings-examples/dfxagent-mkami-dev.json | 4 ++-- .../com/bsmlab/dfx/agent/listener/dto/ReceiveMessageDto.java | 1 + .../dfx/agent/task/dropbox/DropBoxSchedulerService.java | 5 +++++ .../dfx/agent/task/postman/PostmanSchedulerService.java | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/docs/settings-examples/dfxagent-ami-dev.json b/src/docs/settings-examples/dfxagent-ami-dev.json index 73a197d..0ecc100 100644 --- a/src/docs/settings-examples/dfxagent-ami-dev.json +++ b/src/docs/settings-examples/dfxagent-ami-dev.json @@ -47,9 +47,9 @@ ], "statusChecker": { "cron": "0/5 * * * * *", - "consoleHostName": "mkami.foxsoft.kr", + "consoleHostName": "1.220.99.10", "consoleListenPort": 17443, - "consoleSslEnabled": true + "consoleSslEnabled": false }, "dataSourceConfig": [ { diff --git a/src/docs/settings-examples/dfxagent-mkami-dev.json b/src/docs/settings-examples/dfxagent-mkami-dev.json index ab5522c..e7ecc17 100644 --- a/src/docs/settings-examples/dfxagent-mkami-dev.json +++ b/src/docs/settings-examples/dfxagent-mkami-dev.json @@ -49,9 +49,9 @@ ], "statusChecker": { "cron": "0/5 * * * * *", - "consoleHostName": "mkami.foxsoft.kr", + "consoleHostName": "192.168.0.16", "consoleListenPort": 17443, - "consoleSslEnabled": true + "consoleSslEnabled": false }, "dataSourceConfig": [ { diff --git a/src/main/java/com/bsmlab/dfx/agent/listener/dto/ReceiveMessageDto.java b/src/main/java/com/bsmlab/dfx/agent/listener/dto/ReceiveMessageDto.java index 48551df..36ff060 100644 --- a/src/main/java/com/bsmlab/dfx/agent/listener/dto/ReceiveMessageDto.java +++ b/src/main/java/com/bsmlab/dfx/agent/listener/dto/ReceiveMessageDto.java @@ -16,6 +16,7 @@ import java.util.Map; public class ReceiveMessageDto implements Serializable { private String senderHostId; private long senderTimestamp; + private String senderPostmanId; private String messageUuid; private AgentConfigDto.MessageType messageType; private long receivedTimestamp; diff --git a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java index 805ee65..6b0c6ff 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java @@ -5,6 +5,7 @@ import com.bsmlab.dfx.agent.config.AgentConfigReader; import com.bsmlab.dfx.agent.config.datasource.SqlExecuteService; import com.bsmlab.dfx.agent.listener.dto.AckDto; import com.bsmlab.dfx.agent.listener.dto.ReceiveMessageDto; +import com.bsmlab.dfx.agent.support.MessageUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.micrometer.common.util.StringUtils; @@ -122,6 +123,10 @@ public class DropBoxSchedulerService { receiveMessageDto.setProcessStatus(processStatus); this.ackDropBoxProcessResult(receiveMessageDto, processMessage); } + //2.1 콘솔에 연결되어 있는 경우 콘솔에도 메시지 전송 + if(this.agentConfigReader.isConnectedConsole()) { + MessageUtils.announceMessageHistory(this.agentConfigReader, receiveMessageDto); + } //3. 처리한 메시지 이동 try { boolean isSuccess = ReceiveMessageDto.ProcessStatus.PROCESS_DONE == processStatus; // PROCESS_DONE 이면 success 경로로 옮기고 아니면 failure 경로로 옮김 diff --git a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java index 4317e0e..4c11aaf 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java @@ -92,7 +92,7 @@ public class PostmanSchedulerService { routingHostList.add(routingHost); } ReceiveMessageDto receiveMessageDto = ReceiveMessageDto.builder().senderHostId(senderHostId).senderTimestamp(senderTimestamp) - .messageUuid(messageUuid).messageType(AgentConfigDto.MessageType.TRANSFER_DB_TO_DB) + .senderPostmanId(postman.getPostmanId()).messageUuid(messageUuid).messageType(AgentConfigDto.MessageType.TRANSFER_DB_TO_DB) .recipientHostId(postman.getRecipientHostId()).recipientDropBoxId(postman.getRecipientDropBoxId()) .routingHostList(routingHostList) .data(dataString).build();