diff --git a/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp b/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp index 62027e4..f2db533 100644 --- a/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp +++ b/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp @@ -567,7 +567,7 @@ }); $("#btn_password_reset").click(function () { - if (!confirm("패스워드를 초기화 하시겠습니까?\n초기 패스워드는 '!' + 이메일ID 입니다.")) return; + if (!confirm("패스워드를 초기화 하시겠습니까?\n초기 패스워드는 '이메일ID${passwordInitSubfix}' 입니다.")) return; $.ajax({ type: "POST", diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java b/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java index 55575db..e7c4ac6 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/common/DjbProperty.java @@ -41,7 +41,7 @@ public class DjbProperty { description = "API 접근 허용 IP 목록 (콤마(,)로 구분된 IP들, 예: 192.168.0.1, 192.168.1.*,127.*.*.*", defaultValue = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*" ) - private String dapiAllowIpList = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*"; + private String apiAllowIpList = "10.15.106.*, 10.14.8.*, 10.15.8.*, 192.168.240.*, 127.0.0.1, 192.168.132.*, 192.168.131.*"; diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManController.java index 0388ba1..d1812b9 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManController.java @@ -38,7 +38,8 @@ public class PortalUserManController extends BaseAnnotationController { } @GetMapping(value = "/onl/apim/portaluser/portalUserMan.view", params = "cmd=DETAIL") - public String detailNewView() { + public String detailNewView(Model model) { + model.addAttribute("passwordInitSubfix", portalUserManService.getPasswordInitSubfix()); return "/onl/apim/portaluser/portalUserManDetail"; } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManService.java index 4a749f6..bb71dbf 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManService.java @@ -10,6 +10,7 @@ import com.eactive.apim.portal.portaluser.entity.PortalUserEnums; import com.eactive.apim.portal.portaluser.entity.PortalUserPrivacyAgreement; import com.eactive.eai.common.util.SystemUtil; import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.common.spring.LocaleMessage; import com.eactive.eai.rms.data.entity.onl.apim.approval.ApprovalService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryService; @@ -61,6 +62,7 @@ public class PortalUserManService extends BaseService { private final ApprovalService approvalService; private final PortalInquiryService portalInquiryService; private final PortalPropertyService portalPropertyService; + private final MonitoringContext monitoringContext; /** 가입자 목록 '선택 삭제'(완전삭제) 버튼 노출 여부 */ public boolean isHardDeleteEnabled() { @@ -270,11 +272,20 @@ public class PortalUserManService extends BaseService { portalUserService.deleteById(id); } + /** 초기 패스워드 접미사(loginId + subfix). 초기화 안내 문구 노출에도 사용. */ + public String getPasswordInitSubfix() { + return monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!"); + } + public void passwordReset(String id) { PortalUser portalUser = portalUserService.getById(id); - // 패스워드를 초기 패스워드("!" + loginId)로 초기화 - portalUser.setPasswordHash(kjbSafedbPasswordEncoder.encode("!" + portalUser.getLoginId())); + // 패스워드를 초기 패스워드(loginId + subfix)로 초기화 + String subfix = getPasswordInitSubfix(); + portalUser.setPasswordHash(kjbSafedbPasswordEncoder.encode(portalUser.getLoginId() + subfix)); + + // 비밀번호 변경일 초기화 (초기 비밀번호 강제 변경 유도) + portalUser.setPasswordChangeDate(null); // 로그인 실패 횟수 초기화 portalUser.setLoginFailureCount(0);