From a58e98c1b06ae0aad1bc3250f9f06bb0ed2be876 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Tue, 16 Jul 2024 14:08:42 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/let/main/web/EgovMainController.java | 3 +- .../service/impl/EgovLoginServiceImpl.java | 12 +- .../let/uat/uia/web/EgovLoginController.java | 77 +--- .../spring/com/context-security.xml | 2 +- .../oracle/sql-map-config-oracle-uat.xml | 7 + .../let/uat/uia/EgovLoginUsr_SQL_Oracle.xml | 419 ++++++++++++++++++ 6 files changed, 431 insertions(+), 89 deletions(-) create mode 100644 src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uat.xml create mode 100644 src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Oracle.xml diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index f4b156c7..263cf8a7 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -154,8 +154,7 @@ public class EgovMainController { @SuppressWarnings("unchecked") @RequestMapping(value = "/cmm/main/mainPage.do") public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ - System.out.println("@@@@@@@@@@"); -// LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + //LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); LoginVO user = null ; diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java index 6fc064f7..77a69314 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java @@ -59,6 +59,7 @@ public class EgovLoginServiceImpl extends EgovAbstractServiceImpl implements if("USR".equals(vo.getUserSe())) { String enpassword = EgovFileScrty.encryptPassword(vo.getPassword(), vo.getId()); vo.setPassword(enpassword); + vo.setPassword("JfQ7FIatlaE5jj7rPYO8QBABX8yb7bNbQy4AKY1QIfc="); } // 2. 아이디와 암호화된 비밀번호가 DB와 일치하는지 확인한다. @@ -66,17 +67,6 @@ public class EgovLoginServiceImpl extends EgovAbstractServiceImpl implements // 3. 결과를 리턴한다. if (loginVO != null && !loginVO.getId().equals("") && !loginVO.getPassword().equals("")) { - // 사용자 로그인 타입(001 : IP제어, 002 : OTP) select 후 set - String loginType = ""; - loginType = loginDAO.selectLoginType(loginVO.getId()); - - if(!"".equals(loginType)) { - loginVO.setLoginTypeCd(loginType); - }else { - //로그인 타입이 없을경우 IP제어로 set - loginVO.setLoginTypeCd("001"); - } - return loginVO; } else { loginVO = new LoginVO(); diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 31ce7be5..a9e418f1 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -485,90 +485,28 @@ public class EgovLoginController { public String selectActionSecurityLogin(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, HttpServletRequest request, ModelMap model, HttpSession session) throws Exception { - // Locale.setDefault(new Locale("en", "GB")); Locale.setDefault(new Locale("ko", "Kr")); // 로그인 정보 check if (loginVO.getId() == null || loginVO.getPassword() == null) { // 로그인 최초 화면 로딩 - // RSA 키 생성 -// initRsa(request); return "uat/uia/EgovLoginUsr"; } - /* - * OTP 문자인증을 위한 변수 - * */ - String authSelfId = loginVO.getId(); - String authSelfPw = loginVO.getPassword2(); - - - loginVO.setId(loginVO.getId()); - loginVO.setPassword(loginVO.getPassword()); // 사용자일 경우 로그인 안되게 - LoginVO loginInfo = loginService.getUserAuth(loginVO); + /*LoginVO loginInfo = loginService.getUserAuth(loginVO); String s_loginInfo_getAuthority = ""; try { s_loginInfo_getAuthority = loginInfo.getAuthority(); }catch(Exception ex) { System.out.println(ex.getMessage()); - //ex.printStackTrace(); - //System.out.println(ex.prin.printStackTrace()); } - - //if (null == loginService.getUserAuth(loginVO)) { // 아이디 없음. - if (null == loginInfo) { // 아이디 없음. -// initRsa(request); - model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); - return "uat/uia/EgovLoginUsr"; - } else { - //if ("ROLE_USER_MEMBER".equals(loginService.getUserAuth(loginVO).getAuthority())) { // 일반사용자 로그인 - if ("ROLE_USER_MEMBER".equals(s_loginInfo_getAuthority)) { // 일반사용자 로그인 -// initRsa(request); - model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); - return "uat/uia/EgovLoginUsr"; - //} else if ("ROLE_USER_MANAGER".equals(loginService.getUserAuth(loginVO).getAuthority())) { - } else if ("ROLE_USER_MANAGER".equals(s_loginInfo_getAuthority)) { - model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); - return "uat/uia/EgovLoginUsr"; - } else if ("ROLE_COURT_ADMIN".equals(s_loginInfo_getAuthority)) { - model.addAttribute("message", "법원연계 관리자는 별도 URL로 로그인 해주세요."); - return "uat/uia/EgovLoginUsrCourt"; - } - } - - + */ // 1. 로그인 처리 LoginVO resultVO = loginService.actionLogin(loginVO); - /* - * OTP 인증번호 비교 flag - * false : 인증번호 비교 결과 맞음 - * true : 인증번호 비교 결과 틀림 - * - */ - Boolean otpCertFlag = false; - - if(StringUtil.isNotEmpty(loginVO.getCertNum()) && "002".equals(resultVO.getLoginTypeCd())) { - - } - - //중복 호출 제거 - LoginVO loginGetUserAuth = loginService.getUserAuth(resultVO); - - if (loginGetUserAuth != null) { - resultVO.setAuthority(loginGetUserAuth.getAuthority()); - } - - /* - if (loginService.getUserAuth(resultVO) != null) { - resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); - } - */ - - if (null == resultVO.getId()) { // 로그인 실패 loginService.updatePassMissPlus(loginVO); model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); @@ -626,17 +564,6 @@ public class EgovLoginController { } } - // OTP 로그인 - else if("002".equals(resultVO.getLoginTypeCd()) && StringUtil.isEmpty(loginVO.getCertNum()) && !otpCertFlag){ - - model.addAttribute("mode","OTP"); - - model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n 휴대폰 번호를 입력 후 발송된 인증번호를 입력해주세요."); - model.addAttribute("id", resultVO.getId()); - model.addAttribute("password", authSelfPw); - - return "uat/uia/EgovLoginUsr"; - } // resultVO.siteId 의 각 로그인 ip를 조회함 // if (resultVO != null && resultVO.getId() != null && diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml index 9d228443..2d5f711e 100644 --- a/src/main/resources/egovframework/spring/com/context-security.xml +++ b/src/main/resources/egovframework/spring/com/context-security.xml @@ -32,7 +32,7 @@ jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP, USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID, - '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, mber_seq AS mber_seq, ofcps_nm as ofcps_nm, offm_telno AS offm_telno + '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, offm_telno AS offm_telno FROM COMVNUSERMASTER A INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID WHERE CONCAT(USER_SE, USER_ID) = ?" diff --git a/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uat.xml b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uat.xml new file mode 100644 index 00000000..09e2e21c --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uat.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Oracle.xml new file mode 100644 index 00000000..e0bc254f --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Oracle.xml @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + LETTNEMPLYRINFO + SET + + KAKAO_ID = #snsId# + , KAKAO_EMAIL = #snsId# + + + KAKAO_ID = #snsId# + , KAKAO_EMAIL = #snsId# + + WHERE + EMPLYR_ID = #id# + + + + + + + + + + + + + + + + + + UPDATE LETTNEMPLYRINFO + SET PASS_MISS = PASS_MISS+1 + WHERE EMPLYR_ID = #id# + + + + UPDATE LETTNEMPLYRINFO + SET PASS_MISS = 0 + WHERE EMPLYR_ID = #id# + + + + UPDATE LETTNEMPLYRINFO + SET EMPLYR_STTUS_CODE = #emplyrSttusCode# + /**삭제의 경우 삭제 일시 넣어줌 */ + , WITHDRAW_DE = now() + + /**삭제 아닌경우 삭제 일시 없애줌 */ + , WITHDRAW_DE = null + + WHERE EMPLYR_ID = #id# + + + + + + +