diff --git a/src/main/java/com/urpsys/basefront/common/util/RestApiCallUtil.java b/src/main/java/com/urpsys/basefront/common/util/RestApiCallUtil.java index 266aee5d..359207c2 100644 --- a/src/main/java/com/urpsys/basefront/common/util/RestApiCallUtil.java +++ b/src/main/java/com/urpsys/basefront/common/util/RestApiCallUtil.java @@ -147,7 +147,7 @@ public class RestApiCallUtil String strFullReturnData = returnObj.toString(); // 개발완료 후 주석처리 - log.info("전체 리턴값 => [{}]", returnObj.toString()); + // log.info("전체 리턴값 => [{}]", returnObj.toString()); // Map 변환처리 Map returnMap = null; diff --git a/src/main/java/com/urpsys/basefront/config/SecurityConfig.java b/src/main/java/com/urpsys/basefront/config/SecurityConfig.java index 5b934476..496d7c82 100644 --- a/src/main/java/com/urpsys/basefront/config/SecurityConfig.java +++ b/src/main/java/com/urpsys/basefront/config/SecurityConfig.java @@ -54,12 +54,17 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter @Override public void configure(HttpSecurity http) throws Exception { + // 2026.01.14 나혁제 공통팝업 허용처리 http.csrf().disable() .authorizeRequests() .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() - .antMatchers("/main/actionMain.do" ).permitAll() - .antMatchers("/logout*.do" ).permitAll() - .antMatchers("/main/logout.do" ).permitAll() + .antMatchers("/main/actionMain.do" ).permitAll() + .antMatchers("/logout*.do" ).permitAll() + .antMatchers("/main/logout.do" ).permitAll() + .antMatchers("/common/PageRedirection.do" ).permitAll() + .antMatchers("/main/searchIdFind.do" ).permitAll() + .antMatchers("/main/UserPasswordResetExt.do" ).permitAll() + .antMatchers("/egov/js/**" ).permitAll() .antMatchers("/").permitAll() .and() .headers().frameOptions().disable() diff --git a/src/main/java/com/urpsys/basefront/config/handler/CustomSuccessHandler.java b/src/main/java/com/urpsys/basefront/config/handler/CustomSuccessHandler.java index 40d704c9..b5446363 100644 --- a/src/main/java/com/urpsys/basefront/config/handler/CustomSuccessHandler.java +++ b/src/main/java/com/urpsys/basefront/config/handler/CustomSuccessHandler.java @@ -52,7 +52,7 @@ public class CustomSuccessHandler extends SavedRequestAwareAuthenticationSuccess , HttpServletResponse response , Authentication authentication) throws ServletException, IOException { - log.debug(">>>>>>>>>> CustomSuccessHandler onAuthenticationSuccess <<<<<<<<<<"); + log.info(">>>>>>>>>> CustomSuccessHandler onAuthenticationSuccess <<<<<<<<<<"); log.info("### login success => {}", authentication.getAuthorities()); @@ -96,7 +96,7 @@ public class CustomSuccessHandler extends SavedRequestAwareAuthenticationSuccess super.onAuthenticationSuccess(request, response, authentication); - log.debug("<<<<<<<<<< CustomSuccessHandler onAuthenticationSuccess >>>>>>>>>>"); + log.info("<<<<<<<<<< CustomSuccessHandler onAuthenticationSuccess >>>>>>>>>>"); } diff --git a/src/main/java/com/urpsys/basefront/controller/MainController.java b/src/main/java/com/urpsys/basefront/controller/MainController.java index eb8c7b1a..21049505 100644 --- a/src/main/java/com/urpsys/basefront/controller/MainController.java +++ b/src/main/java/com/urpsys/basefront/controller/MainController.java @@ -1,6 +1,7 @@ package com.urpsys.basefront.controller; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -14,9 +15,11 @@ import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -29,6 +32,7 @@ import com.urpsys.basefront.domain.MemberVO; import com.urpsys.basefront.domain.TokenInfo; import com.urpsys.itmsfront.sys.domain.PrsnlPortletCreateVO; import com.urpsys.itmsfront.sys.domain.PrsnlPortletManageVO; +import com.urpsys.itmsfront.sys.domain.UserManageVO; import kong.unirest.HttpResponse; import kong.unirest.JsonNode; @@ -415,6 +419,81 @@ public class MainController return "main/inc/IncFooter"; } + /** + * ID 찾기를 수행한다. + * @author urp 인프라본부 나혁제 + * 작성일 : 2026.01.14 + */ + @ResponseBody + @RequestMapping(value="/main/searchIdFind.do") + public LinkedHashMap searchIdFind( HttpServletRequest request + , HttpServletResponse response ) throws Exception + { + log.info(">>>>>>>>>>>>>>> /main/searchIdFind.do <<<<<<<<<<<<<<<"); + + LinkedHashMap resBody = new LinkedHashMap(); // Response Map + + // api in/out map 정의 + Map bodyMap = new LinkedHashMap(); + Map returnMap = new LinkedHashMap(); + + bodyMap.put("userNm" , CommonUtil.getData(request, "userNm")); + bodyMap.put("userEmail" , CommonUtil.getData(request, "userEmail")); + + // RestApi Call Start --------------------------------- + returnMap = restApiCallUtil.RestApiCallNoAuth(bodyMap, "/main/searchIdFind.do"); + // RestApi Call End --------------------------------- + + String userId = (String)returnMap.get("userId"); + + resBody.put("userId", userId ); + + log.info("<<<<<<<<<<<<<<< /main/searchIdFind.do >>>>>>>>>>>>>>>"); + + return resBody; + } + + /** + * 패스워드 초기화 수행한다. + * @author urp 인프라본부 나혁제 + * 작성일 : 2026.01.14 + */ + @ResponseBody + @RequestMapping(value="/main/UserPasswordResetExt.do") + public LinkedHashMap UserPasswordResetExt( HttpServletRequest request + , HttpServletResponse response ) throws Exception + { + log.info(">>>>>>>>>>>>>>> /main/UserPasswordResetExt.do <<<<<<<<<<<<<<<"); + + LinkedHashMap resBody = new LinkedHashMap(); // Response Map + + // api in/out map 정의 + Map bodyMap = new LinkedHashMap(); + Map returnMap = new LinkedHashMap(); + + bodyMap.put("userId" , CommonUtil.getData(request, "userId")); + bodyMap.put("userNm" , CommonUtil.getData(request, "userNm")); + bodyMap.put("userEmail" , CommonUtil.getData(request, "userEmail")); + + // RestApi Call Start --------------------------------- + returnMap = restApiCallUtil.RestApiCallNoAuth(bodyMap, "/main/UserPasswordResetExt.do"); + // RestApi Call End --------------------------------- + + int resultCd = (int)returnMap.get("resultCd"); + String resultMsg = (String)returnMap.get("resultMsg"); + + resBody.put("resultCd" , resultCd ); + resBody.put("resultMsg" , resultMsg ); + + log.info("<<<<<<<<<<<<<<< /main/UserPasswordResetExt.do >>>>>>>>>>>>>>>"); + + return resBody; + } + + + + + diff --git a/src/main/java/com/urpsys/basefront/controller/urpCommonController.java b/src/main/java/com/urpsys/basefront/controller/urpCommonController.java index ac35bda9..91e1441e 100644 --- a/src/main/java/com/urpsys/basefront/controller/urpCommonController.java +++ b/src/main/java/com/urpsys/basefront/controller/urpCommonController.java @@ -56,6 +56,10 @@ public class urpCommonController { strMovePage = "uritms-popup1"+ strPage; } + else if(strPopupYn.equals("B")) + { + strMovePage = "uritms-base-popup1"+ strPage; + } else { strMovePage = "uritms-tiles2"+ strPage; @@ -67,7 +71,7 @@ public class urpCommonController model.addAttribute("Param04" , strParam04 ); model.addAttribute("Param06" , strParam05 ); - + log.info("strMovePage [{}]", strMovePage); log.info("<<<<<<<<<<<<<<< /common/PageRedirection.do >>>>>>>>>>>>>>>"); return strMovePage; diff --git a/src/main/webapp/WEB-INF/jsp/main/LoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/main/LoginUsr.jsp index a2257550..62321893 100644 --- a/src/main/webapp/WEB-INF/jsp/main/LoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/LoginUsr.jsp @@ -1,3 +1,5 @@ + + <%-- Class Name : LoginUsr.jsp Description : 로그인화면 @@ -17,7 +19,9 @@ - + UR-ITSM + + @@ -38,7 +42,14 @@ + + + + + + + + + + + + + + +
+

