From 6d2e62e13c4037e4408d8711e48940b34607ea2a Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 16:56:46 +0900 Subject: [PATCH 1/6] =?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?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 개발서버 오즈리포트 오류 수정 --- .../kcc/kccadr/adjPgrMgr/apm/web/ApmController.java | 10 +++++++++- .../egovframework/egovProps/globals_dev.properties | 2 +- .../egovframework/egovProps/globals_local.properties | 2 +- .../egovframework/egovProps/globals_svr.properties | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index c8350f00..6918a796 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -627,7 +627,15 @@ public class ApmController { //처리일자 PgrCmmVO adrEndDeDayVO = new PgrCmmVO(); adrEndDeDayVO.setAdrSeq(cmmVO.getAdrSeq()); - model.addAttribute("adrEndDeDay", cmmService.selectAdrEndDeDay(adrEndDeDayVO).getAdrEndDeDay()); + + PgrCmmVO PgrCmmVO = new PgrCmmVO(); + PgrCmmVO = cmmService.selectAdrEndDeDay(adrEndDeDayVO); + String adrEndDeDay = ""; + if(PgrCmmVO != null) { + adrEndDeDay = PgrCmmVO.getAdrEndDeDay(); + } + + model.addAttribute("adrEndDeDay", adrEndDeDay); }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 75108ffb..0727d80d 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -178,7 +178,7 @@ Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.200 #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index df245679..192d71dd 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -187,7 +187,7 @@ Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index bb3e263f..e3a7875c 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -176,7 +176,7 @@ Globals.prod.islocal=real Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.176 Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 #Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out From dfc5f07385da3e3ff897f8aa0aaa0325fe242d33 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 17:32:35 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=A1=B0=EC=A0=80?= =?UTF-8?q?=EC=9E=87=EC=8A=A4=ED=85=8C=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 오즈리포트 서버 정보불러오는부분 수정 --- src/main/java/kcc/com/cmm/util/IpUtil.java | 2 +- src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index 88f5e56b..08661da7 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -97,7 +97,7 @@ public class IpUtil { String ozServerNm = ""; - if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 + if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("172.25.0.9")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://119.193.215.98:8086"; // ozServerNm = "http://192.168.0.176:8091"; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 6918a796..9897d59d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -2683,6 +2683,9 @@ public class ApmController { //오즈리포트 서버별 주소 셋팅해주기 String serverName = req.getServerName(); + + System.out.println("++++++++++++++++++++++++++++++++++++++++++ serverName : "+ serverName); + String ozServerNm = IpUtil.getOzServerName(serverName); model.addAttribute("ozServerNm", ozServerNm); From 15f6507931c0b8afb3198c22b7371124cb1bab16 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 17:34:22 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/util/IpUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index 08661da7..46ef4bf6 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -97,7 +97,7 @@ public class IpUtil { String ozServerNm = ""; - if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("172.25.0.9")) {//로컬 및 개발서버 요청시 서버 경로 처리 + if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("172.25.0.9") || serverNm.contains("ljhtest")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://119.193.215.98:8086"; // ozServerNm = "http://192.168.0.176:8091"; From e47c40756266d83191ed0ea7c38e5c441a964d20 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 17:37:51 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=BB=A4=EB=B0=8B.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_dev.properties | 2 +- .../resources/egovframework/egovProps/globals_local.properties | 2 +- .../resources/egovframework/egovProps/globals_svr.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 0727d80d..f7133f8f 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -178,7 +178,7 @@ Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.200 #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 192d71dd..c776d251 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -187,7 +187,7 @@ Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index e3a7875c..672c77e4 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -176,7 +176,7 @@ Globals.prod.islocal=real Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.176 Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9 +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 #Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out From 6e08632dff7832c1afea563fd1c0483b2833514d Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 17:44:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=BB=A4=EB=B0=8B.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java | 3 --- .../java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 9897d59d..6918a796 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -2683,9 +2683,6 @@ public class ApmController { //오즈리포트 서버별 주소 셋팅해주기 String serverName = req.getServerName(); - - System.out.println("++++++++++++++++++++++++++++++++++++++++++ serverName : "+ serverName); - String ozServerNm = IpUtil.getOzServerName(serverName); model.addAttribute("ozServerNm", ozServerNm); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index d5dd04cd..2a31569b 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -910,6 +910,9 @@ public class AdjReqMgrController { //오즈리포트 서버별 주소 셋팅해주기 String serverName = req.getServerName(); + + System.out.println("++++++++++++++++++++++++++++++++++++++++++ serverName : "+ serverName); + String ozServerNm = IpUtil.getOzServerName(serverName); model.addAttribute("ozServerNm", ozServerNm); From fdf4d264c31c41752566b8f9377ba4db3d2c2e62 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 13 Oct 2023 17:48:03 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EC=BB=A4=EB=B0=8B.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/util/IpUtil.java | 2 +- .../resources/egovframework/egovProps/globals_dev.properties | 2 +- .../resources/egovframework/egovProps/globals_local.properties | 2 +- .../resources/egovframework/egovProps/globals_svr.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index 46ef4bf6..a9e636f8 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -97,7 +97,7 @@ public class IpUtil { String ozServerNm = ""; - if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("172.25.0.9") || serverNm.contains("ljhtest")) {//로컬 및 개발서버 요청시 서버 경로 처리 + if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("192.168.0.176") || serverNm.contains("ljhtest")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://119.193.215.98:8086"; // ozServerNm = "http://192.168.0.176:8091"; diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index f7133f8f..0193f259 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -178,7 +178,7 @@ Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.200 #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||192.168.0.176||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index c776d251..da8cf287 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -187,7 +187,7 @@ Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||192.168.0.176||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 672c77e4..b6f81c03 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -176,7 +176,7 @@ Globals.prod.islocal=real Globals.oz.devServerIp=192.168.0.176:8086 Globals.oz.devSchedulerIp=192.168.0.176 Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9||ljhtest +Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||192.168.0.176||ljhtest Globals.oz.realServerIp=192.168.39.145:8080 Globals.oz.realSchedulerIp=192.168.39.147 #Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out