From 536151a7376d25d12203aaefb7d6ef53338fbca8 Mon Sep 17 00:00:00 2001 From: eastargh Date: Wed, 2 Sep 2026 14:16:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=B0=A8=ED=8A=B8=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp | 3 ++- WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp | 3 ++- WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp | 5 ++++- WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp | 3 ++- WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp index 8954a04..4aa6545 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsDayMan.jsp @@ -70,6 +70,7 @@ // 총건수 도넛 차트 var totalDonutOption = { + color: ['#5470C6', '#FAC858', '#EE6666'], title: { text: '총 건수 분포', left: 'center', @@ -111,7 +112,7 @@ show: true }, data: [ - { value: 0, name: '성공', itemStyle: { color: '#91CC75' } }, + { value: 0, name: '성공', itemStyle: { color: '#5470C6' } }, { value: 0, name: 'Timeout', itemStyle: { color: '#FAC858' } }, { value: 0, name: '시스템오류', itemStyle: { color: '#EE6666' } } ] diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp index 6a2512c..2ac6916 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsHourMan.jsp @@ -71,6 +71,7 @@ // 총건수 도넛 차트 var totalDonutOption = { + color: ['#5470C6', '#FAC858', '#EE6666'], title: { text: '총 건수 분포', left: 'center', @@ -112,7 +113,7 @@ show: true }, data: [ - { value: 0, name: '성공', itemStyle: { color: '#91CC75' } }, + { value: 0, name: '성공', itemStyle: { color: '#5470C6' } }, { value: 0, name: 'Timeout', itemStyle: { color: '#FAC858' } }, { value: 0, name: '시스템오류', itemStyle: { color: '#EE6666' } } ] diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp index dd8c252..feae786 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp @@ -63,6 +63,9 @@ // 총건수 도넛 차트 var totalDonutOption = { + // updateCharts()에서 series[].data를 itemStyle 없이 재설정하면 조각별 itemStyle.color가 + // 병합 과정에서 유실되므로, 옵션 레벨 color 팔레트(성공/Timeout/시스템오류 순)로 색을 고정한다. + color: ['#5470C6', '#FAC858', '#EE6666'], title: { text: '총 건수 분포', left: 'center', @@ -104,7 +107,7 @@ show: true }, data: [ - { value: 0, name: '성공', itemStyle: { color: '#91CC75' } }, + { value: 0, name: '성공', itemStyle: { color: '#5470C6' } }, { value: 0, name: 'Timeout', itemStyle: { color: '#FAC858' } }, { value: 0, name: '시스템오류', itemStyle: { color: '#EE6666' } } ] diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp index 8501ecd..a0fd6b7 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsMonthMan.jsp @@ -58,6 +58,7 @@ // 총건수 도넛 차트 var totalDonutOption = { + color: ['#5470C6', '#FAC858', '#EE6666'], title: { text: '총 건수 분포', left: 'center', @@ -99,7 +100,7 @@ show: true }, data: [ - { value: 0, name: '성공', itemStyle: { color: '#91CC75' } }, + { value: 0, name: '성공', itemStyle: { color: '#5470C6' } }, { value: 0, name: 'Timeout', itemStyle: { color: '#FAC858' } }, { value: 0, name: '시스템오류', itemStyle: { color: '#EE6666' } } ] diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp index a4d27b6..fc56cb4 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsYearMan.jsp @@ -58,6 +58,7 @@ // 총건수 도넛 차트 var totalDonutOption = { + color: ['#5470C6', '#FAC858', '#EE6666'], title: { text: '총 건수 분포', left: 'center', @@ -99,7 +100,7 @@ show: true }, data: [ - { value: 0, name: '성공', itemStyle: { color: '#91CC75' } }, + { value: 0, name: '성공', itemStyle: { color: '#5470C6' } }, { value: 0, name: 'Timeout', itemStyle: { color: '#FAC858' } }, { value: 0, name: '시스템오류', itemStyle: { color: '#EE6666' } } ] From 7117420f38c9ef5453558fecd7e6b43702feeb1a Mon Sep 17 00:00:00 2001 From: eastargh Date: Wed, 2 Sep 2026 14:16:46 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B9=84=EB=B9=8C=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EA=B7=9C=EC=B9=99=20=ED=94=84=EB=9D=BC?= =?UTF-8?q?=ED=8D=BC=ED=8B=B0=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/common/screen/emergency.jsp | 17 +++++++- .../rms/common/context/MonitoringContext.java | 9 ++++ .../eai/rms/common/login/MainController.java | 42 +++++++++++++++---- 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/WebContent/jsp/common/screen/emergency.jsp b/WebContent/jsp/common/screen/emergency.jsp index b503f2e..68b9132 100644 --- a/WebContent/jsp/common/screen/emergency.jsp +++ b/WebContent/jsp/common/screen/emergency.jsp @@ -7,6 +7,19 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ include file="/jsp/common/include/localemessage.jsp" %> +<% + // 비밀번호 규칙 안내문구용 모니터링 프로퍼티 조회 + com.eactive.eai.rms.common.context.MonitoringContext monitoringContext = + (com.eactive.eai.rms.common.context.MonitoringContext) WebApplicationContextUtils + .getRequiredWebApplicationContext(pageContext.getServletContext()) + .getBean("monitoringContext"); + int pwdLengthCheck = monitoringContext.getIntProperty( + com.eactive.eai.rms.common.context.MonitoringContext.RMS_PASSWORD_LENGTH_CHECK, 7); + int pwdCombiCheck = monitoringContext.getIntProperty( + com.eactive.eai.rms.common.context.MonitoringContext.RMS_PASSWORD_COMBI_CHECK, 2); + int pwdRepeatCheck = monitoringContext.getIntProperty( + com.eactive.eai.rms.common.context.MonitoringContext.RMS_PASSWORD_REPEAT_CHECK, 3); +%> " scope="session" /> <% @@ -481,8 +494,8 @@ " autocomplete="off" required> - ※ 7글자 이상 & 영문/숫자/특수문자 2종류 이상
- ※ 연속된 숫자/문자(예: 123, abc, qwer), 동일 문자 3자 이상 반복 사용 불가 + ※ <%= pwdLengthCheck %>글자 이상 & 영문/숫자/특수문자 <%= pwdCombiCheck %>종류 이상
+ ※ 연속된 숫자/문자(예: 123, abc, qwer) 사용 불가<%= pwdRepeatCheck >= 2 ? ", 동일 문자 " + pwdRepeatCheck + "자 이상 반복 불가" : "" %>
diff --git a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java index 5230b33..39103b0 100644 --- a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java +++ b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java @@ -276,6 +276,15 @@ public interface MonitoringContext { // 비밀번호 변경 시 SMS 2차 인증 사용 여부 (djb.sms_auth.enabled 와 함께 true 여야 동작) public static final String RMS_PASSWORD_SMS_AUTH_ENABLED = "rms.password.sms_auth.enabled"; + // 비밀번호 최소 길이 (기본 7) + public static final String RMS_PASSWORD_LENGTH_CHECK = "rms.password.length.check"; + + // 비밀번호 문자 조합 종류 수 (영문/숫자/특수문자 중 N종류 이상, 기본 2) + public static final String RMS_PASSWORD_COMBI_CHECK = "rms.password.combi.check"; + + // 동일 문자 연속 반복 제한 개수 (기본 3, 2 미만이면 미검사) + public static final String RMS_PASSWORD_REPEAT_CHECK = "rms.password.repeat.check"; + // API 상태변화 스윙챗 발송여부 public static final String DJB_UMS_MESSENGER_APIMONITOR_ENABLED = "djb.ums.messenger.api-monitor.enabled"; diff --git a/src/main/java/com/eactive/eai/rms/common/login/MainController.java b/src/main/java/com/eactive/eai/rms/common/login/MainController.java index a95d81b..106ede9 100644 --- a/src/main/java/com/eactive/eai/rms/common/login/MainController.java +++ b/src/main/java/com/eactive/eai/rms/common/login/MainController.java @@ -67,6 +67,9 @@ public class MainController implements InterceptorSkipController { private static final String USER_STATUS_LOCKED = "2"; private static final int DEFAULT_MAX_LOGIN_FAIL_COUNT = 5; private static final int DEFAULT_PASSWORD_HISTORY_COUNT = 5; + private static final int DEFAULT_PASSWORD_LENGTH_CHECK = 7; + private static final int DEFAULT_PASSWORD_COMBI_CHECK = 2; + private static final int DEFAULT_PASSWORD_REPEAT_CHECK = 3; private final LocaleMessage localeMessage; private final MonitoringContext monitoringContext; @@ -469,6 +472,24 @@ public class MainController implements InterceptorSkipController { return monitoringContext.getBooleanProperty(MonitoringContext.RMS_PASSWORD_SMS_AUTH_ENABLED, false); } + // 비밀번호 최소 길이 조회 (rms.password.length.check) + private int getPasswordLengthCheck() { + return monitoringContext.getIntProperty( + MonitoringContext.RMS_PASSWORD_LENGTH_CHECK, DEFAULT_PASSWORD_LENGTH_CHECK); + } + + // 비밀번호 문자 조합 종류 수 조회 (rms.password.combi.check, 영문/숫자/특수문자 중 N종류 이상) + private int getPasswordCombiCheck() { + return monitoringContext.getIntProperty( + MonitoringContext.RMS_PASSWORD_COMBI_CHECK, DEFAULT_PASSWORD_COMBI_CHECK); + } + + // 동일 문자 연속 반복 제한 개수 조회 (rms.password.repeat.check, 2 미만이면 미검사) + private int getPasswordRepeatCheck() { + return monitoringContext.getIntProperty( + MonitoringContext.RMS_PASSWORD_REPEAT_CHECK, DEFAULT_PASSWORD_REPEAT_CHECK); + } + // 로그인 실패 횟수 증가, 임계치 도달 시 계정 잠금 private int increaseLoginFailCount(UserInfo userInfo) { int failCount = (userInfo.getLoginfailcount() == null ? 0 : userInfo.getLoginfailcount()) + 1; @@ -1018,10 +1039,17 @@ public class MainController implements InterceptorSkipController { private boolean isPasswordValid(String password) { - return password != null && password.getBytes().length == password - .length() && password.getBytes().length >= 7 - && isCombination(password) - && !isRepeatPassword(password, PASSWORD_PATTERN_CHECK_LENGTH) + if (password == null || password.getBytes().length != password.length()) { + return false; + } + + int lengthCheck = getPasswordLengthCheck(); + int combiCheck = getPasswordCombiCheck(); + int repeatCheck = getPasswordRepeatCheck(); + + return password.getBytes().length >= lengthCheck + && isCombination(password, combiCheck) + && (repeatCheck < 2 || !isRepeatPassword(password, repeatCheck)) && !isSerialPassword(password, PASSWORD_PATTERN_CHECK_LENGTH) && !isKeyboardSequentialPassword(password, PASSWORD_PATTERN_CHECK_LENGTH); } @@ -1088,7 +1116,7 @@ public class MainController implements InterceptorSkipController { return false; } - private boolean isCombination(String password) { + private boolean isCombination(String password, int minTypes) { int combicount = 0; // 숫자포함여부 String pattern = "[0-9]+"; @@ -1117,8 +1145,8 @@ public class MainController implements InterceptorSkipController { combicount++; } - // combicount가 2 이상이면 true, 그렇지 않으면 false 반환 - return combicount >= 2; + // combicount가 minTypes 이상이면 true, 그렇지 않으면 false 반환 + return combicount >= minTypes; } From 1ba140ddea64dd4dda8bc5dc4a1d54465c801a67 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 3 Sep 2026 10:09:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=B2=A8?= =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp | 4 ++++ .../rms/onl/apim/portalnotice/PortalNoticeManService.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp index 1267845..4fcfa37 100644 --- a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp @@ -530,6 +530,10 @@ if (confirm("<%= localeMessage.getString("common.checkSave")%>") != true) return; var formData = new FormData($("#ajaxForm")[0]); + // Summernote 그림 다이얼로그의 내부 파일 input(name="files")이 #ajaxForm 안에 있어 + // 선택한 이미지가 지워지지 않고 남아 있으면 여기서 함께 딸려 온다. + // 본 화면은 첨부파일 기능을 쓰지 않으므로 항상 제거한다. + formData.delete("files"); formData.set("useYn", $("#useYn").is(":checked") ? "Y" : "N"); formData.set("fixYn", $("#fixYn").is(":checked") ? "Y" : "N"); formData.set("noticeDetail", $('#contents').summernote('code')); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java index aa7d10e..e9b44b1 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java @@ -60,6 +60,9 @@ public class PortalNoticeManService extends BaseService { private static final String MANUAL_TITLE_KEYWORD = "장애"; private String decodeString(String value) { + if (value == null) { + return null; + } if (ContainerUtil.get() == ContainerUtil.TOMCAT) { try { return new String(value.getBytes("euc-kr"), StandardCharsets.UTF_8); @@ -433,7 +436,8 @@ public class PortalNoticeManService extends BaseService { MultipartFile file = portalNoticeUI.getFiles(); if (file != null && !file.isEmpty()) { // 새로운 파일이 업로드된 경우에만 처리 - String decodedFileName = decodeString(portalNoticeUI.getFileName()); + String fileName = StringUtils.defaultIfBlank(portalNoticeUI.getFileName(), file.getOriginalFilename()); + String decodedFileName = decodeString(fileName); FileTypeContext.setFileType("notice"); FileInfo fileInfo = fileService.createOrUpdateSingleFile(portalNotice.getFileId(), file, decodedFileName, true); From a1d7f8f10ef46a79680d396620d6d95ebb03884f Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 3 Sep 2026 15:10:48 +0900 Subject: [PATCH 4/4] =?UTF-8?q?UI=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/adapter/socket/socketStatus.jsp | 6 +++--- .../jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WebContent/jsp/onl/adapter/socket/socketStatus.jsp b/WebContent/jsp/onl/adapter/socket/socketStatus.jsp index eabc18a..f4ece64 100644 --- a/WebContent/jsp/onl/adapter/socket/socketStatus.jsp +++ b/WebContent/jsp/onl/adapter/socket/socketStatus.jsp @@ -179,8 +179,8 @@ autowidth: true, viewrecords : true, gridview : true, - ondblClickRow : function(rowId) { - console.log("rowId", rowId); + ondblClickRow : function(rowId) { + /* console.log("rowId", rowId); var rowData = $(this) .getRowData(rowId); var key = rowData['EaiSevrInstncName']; @@ -193,7 +193,7 @@ url2 += "&searchAdptrBzwkGroupName=" + key2; url2 += '&menuId='+'${param.menuId}'; - goNav(url2); + goNav(url2); */ }, loadComplete : function(d) { $("button[name*=img]").unbind("click"); diff --git a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp index b735fbb..0a4c09b 100644 --- a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp +++ b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp @@ -97,7 +97,7 @@
-
전문레이아웃 연동 이력 상세
+
연동 배포 이력 상세