tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2023-10-25 15:43:26 +09:00
commit 946df34bc2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
View File

@ -365,6 +365,10 @@ public class EgovLoginController {
model.addAttribute("beforeUrl", beforeUrl); model.addAttribute("beforeUrl", beforeUrl);
model.addAttribute("message", message); model.addAttribute("message", message);
model.addAttribute("environment", environment); model.addAttribute("environment", environment);
//운영서버는 sso로그인 화면이 아닌 e배움터 로그인 화면으로 이동.
if(!"local".equals(environment)) {
return "redirect:http://223.255.205.7/user/member/loginForm.do?eduOff=Y";
}
// initRsa(request); // initRsa(request);
if (test != null && test.equals("test")) { if (test != null && test.equals("test")) {
return "web/kccadr/login/SsoLoginUsr3"; return "web/kccadr/login/SsoLoginUsr3";

3
src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java
View File

@ -489,6 +489,9 @@ public class ExprnClsrmAplctController {
public String exprnClsrmAplctDashboard( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { public String exprnClsrmAplctDashboard( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception {
//현재 진행중인 체험교실 운영 조회 //현재 진행중인 체험교실 운영 조회
LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
if (loginVO == null) {
return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다.
}
String eduAplctOrd = vEEduAplctService.selectProceedingOrd(loginVO.getUniqId()); String eduAplctOrd = vEEduAplctService.selectProceedingOrd(loginVO.getUniqId());
if(eduAplctOrd != null) { if(eduAplctOrd != null) {

5
src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp
View File

@ -12,11 +12,6 @@ $(document).ready(function(){
if(${message != null}){ if(${message != null}){
alert('${message}'); 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(); } function press(event) { if (event.keyCode == 13) actionLogin(); }