From 51bbd6678bc654b05c5c40a7f7e4c044ee1831f0 Mon Sep 17 00:00:00 2001 From: daekuk Date: Wed, 28 Jan 2026 18:31:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?-=20=EB=A9=94=EB=AA=A8=EB=A6=AC=20=EB=A6=AC?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=AC=B8=EC=A0=9C=20=EA=B0=9C=EC=84=A0=20?= =?UTF-8?q?(=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=96=B4=EB=8C=91=ED=84=B0=20?= =?UTF-8?q?=ED=94=84=EB=9D=BC=ED=8D=BC=ED=8B=B0=20=EA=B0=92=EC=9D=B4=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=EB=90=98=EC=A7=80=EC=95=8A=EC=95=84=EC=84=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/adapter/AdapterController.java | 2 +- .../adapter/adapter/AdapterManService.java | 64 ++++++++++++------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java index 64129af..338f5d5 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java @@ -248,7 +248,7 @@ public class AdapterController extends OnlBaseAnnotationController { synchronized (obj) { service.update(adapterGroupUI); - Map resultMap = service.reloadSync(adapterGroupUI); + Map resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI.getAdptrbzwkgroupname()); return ResponseEntity.ok(resultMap); } diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java index 9b782ce..7de3d7b 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java @@ -333,8 +333,6 @@ public class AdapterManService extends OnlBaseService { List stdMsgInfoList = standardmessageinfoService.findByBzwksvckeynameStartingWith(adapterName); // 변경 사항이 있었는지 체크해서 HS04 Reload 함. - boolean isUpdated = false; - for (StandardMessageInfo stdMsgInfo : stdMsgInfoList) { String fullPath = stdMsgInfo.getApifullpath(); @@ -358,8 +356,6 @@ public class AdapterManService extends OnlBaseService { // DB에 즉시 반영 standardmessageinfoService.saveAndFlush(stdMsgInfo); - isUpdated = true; - } catch (Exception e) { log.error("StandardMessageInfo APIFULLPATH SAVE FAIL key = {}", stdMsgInfo.getBzwksvckeyname()); @@ -374,22 +370,6 @@ public class AdapterManService extends OnlBaseService { } } - if (isUpdated) { - - try { - - Command command = new ReloadSTDMessageCommand(); - command.setArgs("ALL"); - - agentUtilService.broadcast(command); - - log.debug("API 경로 변경 감지 -> 전체 표준 전문 리로드 명령 전송 완료 (ALL)"); - - } catch (Exception e) { - log.debug("브로드캐스트 전송 실패", e); - } - } - } public void delete(AdapterGroupUI adapterGroupUI) { @@ -559,7 +539,43 @@ public class AdapterManService extends OnlBaseService { adapterGroup.setMoniuseyn(adapterGroupUI.getMoniuseyn()); } } + + public Map reloadSyncStdMsgAndAdapter(String adapterGroupName) throws Exception { + + Map result = new HashMap<>(); + + String status = "success"; + + try { + log.debug(">>>>>>>> [Reload Start] 어댑터 그룹명 {}", adapterGroupName); + + CommonCommand pcommand = new CommonCommand( + "com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand", + adapterGroupName + ); + agentUtilService.broadcast(pcommand); + + CommonCommand acommand = new CommonCommand( + "com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand", + adapterGroupName + ); + agentUtilService.broadcast(acommand); + + Command stdcommand = new ReloadSTDMessageCommand(); + stdcommand.setArgs("ALL"); + agentUtilService.broadcast(stdcommand); + + log.info(">>>>>> [Reload End] 모든 리로드 명령 전송 완료"); + } catch (Exception e) { + status = "error"; + log.error("리로드 실패", e); + } + + result.put("status", status); + return result; + } + public Map reloadSync(AdapterGroupUI adapterGroupUI) throws Exception { Map receive = null; Map result = new HashMap<>(); @@ -571,19 +587,19 @@ public class AdapterManService extends OnlBaseService { prptyGroupName); agentUtilService.broadcast(pcommand); } - + CommonCommand acommand = new CommonCommand("com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand", adapterGroupUI.getAdptrbzwkgroupname()); receive = agentUtilService.broadcast(acommand); - + if (receive.values().stream().anyMatch(value -> value == null || !"success".equals(value))) { status = "error"; } - + result.put("status", status); result.put("message", receive.toString()); return result; - + } public Map deleteSync(AdapterGroupUI map, List list) throws Exception { From 71892f16f6d0336ba7ff89d9617b04dd69276746 Mon Sep 17 00:00:00 2001 From: daekuk Date: Thu, 29 Jan 2026 10:00:57 +0900 Subject: [PATCH 2/4] =?UTF-8?q?-=20target=20=EB=B3=80=ED=99=98=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=8F=84=20setSearchble=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80(=ED=82=A4=EC=9B=8C=EB=93=9C=20=EA=B2=80?= =?UTF-8?q?=EC=83=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/onl/admin/rule/transform2/transform2ManDetail.jsp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp index d37ab64..577526e 100644 --- a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp +++ b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp @@ -1313,6 +1313,8 @@ $('#functionComboDialog').val($('#functionCombo').val()); + setSearchable("functionComboDialog"); + mouseoverEndpoint(endpoint, 'click-endpoint'); moveDialogPosition(false); }, From ad07c7dcd5b453cc82363127412a2988b21b3fef Mon Sep 17 00:00:00 2001 From: cho Date: Thu, 29 Jan 2026 16:17:59 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EA=B1=B0=EB=9E=98=ED=86=B5=EC=A0=9C=20API?= =?UTF-8?q?=20=EC=A0=9C=EA=B3=B5=EC=9D=84=20=EC=9C=84=ED=95=9C=20login=20s?= =?UTF-8?q?kip=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 로그인 안하면 보안문제? 해당 거래통제 거래는 인터페이스 생성후, OAuth토큰 인증 하고 들어올 예정. --- .../rms/onl/manage/control/control/ControlManController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlManController.java index 3522889..94f5cb3 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlManController.java @@ -17,11 +17,12 @@ import org.springframework.web.servlet.ModelAndView; import com.eactive.eai.agent.command.CommonCommand; import com.eactive.eai.rms.common.base.OnlBaseAnnotationController; +import com.eactive.eai.rms.common.interceptor.InterceptorSkipController; import com.eactive.eai.rms.common.login.SessionManager; import com.google.gson.Gson; @Controller -public class ControlManController extends OnlBaseAnnotationController { +public class ControlManController extends OnlBaseAnnotationController implements InterceptorSkipController { private static final String RELOAD_RESTRICT_INFO_COMMAND = "com.eactive.eai.agent.restrict.ReloadRestrictInfoCommand"; private static final String ERROR_RESULT_STATUS = "에러"; From 9943c44eb40985e27369c81af95893c4b3618d35 Mon Sep 17 00:00:00 2001 From: daekuk Date: Fri, 30 Jan 2026 10:45:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?-=20=EB=A9=94=EB=AA=A8=EB=A6=AC=20=EB=A6=AC?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=B9=84=EC=A0=95=EC=83=81=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=ED=95=98=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EA=B8=B0=EC=A1=B4=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/adapter/AdapterController.java | 2 +- .../adapter/adapter/AdapterManService.java | 74 +++++++++++-------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java index 338f5d5..77dd89d 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java @@ -248,7 +248,7 @@ public class AdapterController extends OnlBaseAnnotationController { synchronized (obj) { service.update(adapterGroupUI); - Map resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI.getAdptrbzwkgroupname()); + Map resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI); return ResponseEntity.ok(resultMap); } diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java index 7de3d7b..d55875d 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java @@ -540,40 +540,52 @@ public class AdapterManService extends OnlBaseService { } } - public Map reloadSyncStdMsgAndAdapter(String adapterGroupName) throws Exception { - - Map result = new HashMap<>(); - - String status = "success"; - - try { - log.debug(">>>>>>>> [Reload Start] 어댑터 그룹명 {}", adapterGroupName); - - CommonCommand pcommand = new CommonCommand( - "com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand", - adapterGroupName - ); - agentUtilService.broadcast(pcommand); - - CommonCommand acommand = new CommonCommand( - "com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand", - adapterGroupName - ); - agentUtilService.broadcast(acommand); - - Command stdcommand = new ReloadSTDMessageCommand(); - stdcommand.setArgs("ALL"); + public Map reloadSyncStdMsgAndAdapter(AdapterGroupUI adapterGroupUI) throws Exception { + Map receive = null; + Map result = new HashMap<>(); + String status = "success"; + + try { + log.info(">>>>>> [Reload AdapterManService Start] 리로드 시작"); + + for (Entry entry : adapterGroupUI.getAdapterData().entrySet()) { + AdapterUI adapterUI = entry.getValue(); + String prptyGroupName = adapterUI.getPrptygroupname(); + + CommonCommand pcommand = new CommonCommand( + "com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand", + prptyGroupName + ); + agentUtilService.broadcast(pcommand); + } + + // 어댑터 그룹 리로드 + CommonCommand acommand = new CommonCommand( + "com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand", + adapterGroupUI.getAdptrbzwkgroupname() + ); + receive = agentUtilService.broadcast(acommand); + + // HS04 API_FULL_PATH + Command stdcommand = new ReloadSTDMessageCommand(); + stdcommand.setArgs("ALL"); agentUtilService.broadcast(stdcommand); - log.info(">>>>>> [Reload End] 모든 리로드 명령 전송 완료"); - } catch (Exception e) { - status = "error"; - log.error("리로드 실패", e); - } - - result.put("status", status); - return result; + log.info(">>>>>> [Reload AdapterManService End] 리로드 완료"); + } catch (Exception e) { + status = "error"; + log.error("리로드 실패", e); + } + + if (receive != null && receive.values().stream().anyMatch(value -> value == null || !"success".equals(value))) { + status = "error"; + } + + result.put("status", status); + if(receive != null) result.put("message", receive.toString()); + + return result; } public Map reloadSync(AdapterGroupUI adapterGroupUI) throws Exception {