From 51f6053c7afb840e3fcf5bf3ecfb117951313c5f Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 30 Dec 2024 17:05:37 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20>=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20>=20=EC=9D=B4=EC=A0=84=EC=82=AC=EA=B1=B4=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/SocialCertController.java | 4 +- .../user/check/WebUserCheckController.java | 2 +- .../mediation/WebMediationController.java | 2 +- .../com/user/mypage/WebMyPageController.java | 243 +++++++++++++++++- src/main/java/seed/utils/FairnetUtils.java | 4 + .../config/mappers/mypage/mypage_sql.xml | 14 +- .../web/user/myPage/myMediationView.jsp | 8 +- .../web/user/myPage/myPastMediationList.jsp | 131 ++++++++++ .../gtm/trublprocessmng/fileAtchPop.jsp | 2 +- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 10 +- 10 files changed, 403 insertions(+), 17 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp diff --git a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java index 56113c18..d010a2a7 100644 --- a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java +++ b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java @@ -231,7 +231,7 @@ public class SocialCertController { returnData.put("msg", "인증되었습니다."); //세션 등록 - FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP())); + FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP()), ""); certVO.setPhone(nDecrypt(result.getReceiverHP())); certVO.setName(nDecrypt(result.getReceiverName())); @@ -302,7 +302,7 @@ public class SocialCertController { returnData.put("msg", "인증되었습니다."); //세션 등록 - FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP())); + FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP()), ""); certVO.setPhone(kDecrypt(result.getReceiverHP())); certVO.setName(kDecrypt(result.getReceiverName())); diff --git a/src/main/java/seed/com/user/check/WebUserCheckController.java b/src/main/java/seed/com/user/check/WebUserCheckController.java index f0a36ff8..c9c73983 100644 --- a/src/main/java/seed/com/user/check/WebUserCheckController.java +++ b/src/main/java/seed/com/user/check/WebUserCheckController.java @@ -419,7 +419,7 @@ public class WebUserCheckController { e.printStackTrace(); } - FairnetUtils.setCertSession(req, hpName, hpCellNo); + FairnetUtils.setCertSession(req, hpName, hpCellNo, hpDi); CertVO certVO = new CertVO(); certVO.setName(hpName); diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index f025d97c..dbb8ec49 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -2970,7 +2970,7 @@ public class WebMediationController { caseAuthVO.setCertId(certVO.getCertId()); //등록자 승인 완료 설정 - caseAuthVO.setCaseAuthType("REG"); + caseAuthVO.setCaseAuthType("reg"); caseAuthVO.setCaseAuthYn("Y"); caseAuthService.insertCaseAuth(caseAuthVO); diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 57661921..569e527a 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -461,6 +461,7 @@ private Logger log = Logger.getLogger(this.getClass()); //페이지용 추가 1 try { paramMap.put("hpDi", session.getAttribute("hpDi")); + paramMap.put("certDi", session.getAttribute("certDi")); }catch(Exception ex) { paramMap.put("hpDi", "hpDi"); ex.printStackTrace(); @@ -480,8 +481,8 @@ private Logger log = Logger.getLogger(this.getClass()); PageMaker pageMaker = new PageMaker(); pageMaker.setCri(cri); + //2025년 1월 1일 데이터부터 조회 pageMaker.setTotalCount(service.myPageListCnt(paramMap)); - map.put("myPageList", service.myPageList(paramMap)); map.put("pageMaker", pageMaker); }catch(Exception ex) { @@ -503,6 +504,236 @@ private Logger log = Logger.getLogger(this.getClass()); return new ModelAndView("/_extra/web/user/myPage/myMediationList"); } + // /user/mypage/case/01/169/myMediationList.do + @RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myPastMediationList.do") + public ModelAndView myPastMediationList(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map paramMap, Criteria cri, + @PathVariable(value="siteIdx") String siteIdx, + @PathVariable(value="siteMenuIdx") Integer siteMenuIdx + ){ + + /* + if(SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ + map.put("siteIdx", "case"); + map.put("url", "/web/user/mypage/case/01/168/myCheck.do"); + map.put("message", "common.message.my.check"); + map.put("opener", ""); + map.put("append", ""); + map.put("self", ""); + + return new ModelAndView("/_common/jsp/umessage"); + } + */ + + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + + System.out.println("1"); + + boolean b_ret_u = true; + map = FairnetUtils.myCheck(map, session); + b_ret_u = (boolean)map.get("b_ret"); + + if (!b_ret_u) { + return new ModelAndView("/_common/jsp/umessage"); + } + + setSessionMessageRemove(session); + + /*----권한체크----*/ + Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0")); + String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N"); + boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx); + boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); + + System.out.println("12"); + + //메뉴 권한설정 + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth && + !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){ + + map.put("message", "common.message.no.grant"); + + if(memberIdx.equals(0)){ + map.put("url", "/"+siteIdx+"/index.do"); + }else{ + map.put("self", "history"); + } + + return new ModelAndView("/_common/jsp/umessage"); + } + */ + + boolean b_ret = true; + b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map); + + if (!b_ret) { + return new ModelAndView("/_common/jsp/message"); + } + + + Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, + new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", + "siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1", + "tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"}); + + System.out.println("13"); + + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){ + if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){ + map.put("message", "common.message.no.siteMenu"); + map.put("self", "history"); + return new ModelAndView("/_common/jsp/umessage"); + } + } + */ + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){ + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + try{ + + Date getDate = new Date(); + + Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate"))); + Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate"))); + + if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) || + (sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){ + return new ModelAndView("redirect:/user/common/service/"+siteIdx+".do"); + } + + }catch(ParseException e){ + log.error("CHECK ERROR:",e); + } + } + + System.out.println("14"); + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") || + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){ + return new ModelAndView("redirect:"+SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuLinkUrl"))); + } + + String siteMenuManager = "N"; + StringBuffer siteMenuManagerIdx = new StringBuffer(); + String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N"); + + List> siteMenuManagerList = + managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"}); + + System.out.println("15"); + + for(int i=0; i tSiteMenuManagerDB = siteMenuManagerList.get(i); + + if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){ + + if(!memberIdx.equals(0) && + memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) && + siteMenuManager.equals("N")){ + siteMenuManager = "Y"; + } + siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString()); + siteMenuManagerIdx.append(","); + } + } + + if(memberGrant.equals("S") || memberAuthM){ + siteMenuManager = "Y"; + } + + System.out.println("16"); + + //편집 권한 + map.put("siteMenuManager", siteMenuManager); + //담당자 보기 설정 + map.put("siteMenuCharge", siteMenuCharge); + //담당자 이름 + map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString()); + //만족도 설정 + map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N")); + + map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1")))); + + String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("》", "|") + + " | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName")); + + map.put("siteMenuTitle", siteMenuTitle); + + System.out.println("157"); + + //부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴 + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){ + String[] siteMenuTitles = siteMenuTitle.split("\\|"); + tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]); + } + + map.put("tSiteMenuDB", tSiteMenuDB); + + map.put("memberAuthM", memberAuthM); + map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx)); + /*----권한체크 종료----*/ + + System.out.println("158"); + + //여기서부터 작업할거 + //페이징 관련 + paramMap.put("pageStart", cri.getPageStart()); + paramMap.put("perPageNum", cri.getPerPageNum()); + + //페이지용 추가 1 + try { + paramMap.put("hpDi", session.getAttribute("hpDi")); + paramMap.put("certDi", session.getAttribute("certDi")); + }catch(Exception ex) { + paramMap.put("hpDi", "hpDi"); + ex.printStackTrace(); + } + + //사건권한 설정 + try { + CertVO certVO = certService.selectCert(FairnetUtils.getCertSession(req)); + paramMap.put("certName", certVO.getName()); + paramMap.put("certPhone", certVO.getPhone()); + }catch(Exception ex) { + ex.printStackTrace(); + } + + //페이지용 추가 2 + try { + PageMaker pageMaker = new PageMaker(); + pageMaker.setCri(cri); + + //2025년 1월 1일 이전 데이터 조회 + paramMap.put("viewPoint", "past"); + pageMaker.setTotalCount(service.myPageListCnt(paramMap)); + map.put("myPageList", service.myPageList(paramMap)); + map.put("pageMaker", pageMaker); + }catch(Exception ex) { + ex.printStackTrace(); + } + + System.out.println("159"); + + System.out.println(paramMap); + System.out.println("160"); + System.out.println(map); + + System.out.println("161"); + + if ("temp".equals((String)paramMap.get("command"))) { + return new ModelAndView("/_extra/web/user/myPage/myMediationTempList"); + } + + return new ModelAndView("/_extra/web/user/myPage/myPastMediationList"); + } + // /user/mypage/case/01/169/myMediationView.do @RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myMediationDetail.do") public ModelAndView myMediationView(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map paramMap, @@ -659,8 +890,17 @@ private Logger log = Logger.getLogger(this.getClass()); CaseAuthVO caseAuthVO = new CaseAuthVO(); caseAuthVO.setCertId(certVO.getCertId()); caseAuthVO.setRceptNo(SeedUtils.setReplaceNull(paramMap.get("rceptNo"))); + + //등록자 이전사건조회에서 상세 넘어갈 시 권한 등록하기 + caseAuthVO.setCaseAuthType("reg"); + caseAuthVO.setCaseAuthYn("N"); + caseAuthService.insertCaseAuth(caseAuthVO); + caseAuthVO = caseAuthService.selectCaseAuthExist(caseAuthVO); map.put("caseAuthVO", caseAuthVO);//구분 + + + } }catch(Exception e) { e.printStackTrace(); @@ -1082,6 +1322,7 @@ private Logger log = Logger.getLogger(this.getClass()); req.getSession().removeAttribute("certNm"); req.getSession().removeAttribute("certHpNo"); + req.getSession().removeAttribute("certDi"); return "redirect:/"; } diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 796a0ac1..3a922466 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -251,10 +251,14 @@ public class FairnetUtils { HttpServletRequest reqeust , String certNm , String certHpNo + , String certDi ) { HttpSession session = reqeust.getSession(); session.setAttribute("certNm", certNm); session.setAttribute("certHpNo", certHpNo); + if(!"".equals(certDi)) { + session.setAttribute("certDi", certDi); + } session.setMaxInactiveInterval(60*60*2); } diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml index 677b6429..bb7ae257 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml @@ -69,15 +69,18 @@ WHERE UCA.RCEPT_NO = RCEPT_NO AND UC.CERT_NAME = #{certName} AND UC.CERT_PHONE = #{certPhone} - AND UCA.CASE_AUTH_YN = 'Y' ) - OR APPLCNT_DI = #{hpDi} + OR APPLCNT_DI = #{certDi} ) AND DEL_GUBUN = 'N' AND REQUEST_CHECK = '1601000000' AND REQUEST_CHECK = '1602000000' + + AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE + AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD') + ORDER BY RCEPT_NO DESC ) ROW_ ) @@ -97,15 +100,18 @@ WHERE UCA.RCEPT_NO = RCEPT_NO AND UC.CERT_NAME = #{certName} AND UC.CERT_PHONE = #{certPhone} - AND UCA.CASE_AUTH_YN = 'Y' ) - OR APPLCNT_DI = #{hpDi} + OR APPLCNT_DI = #{certDi} ) AND DEL_GUBUN = 'N' AND REQUEST_CHECK = '1601000000' AND REQUEST_CHECK = '1602000000' + + AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE + AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD') + diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp index 568748e6..ff3b9205 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp @@ -30,8 +30,12 @@ } function goList(){ - - location.href="/web/user/mypage/case/01/169/myMediationList.do?page=1"; + var viewPoint = '${param.viewPoint}'; + if(viewPoint == 'past'){ + location.href="/web/user/mypage/case/01/169/myPastMediationList.do?page=1"; + }else{ + location.href="/web/user/mypage/case/01/169/myMediationList.do?page=1"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp new file mode 100644 index 00000000..7aff5716 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp @@ -0,0 +1,131 @@ +<%@ page language='java' contentType='text/html; charset=UTF-8'%> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %> +<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> + + + + + + + + + + + + + + + + + + + + + + +
+ + +
    +
    • +
  • 마이페이지
    • +
  • 이전사건조회
    • +
+ + +

이전사건조회

+ +
    +
+ +
+ +
+

전체 건 (1/1페이지)

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
상태문서 등록번호신청인피신청인사건번호담당자신청일
${list.STATE}문서 등록번호 : ${list.RCEPT_NO }${list.APPLCNT_NM}${list.RESPONDENT_CEO } 외${list.RES_CNT-1 }명${list.CASE_NO}${list.EXAMINER_ASSIGN_NAME}${list.REG_DT}
등록된 데이터가 없습니다.
+
+

※ 사건접수 완료 후 진행상황은 홈페이지 메뉴 분쟁조정 사건조회에서 조회가 가능합니다.

+ +
+ + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp index 4c43edef..5168e74f 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp @@ -335,7 +335,7 @@ function fn_gwGo(fileKey){ - +
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index d9bd3e28..b53407d9 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -3347,10 +3347,10 @@ function atendReqPopOpen(caseNo){ window.open(popUrl, "", popOption); } -function fileFirstPopOpen(p_caseNo, p_rceptNo, p_fileFuncType, p_approKey, fileGubun){ +function fileFirstPopOpen(p_caseNo, p_rceptNo, p_gwId, p_fileFuncType, p_approKey, fileGubun){ //alert('작업중') //return; - var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo +"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; + var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo + "&loginId=" + p_gwId + "&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; window.open(popUrl, "", popOption); } @@ -3772,17 +3772,17 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, if (jobID=='1-1'||jobID=='2-1' ||jobID=='3-1'||jobID=='4-1' ||jobID=='5-1'||jobID=='6-1'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-1',r.data2.docId, '4840000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-1',r.data2.docId, '4840000000'); }else if(jobID=='1-11'||jobID=='2-11' ||jobID=='3-11'||jobID=='4-11' ||jobID=='5-11'||jobID=='6-11'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-2',r.data2.docId, '4841000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-2',r.data2.docId, '4841000000'); }else if(jobID=='1-12'||jobID=='2-12' ||jobID=='3-12'||jobID=='4-12' ||jobID=='5-12'||jobID=='6-12'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-3',r.data2.docId, '4842000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-3',r.data2.docId, '4842000000'); }else{ var f = document.nanumViewFrm; From b9d1f8326bf6d12b08e30f41250d6376fbb9abab Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 31 Dec 2024 11:25:01 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=8B=A4=EC=84=9C=EB=B2=84=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/SocialCertController.java | 6 +++-- .../egovProps/globals_svr.properties | 6 ++--- src/main/resources/log4j2.xml | 6 ++--- .../jsp/_extra/web/user/myPage/myCheck.jsp | 27 ++++++++++--------- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java index 56113c18..ee5b6a81 100644 --- a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java +++ b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java @@ -366,9 +366,11 @@ public class SocialCertController { private String kDecrypt(String param) { // 복호화 키 - String secretKey = "+EJwVvo37PY1v4zcENdmGezYXwCdmtUlbaNVI0kvrFM="; +// String secretKey = "+EJwVvo37PY1v4zcENdmGezYXwCdmtUlbaNVI0kvrFM="; + String secretKey = "5n7Zmp9J04TRHpJI4tmBE9N84yBMl8RWCQIa9tjX7f4="; // 초기화 벡터 - String iv = "uG+F70tIcBb3z1lh8RcVDQ=="; +// String iv = "uG+F70tIcBb3z1lh8RcVDQ=="; + String iv = "2qL7BcJrSkeflRNIPznR+g=="; // 암호문 String cipherText = SeedUtils.setReplaceNull(param); try { diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 9c7e6b17..aaf9a122 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -21,12 +21,12 @@ Globals.LocalIp = 127.0.0.1 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 Globals.DbType = oracle -Globals.UserName= FAIRNETUR -Globals.Password= FAIRNETUR!@#$ +Globals.UserName= newcasedb +Globals.Password= newcasedb1130 # oracle Globals.DriverClassName=oracle.jdbc.OracleDriver -Globals.Url=jdbc:oracle:thin:@211.245.106.125:1521:XE +Globals.Url=jdbc:oracle:thin:@211.245.106.125:1521:kofairdb # MainPage Setting(admin) Globals.MainPage = /cmm/main/mainPage.do diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 00d7d3b7..f63e4907 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -12,10 +12,10 @@ - + - - + + 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 d486b646..2d94508b 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 @@ -7,6 +7,7 @@ <%@ page language='java' contentType='text/html; charset=UTF-8'%> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %> <%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -69,18 +70,20 @@ 카카오톡 -
  • - - -
    • + +
  • + + +
    • +
    본인인증은 본인 명의의 휴대폰 인증을 통해서만 가능하며, 사업자 대표가 아닌 자(소속 임직원, 법무법인, 친인척 등)가
    신청하는 경우 추후 조정절차 과정에서 추가로 관련 자료의 제출 요구를 받으실 수 있습니다. From c839ea63716b5dc490f62a7dc90e75964cf76f36 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 31 Dec 2024 12:57:04 +0900 Subject: [PATCH 3/5] Merge branch 'tolag3' --- .../egovProps/globals_svrtest.properties | 300 ------------------ src/main/webapp/META-INF/context.xml | 16 +- .../clipreport4/DataConnection.properties | 28 +- .../WEB-INF/clipreport4/License.properties | 10 +- 4 files changed, 22 insertions(+), 332 deletions(-) delete mode 100644 src/main/resources/egovframework/egovProps/globals_svrtest.properties diff --git a/src/main/resources/egovframework/egovProps/globals_svrtest.properties b/src/main/resources/egovframework/egovProps/globals_svrtest.properties deleted file mode 100644 index b7cf272b..00000000 --- a/src/main/resources/egovframework/egovProps/globals_svrtest.properties +++ /dev/null @@ -1,300 +0,0 @@ -#----------------------------------------------------------------------- -# -# globals.properties : \uc2dc\uc2a4\ud15c -# -#----------------------------------------------------------------------- -# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4. -# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5 -# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5 -# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9) -# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428) -# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/' -# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9 -# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83 -#----------------------------------------------------------------------- - -# \uc6b4\uc601\uc11c\ubc84 \ud0c0\uc785(WINDOWS, UNIX) -Globals.OsType = WINDOWS - -# G4C \uc5f0\uacb0\uc6a9 IP (localhost) -Globals.LocalIp = 127.0.0.1 - -# DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 -Globals.DbType = oracle -Globals.UserName= FAIRNETUR -Globals.Password= FAIRNETUR@#$ - -# oracle -Globals.DriverClassName=oracle.jdbc.OracleDriver -Globals.Url=jdbc:oracle:thin:@119.193.215.98:1524:XE - -# MainPage Setting(admin) -Globals.MainPage = /cmm/main/mainPage.do -#\ucee8\ud150\uce20 \ud30c\uc77c\uc704\uce58 -Globals.ckeditorUploadDir=/usr/local/tomcat/file/ckeditor/ -#TEST SERVER -Globals.RealCntFileFolder=C:/eGovFrameDev-3.9.0-64bit_ncms/workspace/ncms39/src/main/webapp/WEB-INF/jsp/cnt/ - -#prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 -#\uac1c\ubc1c\uc11c\ubc84 -#Globals.prod.islocal=local -#\uc2e4\uc11c\ubc84 -Globals.prod.islocal=real - -############################################################################################################## -#############################################\ubd84\uc7c1\uc870\uc815 \ucd94\uac00 \uc601\uc5ed ################################################### -############################################################################################################## - -#hibernate \uc124\uc815 -language=ko -database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect - - -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ud0c0\uc785 \uc124\uc815 ex). message,script -Globals.message.check=message -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ubc84\ud2bc\ud65c\uc131\ud654 \uc124\uc815 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -Globals.message.confirm=false -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \uc2dc\uac04 \uc124\uc815 ex). 1500 -Globals.message.time=1500 - - -#SEED \uc5b8\uc5b4 ex). ko,en -language=ko -#SEED URL \uc778\uc99d\ud0a4 -seed.key=wb3v96+QZFtSb/nfBWG7MQ9yhOnmQ3lzKFpjtuL77vA= -#SEED \uad00\ub9ac\uc790 \ud398\uc774\uc9c0 \uc811\uc18d \ub0a0\uc9dc \uae30\uac04 \uc124\uc815 ex). 0000-00-00 ~ 0000-00-0000 -seed.key.date=Waoa8oWVv6WPaaqsw3jGAQ== -#SEED \uad00\ub9ac\uc790 \ud398\uc774\uc9c0 \ub77c\uc774\uc13c\uc2a4 -seed.site.license=dDDxHXAwkzrD1hpNcksUuA== - -#\uc11c\ubc84 HOST \ub77c\uc774\uc13c\uc2a4[] -server.host.name=OsIUEcGP7ONHDjAHOjJwuVUmRS5pNCYC -#\uc11c\ubc84 IP \ub77c\uc774\uc13c\uc2a4[] -server.host.ip=MjFPxdq/pwOO+LAukz4FT6kEZQ20gmwL - -#\uac1c\uc778\uc815\ubcf4 \uae30\ub2a5 \uc124\uc815 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -private=false - -#\ud1b5\uacc4 \uae30\ub2a5 \uc124\uc815 ex). none,sessionId,accessIp -statistics.type=sessionId - -#\uc11c\ubc84 OS \uc885\ub958 -os=windows -#\uc11c\ubc84 \ubc84\uc804 -os.version=7 - -#DB \uc885\ub958 -database=oracle -#DB \ubc84\uc804 -database.version=11 -#DB\uc5d0 \ub530\ub978 hibernate \uc124\uc815\uac12 applicationContext-hibernate.xml \ub77c\uc778 \ucc38\uc870 -#database.hibernate.dialect=org.hibernate.dialect.OracleDialect -database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect - -#WAS \uc885\ub958 -was=tomcat -#WAS \ubc84\uc804 -was.version=6 -#WAS \uc138\uc158 \uc124\uc815 ex). 60[60\ubd84] -was.session.time=60 -#WAS \ub85c\uadf8 \uacbd\ub85c -was.log.path=D:/tomcat/apache-tomcat-7.0.63-case_seed/logs/ - -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ud0c0\uc785 \uc124\uc815 ex). message,script -message.check=message -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \uc2dc\uac04 \uc124\uc815 ex). 1500 -message.time=1500 -#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ubc84\ud2bc\ud65c\uc131\ud654 \uc124\uc815 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -message.confirm=false - -#\ucabd\uc9c0 \uae30\ub2a5 ex). 100 -message.count.limit=100 -#\ucabd\uc9c0 \uae30\ub2a5 \ucca8\ubd80\ud30c\uc77c \uc0ac\uc774\uc988 ex). 100 -message.file.size=100 - -#captcha \uae30\ub2a5 \uc124\uc815 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -captcha=true -#captcha \uae00\uc790\uc0c9 \uc5ec\ubd80 ex). green,pink,gray,black,blue -captcha.color=black -#captcha \uac00\ub85c \uc0ac\uc774\uc988 -captcha.width=150 -#captcha \uc138\ub85c \uc0ac\uc774\uc988 -captcha.height=50 -#captcha \uae00\uc790 \uc0ac\uc774\uc988 -captcha.font.size=40 - -#\ucca8\ubd80\ud30c\uc77c \uc378\ub124\uc77c \uac00\ub85c \uc0ac\uc774\uc988 -thumb.width=250 -#\ucca8\ubd80\ud30c\uc77c \uc378\ub124\uc77c \uc138\ub85c \uc0ac\uc774\uc988 -thumb.height=250 - -#\ucca8\ubd80\ud30c\uc77c \uba40\ud2f0 \uae30\ub2a5 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -file.multi=false -#\ucca8\ubd80\ud30c\uc77c \ubbf8\ub9ac\ubcf4\uae30 \uae30\ub2a5 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -file.preview=false -#\ucca8\ubd80\ud30c\uc77c \uc554\ud638\ud654 \uae30\ub2a5 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -file.encryption=false -#\ucca8\ubd80\ud30c\uc77c \uc554\ud638\ud654 \uae30\ub2a5 \ub9ac\uc2a4\ud2b8[] ex). bbs,message,formbuilder -file.encryption.type=bbs,message,formbuilder -#\ucca8\ubd80\ud30c\uc77c 20GB ex). 2000000000 -file.size=2000000000 -#\ucca8\ubd80\ud30c\uc77c \uc124\uba85 \uae30\ub2a5 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -file.text=true - -#\ud68c\uc6d0\uad00\ub9ac \uba54\ub274 \uc228\uae40 \uc124\uc815 \uc5ec\ubd80 ex). true[\uc228\uae40],false[\ubcf4\uc784] -member.page=true -#\ud68c\uc6d0 \uc790\ub3d9\uac00\uc785 \uc124\uc815 \uc5ec\ubd80 ex). true[\uc790\ub3d9\uac00\uc785],false[\uc2b9\uc778\uac00\uc785] -member.auto=true -#\ud68c\uc6d0 \ud0c8\ud1f4\uc2dc DB\uc0ad\uc81c \uc5ec\ubd80 ex). true[\uc0ad\uc81c\uc548\ud568],false[\uc0ad\uc81c\ud568] -member.flag=true -#\ud68c\uc6d0 \ud328\uc2a4\uc6cc\ub4dc \ubcc0\uacbd \uc5ec\ubd80 ex). 0[\uc0ac\uc6a9\uc548\ud568],3[3\uac1c\uc6d4] -member.pw.change=0 -#\ud68c\uc6d0 \ub85c\uadf8\uc778 \uc2e4\ud328\uc2dc \uc7a0\uae40 \uae30\ub2a5 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -member.lock=false -#\ud68c\uc6d0 \ub85c\uadf8\uc778 \uc2e4\ud328\uc2dc \uc7a0\uae40 \uce74\uc6b4\ud2b8 ex). 5[5\ubc88 \ud2c0\ub9ac\uba74 \ud68c\uc6d0 \uc7a0\uae40] -member.lock.num=5 - -#\ud1b5\ud569\ud68c\uc6d0 \uc5ec\ubd80 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -member.merge=true -#\ud1b5\ud569\ud68c\uc6d0 siteIdx -member.merge.siteIdx=seed - -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 \uc5ec\ubd80 (\ud68c\uc6d0 \ub4f1\ub85d\uc77c \uae30\uc900\uc73c\ub85c \uc801\uc6a9) ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] -member.privacy.destroyed=false -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 DB\uc0ad\uc81c \uc5ec\ubd80 ex). true[\ubbf8\uc0ad\uc81c],false[\uc0ad\uc81c] -member.privacy.flag=true -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \uc218\uc9d1 \uae30\uac04\uc124\uc815(365\uc77c) ex). 365 -member.privacy.date=365 -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 \ud0c0\uc785 ex). mail,sms -member.privacy.type=mail,sms -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 \ud0c0\uc785 \ub0a0\uc9dc \uc124\uc815[](\uc77c \uae30\uc900, \uae34\ub0a0\uc9dc\ubd80\ud130 \uc124\uc815\ud574\uc8fc\uc138\uc694) ex). 15,7 -member.privacy.type.date=15,7 -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 MAIL URL[] ex). http://seed.co.kr/user/extra/siteIdx/privacy/mail/jsp/Page.do -member.privacy.mail.url= -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 SMS URL[] ex). http://seed.co.kr/user/extra/siteIdx/privacy/sms/jsp/Page.do -member.privacy.sms.url= - -#FTP \uae30\ub2a5 \uc124\uc815 ex). false,ftp,sftp -ftp.type=false -#FTP \uae30\ub2a5 \uc124\uc815[] ex). 127.0.0.1 -ftp.server=false -#FTP \uae30\ub2a5 \uc124\uc815[] ex). seed -ftp.id=false -#FTP \uae30\ub2a5 \uc124\uc815[] ex). seed -ftp.pw=false -#FTP \uae30\ub2a5 \uc124\uc815[] ex). 21 -ftp.port=false -#FTP \uae30\ub2a5 \uc124\uc815[] ex). /home/data/seed -ftp.path=false - -#POST \ubc29\uc2dd\uc774\uc5b4\ub3c4 \ud574\ub2f9 URL\uc740 CSRF\uc5d0\uc11c \uc81c\uc678[] ex). /user/extra/*/zipcode/zipcode/jsp/Page.do,siteRegProc.do,/*/proc/siteRegProc.do -#\ud68c\uc6d0 \uac1c\uc778\uc815\ubcf4 \ud30c\uae30 URL \ucd94\uac00\ud574\uc918\uc57c\ud55c\ub2e4. (\uac1c\uc778\uc815\ubcf4 \ud30c\uae30\ub294 POST\ud615\ud0dc\uc784) -csrf.url=/user/extra/case/zipCode/jusoPopup/jsp/Page.do,/nanum/NanumCallback.do,/user/mediation/case/04/154/mediationStep03.do,/user/extra/case/siren/hpParamPop/jsp/Page.do,/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do,/user/extra/case/siren/onlineCounsel_hpParamPop/jsp/Page.do,/user/extra/case/siren/lawCounsel_hpParamPop/jsp/Page.do,/user/extra/case/siren/checkMedi_hpParamPop/jsp/Page.do - -#SEED \uad00\ub9ac\uc790 \ud398\uc774\uc9c0\uc758 https \uc801\uc6a9 URL[] -#https.seed.url=/gta/index.do,/gta/login.do,/gtu/index.do,/gtu/login.do,/gtm/index.do,/gtm/login.do,/gte/index.do,/gte/login.do -#SEED \uad00\ub9ac\uc790 \ud398\uc774\uc9c0\uc758 http \uc801\uc6a9 URL[] -#http.seed.url=/dashboard.do,/eIndex.do,/gtu/memberList.do - -#\uc0ac\uc6a9\uc790 \ud398\uc774\uc9c0\uc758 https \uc801\uc6a9 URL[] ex). /user/extra/*/login/login/jsp/Page.do -https.url= -#\uc0ac\uc6a9\uc790 \ud398\uc774\uc9c0\uc758 http \uc801\uc6a9 URL[] ex). /*/index.do,/*/subIndex/ -http.url= - -#\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL -root.url=http://localhost -#\ud574\ub2f9 \uc11c\ubc84 SEED\uc11c\ubc84 \uacbd\ub85c -root.path=/usr/local/homepage/WEB-INF/views/site -#\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL path -root.contextpath= - -#\ucca8\ubd80\ud30c\uc77c \uc784\uc2dc\ud3f4\ub354 -file.temp.path=/usr/local/homepage/WEB-INF/views/site/case/upload/tempFiles -#\ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc\ud3f4\ub354 -file.real.path=/usr/local/homepage/WEB-INF/views/site/case/upload/uploadFiles - -#NICE -nice.uid=kofair -nice.pwd=kofair2016! - -#oz \uc11c\ubc84 \uc8fc\uc18c -oz.ozServerNm=http://211.245.106.124:8071 - -#\uadf8\ub8f9\uc6e8\uc5b4 \uc5f0\ub3d9 \uc8fc\uc18c -gw.url=https://gwd.unicologx.com - -#\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c -cert.retUrl=23https://fairnet.kofair.or.kr -cert.hpRetUrl=23https://fairnet.kofair.or.kr -cert.hpSrvNo=012006 - -#\ub300\uc6a9\ub7c9 innorix license -Globals.Innorix.License=svr -#Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ - -#\uc774\uba54\uc77c \ubc1c\uc1a1 \uc815\ubcf4 -email.smtpHost=mail.kofair.or.kr -email.smtpPort=25 -email.username=caseadmin@kofair.or.kr -email.password=@caseadmin2024 - -#\uac80\uc0c9\uc194\ub8e8\uc158 -search.host=http://211.245.106.124:7578 - -#\uc54c\ub9bc\ud1a1 -ppurio.id=kofair -ppurio.pw=kofa2024@ -ppurio.host=https://api.bizppurio.com -ppurio.senderKey=953031f0c131963c2fa9cd004f9965f9d487bdc5 -ppurio.templateCode1=bizp_2024112810423519814410026 -ppurio.templateCode2=bizp_2024112810423516931294012 -ppurio.templateCode3=bizp_2024112810492919814837182 -ppurio.templateCode4=bizp_2024112810492916931760451 -ppurio.templateCode5=bizp_2024112810492916931854671 -ppurio.templateCode6=bizp_2024112810522719814540186 -ppurio.from=15881490 - - -#pdf-url -##=====================================1.local(http://192.168.0.34:7080)============================================================= -##pdf\ubcc0\ud658\uc11c\ubc84 - WAS \uc5d0\uc11c \ud638\ucd9c\ud558\ub294 PDF \ubcc0\ud658 \uc11c\ubc84 IP \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.serverUrl=192.168.0.200 - - -##\uc6f9\ud398\uc774\uc9c0\ub97c pdf\ub85c \ubcc0\ud658\ud558\uae30 \uc704\ud55c api \ud638\ucd9curl - \uc870\uc815\uc2e0\uccad\uc11c \ub4f1 - WAS \uc11c\ubc84 \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.apiUrl=http://192.168.0.34:7080 - - -##pdf \uc11c\ubc84\uc758 \ub124\ud2b8\uc6cc\ud06c \uacbd\ub85c -##pdf\ubcc0\ud658 \uc11c\ube0c\ub97c \uc704\ud55c path - 1.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc774 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c - PDF \ubcc0\ud658 \uc11c\ubc84\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \ud3f4\ub354 \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.filepath.out=file:/z:/out/ - - -##tomcat upload \uacbd\ub85c -##\ud30c\uc77c \uad00\ub9ac\ub97c \uc704\ud55c path - 2.pdf\ubcc0\ud658\uc744 \uc704\ud55c \uc5c5\ub85c\ub4dc \ud30c\uc77c \uacbd\ub85c - WAS \uc11c\ubc84\uc5d0\uc11c PDF \ubcc0\ud658 \uc9c0\uc6d0\uc744 \uc704\ud574 \uc81c\uc5b4 \ud558\ub294 \uacbd\ub85c -#Globals.pdf.makepath=y:/ - -##\ud30c\uc77c \uad00\ub9ac\ub97c \uc704\ud55c path - 3.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc774 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c - WAS \uc11c\ubc84\uc5d0\uc11c PDF \ubcc0\ud658 \uc9c0\uc6d0\uc744 \uc704\ud574 \uc81c\uc5b4 \ud558\ub294 \uacbd\ub85c -#Globals.pdf.makepath.out=y:/out/ - - -##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 -#Globals.pdf.webpath=/pdf/out/ - -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8081)============================================================= -## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. -#Globals.pdf.serverUrl=192.168.0.200 -#Globals.pdf.apiUrl=http://119.193.215.98:8081 -#Globals.pdf.filepath.out=file:/z:/out/ -#Globals.pdf.makepath=/usr/local/tomcat/file/sht/ -#Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ -#Globals.pdf.webpath=/pdf/out/ - -##=====================================3.\uc2e4\uc11c\ubc84(192.168.39.143, 192.168.39.144)============================================================= -## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. -Globals.pdf.serverUrl=192.168.39.147 -Globals.pdf.apiUrl=http://192.168.39.143:8080 -Globals.pdf.filepath.out=file:/z:/out/ -Globals.pdf.makepath=/usr/local/tomcat/file/sht/ -Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ -Globals.pdf.webpath=/pdf/out/ \ No newline at end of file diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 10156738..7468c3e1 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -26,20 +26,10 @@ name="jndi/svr" auth="Container" driverClassName="oracle.jdbc.driver.OracleDriver" - username="FAIRNETUR" - password="FAIRNETUR!@#$" + username="newcasedb" + password="newcasedb1130" type="javax.sql.DataSource" - url="jdbc:oracle:thin:@211.245.106.125:1521/XE" - factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" - /> - diff --git a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties index c88250cc..7a85c5f5 100644 --- a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties +++ b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties @@ -8,27 +8,27 @@ dataconnection.count=3 ################################# \uac1c\ubc1c ################################# -dataconnection1.conntype=jdbc -dataconnection1.type=Oracle -dataconnection1.dbname=XE -dataconnection1.version= -dataconnection1.url=jdbc:oracle:thin:@119.193.215.98:1524:XE -dataconnection1.user=FAIRNETUR -dataconnection1.password=FAIRNETUR@#$ -dataconnection1.encoding= -dataconnection1.decoding= -################################# \uac1c\ubc1c ################################# - -################################# \uc2e4\uc11c\ubc84 ################################# #dataconnection1.conntype=jdbc #dataconnection1.type=Oracle #dataconnection1.dbname=XE #dataconnection1.version= -#dataconnection1.url=jdbc:oracle:thin:@211.245.106.125:1521:XE +#dataconnection1.url=jdbc:oracle:thin:@119.193.215.98:1524:XE #dataconnection1.user=FAIRNETUR -#dataconnection1.password=FAIRNETUR!@#$ +#dataconnection1.password=FAIRNETUR@#$ #dataconnection1.encoding= #dataconnection1.decoding= +################################# \uac1c\ubc1c ################################# + +################################# \uc2e4\uc11c\ubc84 ################################# +dataconnection1.conntype=jdbc +dataconnection1.type=Oracle +dataconnection1.dbname=XE +dataconnection1.version= +dataconnection1.url=jdbc:oracle:thin:@211.245.106.125:1521:kofairdb +dataconnection1.user=newcasedb +dataconnection1.password=newcasedb1130 +dataconnection1.encoding= +dataconnection1.decoding= ################################# \uc2e4\uc11c\ubc84 ################################# dataconnection2.conntype=jdbc diff --git a/src/main/webapp/WEB-INF/clipreport4/License.properties b/src/main/webapp/WEB-INF/clipreport4/License.properties index 6cb875d1..3f3786d9 100644 --- a/src/main/webapp/WEB-INF/clipreport4/License.properties +++ b/src/main/webapp/WEB-INF/clipreport4/License.properties @@ -1,9 +1,9 @@ # License key Value!! -#\uac1c\ubc1c\uc790\ub85c\uceec -key=license +#\uAC1C\uBC1C\uC790\uB85C\uCEEC +#key=license -#\uac1c\ubc1c\uc11c\ubc84 +#\uAC1C\uBC1C\uC11C\uBC84 #key=qxl04+oK4y3vvoBqp/lqF86H0r88nTliyx1TVIS5+JSjl4/thf9vFFYP4FNkcR78gmwVouVKtzPwERFBD9rh1uhB7YkUPnnSo4EAf9XUHyGF1T/XHBBogB9Nh2Zby7CSTY366djkwF2blTxdbcNHvB6TKolr2pbWQtMhuYhLGbk= -#\uc2e4\uc11c\ubc84 -#key=I7p8BAksAJfmgja1vI9GE0ecBRpRao1lFo3gItvToaBKHVXv9Zk0BIXtjxbgNXYgVF1H3fkBkKbVSKbHJtBxgr2meVI9FNqMSTwV60mgyRFAhoFHbhsocmtG9zNtrtTAjo9OXaXmTGzCDlDmXmhE6///fNv9h3vUHdRhW8j8FaU= \ No newline at end of file +#\uC2E4\uC11C\uBC84 +key=I7p8BAksAJfmgja1vI9GE0ecBRpRao1lFo3gItvToaBKHVXv9Zk0BIXtjxbgNXYgVF1H3fkBkKbVSKbHJtBxgr2meVI9FNqMSTwV60mgyRFAhoFHbhsocmtG9zNtrtTAjo9OXaXmTGzCDlDmXmhE6///fNv9h3vUHdRhW8j8FaU= \ No newline at end of file From 4d555a21eb48a8b08a2e86ef2248a6fbe78acc09 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Tue, 31 Dec 2024 13:45:40 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=B6=84=EC=9F=81=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20>=20=EB=8F=99?= =?UTF-8?q?=EC=8B=9C=EA=B8=B0=EC=95=88=20>=20=EC=B2=A8=EB=B6=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seed/com/gtm/base/BaseController.java | 2 + .../com/gtm/seedfile/SeedFileService.java | 113 ++++++ src/main/webapp/WEB-INF/decorators.xml | 1 + .../trublprocessmng/sameTimeFileAtchPop.jsp | 348 ++++++++++++++++++ .../trublprocessmng/trublprocessmngList.jsp | 57 ++- 5 files changed, 513 insertions(+), 8 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/sameTimeFileAtchPop.jsp diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java index d1155f04..d1259274 100644 --- a/src/main/java/seed/com/gtm/base/BaseController.java +++ b/src/main/java/seed/com/gtm/base/BaseController.java @@ -226,6 +226,8 @@ public class BaseController { log.warn("nanumCall>>>>"+params.get("nanumCall")); }else if("FILE".equals(type)){ fileService.fileInsertEgov(params, request, session); + }else if("SAMETIME_FILE".equals(type)){ //동시기안 파일 첨부 + fileService.fileInsertSameTime(params, request, session); }else if("TRS_EDIT".equals(type)){ //사건마스터 params.put("sql", pageFolder+".selectRceptms"); diff --git a/src/main/java/seed/com/gtm/seedfile/SeedFileService.java b/src/main/java/seed/com/gtm/seedfile/SeedFileService.java index 89f2a60f..8614a842 100644 --- a/src/main/java/seed/com/gtm/seedfile/SeedFileService.java +++ b/src/main/java/seed/com/gtm/seedfile/SeedFileService.java @@ -278,6 +278,119 @@ public class SeedFileService { throw e; } } + + public void fileInsertSameTime(EgovMap paramMap, HttpServletRequest request, HttpSession session)throws Exception { + System.out.println(">>>>>>>fileInsertEgov<<<<<<<<<"); + try { + + String siteIdx = SeedUtils.setReplaceNull(session.getAttribute("siteIdx")); + if(siteIdx.equals("")){ + siteIdx = SeedUtils.setReplaceNull(request.getParameter("siteIdx")); + } + String fileFuncType = (String)paramMap.get("fileFuncType"); + String fileTarget = (String)paramMap.get("fileTarget"); + + SeedProperties seedProperties = new SeedProperties(); + + /*String rootPath = seedProperties.getConfigValue("file.real.path"); + String tempPath = seedProperties.getConfigValue("file.temp.path");*/ + + /*241216 global 값으로 수정*/ + /*String rootPath = propertyService.getString("file.real.path"); + String tempPath = propertyService.getString("file.temp.path");*/ + String rootPath = globalRealPath; + String tempPath = globalTempPath; + + SeedDateUtil seedDateUtil = new SeedDateUtil(); + String toDate = seedDateUtil.getSimpleDateFormat(new Date(), "yyyyMMdd"); + String renameDate = seedDateUtil.getSimpleDateFormat(new Date(), "yyyyMMddHHmmss"); + + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType); + + int fileCnt = 0; + + String[] uploadFileName = request.getParameterValues("uploadFileName"); + String[] uploadFileReName = request.getParameterValues("uploadFileReName"); + String[] copyContractYnList = request.getParameterValues("copyContractYn"); + String[] fileGubun = request.getParameterValues("fileGubun"); + String[] fileMemo = request.getParameterValues("fileMemo"); + + if(uploadFileName!=null && uploadFileName.length > 0){ + + for(int i=0; i 0){ + if(uploadFileName.length == fileMemo.length){ + fileMemoData = fileMemo[i]; + } + } + + + String copyContractYn = ""; + if(copyContractYnList != null){ + copyContractYn = copyContractYnList[i]; + } + + String fileType = uploadFileNameData.substring(uploadFileNameData.lastIndexOf(".")+1, uploadFileNameData.length()); + String reFileName = renameDate + "_" + SeedUtils.getSeedMD5Code(String.valueOf(SeedUtils.getRandom(999,1))); + + File oldFile = new File(tempPath + "/"+siteIdx+"/"+fileFuncType+ "/" + uploadFileReNameData); + System.out.println(">>>>>>>fileInsertEgov0<<<<<<<<<"+tempPath + "/"+siteIdx+"/"+fileFuncType+ "/" + uploadFileReNameData); + if(oldFile.exists()){ + + Long fileSize = oldFile.length(); + + SeedUtils.setSeedFileCopy(tempPath + "/"+siteIdx+"/"+fileFuncType + "/" + uploadFileReNameData, + rootPath + "/"+siteIdx+"/"+fileFuncType+"/"+reFileName+"."+fileType); + + + paramMap.put("uploadFileNameData", uploadFileNameData); + paramMap.put("reFileName", reFileName+"."+fileType); + paramMap.put("fileSize", fileSize); + paramMap.put("fileType", fileType); + paramMap.put("filePath", rootPath + "/"+siteIdx+"/"+fileFuncType+"/"); + paramMap.put("copyContractYn", copyContractYn); + paramMap.put("fileGubun", fileGubunData); + paramMap.put("fileMemo", fileMemoData); + //파일타입에 따라서 sql분기 + /*if(fileFuncType.equals("mediation")){ + dao.caseInsert(paramMap); + }else{ + dao.fileInsert(paramMap); + }*/ + System.out.println(">>>>>>>fileInsertEgov1<<<<<<<<<"); + String[] fileTargets = fileTarget.split("_"); + try { + for(String target : fileTargets) { + String[] targetTwo = target.split("@"); + + String rceptNo = targetTwo[0]; + String caseNo = targetTwo[1]; + + paramMap.put("rceptNo", rceptNo); + paramMap.put("fileAdd1", caseNo); + bservice.insert(paramMap); + } + }catch(Exception e){ + e.printStackTrace(); + } + System.out.println(">>>>>>>fileInsertEgov2<<<<<<<<<"); + + oldFile.delete(); + fileCnt = fileCnt+1; + } + } + } + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } public List> fileList(Map paramMap){ return dao.fileList(paramMap); diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 0af6f7b0..3527d3f7 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -85,6 +85,7 @@ */gtm/case/trublprocessmng/fileHistoryPop/jsp/Page.do* */gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do* */gtm/case/trublprocessmng/fileAtchPop2/jsp/Page.do* + */gtm/case/trublprocessmng/sameTimeFileAtchPop/jsp/Page.do* */gtm/newcasebase/fileatchPop/rawEdit.do* diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/sameTimeFileAtchPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/sameTimeFileAtchPop.jsp new file mode 100644 index 00000000..260dc94e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/sameTimeFileAtchPop.jsp @@ -0,0 +1,348 @@ +<%-- + Class Name : EgovNoticeRegist.jsp + Description : 게시물 생성 화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.24 이삼섭 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 이삼섭 + since : 2009.03.24 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +기안 파일 첨부하기 + + + +

    ■ 기안파일첨부하기

    +
    + +
    +
    + +
    + +
    + + + + + + + + + + + + + + + + +
    +

    첨부파일

    +     		+
    +
    + +
    +
      + +
    + + +
    +
    + +
    + + + +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    + + + + + + + + + + + + + +
    + +
    + + +
    + + + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp index 5ec80a64..4a162ceb 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp @@ -241,7 +241,7 @@ function clipCall(crfNm){ - @@ -378,8 +378,9 @@ function clipCall(crfNm){ @@ -437,6 +438,9 @@ function clipCall(crfNm){ //step3.같은 기안의 상태인지? var v_data_state = ''; var v_data_case_no = ''; + var v_data_rcept_no = ''; + var v_data_file_target = ''; + $('input:checkbox[name="chk"]:checked').each(function(idx) { if (v_data_state==''){ @@ -448,6 +452,8 @@ function clipCall(crfNm){ } v_data_case_no = v_data_case_no + $(this).attr("data-caseno") + "_"; + v_data_rcept_no = v_data_rcept_no + $(this).attr("data-rceptno") + "_"; + v_data_file_target = v_data_file_target + $(this).attr("data-rceptno") + "@" + $(this).attr("data-caseno") + "_"; }); @@ -575,11 +581,11 @@ function clipCall(crfNm){ $("#nanumFrmCaseNo").val(v_data_case_no); - nanumApi(jobID, codeNo, v_class); + nanumApi(jobID, codeNo, v_class, v_data_file_target); } //문서 기안작성 및 결제상신 - function nanumApi(jobID, codeNo, v_class){ + function nanumApi(jobID, codeNo, v_class, v_data_file_target){ alert(jobID+":"+codeNo+":"+v_class); @@ -624,20 +630,55 @@ function clipCall(crfNm){ //$("#subjectStrImsi").val(r.title); //그룹웨어로그인아이디 //$("#contentsStrImsi").val(r.contents); //그룹웨어로그인아이디 - var f = document.nanumViewFrm; + + /* var f = document.nanumViewFrm; f.action = $("#nanumViewFrm #gwCallUrlView").val(); f.target = "_blank"; - f.submit(); + f.submit(); */ + /* 첨부파일 업로드 팝업 */ + var fileFuncType = ''; + var fileGubun = ''; + if (jobID=='1-1'||jobID=='2-1' /* 착수보고서 */ + ||jobID=='3-1'||jobID=='4-1' + ||jobID=='5-1'||jobID=='6-1'){ + fileFuncType = 'x-1'; + fileGubun = '4840000000'; + + }else if(jobID=='1-11'||jobID=='2-11' /* 종료보고서 */ + ||jobID=='3-11'||jobID=='4-11' + ||jobID=='5-11'||jobID=='6-11'){ + fileFuncType = 'x-2'; + fileGubun = '4841000000'; + }else if(jobID=='1-12'||jobID=='2-12' /* 조사보고서 */ + ||jobID=='3-12'||jobID=='4-12' + ||jobID=='5-12'||jobID=='6-12'){ + fileFuncType = 'x-3'; + fileGubun = '4842000000'; + } + fileFirstPopOpen(v_data_file_target, r.gwId, fileFuncType,r.data2.docId, fileGubun); } - location.reload(); }); } } + function fileFirstPopOpen(p_fileTarget, p_gwId, p_fileFuncType, p_approKey, fileGubun){ + var popUrl = "/gtm/case/trublprocessmng/sameTimeFileAtchPop/jsp/Page.do?fileTarget="+p_fileTarget+"&loginId=" + p_gwId + "&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; + var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; + window.open(popUrl, "", popOption); + } + + function nanumApiByPopup(fileKey){ + $("#nanumViewFrm #fileKeyView").val(fileKey); + var f = document.nanumViewFrm; + f.action = $("#nanumViewFrm #gwCallUrlView").val(); + f.target = "_blank"; + f.submit(); + } + function goPage(type, param){ if(type == 'view'){ $("#rceptNo").val(param); From 2cf7bd2b0fee0401e1b3a6ca36d45a4f340ae536 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 31 Dec 2024 13:58:06 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/seed/utils/FairnetUtils.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 3a922466..02d0028e 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -9,9 +9,10 @@ import java.net.URL; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Base64; -import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,7 +41,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.TextNode; -import com.ibm.icu.text.SimpleDateFormat; import kcc.com.snd.service.SendAtVO; import kcc.com.snd.service.SendAtVO.Content; @@ -152,9 +152,13 @@ public class FairnetUtils { String hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/siren/case/04/154/check.do";//모바일 인증후 리턴 페이지 //날짜 생성 - Calendar today = Calendar.getInstance(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - String day = sdf.format(today.getTime()); +// Calendar today = Calendar.getInstance(); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); +// String day = sdf.format(today.getTime()); + + LocalDateTime today = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + String day = today.format(formatter); java.util.Random ran = new Random(); //랜덤 문자 길이