diff --git a/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java b/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java index cb813bbb..0d09c5c8 100644 --- a/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java +++ b/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java @@ -96,4 +96,6 @@ public interface EgovLoginService { void updateMberSeqKeyAjax(LoginVO vo) throws Exception; void updateMberSeqKeyNull(LoginVO vo) throws Exception; + + LoginVO actionLoginMberId(LoginVO vo) throws Exception; } 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 f8705d29..8c8cc15a 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 @@ -291,4 +291,27 @@ public class EgovLoginServiceImpl extends EgovAbstractServiceImpl implements public void updateMberSeqKeyNull(LoginVO vo) throws Exception { loginDAO.updateMberSeqKeyNull(vo); } + + @Override + public LoginVO actionLoginMberId(LoginVO vo) throws Exception { + + //최고관리자를 제외한 사용자 sso 로그인으로 비밀번호 암호화 삭제(210818, 이준호) + // 1. 입력한 비밀번호를 암호화한다. + if("USR".equals(vo.getUserSe())) { + String enpassword = EgovFileScrty.encryptPassword(vo.getPassword(), vo.getId()); + vo.setPassword(enpassword); + } + + // 2. 아이디와 암호화된 비밀번호가 DB와 일치하는지 확인한다. + LoginVO loginVO = loginDAO.actionLoginMberId(vo); + + // 3. 결과를 리턴한다. + if (loginVO != null && !loginVO.getId().equals("") && !loginVO.getPassword().equals("")) { + return loginVO; + } else { + loginVO = new LoginVO(); + } + + return loginVO; + } } diff --git a/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java b/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java index 7769173b..48fcb074 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java @@ -145,4 +145,8 @@ public class LoginDAO extends EgovAbstractDAO { update("loginDAO.updateMberSeqKeyNull", vo); } + + public LoginVO actionLoginMberId(LoginVO vo) throws Exception { + return (LoginVO)select("loginDAO.actionLoginMberId", vo); + } } diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index 1e661b01..c2163a39 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.http.ResponseEntity; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -58,6 +59,10 @@ public class APILoginContoller { @Resource(name = "loginService") private EgovLoginService loginService; + /** 구동 환경 */ + @Value("#{property['Globals.prod.islocal']}") + private String environment; + /** * @methodName : loginKeyChk * @author : 이지우 @@ -185,6 +190,9 @@ public class APILoginContoller { } byte[] postDataBytes = postData.toString().getBytes("UTF-8"); URL obj = new URL("http://223.255.205.7/notdeco/mbrLinkSso.do"); + if("real".equals(environment)) { + obj = new URL("https://edu-copyright.or.kr/notdeco/mbrLinkSso.do"); + } HttpURLConnection con = (HttpURLConnection)obj.openConnection(); con.setRequestMethod("POST"); con.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length)); 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 22a450d1..c09195f9 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -365,10 +365,15 @@ public class EgovLoginController { model.addAttribute("beforeUrl", beforeUrl); model.addAttribute("message", message); model.addAttribute("environment", environment); - //운영서버는 sso로그인 화면이 아닌 e배움터 로그인 화면으로 이동. - if(!"local".equals(environment)) { + //로컬은 셀렉트박스 로그인 + //개발은 e배움터 개발서버 로그인 + //운영은 e배움터 운영서버 로그인 + if("dev".equals(environment)) { return "redirect:http://223.255.205.7/user/member/loginForm.do?eduOff=Y"; } + if("real".equals(environment)) { + return "redirect:https://edu-copyright.or.kr/user/member/loginForm.do?eduOff=Y"; + } // initRsa(request); if (test != null && test.equals("test")) { return "web/kccadr/login/SsoLoginUsr3"; @@ -718,7 +723,13 @@ public class EgovLoginController { loginVO.setStatusAll("N"); ssologinVO.setMembSeq(loginVO.getId()); //중요 //loginVO = loginService.actionLogin(loginVO); - loginVO = loginService.actionLoginDev(loginVO); //개발자 아이디 선택 로그인시 + + //기존에 개발자 로그인은 selectbox와 mber_seq로 로그인 처리. + //e배움터 연동 후 mber_seq는 key로 사용하기 때문에 mber_id로 로그인 처리 과정 + //loginVO = loginService.actionLoginDev(loginVO); //개발자 아이디 선택 로그인시 + loginVO = loginService.actionLoginMberId(loginVO); + + //ssologinVO.setMembSeq(loginVO.getId()); //중요 //loginVO = loginService.actionLoginDev(loginVO); //개발자 아이디 선택 로그인시 diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 73c33510..7dfd3011 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -22,12 +22,18 @@ Globals.LocalIp = 127.0.0.1 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 Globals.DbType = tibero # \uac1c\ubc1c\uc6a9 DB \uc11c\ubc84 tibero \uc5f0\ub3d9 -Globals.UserName= EDUSCE -Globals.Password= edusce#23 +#Globals.UserName= EDUSCE +#Globals.Password= edusce#23 +Globals.UserName= teduUr +Globals.Password= tedu1234 Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver -#\uac1c\ubc1c DB \uc11c\ubc84 -Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb +#\ub85c\uceec DB +Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero +#\uc6b4\uc601 \uac1c\ubc1cDB +#Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb +#\uc6b4\uc601 DB +#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) @@ -147,9 +153,12 @@ Globals.pdf.webpath=/pdf/out/ #Globals.pdf.webpath=/pdf/out/ #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 -#\uac1c\ubc1c\uc11c\ubc84 +#\ub85c\uceec +#Globals.prod.islocal=local +#\uc6b4\uc601 \uac1c\ubc1c +#\uac1c\ubc1c \uc11c\ubc84 \ud14c\uc2a4\ud2b8\ub97c \uc704\ud574 DB\ub294 \ub85c\uceec\uc744 \ubc14\ub77c\ubcf4\uba70 \ub85c\uadf8\uc778\uc740 e\ubc30\uc6c0\ud130 \uc5f0\ub3d9 \ucc98\ub9ac\ub97c \uc704\ud574 islocal \uad6c\ubd84 Globals.prod.islocal=dev -#\uc2e4\uc11c\ubc84 +#\uc6b4\uc601 #Globals.prod.islocal=real diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 1f5ceaaf..45c6f811 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -26,8 +26,12 @@ Globals.UserName= EDUSCE Globals.Password= edusce#23 Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver -#\uac1c\ubc1c DB \uc11c\ubc84 -Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb +#\ub85c\uceec DB +#Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero +#\uc6b4\uc601 \uac1c\ubc1cDB - \ud14c\uc2a4\ud2b8 \uc644\ub8cc \ud6c4 \uc6b4\uc601 DB\ub85c \ubcc0\uacbd \uc608\uc815 +Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb +#\uc6b4\uc601 DB +#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) @@ -147,11 +151,12 @@ Globals.pdf.webpath=/pdf/out/ #Globals.pdf.webpath=/pdf/out/ #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 -#\uac1c\ubc1c\uc11c\ubc84 +#\ub85c\uceec #Globals.prod.islocal=local -#\uc2e4\uc11c\ubc84 +#\uc6b4\uc601 \uac1c\ubc1c +#Globals.prod.islocal=dev +#\uc6b4\uc601 Globals.prod.islocal=real -#Globals.prod.islocal=svr #\ub300\uc6a9\ub7c9 innorix license diff --git a/src/main/resources/egovframework/egovProps/globals_tLocal.properties b/src/main/resources/egovframework/egovProps/globals_tLocal.properties index 8ab0c9e7..5a9f7d91 100644 --- a/src/main/resources/egovframework/egovProps/globals_tLocal.properties +++ b/src/main/resources/egovframework/egovProps/globals_tLocal.properties @@ -26,8 +26,12 @@ Globals.UserName= teduUr Globals.Password= tedu1234 Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver -#\uac1c\ubc1c DB \uc11c\ubc84 +#\ub85c\uceec DB Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero +#\uc6b4\uc601 \uac1c\ubc1cDB +#Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb +#\uc6b4\uc601 DB +#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) @@ -147,9 +151,11 @@ Globals.pdf.webpath=/pdf/out/ #Globals.pdf.webpath=/pdf/out/ #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 -#\uac1c\ubc1c\uc11c\ubc84 +#\ub85c\uceec Globals.prod.islocal=local -#\uc2e4\uc11c\ubc84 +#\uc6b4\uc601 \uac1c\ubc1c +#Globals.prod.islocal=dev +#\uc6b4\uc601 #Globals.prod.islocal=real diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml index 6bed7ed1..0e755fd4 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml @@ -118,6 +118,53 @@ + + + - + @@ -241,11 +245,15 @@ function usrJoin(){ --%>
- - - - - + + + + + + + + +
@@ -297,7 +305,7 @@ function usrJoin(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp index 6982c80c..c2a89238 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp @@ -124,7 +124,9 @@ function usrIdPassFind(choose){ 개발자 아이디 선택 :