From efc62725775a5aefcd347f7051b60b5e8b195201 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 13 Nov 2024 17:39:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/check/WebUserCheckController.java | 10 +- .../com/user/mypage/WebMyPageController.java | 17 +- src/main/java/seed/utils/FairnetUtils.java | 3 +- src/main/webapp/WEB-INF/decorators.xml | 2 +- .../_extra/user/siren/myPage_hpParamPop.jsp | 67 +----- .../jsp/_extra/web/user/myPage/myCheck.jsp | 207 +----------------- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 189 ++++++---------- 7 files changed, 100 insertions(+), 395 deletions(-) diff --git a/src/main/java/seed/com/user/check/WebUserCheckController.java b/src/main/java/seed/com/user/check/WebUserCheckController.java index d1081f6b..e92126c1 100644 --- a/src/main/java/seed/com/user/check/WebUserCheckController.java +++ b/src/main/java/seed/com/user/check/WebUserCheckController.java @@ -337,10 +337,11 @@ public class WebUserCheckController { @RequestMapping("/web/user/siren/case/04/154/check.do") - public String getCheckCodeAndRedirect(ModelMap map, HttpServletRequest req, HttpServletResponse response, HttpSession session, - @RequestParam("retInfo") String retInfo, - @RequestParam("nextUrl") String nextUrl){ + public String getCheckCodeAndRedirect(ModelMap map, HttpServletRequest req, HttpServletResponse response, HttpSession session) { +// @RequestParam("retInfo") String retInfo, +// @RequestParam("nextUrl") String nextUrl){ + String retInfo = req.getParameter("retInfo").trim(); String hpName = ""; //성명 String hpSex = ""; //성별 @@ -460,6 +461,7 @@ public class WebUserCheckController { session.setMaxInactiveInterval(60*60*2); - return "redirect:" + nextUrl; +// return "redirect:" + nextUrl; + return "/_extra/user/siren/myPage_hpParamPop"; } } diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 9d33ee2a..0b9b1aff 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.text.ParseException; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -131,8 +132,6 @@ private Logger log = Logger.getLogger(this.getClass()); FairnetUtils.certSet(map, req, session, "my"); } - System.out.println("session.getId1111111111 :: " + session.getId()); - session.removeAttribute("myPass"); setSessionMessageRemove(session); @@ -1014,12 +1013,20 @@ private Logger log = Logger.getLogger(this.getClass()); } @RequestMapping("/web/user/mypage/case/01/168/devCiMakePopCiCheck.do") - public String devCiMakePopCiCheck(ModelMap map + public ResponseEntity devCiMakePopCiCheck(ModelMap map , HttpSession session , HttpServletRequest req ){ - - return "/web/xxx/devCiMakePop"; + // JSON 데이터 받기 + Map returnMap = new HashMap(); + try { + returnMap.put("hpCi1",req.getSession().getAttribute("hpCi1")); + returnMap.put("hpName",req.getSession().getAttribute("hpName")); + + } catch (Exception e) { + e.printStackTrace(); + } + return new ResponseEntity<>(returnMap, HttpStatus.OK); } @RequestMapping("/web/user/mypage/case/01/168/devCiRemove.do") diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 4839c039..80b1d21e 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -173,7 +173,8 @@ public class FairnetUtils { retUrl = CertGlobalSet.getRetUrl() + "/web/user/extra/case/siren/myPage_ipin_popup_seed/jsp/Page.do"; // hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do"; +// hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do"; + hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/siren/case/04/154/check.do"; }else if(commandCode.equals("online")){//온라인 분쟁조정 상담 본인인증 //개발서버 diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 6c778c84..083f4ee6 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -155,7 +155,7 @@ /web/kccadr/adjst/adjstProgressTutorial.do /kccadr/textsence/textSenseResponse.do /web/user/mypage/case/01/168/devCiMakePop.do - + /web/user/siren/case/04/154/check.do diff --git a/src/main/webapp/WEB-INF/jsp/_extra/user/siren/myPage_hpParamPop.jsp b/src/main/webapp/WEB-INF/jsp/_extra/user/siren/myPage_hpParamPop.jsp index fe5c41e8..7fddb3b8 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/user/siren/myPage_hpParamPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/user/siren/myPage_hpParamPop.jsp @@ -1,72 +1,15 @@ -<%@ page contentType = "text/html;charset=ksc5601"%> -<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> -<% - response.setHeader("Cache-Control","no-cache"); - response.setHeader("Pragma","no-cache"); -%> -<% - String param = ""; - String enc_retInfo = request.getParameter("retInfo").trim(); - /* String nextUrl = "/user/mypage/case/01/168/myMediationList.do"; */ - String nextUrl = "/"; - - param= "?retInfo="+enc_retInfo+"&nextUrl="+ nextUrl; - - - /* Ȯΰ */ - String hpResult = ""; // Ȯΰ (Y/N) - - //ȭȭ - String hpEncPara = ""; - String hpEncMsg = ""; - String hpMsgChk = "N"; - - String hpReqNumKey = (String)session.getAttribute("hpReqNumKey"); - - // 1. ȣȭ (jar) Loading - com.sci.v2.pcc.secu.SciSecuManager sciSecuMg = new com.sci.v2.pcc.secu.SciSecuManager(); - //Ű Key Ѵ. - enc_retInfo = sciSecuMg.getDec(enc_retInfo, hpReqNumKey); - - // 2.1 Ľ--------------------------------------------------------------- - String[] aRetInfo1 = enc_retInfo.split("\\^"); - hpEncPara = aRetInfo1[0]; //ȣȭ Ķ - hpEncMsg = aRetInfo1[1]; //ȣȭ Ķ Hash - - String encMsg2 = sciSecuMg.getMsg(hpEncPara); - // 3./ --------------------------------------------------------------- - if(encMsg2.equals(hpEncMsg)){ - hpMsgChk="Y"; - } - - - enc_retInfo = sciSecuMg.getDec(hpEncPara, hpReqNumKey); - String[] aRetInfo = enc_retInfo.split("\\^"); - - hpResult = aRetInfo[9]; - - -%> - +<%-- <%@ page contentType = "text/html;charset=ksc5601"%> --%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="UTF-8"%> +<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> - <%-- - - - --%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myCheck.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myCheck.jsp index 1a1c4f59..01afea4f 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myCheck.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myCheck.jsp @@ -8,24 +8,9 @@ <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %> <%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> - +
@@ -83,18 +49,6 @@ 휴대폰 인증하기 - <%--
  • - -
    • -
  • - -
    • --%>
    • - - - - - - - - - - - - - - - - - -<%-- - - - <c:out escapeXml='true' value='${siteMenuTitle}'/> - - - - - - - - - - - - - - - - - - - - -
    -     - - - - - - - - - -
    -
    -

    본문

    -
    -

    마이페이지

    -
    -
    -
    -

    본인인증

    -
      -

    • 「개인정보 보호법」개정시행(2014.8.7)에 따라 분쟁조정 신청단계에서는 고유식별정보(주민등록번호)를 수집하지 아니하고 '휴대폰 인증‘ 및 ‘아이핀(I-Pin)’으로 고유식별정보를 대체합니다.

      • - -

    • 한국공정거래조정원에서는 보다 깨끗하고 안정적인 서비스를 제공하기 위해 아이핀(I-Pin) 및 휴대폰인증을 통한 본인확인제를 실시하고 있습니다.

      • -
    -
    -
    - 휴대폰 인증하기 - 아이핀 인증하기 - 공인인증서 -
    -
    -
    -

    본인인증은 본인 명의의 휴대폰 인증을 통해서만 가능하며, 사업자 대표가 아닌 자(소속 임직원, 법무법인, 친인척 등)가 신청하는 경우 추후 조정절차 과정에서 추가로 관련 자료의 제출 요구를 받으실 수 있습니다.

    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index ac936a08..bcfcfbef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -3,7 +3,6 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ page import="egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper" %> -<%@ page import="kcc.com.cmm.LoginVO" %> @@ -77,12 +75,12 @@
    - - - - - - +
    + + +
    @@ -147,97 +145,57 @@
    -
    -
    -

    한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY

    - -
    -
    - -
    - +
    +
    +

    한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY

    + +
    +
    + +
    @@ -249,14 +207,14 @@
    - +
    - - - - +
    + + +

    @@ -292,7 +250,6 @@ -