From 7a0fac1f97bb0568eb115c41c96e966d3698a859 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 27 Oct 2022 16:29:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20(?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EC=86=A1=EB=8B=AC=EC=84=9C?= =?UTF-8?q?=EB=A5=98=20=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dlvinfo/service/DlvinfoService.java | 4 ++- .../service/impl/DlvinfoServiceImpl.java | 13 ++++++-- .../dlvinfo/web/DlvinfoController.java | 9 ++++-- .../kccadr/certDoc/web/CertDocController.java | 4 +-- .../let/utl/fcc/service/EgovCryptoUtil.java | 2 +- .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 30 +++++++++++++++++-- 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java index 86f18399..15381227 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -2,6 +2,8 @@ package kcc.kccadr.adjPgrMgr.dlvinfo.service; import java.util.List; +import javax.servlet.http.HttpServletRequest; + public interface DlvinfoService { List selectAdjustDeliveryInfoList(DlvinfoVO dlvinfoVO) throws Exception; @@ -24,7 +26,7 @@ public interface DlvinfoService { DlvinfoVO selectAdjustDeliveryLatestInfo(DlvinfoVO dlvinfoVO) throws Exception; - public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO, HttpServletRequest request) throws Exception; int updateAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java index e990ad92..b9e591f7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java @@ -3,6 +3,7 @@ package kcc.kccadr.adjPgrMgr.dlvinfo.service.impl; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Repository; @@ -126,12 +127,20 @@ public class DlvinfoServiceImpl implements DlvinfoService { } @Override - public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO, HttpServletRequest request) throws Exception { + String serverNm = request.getServerName(); + String serverPort = String.valueOf(request.getServerPort()); + String serverScheme = request.getScheme(); + if("80".equals(serverPort)) { + serverPort = ""; + }else { + serverPort = ":" + serverPort; + } for(String target : dlvinfoDetailVO.getRpplSeqs()) { dlvinfoDetailVO.setRpplSeq(target); - dlvinfoDetailVO.setUrl("http://localhost:8089/web/kccadr/certDoc/snsLoginPage.do?rpplSeq="+dlvinfoDetailVO.getRpplSeq()+"&dlvrySeq="+dlvinfoDetailVO.getDlvrySeq()); + dlvinfoDetailVO.setUrl(serverScheme + "://" + serverNm + serverPort + "/web/kccadr/certDoc/snsLoginPage.do?rpplSeq="+dlvinfoDetailVO.getRpplSeq()+"&dlvrySeq="+dlvinfoDetailVO.getDlvrySeq()); dlvinfoDAO.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java index 01f306da..ed9b25ff 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateUtils; @@ -421,7 +422,11 @@ public class DlvinfoController { * @throws Exception */ @RequestMapping("dlvinfoUrlInsertAjax.do") - public ModelAndView dlvinfoUrlInsertAjax(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO, ModelMap model, RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { + public ModelAndView dlvinfoUrlInsertAjax(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO + , ModelMap model + , RedirectAttributes redirectAttributes + , final MultipartHttpServletRequest multiRequest + , HttpServletRequest request) throws Exception { // 로그인 정보 불러오기 LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; @@ -434,7 +439,7 @@ public class DlvinfoController { modelAndView.setViewName("jsonView"); try { - dlvinfoService.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); + dlvinfoService.insertAdjustDeliverySocialInfo(dlvinfoDetailVO, request); modelAndView.addObject("result", "success"); }catch (Exception e) { modelAndView.addObject("message", "다시 시도 부탁드립니다."); diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 5a0890d5..6cc2b6b4 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -125,7 +125,7 @@ public class CertDocController { rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()); + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); String returnUrl = ""; @@ -134,7 +134,7 @@ public class CertDocController { if(!encEmail.equals(rpplVO.getRpplEmail())){ rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); - + rs.addFlashAttribute("logout", "Y"); returnUrl = dlvinfoVO.getUrl(); return "redirect:" + returnUrl; diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 0cd0adee..cd0f2928 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -57,7 +57,7 @@ public class EgovCryptoUtil { //System.out.println(cryptoService.getCyptoAlgorithmKey()); //System.out.println(cryptoService.getCyptoAlgorithmKey()); //return cryptoService.encrypt(encrypt); // Handles URLEncoding. - return cryptoService.encryptNone(encrypt); // Does not handle URLEncoding. + return cryptoService.encryptNone(encrypt).trim(); // Does not handle URLEncoding. } catch(IllegalArgumentException e) { LOGGER.error("[IllegalArgumentException] Try/Catch...usingParameters Runing : "+ e.getMessage()); } catch (Exception e) { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 6da63646..ea2a165a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -30,8 +30,8 @@ @@ -56,7 +56,10 @@ $(document).ready(function() { alert(""); } - + var logoutYn = ""; + if(logoutYn == 'Y'){ + kakaoLogout(); + } }); $(document).on("click", "#naverLogin", function(){ var btnNaverLogin = document.getElementById("naverIdLogin").firstChild; @@ -117,4 +120,25 @@ $(document).on("click", "#naverLogin", function(){ snsLoginForm.submit(); } + + function kakaoLogout() { + if (Kakao.Auth.getAccessToken()) { + //토큰이 있으면 + Kakao.API.request({ + //로그아웃하고 + url: '/v1/user/unlink', + success: function (response) { + //console.log(response) + }, + fail: function (error) { + console.log(error) + }, + }) + //토큰도 삭제 + Kakao.Auth.setAccessToken(undefined) + //유저정보도 삭제 + const userinfoElem = document.querySelector('#userinfo') + if(userinfoElem) userinfoElem.value = '' + } + }