ID 찾기

+
+ + +
+ + + "> + + + + + + + + + + + + + + + +
처리완료
+ 성명 + + +
+ E-Mail + + +
+ +
+ +
+
+ + +
+ + "> + + + + + + + + + + + +
처리완료
+ ID + + +
+
+ + +
+ +
+ + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/main/PopPasswordReset.jsp b/src/main/webapp/WEB-INF/jsp/main/PopPasswordReset.jsp new file mode 100644 index 00000000..9a3b485b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/main/PopPasswordReset.jsp @@ -0,0 +1,175 @@ + + +<%-- + /** + * @Class Name : PopPasswordReset.jsp + * @Description : Password 초기화 팝엄 화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ---------- -------- --------------------------- + * @ 2026.01.14 나혁제 최초 생성 + * + * @author urp 인프라본부 나혁제 + * @since 2026.01.14 + * @version 1.0 + * @see + * + */ +--%> + +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + +ID 찾기 + + + + + + + + + + + +
+

PASSWORD 초기화

+
+ + +
+ + + "> + + + + + + + + + + + + + + + + + + + +
처리완료
+ 성명 + + +
+ 성명 + + +
+ E-Mail + + +
+
+ +
+ + +
+ + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/tilesLayout/uritms-base-popup1.jsp b/src/main/webapp/WEB-INF/jsp/tilesLayout/uritms-base-popup1.jsp new file mode 100644 index 00000000..f1effdea --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/tilesLayout/uritms-base-popup1.jsp @@ -0,0 +1,64 @@ +<%-- + Class Name : portal-popup1.jsp + Description : Tiles 팝업 화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2026.01.14 나혁제 최초 생성 + + author : urp 인프라본부 나혁제 + since : 2026.01.14 +--%> + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> + +<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ +
+ + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/tiles.xml b/src/main/webapp/WEB-INF/tiles/tiles.xml index a9603788..5e18d0b1 100644 --- a/src/main/webapp/WEB-INF/tiles/tiles.xml +++ b/src/main/webapp/WEB-INF/tiles/tiles.xml @@ -36,6 +36,11 @@ + + + + + @@ -98,7 +103,7 @@ - + @@ -110,7 +115,25 @@ - + + + + + + + + + + + + + + + + + + +