From f0a35766b8de894bf27ccf02eaf5817956c04948 Mon Sep 17 00:00:00 2001 From: "icksishu@gmail.com" Date: Mon, 12 Jan 2026 14:31:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=84=A4=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=84=9C=EB=A5=BC=20=ED=86=B5=ED=95=9C=20https=20=ED=86=B5?= =?UTF-8?q?=EC=8B=A0=20=EA=B8=B0=EB=8A=A5=20#4=20=20-=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 ++++ .../conf/dfxagent-bsm-lab-postgres.json | 5 ---- .../conf/dfxagent-tuf-a15-defree-oracle.json | 5 ---- .../bsmlab/dfx/agent/DfxAgentApplication.java | 23 +++++++++---------- .../dfx/agent/config/AgentConfigDto.java | 5 ---- .../dfx/agent/config/StartupRunner.java | 1 + .../dfx/agent/support/MessageUtils.java | 10 ++++---- 7 files changed, 22 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 2349cb6..17af38e 100644 --- a/build.gradle +++ b/build.gradle @@ -33,6 +33,11 @@ configurations { } } +bootRun { + // 실행시 jvm에 -D 옵션을 적용하기 위하여 설정 + systemProperties System.properties +} + repositories { mavenCentral() maven { diff --git a/src/docs/agent-bsm-lab-postgres/conf/dfxagent-bsm-lab-postgres.json b/src/docs/agent-bsm-lab-postgres/conf/dfxagent-bsm-lab-postgres.json index 69a3bce..4a06066 100644 --- a/src/docs/agent-bsm-lab-postgres/conf/dfxagent-bsm-lab-postgres.json +++ b/src/docs/agent-bsm-lab-postgres/conf/dfxagent-bsm-lab-postgres.json @@ -4,11 +4,6 @@ "myHostName": "agent-bsm-lab-postgres", "myListenPort": 17801, "sslEnabled": true, - "keyStorePath": "file:/D:/projects/bsm-lab/dfx/dfxagent/src/docs/agent-bsm-lab-postgres/cert/dfxagent-bsm-lab-postgres.p12", - "keyStorePassword": "qortpals1!", - "keyStoreAlias": "agent-bsm-lab-postgres", - "trustStorePath": "file:/D:/projects/bsm-lab/dfx/dfxagent/src/docs/agent-bsm-lab-postgres/cert/truststore-merged.jks", - "trustStorePassword": "changeit", "knownAgentList": [ { "hostId": "agent-tuf-a15-defree-oracle", diff --git a/src/docs/agent-tuf-a15-defree-oracle/conf/dfxagent-tuf-a15-defree-oracle.json b/src/docs/agent-tuf-a15-defree-oracle/conf/dfxagent-tuf-a15-defree-oracle.json index 3d73760..bca5ccb 100644 --- a/src/docs/agent-tuf-a15-defree-oracle/conf/dfxagent-tuf-a15-defree-oracle.json +++ b/src/docs/agent-tuf-a15-defree-oracle/conf/dfxagent-tuf-a15-defree-oracle.json @@ -4,11 +4,6 @@ "myHostName": "agent-tuf-a15-defree-oracle", "myListenPort": 63801, "sslEnabled": true, - "keyStorePath": "file:/D:/projects/bsm-lab/dfx/dfxagent/src/docs/agent-tuf-a15-defree-oracle/cert/dfxagent-tuf-a15-defree-oracle.p12", - "keyStorePassword": "qortpals1!", - "keyStoreAlias": "agent-tuf-a15-defree-oracle", - "trustStorePath": "file:/D:/projects/bsm-lab/dfx/dfxagent/src/docs/agent-tuf-a15-defree-oracle/cert/truststore-merged.jks", - "trustStorePassword": "changeit", "knownAgentList": [ { "hostId": "agent-bsm-lab-postgres", diff --git a/src/main/java/com/bsmlab/dfx/agent/DfxAgentApplication.java b/src/main/java/com/bsmlab/dfx/agent/DfxAgentApplication.java index 94277e8..c984e5b 100644 --- a/src/main/java/com/bsmlab/dfx/agent/DfxAgentApplication.java +++ b/src/main/java/com/bsmlab/dfx/agent/DfxAgentApplication.java @@ -53,30 +53,29 @@ public class DfxAgentApplication { if(agentConfigDto.isSslEnabled()) { props.put("server.port", agentConfigDto.getMyListenPort()); props.put("server.ssl.enabled", agentConfigDto.isSslEnabled()); - props.put("server.ssl.key-store", agentConfigDto.getKeyStorePath()); - String keyStoreFilePath = agentConfigDto.getKeyStorePath(); - if(keyStoreFilePath.startsWith("file:")) { - keyStoreFilePath = keyStoreFilePath.substring(5); + props.put("server.ssl.key-store", System.getProperty("javax.net.ssl.keyStore")); + String keyStoreFilePath = String.valueOf(props.get("server.ssl.key-store")); + if(keyStoreFilePath.startsWith("file:/")) { + keyStoreFilePath = keyStoreFilePath.substring(6); } File keyStoreFile = new File(keyStoreFilePath); if(!keyStoreFile.exists()) { System.out.println("cannot find a keystore file: " + keyStoreFilePath); System.exit(0); } - props.put("server.ssl.key-store-password", agentConfigDto.getKeyStorePassword()); - props.put("server.ssl.key-alias", agentConfigDto.getKeyStoreAlias()); - props.put("server.ssl.key-store-type", "PKCS12"); - props.put("server.ssl.trust-store", agentConfigDto.getTrustStorePath()); - String trustStoreFilePath = agentConfigDto.getTrustStorePath(); - if(trustStoreFilePath.startsWith("file:")) { - trustStoreFilePath = trustStoreFilePath.substring(5); + props.put("server.ssl.key-store-password", System.getProperty("javax.net.ssl.keyStorePassword")); + props.put("server.ssl.key-store-type", System.getProperty("javax.net.ssl.keyStoreType")); + props.put("server.ssl.trust-store", System.getProperty("javax.net.ssl.trustStore")); + String trustStoreFilePath = String.valueOf(props.get("server.ssl.trust-store")); + if(trustStoreFilePath.startsWith("file:/")) { + trustStoreFilePath = trustStoreFilePath.substring(6); } File trustStoreFile = new File(trustStoreFilePath); if(!trustStoreFile.exists()) { System.out.println("cannot find a truststore file: " + trustStoreFilePath); System.exit(0); } - props.put("server.ssl.trust-store-password", agentConfigDto.getTrustStorePassword()); + props.put("server.ssl.trust-store-password", System.getProperty("javax.net.ssl.trustStorePassword")); props.put("server.ssl.trust-store-type", "JKS"); props.put("server.ssl.client-auth", "need"); } diff --git a/src/main/java/com/bsmlab/dfx/agent/config/AgentConfigDto.java b/src/main/java/com/bsmlab/dfx/agent/config/AgentConfigDto.java index 3a579f7..11769c1 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/AgentConfigDto.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/AgentConfigDto.java @@ -12,11 +12,6 @@ public class AgentConfigDto { private String myHostName; private int myListenPort; private boolean sslEnabled; - private String keyStorePath; - private String keyStorePassword; - private String keyStoreAlias; - private String trustStorePath; - private String trustStorePassword; private List knownAgentList; private StatusChecker statusChecker; private List dataSourceConfig; diff --git a/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java b/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java index a1f766f..d779f29 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java @@ -27,6 +27,7 @@ public class StartupRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { log.info("✅ StartupRunner 기동"); + log.debug("System.getProperties(): \n{}", System.getProperties()); // DfxAgentConfiguration 에서 생성한 빈 중 DataSource 관련 설정을 마무리한다. dynamicDataSourceService.setSqlSessionFactoryMap(dfxAgentConfiguration.getTemporarySqlSessionFactoryMap()); dynamicDataSourceService.setTransactionManagerMap(dfxAgentConfiguration.getTemporaryTransactionManagerMap()); 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 3ab5549..364f44e 100644 --- a/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java +++ b/src/main/java/com/bsmlab/dfx/agent/support/MessageUtils.java @@ -286,12 +286,12 @@ public class MessageUtils { log.debug("StatusChecker to {} send a message UUID {}", knownAgent.getHostName(), messageUuid); String response = ""; AckDto ackDto = null; - try { +// try { response = restTemplate.postForObject(url, bodyEntity, String.class); - } - catch(Exception e) { - log.error("send a alive message: response = restTemplate.postForObject(url, bodyEntity, String.class);", e); - } +// } +// catch(Exception e) { +// log.error("send a alive message: response = restTemplate.postForObject(url, bodyEntity, String.class);", e); +// } ackDto = objectMapper.readValue(response, new TypeReference() {}); return ackDto; }