From 685fbf4c514c2406f696f4b2909464479092f9c0 Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 5 Sep 2022 17:43:35 +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?=EB=A9=94=EC=9D=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=EC=B0=BD=20sort=20=EC=88=9C=EC=84=9C=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EB=85=B8=EC=B6=9C=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=20-=20oz=EB=A6=AC=ED=8F=AC=ED=8A=B8=20export=20ip=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= 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/ozSchd/web/OzSchdExportUtil.java | 4 ++-- src/main/java/kcc/web/MainController.java | 2 ++ src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp | 3 ++- 4 files changed, 7 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 695eab24..fbfae2d8 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("219.240.88.15")) {//로컬 및 개발서버 요청시 서버 경로 처리 + if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://219.240.88.15:8091"; diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index 1c3f79c9..f4bbef3c 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -22,9 +22,9 @@ public class OzSchdExportUtil { //개발서버 및 운영서버 구분에 따른 서버 정보 셋팅 String serverNm = request.getServerName(); - if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15")) { + if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) { - ozApiUrl = "http://219.240.88.15:8091/oz80/server"; + ozApiUrl = "http://192.168.0.125:8091/oz80/server"; ozApiIp = "192.168.0.125"; }else { diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index ca8f2b7b..49f86a13 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -417,6 +417,8 @@ public class MainController { popupzoneVo.setFirstIndex(0); popupzoneVo.setSeCd("02"); //좌측팝업 popupzoneVo.setUseYn("Y"); + popupzoneVo.setSearchSortCnd("MB.sort"); + popupzoneVo.setSearchSortOrd("ASC"); List popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo); model.addAttribute("popupzoneList", popupzoneList); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp index af4754d2..04c8ad1d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp @@ -369,7 +369,8 @@ - + <%-- --%> +