이지우 - 사용자 로그아웃 수정, 로그인 체크 페이지 수정(운영은 e배움터 링크로 이동)
This commit is contained in:
parent
c0fbc639fd
commit
549d45240e
@ -229,7 +229,7 @@ public class APILoginContoller {
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/web/chkloginKeyForEEdu.do", method = RequestMethod.POST)
|
||||
public ResponseEntity<Map<String, String>> loginKeytoOffedu(@RequestBody LoginVO loginVO) throws Exception{
|
||||
public ResponseEntity<Map<String, String>> loginKeytoOffedu(LoginVO loginVO) throws Exception{
|
||||
System.out.println("@@@@@@@@@찾교API시작 ID:"+loginVO.getUser_id()+"key:"+loginVO.getKey()+"@@@@@@@@@@");
|
||||
Map<String, String> response = new HashMap<>();
|
||||
try {
|
||||
@ -237,17 +237,25 @@ public class APILoginContoller {
|
||||
if(loginVO != null) {
|
||||
response.put("result_code", "1");
|
||||
response.put("message", "");
|
||||
System.out.println("@@@찾교api - ID :"+loginVO.getId()+"key:"+loginVO.getKey());
|
||||
System.out.println("@@@찾교api - ID :"+loginVO.getUser_id()+"key:"+loginVO.getKey());
|
||||
loginService.updateMberSeqKeyNull(loginVO);
|
||||
}else {
|
||||
response.put("result_code", "-1");
|
||||
response.put("message", "인증오류입니다.");
|
||||
System.out.println("@@@@@@+인증오류 -1@@@@@@");
|
||||
}
|
||||
//찾교 mber_seq key 값 파기
|
||||
System.out.println("@@@@@찾교 key 파기@@@@@@@@@@");
|
||||
System.out.println("@@@@@@response@@@@@@"+response);
|
||||
System.out.println("@@@@@@code@@@@@@"+response.get("result_code"));
|
||||
System.out.println("@@@@@@message@@@@@@"+response.get("message"));
|
||||
return ResponseEntity.ok(response);
|
||||
}catch (Exception e) {
|
||||
System.out.println("@@@@@@@에러발생@@@@@@");
|
||||
response.put("result_code", "error");
|
||||
System.out.println("@@@@@@response@@@@@@"+response);
|
||||
System.out.println("@@@@@@code@@@@@@"+response.get("result_code"));
|
||||
System.out.println("@@@@@@message@@@@@@"+response.get("message"));
|
||||
//response.put("message", "Internal Server Error: " + e.getMessage());
|
||||
response.put("message", "오류발생");
|
||||
return ResponseEntity.ok(response);
|
||||
|
||||
@ -189,6 +189,10 @@ public class EgovLoginController {
|
||||
@Resource(name = "egovCryptoUtil")
|
||||
EgovCryptoUtil egovCryptoUtil;
|
||||
|
||||
/** 구동 환경 */
|
||||
@Value("#{property['Globals.prod.islocal']}")
|
||||
private String environment;
|
||||
|
||||
|
||||
/*
|
||||
*//**
|
||||
@ -360,6 +364,7 @@ public class EgovLoginController {
|
||||
|
||||
model.addAttribute("beforeUrl", beforeUrl);
|
||||
model.addAttribute("message", message);
|
||||
model.addAttribute("environment", environment);
|
||||
// initRsa(request);
|
||||
if (test != null && test.equals("test")) {
|
||||
return "web/kccadr/login/SsoLoginUsr3";
|
||||
@ -1651,19 +1656,20 @@ public class EgovLoginController {
|
||||
// SsoLoginVO 세션 정보 취득
|
||||
SsoLoginVO ssoLoginVO = new SsoLoginVO();
|
||||
HttpSession session = request.getSession();
|
||||
ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO");
|
||||
/*ssologin에서 e배움터 API 로그인으로 변경*/
|
||||
/*ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO");
|
||||
if (ssoLoginVO != null) {
|
||||
if (!"USRCNFRM_00000002940".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002941".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002942".equals(ssoLoginVO.getMembId())
|
||||
|| !"USRCNFRM_00000002943".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002944".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002550".equals(ssoLoginVO.getMembId())
|
||||
|| !"USRCNFRM_00000002542".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002541".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002540".equals(ssoLoginVO.getMembId())
|
||||
|| !"USRCNFRM_00000002533".equals(ssoLoginVO.getMembId())) {
|
||||
/*BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope);*/
|
||||
BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope);
|
||||
BandiSSOAgent agent = new BandiSSOAgent(ssoagentinfo.getSsoUri(), ssoagentinfo.getClientId(), ssoagentinfo.getClientSecret(), ssoagentinfo.getScope());
|
||||
|
||||
// sso 로그아웃
|
||||
agent.logout(ssoLoginVO.getAccess_token(), client_ip);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
// Spring Security 로그아웃
|
||||
|
||||
@ -151,6 +151,7 @@ Globals.pdf.webpath=/pdf/out/
|
||||
#Globals.prod.islocal=local
|
||||
#\uc2e4\uc11c\ubc84
|
||||
Globals.prod.islocal=real
|
||||
#Globals.prod.islocal=svr
|
||||
|
||||
|
||||
#\ub300\uc6a9\ub7c9 innorix license
|
||||
|
||||
@ -425,7 +425,7 @@
|
||||
<select id="loginDAO.selectOffeduMberChk" resultClass="loginVO">
|
||||
/* 임시.*NOT_SQL_LOG.* loginDAO.selectOffeduMberChk */
|
||||
SELECT mber_id AS user_id
|
||||
, ESNTL_ID AS key
|
||||
, mber_seq AS key
|
||||
FROM lettngnrlmber a
|
||||
WHERE mber_id = #user_id#
|
||||
AND mber_seq = #key#
|
||||
|
||||
@ -241,10 +241,12 @@ function usrJoin(){
|
||||
</button> --%>
|
||||
|
||||
<div class="area_right">
|
||||
<!-- Sso 연계 테스트 로그인 후-->
|
||||
<!-- e배움터 로그인 연동으로 인하여 로컬, 운영 구분 -->
|
||||
<c:if test="${environment eq 'local'}">
|
||||
<p class="login_after"><c:out value="${ssoLoginVO.membName}"/><span>님</span></p>
|
||||
<p class="login_info"><a href="#" onclick="location.href='${pageContext.request.contextPath}/web/uat/uia/actionLogout.do'">로그아웃</a></p>
|
||||
<p class="login_info"><a href="#" onclick="javascript:usrModify();" title="새창열림">회원정보 수정</a></p>
|
||||
</c:if>
|
||||
<p class="login_info"><a href="#" onclick="location.href='${pageContext.request.contextPath}/web/uat/uia/actionLogout.do'">로그아웃</a></p>
|
||||
<div class="btn_util">
|
||||
<button class="btn_minus" onClick="zoomOut();" title="글자 확대"></button>
|
||||
<button class="btn_plus" onClick="zoomIn();" title="글자 축소"></button>
|
||||
|
||||
@ -12,6 +12,11 @@ $(document).ready(function(){
|
||||
if(${message != null}){
|
||||
alert('${message}');
|
||||
}
|
||||
//로컬이 아닐 시 e배움터 로그인 페이지로 이동
|
||||
var environment = '${environment}';
|
||||
if(environment != 'local'){
|
||||
location.href="http://223.255.205.7/user/member/loginForm.do?eduOff=Y";
|
||||
}
|
||||
});
|
||||
function press(event) { if (event.keyCode == 13) actionLogin(); }
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user