diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index 31c42ef1..da8be385 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -14,9 +14,12 @@ public final class MagicDBAPIUtil { private static final Logger log = LoggerFactory.getLogger(MagicDBAPIUtil.class); // 정책 명 -// @Value("#{globalSettings['Globals.MagicDB.PolicyName']}") private static String POLICY_NAME = "POLICY001"; + +// @Value("#{globalSettings['Globals.MagicDB.PolicyName']}") +// private static String POLICY_NAME; + /** * @methodName : encryptAdjReqMgrPastData * @author : 이호영 @@ -33,11 +36,12 @@ public final class MagicDBAPIUtil { public static String encryptOnlyOneString(String stringVal) { return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return stringVal; } public static String decryptOnlyOneString(String stringVal) { -// log.info(" stringVal :: [{}]", stringVal); return MagicDBAPI.decrypt(POLICY_NAME, stringVal); +// return stringVal; } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 63b5fcb6..3906e954 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import ch.qos.logback.classic.Logger; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -43,6 +44,8 @@ import kcc.kccadr.adjPgrMgr.ent.service.EntService; import kcc.kccadr.adjPgrMgr.ent.service.EntVO; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; @@ -104,6 +107,9 @@ public class InternalApprovManageController { //조정사건 이력관리 일련번호 @Resource(name="adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; + + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @@ -140,8 +146,10 @@ public class InternalApprovManageController { } //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01), 결재진행중(02) 상태가 기본값으로 해달라는 요청_220225_이준호수정 + //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01) 상태가 기본값으로 해달라는 요청_221201_조용준수정 if("".equals(internalApprovManageVO.getSearchStatusArr()) || internalApprovManageVO.getSearchStatusArr() == null){ - String[] defaultSearchStatusArr = {"01", "02"}; + //String[] defaultSearchStatusArr = {"01", "02"}; + String[] defaultSearchStatusArr = {"01"}; internalApprovManageVO.setSearchStatusArr(defaultSearchStatusArr); } @@ -236,8 +244,14 @@ public class InternalApprovManageController { /* 신청 취지, 원인 글자수 줄여서 Temp에 넣음 */ - info.setReqTempCn1(StringUtils.abbreviate(info.getReqCn1(), 320)); - info.setReqTempCn2(StringUtils.abbreviate(info.getReqCn2(), 320)); + info.setReqTempCn1(StringUtils.abbreviate(info.getReqCn1(), 250)); + info.setReqTempCn2(StringUtils.abbreviate(info.getReqCn2(), 250)); + + // 20221201 이호영 + // 법인일 경우 법인명+대표자명 노출 + AdjRpplVO rpplVO = adjRpplService.findOfRpplBizNm(info.getAdrSeq()); + info.setRpplUsrTy(rpplVO.getRpplUsrTy()); + info.setRpplBizNm(rpplVO.getRpplBizNm()); model.addAttribute("info", info); model.addAttribute("approvLine", approvLine); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 2a3d8a16..aefeac43 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -217,5 +217,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } + public void deleteAdrAssMgrPstRows(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteAdrAssMgrPstRows", adjReqMgrPastVO ); +// delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); + } + } 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..e44aaa5c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -648,7 +648,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]); - + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } @@ -660,6 +660,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } } @@ -673,9 +674,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjAssMgrPastVO.setAddYn("Y"); - System.out.println(" adjAssMgrPastVO.getFrstRegisterId() :: "+adjAssMgrPastVO.getFrstRegisterId()); if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){ adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); adjAssMgrPastVO.setAddYn("Y"); @@ -726,7 +727,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다. if(t.getAssPstUsrNm().indexOf("RPP") < 0) { - System.out.println("???"); + System.out.println("t.getAssPstUsrNm() : "+ t.getAssPstUsrNm()); t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm())); } else @@ -854,6 +855,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 +881,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())) { @@ -915,11 +947,16 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn())) { if(prtclRowList.size() > 0) + { adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); - int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + adjReqMgrPastDAO.deleteAdrAssMgrPstRows(prtclRowList.get(0)); + } + 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 +965,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); + } + } } @@ -1160,7 +1215,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements resultList.forEach(t->{ if(!t.getAssPstUsrNm().startsWith("[")) { - if(t.getAssPstUsrNm().indexOf("RPP") < 0) + if(t.getAssPstUsrNm().indexOf("RPP") < 0 && StringUtils.isNotEmpty(t.getAssPstUsrNm())) { System.out.println("t.getAssPstUsrNm() :: "+ t.getAssPstUsrNm()); System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("[")); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 5462ca4c..23b50ad6 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 { @@ -742,6 +750,7 @@ public class AdjReqMgrPastController { try { adjReqMgrPastService.selectAssMgrPstEncryption(); } catch (Exception e) { + e.printStackTrace(); return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "암호화 중 오류가 발생하였습니다.", LocalDateTime.now())); } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java index bb6238e5..8f3016fd 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java @@ -41,4 +41,6 @@ public interface AdjRpplService { public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception; public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception; + + public AdjRpplVO findOfRpplBizNm(String adrSeq); } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java index 0e29ae62..ca4a66c6 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java @@ -65,4 +65,8 @@ public class AdjRpplDAO extends EgovAbstractDAO { public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplInfo", adjRpplVO); } + + public AdjRpplVO findOfRpplBizNm(String adrSeq) { + return (AdjRpplVO) select("adjRpplDAO.findOfRpplBizNm", adrSeq); + } } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java index 0f3e2ee6..a80abbee 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java @@ -88,6 +88,10 @@ public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements AdjR public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { return adjRpplDAO.selectAdjRpplInfo(adjRpplVO); } + @Override + public AdjRpplVO findOfRpplBizNm(String adrSeq) { + return adjRpplDAO.findOfRpplBizNm(adrSeq); + } } diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 6cc2b6b4..b985aee1 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.dreamsecurity.magicline.util.Log; + import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.util.StringUtil; @@ -125,11 +127,19 @@ public class CertDocController { rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); String returnUrl = ""; - + System.out.println("dlvinfoVO.getEmail() :: "+ dlvinfoVO.getEmail()); + System.out.println("encEmail :: "+ encEmail); + System.out.println("rpplVO.getRpplEmail() :: "+ rpplVO.getRpplEmail()); + /* + * dlvinfoVO.getEmail() :: hehihoho3@naver.com + * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= + * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== + * */ //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return if(!encEmail.equals(rpplVO.getRpplEmail())){ diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index b32a9b0a..f773f491 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -33,7 +33,6 @@ 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 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8 @@ -96,7 +95,8 @@ Globals.MainPage = /cmm/main/mainPage.do 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/ -Globals.Solr.url=http://localhost:8983/solr +Globals.Solr.url=http://192.168.0.125:8983/solr +#Globals.Solr.url=http://localhost:8983/solr #SNS \ub85c\uadf8\uc778 KEY \uac12 #ITN \ub124\uc774\ubc84 @@ -191,4 +191,15 @@ Globals.pay.siteDomain=http://119.193.215.98:8081/web/kccadr/payment/inipay #inipay \uacb0\uc81c #Globals.pay.mid=crosorkr01 #Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 -#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay \ No newline at end of file + +#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay + +#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 +Globals.MagicDB.PolicyName=POLICY001 + +#Sns \uc778\uc99d \uac12 +Globals.Naver.clientId=c7G40_m4so3YV8Ypb4D3 +Globals.Naver.callbackUrl=http://119.193.215.98:8081/web/kccadr/certDoc/snsCallBack.do + +#[\uce74\uce74\uc624]Sns \uc778\uc99d \uac12 +Globals.Kakao.Key=5c0404a0840eb8821a0fdf6b3f2659b4 diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 9b6c9e88..2ce807e8 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -194,4 +194,12 @@ Globals.pay.siteDomain=http://119.193.215.98:8087/web/kccadr/payment/inipay #Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay #DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 -Globals.MagicDB.PolicyName=POLICY001 \ No newline at end of file +Globals.MagicDB.PolicyName=POLICY001 + +#[NAVER]Sns \uc778\uc99d \uac12 +Globals.Naver.clientId=UiWLhNqpDveCCjwepWtS +Globals.Naver.callbackUrl=http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do + +#[\uce74\uce74\uc624]Sns \uc778\uc99d \uac12 +Globals.Kakao.Key=bf3de0d897afe0e4bef0775f7086f048 + diff --git a/src/main/resources/egovframework/egovProps/globals_pst.properties b/src/main/resources/egovframework/egovProps/globals_pst.properties new file mode 100644 index 00000000..7ff926e7 --- /dev/null +++ b/src/main/resources/egovframework/egovProps/globals_pst.properties @@ -0,0 +1,195 @@ +#----------------------------------------------------------------------- +# +# 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 = mysql +Globals.UserName= kccadradvcUr +Globals.Password= kccadradvc!@#$ + +# mysql +#Globals.DriverClassName=net.sf.log4jdbc.DriverSpy +#Globals.Url=jdbc:log4jdbc:mysql://112.161.144.18:3306/kopostMysql +#Globals.DriverClassName=com.mysql.jdbc.Driver +#Globals.Url=jdbc:mysql://14.63.218.135:3306/kofons +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: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 + + +# \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) +Globals.SMSDB.DriverClassName=oracle.jdbc.driver.OracleDriver +Globals.SMSDB.Url=jdbc:oracle:thin:@192.168.0.118:1521:xe +Globals.SMSDB.UserName=KCCADR +Globals.SMSDB.Password=kccadr +# \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uc6b4\uc601) +#Globals.SMSDB.DriverClassName=oracle.jdbc.driver.OracleDriver +#Globals.SMSDB.Url=jdbc:oracle:thin:@222.231.43.26:1521:ora10g +#Globals.SMSDB.UserName=smsmanager +#Globals.SMSDB.Password=eksanswk2014 + +Globals.SMSDB.SendTelNo=02-2669-0042 +Globals.SMSDB.TrId=kccadr + +# \uc800\uc791\uc704 \uba54\uc77c\uc804\uc1a1 +Globals.KccMail.URI=https://mail.copyright.or.kr/mail_api/form_send_mail +Globals.KccMail.api_key=#!@mail5455 +Globals.KccMail.sender=adr@copyright.or.kr +Globals.KccMail.title=[\ud55c\uad6d\uc800\uc791\uad8c\uc704\uc6d0\ud68c] \ubd84\uc7c1\uc870\uc815\uc2dc\uc2a4\ud15c \uc54c\ub9bc + + +#SSO \uc811\uc18d\uc815\ubcf4 +#\uac1c\ubc1c\uc11c\ubc84 +Globals.sso.ssoUri=https://devsso.copyright.or.kr/oauth2/token.do +Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 +Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 +Globals.sso.scope=http://sso.copyright.or.kr +Globals.sso.returnSiteUrl=http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do +Globals.sso.returnSiteCode=SITE011 + +#\uc2e4\uc11c\ubc84 +#Globals.sso.ssoUri=https://sso.copyright.or.kr/oauth2/token.do +#Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 +#Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 +#Globals.sso.scope=http://sso.copyright.or.kr +#Globals.sso.returnSiteUrl=http://adr.copyright.or.kr/web/user/login/ssoUsrModifyResult.do +#Globals.sso.returnSiteCode=SITE011 + +#SSO \ud1b5\ud569\ud68c\uc6d0\uc0ac\uc774\ud2b8 URL +#\uac1c\ubc1c\uc11c\ubc84 +Globals.sso.joinUrl=https://devoneid.copyright.or.kr/member/signUp/signUpStep1.do +Globals.sso.modifyUrl=https://devoneid.copyright.or.kr/member/baseInfo/baseInfoModify.do +Globals.sso.idFindUrl=https://devoneid.copyright.or.kr/member/infoFind/idFindStep1.do +Globals.sso.pwFindUrl=https://devoneid.copyright.or.kr/member/infoFind/passFindStep1.do +#\uc2e4\uc11c\ubc84 +#Globals.sso.joinUrl=https://oneid.copyright.or.kr/member/signUp/signUpStep1.do +#Globals.sso.modifyUrl=https://oneid.copyright.or.kr/member/baseInfo/baseInfoModify.do +#Globals.sso.idFindUrl=https://oneid.copyright.or.kr/member/infoFind/idFindStep1.do +#Globals.sso.pwFindUrl=https://oneid.copyright.or.kr/member/infoFind/passFindStep1.do + +# MainPage Setting(admin) +Globals.MainPage = /cmm/main/mainPage.do +#\ucee8\ud150\uce20 \ud30c\uc77c\uc704\uce58 +#Globals.ckeditorUploadDir=/home/file/ckeditor/ +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/ +Globals.Solr.url=http://localhost:8983/solr + +#SNS \ub85c\uadf8\uc778 KEY \uac12 +#ITN \ub124\uc774\ubc84 +Globals.kcc.naver.clentId=d9Ohvhty_RVsfrq9p_2J +Globals.kcc.naver.clientSecret=kwiEmpkLg5 +Globals.kcc.naver.returnUrl=http://localhost:80/snsLogin/naverOauth.do +#ITN \uce74\uce74\uc624 +Globals.kcc.kakao.restApiKey=10b66ad0c44b68b659855ddd64db2c44 +Globals.kcc.kakao.returnUrl=http://localhost:80/snsLogin/kakaoOauth.do + +#\uc0ac\uc774\ud2b8 \uc544\uc774\ub514 \uc81c\uac70\ub85c JSP\uc5d0\uc11c siteId/siteNm \ubcf4\uc5ec\uc8fc\uae30 \uc704\ud574 +Globals.homepage.siteId=kccadr +Globals.homepage.siteNm=\uc804\uc790\uc870\uc815\uc2dc\uc2a4\ud15c + +#\uc774\ub2c8\uc2dc\uc2a4PG \uac00\uc0c1\uacc4\uc88c +Globals.iniPg.ip1=203.238.37.15 +Globals.iniPg.ip2=39.115.212.9 +Globals.iniPg.ip3=183.109.71.153 +Globals.iniPg.mid=crosorkr01 +Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 + + + +#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:8091)============================================================= +## \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:8091 +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/ + +#prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 +#\uac1c\ubc1c\uc11c\ubc84 +Globals.prod.islocal=local +#\uc2e4\uc11c\ubc84 +#Globals.prod.islocal=real + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c +#\uac1c\ubc1c\uc11c\ubc84 +Globals.ozFontPath=/home/oz80/fontTestDir/ +#\uc2e4\uc11c\ubc84 +#Globals.ozFontPath=/home/oz80/fontTestDir/ + +#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 +Globals.ozFont=NanumSquareR.ttf + +#\ub300\uc6a9\ub7c9 innorix filePath +Globals.Innorix.FilePath=D:\\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 +#\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 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..20702f6c 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# - + @@ -881,7 +883,11 @@ DELETE FROM ADR_PRTCL_MGR WHERE ADR_SEQ = #adrSeq# - + + + + DELETE FROM ADR_ASS_MGR_PST + WHERE ADR_SEQ = #adrSeq# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml index 18cc0e2e..12e4463b 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml @@ -110,4 +110,14 @@ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp index a34e8f52..28f49bb6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp @@ -361,7 +361,40 @@

+ + + +

+ +

+ +
+

@@ -374,6 +407,7 @@

+ <%-- diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 62b9906e..0601aeaa 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -1837,7 +1837,7 @@ $(document).ready(function(){ - + - +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp index 91070d5e..4c9dbf0f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp @@ -210,7 +210,6 @@
- @@ -219,11 +218,6 @@ - @@ -235,21 +229,6 @@ - @@ -271,11 +250,11 @@ '); return false;">${list.adrDocTy} - <%-- +   - --%> + - +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 93f43bcf..95aa1557 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -11,6 +11,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<% pageContext.setAttribute("replaceChar", "\n"); %> <% /** @@ -1012,7 +1013,18 @@ - + + +
- - - - 일자
-

- - - - - <%-- - - --%> - - - - -

-

${list.frstRegistPnttm}

신청인

+ + + (대표: ) + + + + + +

신청인의 대리인

@@ -1125,12 +1137,7 @@ -
-
-
- -
-
+
@@ -1143,19 +1150,34 @@ - - + + - - + +

신청취지

+ ${fn:replace(info.reqTempCn1, replaceChar, "
")} +
+ ${fn:replace(info.reqCn1, replaceChar, "
")} +

신청원인

+ ${fn:replace(info.reqTempCn2, replaceChar, "
")} +
+ ${fn:replace(info.reqCn2, replaceChar, "
")} +
+ +
+
+
+ +
+
@@ -1165,9 +1187,7 @@ <%-- --%> <%-- --%> -
-
-
+

결재진행

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/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index 05570bb7..491774db 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -305,9 +305,38 @@ -

- +

+ + + + + + ${list.codeNm} diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp index 8e172607..2754d11c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp @@ -194,6 +194,10 @@

+
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowAdmJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowAdmJsp.jsp new file mode 100644 index 00000000..5150a249 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowAdmJsp.jsp @@ -0,0 +1,53 @@ +<%@ page contentType="text/html;charset=UTF-8"%> + + + +
+
+

조정진행 워크플로우

+ +
+
+
    + +
  • 조정신청 제출

    다음
  • +
  • 신청서 보완

    다음
  • +
  • 조정비용납부

    다음
  • +
  • 사건접수

    다음
  • +
  • 조정부배정

    다음
  • +
+
    +
  • 기일확정

    다음
  • +
  • +

    기일통지

    다음다음 +
      +
    • +

      1차 기일 개최다음

      다음 +
        +
      • 조정성립

      • +
      • 직권조정다음

        +
          +
        • 이의신청

        • +
        +
      • +
      • 조정권고

      • +
      • 쌍방수락여부 확인

      • +
      • 불성립종결

      • +
      +
    • +
    • +

      2차 기일 개최

      다음 +
    • +
    • 3차 기일 개최

      다음
    • +
    • 4차 기일 개최

    • +
    +
  • +
  • 기일변경

  • +
  • 변론서 및 답변서

  • +
  • 취하신청

    다음

    취하종결

  • +
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp index 5150a249..fffbac32 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp @@ -17,7 +17,7 @@
  • 신청서 보완

    다음
  • 조정비용납부

    다음
  • 사건접수

    다음
  • -
  • 조정부배정

    다음
  • +
  • 사건진행

    다음
    • 기일확정

      다음
    • 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..c3001367 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 @@ -3,6 +3,10 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + + +
      @@ -67,8 +71,8 @@ $(document).on("click", "#naverLogin", function(){ }); //카카오로그인 - Kakao.init('5a964d4a736ef47416f326a646bcfc5e'); //발급받은 키 중 javascript키를 사용해준다. - //console.log(Kakao.isInitialized()); // sdk초기화여부판단 +// Kakao.init('bf3de0d897afe0e4bef0775f7086f048'); // LOCAL 발급받은 키 중 javascript키를 사용해준다. + Kakao.init(''); // DEV 발급받은 키 중 javascript키를 사용해준다. function kakaoLogin() { Kakao.Auth.login({ success: function (response) { @@ -94,13 +98,13 @@ $(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", + callbackUrl: '', + clientId: '', loginButton: {color: "green", type: 4, height: 40}, isPopup: true /* 팝업을 통한 연동처리 여부 */ } @@ -118,7 +122,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..20e6fa2c 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 @@ -3,14 +3,16 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +