diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index 47863ef3..88f5e56b 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -100,6 +100,7 @@ public class IpUtil { if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://119.193.215.98:8086"; +// ozServerNm = "http://192.168.0.176:8091"; }else if(serverNm.contains("192.168.39.144")) {//저작위 업무시스템망에서 오즈 요청시 오즈 서버 경로 처리 diff --git a/src/main/java/kcc/com/cmm/util/StringUtil.java b/src/main/java/kcc/com/cmm/util/StringUtil.java index f202ea77..a7647d48 100644 --- a/src/main/java/kcc/com/cmm/util/StringUtil.java +++ b/src/main/java/kcc/com/cmm/util/StringUtil.java @@ -506,7 +506,7 @@ public class StringUtil { }else{ //개발서버 시스템 주소 셋팅 - repUrl = url.replaceAll("host_dev", "http://119.193.215.98:8091"); + repUrl = url.replaceAll("host_dev", "http://119.193.215.98:8081"); } diff --git a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java index 2c544973..e10f8c37 100644 --- a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java +++ b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java @@ -1,6 +1,8 @@ package kcc.kccadr.accdnt.apm.web; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -9,11 +11,14 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import com.inicis.std.util.SignatureUtil; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -50,6 +55,15 @@ public class AdjstPayMentController { @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + + @Value("#{globalSettings['Globals.pay.mid']}") + private String global_mid; + + @Value("#{globalSettings['Globals.pay.signKey']}") + private String global_signKey; + + @Value("#{globalSettings['Globals.pay.siteDomain']}") + private String global_siteDomain; /** * 기일변경신청 목록 @@ -135,12 +149,71 @@ public class AdjstPayMentController { /** * 수수료 상세 */ - @RequestMapping("/web/kccadr/accdnt/apm/adjstPayMentDetail.do") - public String adjstPayMentDetail(@ModelAttribute("adjstPayMentVO") AdjstPayMentVO adjstPayMentVO, ModelMap model,HttpSession session) throws Exception { - adjstPayMentVO.setFrstRegisterId("USRCNFRM_00000002510"); - model.addAttribute("list", adjstPayMentService.selectAdjstPayMentDetailList(adjstPayMentVO)); - //SsoLoginVO ssoLoginVO = (SsoLoginVO)session.getAttribute("SSOLoginVO"); - //adjstPayMentVO.setFrstRegisterId(ssoLoginVO.getMembId()); + @RequestMapping("/web/kccadr/payment/accdnt/apm/adjstPayMentDetail.do") + public String adjstPayMentDetail(@ModelAttribute("adjstPayMentVO") AdjstPayMentVO adjstPayMentVO, ModelMap model,HttpSession session, HttpServletRequest request) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + SsoLoginVO ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO"); + + adjstPayMentVO.setFrstRegisterId(loginVO.getUniqId()); + + List adjstPayMentVOList = adjstPayMentService.selectAdjstPayMentDetailList(adjstPayMentVO); + + //수수료 합계 + int totalPrice = 0; + + for(AdjstPayMentVO tmp: adjstPayMentVOList.get(0).getList()) { + totalPrice += Integer.valueOf(tmp.getAdrCost()); + } + + // ======================결제 시작=================== + String mid = global_mid; // 상점아이디 + String signKey = global_signKey; // 웹 결제 signkey + + String mKey = SignatureUtil.hash(signKey, "SHA-256"); + + String timestamp = SignatureUtil.getTimestamp(); // util에 의해서 자동생성 + String orderNumber = mid+"_"+SignatureUtil.getTimestamp(); // 가맹점 주문번호(가맹점에서 직접 설정) + //결제요금 + String price = String.valueOf(totalPrice); // 상품가격(특수기호 제외, 가맹점에서 직접 설정) + + Map signParam = new HashMap(); + + signParam.put("oid", orderNumber); + signParam.put("price", price); + signParam.put("timestamp", timestamp); + + + String signature = SignatureUtil.makeSignature(signParam); + + /* 기타 */ + String siteDomain = global_siteDomain; //가맹점 도메인 입력 + + //서버정보 받아오기 + String scheme = request.getScheme(); + String serverName = request.getServerName(); + String serverPort = String.valueOf(request.getServerPort()); + if(!"".equals(serverPort)) serverPort = ":" + serverPort; + + String requestUrl = scheme + "://" + serverName + serverPort; + + //고객사 임의데이터 ("요청URL" + "§" + "pk") + String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + + model.addAttribute("mid", mid); + model.addAttribute("signKey", signKey); + model.addAttribute("mKey", mKey); + model.addAttribute("timestamp", timestamp); + model.addAttribute("orderNumber", orderNumber); + model.addAttribute("price", price); + model.addAttribute("signature", signature); + model.addAttribute("siteDomain", siteDomain); + model.addAttribute("merchantData", merchantData); + + // ======================결제 끝=================== + + model.addAttribute("list", adjstPayMentVOList); + model.addAttribute("ssoLoginVO", ssoLoginVO); return "/web/kccadr/accdnt/apm/adjstPayMentDetail"; } diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index 6f75b1b7..cf3a19e5 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -61,6 +62,7 @@ import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrCommonVO; +import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -560,11 +562,21 @@ public class AdjstReqStatusController { } // 대국민 조정사건 기록열람 신청 목록 - @RequestMapping(value = "/web/kccadr/accdnt/ai/docIssReqList.do") - public String docIssReqList(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, ModelMap model, HttpServletRequest request) throws Exception { + @RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssReqList.do") + public String docIssReqList(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, + ModelMap model, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + + String sessionId = request.getSession().getId(); + System.out.println(sessionId); + response.setHeader("Set-Cookie", "JSESSIONID="+ sessionId +"; Path=/; Secure; SameSite=None"); + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + SsoLoginVO ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO"); + if (loginVO == null) { model.addAttribute("msg", "로그인 해주세요."); @@ -608,6 +620,7 @@ public class AdjstReqStatusController { } model.addAttribute("list", list); + model.addAttribute("ssoLoginVO", ssoLoginVO); // ======================결제 시작=================== @@ -618,16 +631,24 @@ public class AdjstReqStatusController { String timestamp = SignatureUtil.getTimestamp(); // util에 의해서 자동생성 String orderNumber = mid+"_"+SignatureUtil.getTimestamp(); // 가맹점 주문번호(가맹점에서 직접 설정) - String price = "10"; // 상품가격(특수기호 제외, 가맹점에서 직접 설정) + //열람 비용 + String price_view = "500"; // 상품가격(특수기호 제외, 가맹점에서 직접 설정) + //발급 비용 + String price_print = "800"; // 상품가격(특수기호 제외, 가맹점에서 직접 설정) + Map signParam_view = new HashMap(); + Map signParam_print = new HashMap(); - Map signParam = new HashMap(); + signParam_view.put("oid", orderNumber); + signParam_view.put("price", price_view); + signParam_view.put("timestamp", timestamp); + + signParam_print.put("oid", orderNumber); + signParam_print.put("price", price_print); + signParam_print.put("timestamp", timestamp); - signParam.put("oid", orderNumber); - signParam.put("price", price); - signParam.put("timestamp", timestamp); - - String signature = SignatureUtil.makeSignature(signParam); + String signature_view = SignatureUtil.makeSignature(signParam_view); + String signature_print = SignatureUtil.makeSignature(signParam_print); /* 기타 */ String siteDomain = global_siteDomain; //가맹점 도메인 입력 @@ -648,8 +669,10 @@ public class AdjstReqStatusController { model.addAttribute("mKey", mKey); model.addAttribute("timestamp", timestamp); model.addAttribute("orderNumber", orderNumber); - model.addAttribute("price", price); - model.addAttribute("signature", signature); + model.addAttribute("price_view", price_view); + model.addAttribute("price_print", price_print); + model.addAttribute("signature_view", signature_view); + model.addAttribute("signature_print", signature_print); model.addAttribute("siteDomain", siteDomain); model.addAttribute("merchantData", merchantData); @@ -733,7 +756,7 @@ public class AdjstReqStatusController { adrRecordReadingService.deletedocIssReq(adrRecordReadingVO); // 삭제 redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete")); // 공통메세지 - return "redirect:/web/kccadr/accdnt/ai/docIssReqList.do"; + return "redirect:/web/kccadr/payment/accdnt/ai/docIssReqList.do"; } /** @@ -784,7 +807,7 @@ public class AdjstReqStatusController { } - return "redirect:/web/kccadr/accdnt/ai/docIssReqList.do"; + return "redirect:/web/kccadr/payment/accdnt/ai/docIssReqList.do"; } /** diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java index d3d56c6c..d05f32b5 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.util.StringUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrService; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; @@ -451,11 +452,18 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A // 결제내역 삭제... adjReqMgrDAO.deleteAdjstReqMgrPaymentList(searchVO); sn = 1; + + String test = ""; + if(StringUtil.isNotEmpty(searchVO.getPayment().get(0).getAccTy())) { + test = searchVO.getPayment().get(0).getAccTy(); + } + for(AdjReqMgrVO model : searchVO.getPayment()){ model.setFrstRegisterId(searchVO.getFrstRegisterId()); model.setLastUpdusrId(searchVO.getFrstRegisterId()); model.setApprSeq(payIdgen.getNextStringId()); model.setApprSn(String.valueOf(sn)); + model.setAccTy(test); adjReqMgrDAO.insertAdjReqMgrRegPaymentSave(model); sn++; } diff --git a/src/main/java/kcc/kccadr/adjst/web/InipayWebController.java b/src/main/java/kcc/kccadr/adjst/web/InipayWebController.java index 6b52f6d6..2a1f4d64 100644 --- a/src/main/java/kcc/kccadr/adjst/web/InipayWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/InipayWebController.java @@ -53,14 +53,14 @@ public class InipayWebController { /* * 신청인 및 대리인 작성화면 STEP1 * */ - @RequestMapping("/web/kccadr/inipay/close.do") + @RequestMapping("/web/kccadr/payment/inipay/close.do") public String close( ) throws Exception { return "/web/kccadr/inipay/close"; } - @RequestMapping("/web/kccadr/inipay/INIStdPayRequest.do") + @RequestMapping("/web/kccadr/payment/inipay/INIStdPayRequest.do") public String INIStdPayRequest( ) throws Exception { @@ -68,7 +68,7 @@ public class InipayWebController { return "/web/kccadr/inipay/INIStdPayRequest"; } - @RequestMapping("/web/kccadr/inipay/INIStdPayBill.do") + @RequestMapping("/web/kccadr/payment/inipay/INIStdPayBill.do") public String INIStdPayBill( ) throws Exception { @@ -76,7 +76,7 @@ public class InipayWebController { return "/web/kccadr/inipay/INIStdPayBill"; } - @RequestMapping("/web/kccadr/inipay/INIStdPayRelay.do") + @RequestMapping("/web/kccadr/payment/inipay/INIStdPayRelay.do") public String INIStdPayRelay( ) throws Exception { @@ -84,7 +84,7 @@ public class InipayWebController { return "/web/kccadr/inipay/INIStdPayRelay"; } - @RequestMapping("/web/kccadr/inipay/INIStdPayReturn.do") + @RequestMapping("/web/kccadr/payment/inipay/INIStdPayReturn.do") public String INIStdPayReturn( ) throws Exception { @@ -92,7 +92,7 @@ public class InipayWebController { return "/web/kccadr/inipay/INIStdPayReturn"; } - @RequestMapping("/web/kccadr/inipay/popup.do") + @RequestMapping("/web/kccadr/payment/inipay/popup.do") public String popup( ) throws Exception { @@ -106,7 +106,7 @@ public class InipayWebController { * 신용카드 결제 요청 URL * * */ - @RequestMapping("/web/kccadr/inipay/INIstdpayPcReq.do") + @RequestMapping("/web/kccadr/payment/inipay/INIstdpayPcReq.do") public String INIstdpayPcReq(ModelMap model ) throws Exception { @@ -131,7 +131,7 @@ public class InipayWebController { String signature = SignatureUtil.makeSignature(signParam); /* 기타 */ - String siteDomain = "http://127.0.0.1:8089/web/kccadr/inipay"; //가맹점 도메인 입력 + String siteDomain = "http://127.0.0.1:8089/web/kccadr/payment/inipay"; //가맹점 도메인 입력 model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); @@ -151,7 +151,7 @@ public class InipayWebController { * 신용카드 결제 리턴 URL * * */ - @RequestMapping("/web/kccadr/inipay/INIstdpayPcReturn.do") + @RequestMapping("/web/kccadr/payment/inipay/INIstdpayPcReturn.do") public String INIstdpayPcReturn(HttpServletRequest request , ModelMap model , RedirectAttributes rttr @@ -219,11 +219,12 @@ public class InipayWebController { * 신용카드 결제 닫기 URL * * */ - @RequestMapping("/web/kccadr/inipay/INIstdpayClose.do") + @RequestMapping("/web/kccadr/payment/inipay/INIstdpayClose.do") public String INIstdpayClose( ) throws Exception { - + + System.out.println("test"); return "/web/kccadr/inipay/close"; } diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 8a9bccae..61a0d027 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -445,7 +445,7 @@ public class EgovLoginController { SsoLoginVO ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO"); // 실서버 적용시 바꾸기 - /*String returnSiteUrl = "http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do";*/ + /*String returnSiteUrl = "http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do";*/ String returnSiteUrl = returnSiteUrlGlobal; ssoLoginVO.setReturnSiteUrl(URLEncoder.encode(returnSiteUrl)); diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 61029994..c83cbe36 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -66,7 +66,7 @@ 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.returnSiteUrl=http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##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)============================================================= +##=====================================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:8091 +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/ @@ -186,9 +186,9 @@ Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ #\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.siteDomain=http://119.193.215.98:8081/web/kccadr/payment/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.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index c6a887b0..b32a9b0a 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -66,7 +66,7 @@ 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.returnSiteUrl=http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##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)============================================================= +##=====================================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:8091 +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/ @@ -186,9 +186,9 @@ Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ #\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.siteDomain=http://119.193.215.98:8081/web/kccadr/payment/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.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 15fb59d5..9b6c9e88 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -65,7 +65,7 @@ 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.returnSiteUrl=http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##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)============================================================= +##=====================================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:8091 +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/ @@ -186,12 +186,12 @@ Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ #\uac1c\ubc1c\uc11c\ubc84 Globals.pay.mid=INIpayTest Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS -Globals.pay.siteDomain=http://119.193.215.98:8081/web/kccadr/inipay +Globals.pay.siteDomain=http://119.193.215.98:8087/web/kccadr/payment/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 +#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 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 8ce635c0..8ad4d6d0 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -65,7 +65,7 @@ Globals.KccMail.title=[\ud55c\uad6d\uc800\uc791\uad8c\uc704\uc6d0\ud68c] \ubd84\ #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.returnSiteUrl=http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do #Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 Globals.sso.ssoUri=https://sso.copyright.or.kr/oauth2/token.do @@ -144,10 +144,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##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)============================================================= +##=====================================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:8091 +#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/ @@ -184,11 +184,11 @@ Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ #\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.siteDomain=http://119.193.215.98:8081/web/kccadr/payment/inipay #\uc2e4\uc11c\ubc84 Globals.pay.mid=crosorkr01 Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 -Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/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 diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml index b633d21b..6b048861 100644 --- a/src/main/resources/egovframework/spring/com/context-security.xml +++ b/src/main/resources/egovframework/spring/com/context-security.xml @@ -20,7 +20,7 @@ - + + 우리은행 1005-802-193838 - 가상계좌 + 신용카드결제

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp index 3f5cb9e0..92bce70f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp @@ -10,6 +10,13 @@ 수수료 상세정보 + + + + + + +
+ + + + + + + + + + + + + + + + + +
+
@@ -85,7 +118,7 @@ - +

@@ -103,12 +136,12 @@

수수료합계

-

+ +

-
@@ -145,6 +178,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentList.jsp index cf237469..4f4f1d22 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentList.jsp @@ -133,7 +133,7 @@ var listForm = document.listForm ; listForm.adrSeq.value = adrSeq; listForm.mltApprSeq.value = mltApprSeq; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -295,7 +295,8 @@ 결제구분

- ${list.adrCostBatchYn eq 'Y' ? '일괄결제' : empty list.adrCostBatchYn ? '-' : '단독결제' } + ${list.apprTy eq '01' ? '계좌이체' : '카드결제' } + <%-- ${list.adrCostBatchYn eq 'Y' ? '일괄결제' : empty list.adrCostBatchYn ? '-' : '단독결제' } --%>

@@ -307,7 +308,7 @@ 결제상태

- ${list.adrPayYn eq 'N' ? '미결제' : '결제'} + ${list.adrPayYn eq 'N' ? '결제대기' : '결제완료'}

@@ -321,6 +322,9 @@ + + +

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp index 7af35952..edadbd9b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp @@ -28,26 +28,40 @@ - - - + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqViewPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqViewPop.jsp index 5aa1ea49..55b13832 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqViewPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqViewPop.jsp @@ -38,7 +38,7 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("신청이 완료되었습니다."); - window.location.href=""; + window.location.href=""; } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/inipay/INIstdpay_pc_req.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/inipay/INIstdpay_pc_req.jsp index 07e472ef..675088d0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/inipay/INIstdpay_pc_req.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/inipay/INIstdpay_pc_req.jsp @@ -21,7 +21,7 @@ String signature = SignatureUtil.makeSignature(signParam); /* 기타 */ - String siteDomain = "http://127.0.0.1:8089/web/kccadr/inipay"; //가맹점 도메인 입력 + String siteDomain = "http://127.0.0.1:8089/web/kccadr/payment/inipay"; //가맹점 도메인 입력 %> --%> @@ -138,9 +138,9 @@ <%-- --%> - + <%-- --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 25a27d14..898b3669 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -178,7 +178,7 @@ function fn_egov_inqire_notice(bbsId, nttId) {

진행상황

- +

열람·발급