From 409683ff77f1ae83b6e27e37623338a4f95888c8 Mon Sep 17 00:00:00 2001 From: LJH Date: Wed, 30 Nov 2022 12:34:52 +0900 Subject: [PATCH 1/3] =?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?=EA=B8=80=EB=A1=9C=EB=B2=8C=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0?= =?UTF-8?q?=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovProps/globals_local.properties | 10 ++++------ .../egovProps/globals_svr.properties | 16 +++++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 1caf9bcf..15fb59d5 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -187,13 +187,11 @@ Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ Globals.pay.mid=INIpayTest Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS Globals.pay.siteDomain=http://119.193.215.98:8081/web/kccadr/inipay - -#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 -Globals.MagicDB.PolicyName=POLICY001 - - #\uc2e4\uc11c\ubc84 #inipay \uacb0\uc81c #Globals.pay.mid=crosorkr01 #Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 -#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/inipay \ No newline at end of file +#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/inipay + +#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 +Globals.MagicDB.PolicyName=POLICY001 \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index e5b4dada..8ce635c0 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -182,11 +182,13 @@ Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ #inipay \uacb0\uc81c #\uac1c\ubc1c\uc11c\ubc84 -Globals.pay.mid=INIpayTest -Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS -Globals.pay.siteDomain=http://119.193.215.98:8087/web/kccadr/inipay +#Globals.pay.mid=INIpayTest +#Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS +#Globals.pay.siteDomain=http://119.193.215.98:8087/web/kccadr/inipay #\uc2e4\uc11c\ubc84 -#inipay \uacb0\uc81c -#Globals.pay.mid=crosorkr01 -#Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 -#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/inipay \ No newline at end of file +Globals.pay.mid=crosorkr01 +Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 +Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/inipay + +#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 +Globals.MagicDB.PolicyName=POLICY001 \ No newline at end of file From a2723d93dc2f01bbe2282cfd8bfcb9a0e487297a Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 30 Nov 2022 17:13:49 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=A0=84=EC=9A=A9=20properties(d?= =?UTF-8?q?ev)=20db=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20/=20sns=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=8C=9D=EC=97=85=20=ED=82=A4=20?= =?UTF-8?q?=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdjReqMgrPastServiceImpl.java | 61 +++++++++++++++++-- .../web/AdjReqMgrPastController.java | 8 +++ .../egovProps/globals_dev.properties | 5 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 4 +- .../WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp | 2 +- .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 13 ++-- .../jsp/web/kccadr/login/snsCallBack.jsp | 6 +- 7 files changed, 82 insertions(+), 17 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index c445e664..83fa7fb6 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -854,6 +854,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException { + // + String prmtrAdrSn = adjReqMgrOffLineVO.getAdrSn(); AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); @@ -878,12 +880,41 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.updateBasicInfo(adjReqMgrPastVO); // 조정부 수정 - adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); - + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getMemPstSeq())) + { + adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); + }else { + + AdrMemDeptMgrPstVO adrMemDeptMgrPstVO = new AdrMemDeptMgrPstVO(); + adrMemDeptMgrPstVO.setMemPstSeq(adrMemDeptMgrPstGnrService.getNextStringId()); + adrMemDeptMgrPstVO.setMemDeptNm(adjReqMgrPastVO.getMemDeptNm()); + adrMemDeptMgrPstVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); + adrMemDeptMgrPstVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); + adjReqMgrPastDAO.insertMemDeptMgrPst(adrMemDeptMgrPstVO); + + adjReqMgrPastVO.setMemPstSeq(adrMemDeptMgrPstVO.getMemPstSeq()); + } + // 조사관 수정 - adjReqMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm())); - adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getAssPstSeq())) { + adjReqMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm())); + adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); + }else { + + + AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(); + adjAssMgrPastVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq()); + adjAssMgrPastVO.setAdrSn(0); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy("50"); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm())); + adjAssMgrPastVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); + adjAssMgrPastVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); + adjReqMgrPastDAO.insertAdjAssMgrPst(adjAssMgrPastVO); + + adjReqMgrPastVO.setAssPstSeq(adjAssMgrPastVO.getAssPstSeq()); + } if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq())) { @@ -916,10 +947,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements { if(prtclRowList.size() > 0) adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); - int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + int adrSn = Integer.parseInt(prmtrAdrSn); int cnt = 1; + logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); while(cnt <= adrSn) { + logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); @@ -928,6 +961,24 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO); } + else + { + if(prtclRowList.size() < 1) + { + int adrSn = Integer.parseInt(prmtrAdrSn); + int cnt = 1; + logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); + while(cnt <= adrSn) + { + logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); + adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService + adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); + adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + cnt++; + } + adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO); + } + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 5462ca4c..bc6cb33b 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -735,6 +735,14 @@ public class AdjReqMgrPastController { } + /** + * @methodName : selectAssMgrPstEncryption + * @author : 이호영 + * @date : 2022.11.30 + * @description : 과거사건 등록 암호화 + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/selectAssMgrPstEncryption.do"}, method = RequestMethod.GET) public ResponseEntity selectAssMgrPstEncryption() throws Exception { diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index c6a887b0..7ff926e7 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -33,8 +33,9 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -#Globals.Url=jdbc:cubrid:119.193.215.98:30000:cubdb:::?charset=utf8 -Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 +#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 +#\uacfc\uac70\uc0ac\uac74\ub4f1\ub85d \ud504\ub85c\uc81d\ud2b8 DB +Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc_pst:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 007d9ff4..b0abb4bd 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -846,6 +846,8 @@ UPDATE ADR_MGR_DETAIL SET PST_CN = #pstCn# + , ADR_ADM_ID = #assPstSeq# + , MEM_DEPT_SEQ = #memPstSeq# WHERE ADR_SEQ = #adrSeq# @@ -856,7 +858,7 @@ ADR_END_DE = NOW() WHERE ADR_SEQ = #adrSeq# - + diff --git a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp index 66e845a0..0dcbd402 100644 --- a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp @@ -219,7 +219,7 @@ function onlyNumber(thisObj) {

ID

- +

PASSWORD

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 ea2a165a..196c8c24 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 @@ -67,7 +67,7 @@ $(document).on("click", "#naverLogin", function(){ }); //카카오로그인 - Kakao.init('5a964d4a736ef47416f326a646bcfc5e'); //발급받은 키 중 javascript키를 사용해준다. + Kakao.init('bf3de0d897afe0e4bef0775f7086f048'); //발급받은 키 중 javascript키를 사용해준다. //console.log(Kakao.isInitialized()); // sdk초기화여부판단 function kakaoLogin() { Kakao.Auth.login({ @@ -94,13 +94,15 @@ $(document).on("click", "#naverLogin", function(){ }, }) } - - //네이버로그인 + + //네이버로그인 window.name='opener'; var naverLogin = new naver.LoginWithNaverId( { - clientId: "iMGwQvTUeD4tVwv41haJ", - callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do", +// clientId: "iMGwQvTUeD4tVwv41haJ", +// callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do", + callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do", + clientId: "UiWLhNqpDveCCjwepWtS", loginButton: {color: "green", type: 4, height: 40}, isPopup: true /* 팝업을 통한 연동처리 여부 */ } @@ -118,7 +120,6 @@ $(document).on("click", "#naverLogin", function(){ snsLoginForm.method = "post"; snsLoginForm.action = ""; snsLoginForm.submit(); - } function kakaoLogout() { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp index 911ff193..0de1b367 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp @@ -9,8 +9,10 @@ //네이버로그인 var naverLogin = new naver.LoginWithNaverId( { - clientId: "iMGwQvTUeD4tVwv41haJ", - callbackUrl: "http://127.0.0.1:8089//web/kccadr/certDoc/snsCallBack.do", + clientId: "UiWLhNqpDveCCjwepWtS", + callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do", +// clientId: "iMGwQvTUeD4tVwv41haJ", +// callbackUrl: "http://127.0.0.1:8089//web/kccadr/certDoc/snsCallBack.do", isPopup: false, callbackHandle: true } From ed3e9b8239065a9b5af084c206a3a636b2ecfe37 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 1 Dec 2022 09:07:09 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=EC=95=94=ED=98=B8=ED=99=94=20api?= =?UTF-8?q?=20debuging=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index bc6cb33b..23b50ad6 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -750,6 +750,7 @@ public class AdjReqMgrPastController { try { adjReqMgrPastService.selectAssMgrPstEncryption(); } catch (Exception e) { + e.printStackTrace(); return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "암호화 중 오류가 발생하였습니다.", LocalDateTime.now())); }