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

test

Browse Source
This commit is contained in:
leejunho 2023-11-14 15:37:08 +09:00
parent b89ab6814f
commit cb5500c533
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/kcc/let/uat/uia/web/SSOValid.java
View File

@ -141,23 +141,24 @@ public class SSOValid implements Filter {
SsoLoginVO ssoLoginVO = new SsoLoginVO(); SsoLoginVO ssoLoginVO = new SsoLoginVO();
ssoLoginVO = (SsoLoginVO)session.getAttribute("SSOLoginVO"); ssoLoginVO = (SsoLoginVO)session.getAttribute("SSOLoginVO");
//LoginVO 세션 정보 취득
LoginVO loginVO = new LoginVO();
loginVO = (LoginVO)session.getAttribute("LoginVO");
try { try {
if(ssoLoginVO != null) { if(ssoLoginVO != null) {
if("N".equals(ssoLoginVO.getOtherUser())){ if("N".equals(ssoLoginVO.getOtherUser())){
//LoginVO 세션 정보 취득
// LoginVO loginVO = new LoginVO();
// loginVO = (LoginVO)session.getAttribute("LoginVO");
//SSO 로그인 연계 BandiSSOAgent 생성 //SSO 로그인 연계 BandiSSOAgent 생성
BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope); BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope);
HashMap<String, String> tokenValid = agent.tokenValid(ssoLoginVO.getAccess_token(), client_ip); HashMap<String, String> tokenValid = agent.tokenValid(ssoLoginVO.getAccess_token(), client_ip);
if(tokenValid.get("error").equals("0000")) { if(tokenValid.get("error").equals("0000")) {
if(loginVO == null) { // if(loginVO == null) {
// HttpServletResponse httpServletResponse = (HttpServletResponse) response; // HttpServletResponse httpServletResponse = (HttpServletResponse) response;
// httpServletResponse.sendRedirect("/web/user/login/actionSecurityLogin.do"); // httpServletResponse.sendRedirect("/web/user/login/actionSecurityLogin.do");
} // }
}else { }else {
//SSO 로그아웃 요청 //SSO 로그아웃 요청
agent.logout(ssoLoginVO.getAccess_token(), client_ip); agent.logout(ssoLoginVO.getAccess_token(), client_ip);
@ -180,6 +181,10 @@ public class SSOValid implements Filter {
} }
} }
}else { }else {
//LoginVO 세션 정보 취득
LoginVO loginVO = new LoginVO();
loginVO = (LoginVO)session.getAttribute("LoginVO");
if(loginVO != null) { if(loginVO != null) {
LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();

12
src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml
View File

@ -53,12 +53,14 @@
A.STOPVEW_SETUP_AT, A.STOPVEW_SETUP_AT,
A.NTCE_AT, A.NTCE_AT,
DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM,
(SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.FRST_REGISTER_ID) FRST_REGISTER_NM, t1.USER_NM AS FRST_REGISTER_NM,
A.POPUP_TYPE, A.POPUP_TYPE,
A.SCROLL_TYPE, A.SCROLL_TYPE,
A.NTT_CN, A.NTT_CN,
A.SORT_NUM A.SORT_NUM
FROM COMTNPOPUPMANAGE A FROM COMTNPOPUPMANAGE A
LEFT JOIN LETTNEMPLYRINFO t1
ON t1.ESNTL_ID = A.FRST_REGISTER_ID
WHERE 1=1 WHERE 1=1
AND A.NTCE_AT = 'Y' AND A.NTCE_AT = 'Y'
AND DATE_FORMAT(NOW(),'%Y%m%d%H%i') >= NTCE_BGNDE AND DATE_FORMAT(NOW(),'%Y%m%d%H%i') >= NTCE_BGNDE
@ -291,9 +293,11 @@
USE_YN, USE_YN,
SORT, SORT,
DATE_FORMAT(REGDT, '%Y-%m-%d %h:%m:%s') REGDT, DATE_FORMAT(REGDT, '%Y-%m-%d %h:%m:%s') REGDT,
(SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID, USER_NM AS REGISTER_ID,
SITE_ID SITE_ID
FROM POPUPZONE MB FROM POPUPZONE MB
LEFT JOIN LETTNEMPLYRINFO t1
ON t1.ESNTL_ID = MB.REGISTER_ID
WHERE DEL = '0' WHERE DEL = '0'
]]> ]]>
<isNotEmpty property="searchKeyword"> <isNotEmpty property="searchKeyword">
@ -519,9 +523,11 @@
SORT, SORT,
MAZ_NM, MAZ_NM,
USE_YN, USE_YN,
(SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID , t1.USER_NM AS REGISTER_ID,
DEVICETYPE DEVICETYPE
FROM MAINZONE MB FROM MAINZONE MB
LEFT JOIN LETTNEMPLYRINFO t1
ON t1.ESNTL_ID = MB.REGISTER_ID
WHERE 1=1 WHERE 1=1
]]> ]]>
<isEqual property="useYn" compareValue="Y"> <isEqual property="useYn" compareValue="Y">