From eb3e046886f42e6bfdc34b9f83e6cb542a8427b8 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 22 Dec 2022 17:00:30 +0900 Subject: [PATCH] =?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=B2=B0=EC=9E=AC,=20=EC=95=8C=EB=A6=BC=ED=86=A1=20=20=09=20?= =?UTF-8?q?=EC=8B=A4=EC=84=9C=EB=B2=84/=EA=B0=9C=EB=B0=9C=EC=84=9C?= =?UTF-8?q?=EB=B2=84=20=EA=B5=AC=EB=B6=84=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/accdnt/apm/web/AdjstPayMentController.java | 6 ++++++ .../accdnt/ars/web/AdjstReqStatusController.java | 2 ++ src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java | 6 ------ src/main/java/kcc/kccadr/message/SchedulerUtil.java | 8 ++------ .../jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp | 10 +++++++--- .../jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp | 10 +++++++--- 6 files changed, 24 insertions(+), 18 deletions(-) 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 6eab42bd..63007ba9 100644 --- a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java +++ b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java @@ -75,6 +75,9 @@ public class AdjstPayMentController { @Value("#{globalSettings['Globals.pay.siteDomain']}") private String global_siteDomain; + @Value("#{globalSettings['Globals.prod.islocal']}") + private String prodIsLocal; + @Resource(name="PayService") private PayService payService; @@ -240,6 +243,9 @@ public class AdjstPayMentController { model.addAttribute("list", adjstPayMentVOList); model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("IsLocal", prodIsLocal); + + 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 e6bb51d1..e3574f78 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -673,6 +673,8 @@ public class AdjstReqStatusController { model.addAttribute("merchantData", merchantData); // ======================결제 끝=================== + + model.addAttribute("IsLocal", prodIsLocal); return "/web/kccadr/accdnt/ars/tab/docIssReqList"; } diff --git a/src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java b/src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java index ca304731..492b65b1 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java +++ b/src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java @@ -166,12 +166,6 @@ public class PayUtill { return resultMap; - } - - public void paySetting(HttpServletRequest request, ModelMap model) throws Exception { - - - } // ----------------map to VO 세팅------------------ diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index 516c6f87..1c8e074d 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -67,8 +67,6 @@ public class SchedulerUtil { // @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) public void kakaoAtSendPrcs() throws Exception { System.out.println("===========at scheduler run============"); - log.error("===========at scheduler run============"); - String hostAddr = null; @@ -93,11 +91,10 @@ public class SchedulerUtil { try { System.out.println("server ip ============" + hostAddr); - log.error("server ip ============" + hostAddr); - // if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) { - if(hostAddr.equals(containerIp) ) { +// if(hostAddr.equals(containerIp) ) { + if(hostAddr.equals(dmzIp1) || hostAddr.equals(containerIp) ) { //접속 서버 별 분기처리 필요 List list = kakaoAtSendService.selectKakaoAtList(); @@ -124,7 +121,6 @@ public class SchedulerUtil { } System.out.println("===========at scheduler finish============"); - log.error("===========at scheduler finish============"); } @Bean 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 64404cc7..fc40e190 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 @@ -13,9 +13,13 @@ - - + + + + + + + - - + + + + + + +