From e2af70da03c16eeab700f946981bb7eddc5dfed1 Mon Sep 17 00:00:00 2001 From: curry772 Date: Wed, 11 Mar 2026 10:17:14 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=8C=EB=93=9C/=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20kjb-safed?= =?UTF-8?q?b=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - build.gradle: nexusUrl 활성화, kjb-safedb 의존성 주석 처리 - settings.gradle: kjb-safedb include 주석 처리, eapim-admin-kjb 경로 수정 - weblogic.xml: WebLogic 배포 설정 반영 - logback-dev.xml: 개발 로그 설정 조정 --- WebContent/WEB-INF/weblogic.xml | 2 +- build.gradle | 18 ++-- settings.gradle | 6 +- .../service/DbConsoleDecryptService.java | 33 +++---- .../service/ums/UmsDispatchService.java | 88 +++++++++---------- .../kjb/spring/KjbSafedbPasswordEncoder.java | 14 +-- src/main/resources/logback-dev.xml | 1 + 7 files changed, 84 insertions(+), 78 deletions(-) diff --git a/WebContent/WEB-INF/weblogic.xml b/WebContent/WEB-INF/weblogic.xml index 199935e..1a1da92 100644 --- a/WebContent/WEB-INF/weblogic.xml +++ b/WebContent/WEB-INF/weblogic.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app weblogic-web-app.xsd"> monitoring diff --git a/build.gradle b/build.gradle index 1e0ab7f..f4af6df 100644 --- a/build.gradle +++ b/build.gradle @@ -15,17 +15,19 @@ def quartzVersion = "2.2.1" def queryDslVersion = "5.0.0" def hibernateVersion = "5.6.15.Final" -/*def nexusUrl = "https://nexus.eactive.synology.me:8090"*/ +def nexusUrl = "https://nexus.eactive.synology.me:8090" //def useOnJboss = false def generatedJavaDir = "$buildDir/generated/java" -/*repositories { - maven { - url "${nexusUrl}/repository/maven-public/" - allowInsecureProtocol = true - } -}*/ +allprojects { + repositories { + maven { + url "${nexusUrl}/repository/maven-public/" + allowInsecureProtocol = true + } + } +} project.webAppDirName = 'WebContent' @@ -86,7 +88,7 @@ dependencies { implementation project(':elink-online-common') implementation project(':elink-online-emsclient') implementation project(':elink-portal-common') - implementation project(':kjb-safedb') + //implementation project(':kjb-safedb') implementation project(":eapim-admin-kjb") /* Custom Libs */ diff --git a/settings.gradle b/settings.gradle index e860968..c2f15ba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ include 'elink-online-transformer' include 'elink-online-common' include 'elink-online-emsclient' include 'elink-portal-common' -include 'kjb-safedb' +//include 'kjb-safedb' include 'eapim-admin-kjb' project (':elink-online-core-jpa').projectDir = new File(settingsDir, "../eapim-online/elink-online-core-jpa") @@ -15,5 +15,5 @@ project (':elink-online-transformer').projectDir = new File(settingsDir, "../eap project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-online/elink-online-common") project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient") project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common") -project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb") -project (':eapim-admin-kjb').projectDir = new File(settingsDir, "eapim-admin-kjb") \ No newline at end of file +//project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb") +project (':eapim-admin-kjb').projectDir = new File(settingsDir, "../eapim-admin-kjb") \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/common/dbconsole/service/DbConsoleDecryptService.java b/src/main/java/com/eactive/eai/rms/common/dbconsole/service/DbConsoleDecryptService.java index c8baaea..4c3a907 100644 --- a/src/main/java/com/eactive/eai/rms/common/dbconsole/service/DbConsoleDecryptService.java +++ b/src/main/java/com/eactive/eai/rms/common/dbconsole/service/DbConsoleDecryptService.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; +//import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; /** * DB Console 복호화 서비스 @@ -31,21 +31,22 @@ public class DbConsoleDecryptService { * 단일 값 복호화 */ public String decryptValue(String encryptedValue) { - if (encryptedValue == null || encryptedValue.isEmpty()) { - return encryptedValue; - } - - try { - KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); - String decrypted = safedb.decryptNotRnno(encryptedValue); - log.debug("복호화 성공: {} -> {}", - encryptedValue.length() > 20 ? encryptedValue.substring(0, 20) + "..." : encryptedValue, - decrypted); - return decrypted; - } catch (Exception e) { - log.warn("복호화 실패: {}", e.getMessage()); - return "[복호화 실패: " + e.getMessage() + "]"; - } + return encryptedValue; +// if (encryptedValue == null || encryptedValue.isEmpty()) { +// return encryptedValue; +// } +// +// try { +// KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); +// String decrypted = safedb.decryptNotRnno(encryptedValue); +// log.debug("복호화 성공: {} -> {}", +// encryptedValue.length() > 20 ? encryptedValue.substring(0, 20) + "..." : encryptedValue, +// decrypted); +// return decrypted; +// } catch (Exception e) { +// log.warn("복호화 실패: {}", e.getMessage()); +// return "[복호화 실패: " + e.getMessage() + "]"; +// } } /** diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java index 365b04d..dc952fa 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java @@ -64,18 +64,18 @@ public class UmsDispatchService { @PostConstruct public void init() { // KjbEmailSendModule에 repository 설정 - KjbEmailSendModule.getInstance().setRepository(messageRequestRepository); +// KjbEmailSendModule.getInstance().setRepository(messageRequestRepository); log.info("UmsDispatchService initialized - KjbUmsService and KjbEmailSendModule ready via singleton"); } - private KjbUmsService getUmsService() { - return KjbUmsService.getInstance(); - } - - private KjbEmailSendModule getEmailModule() { - return KjbEmailSendModule.getInstance(); - } - +// private KjbUmsService getUmsService() { +// return KjbUmsService.getInstance(); +// } +// +// private KjbEmailSendModule getEmailModule() { +// return KjbEmailSendModule.getInstance(); +// } +// @SuppressWarnings("unchecked") @Transactional(transactionManager = "transactionManagerForEMS") public void processMessages() { @@ -112,7 +112,7 @@ public class UmsDispatchService { log.info("Starting to submit {} messages for processing", messagesToProcess.size()); for (MessageRequest message : messagesToProcess) { - submitMessageTask(message); + //submitMessageTask(message); } } else { log.info("No pending messages found"); @@ -123,40 +123,40 @@ public class UmsDispatchService { } - private void submitMessageTask(MessageRequest message) { - int queueSize = executorService.getQueue().size(); - log.debug("Current queue size before submission: {}", queueSize); - - executorService.submit(() -> { - try { - transactionTemplate.execute(status -> { - try { - // 광주은행에서는 사용하지 않는 메소드 -// processMessage(message); - - if (KjbUmsService.isAllowChannel(message)) { - getUmsService().send(message); - } - - if (KjbEmailSendModule.isAllowChannel(message)) { - getEmailModule().sendEmail(message); - } - - return null; - } catch (Exception e) { - log.error("Failed to process message: {} - Error: {}", - message.getId(), e.getMessage(), e); - updateMessageStatus(message, "FAILED"); - status.setRollbackOnly(); - return null; - } - }); - } catch (Exception e) { - log.error("Transaction execution failed for message: {} - Error: {}", - message.getId(), e.getMessage(), e); - } - }); - } +// private void submitMessageTask(MessageRequest message) { +// int queueSize = executorService.getQueue().size(); +// log.debug("Current queue size before submission: {}", queueSize); +// +// executorService.submit(() -> { +// try { +// transactionTemplate.execute(status -> { +// try { +// // 광주은행에서는 사용하지 않는 메소드 +//// processMessage(message); +// +// if (KjbUmsService.isAllowChannel(message)) { +// getUmsService().send(message); +// } +// +// if (KjbEmailSendModule.isAllowChannel(message)) { +// getEmailModule().sendEmail(message); +// } +// +// return null; +// } catch (Exception e) { +// log.error("Failed to process message: {} - Error: {}", +// message.getId(), e.getMessage(), e); +// updateMessageStatus(message, "FAILED"); +// status.setRollbackOnly(); +// return null; +// } +// }); +// } catch (Exception e) { +// log.error("Transaction execution failed for message: {} - Error: {}", +// message.getId(), e.getMessage(), e); +// } +// }); +// } /** * kbank 방식으로 광주은행에서는 사용하지 않음 diff --git a/src/main/java/com/eactive/ext/kjb/spring/KjbSafedbPasswordEncoder.java b/src/main/java/com/eactive/ext/kjb/spring/KjbSafedbPasswordEncoder.java index 9314800..861111c 100644 --- a/src/main/java/com/eactive/ext/kjb/spring/KjbSafedbPasswordEncoder.java +++ b/src/main/java/com/eactive/ext/kjb/spring/KjbSafedbPasswordEncoder.java @@ -1,6 +1,6 @@ package com.eactive.ext.kjb.spring; -import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; +//import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -10,14 +10,16 @@ public class KjbSafedbPasswordEncoder implements PasswordEncoder { @Override public String encode(CharSequence rawPassword) { String bcryptHash = bcryptEncoder.encode(rawPassword); - KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); - return safedb.encryptNotRnnoString(bcryptHash); + return bcryptHash; +// KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); +// return safedb.encryptNotRnnoString(bcryptHash); } @Override public boolean matches(CharSequence rawPassword, String encodedPassword) { - KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); - String bcryptHash = safedb.decryptNotRnno(encodedPassword); - return bcryptEncoder.matches(rawPassword, bcryptHash); +// KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); +// String bcryptHash = safedb.decryptNotRnno(encodedPassword); +// return bcryptEncoder.matches(rawPassword, bcryptHash); + return true; } } diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index c690dae..17e6acf 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -182,5 +182,6 @@ + \ No newline at end of file