tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
LJH 2022-10-04 17:37:26 +09:00
commit 7bbe1e7288
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/com/cmm/util/IpUtil.java
View File

@ -99,7 +99,7 @@ public class IpUtil {
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")) {//로컬 및 개발서버 요청시 서버 경로 처리
ozServerNm = "http://192.168.0.176:8086"; ozServerNm = "http://119.193.215.98:8086";
}else if(serverNm.contains("192.168.39.144")) {//저작위 업무시스템망에서 오즈 요청시 오즈 서버 경로 처리 }else if(serverNm.contains("192.168.39.144")) {//저작위 업무시스템망에서 오즈 요청시 오즈 서버 경로 처리

16
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp
View File

@ -26,20 +26,12 @@
<html style="height:100%"> <html style="height:100%">
<head> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<%-- <script src="${ozServerNm}/oz80/ozhviewer/jquery-2.0.3.min.js"></script> <script src="${ozServerNm}/oz80/ozhviewer/jquery-2.0.3.min.js"></script>
<link rel="stylesheet" href="${ozServerNm}/oz80/ozhviewer/jquery-ui.css" type="text/css"/> <link rel="stylesheet" href="${ozServerNm}/oz80/ozhviewer/jquery-ui.css" type="text/css"/>
<script src="${ozServerNm}/oz80/ozhviewer/jquery-ui.min.js"></script> <script src="${ozServerNm}/oz80/ozhviewer/jquery-ui.min.js"></script>
<link rel="stylesheet" href="${ozServerNm}/oz80/ozhviewer/ui.dynatree.css" type="text/css"/> <link rel="stylesheet" href="${ozServerNm}/oz80/ozhviewer/ui.dynatree.css" type="text/css"/>
<script type="text/javascript" src="${ozServerNm}/oz80/ozhviewer/jquery.dynatree.js" charset="utf-8"></script> <script type="text/javascript" src="${ozServerNm}/oz80/ozhviewer/jquery.dynatree.js" charset="utf-8"></script>
<script type="text/javascript" src="${ozServerNm}/oz80/ozhviewer/OZJSViewer.js" charset="utf-8"></script> --%> <script type="text/javascript" src="${ozServerNm}/oz80/ozhviewer/OZJSViewer.js" charset="utf-8"></script>
<!-- 오즈리포트 개발서버 CORS 테스트 -->
<script src="http://119.193.215.98:8086/oz80/ozhviewer/jquery-2.0.3.min.js"></script>
<link rel="stylesheet" href="http://119.193.215.98:8086/oz80/ozhviewer/jquery-ui.css" type="text/css"/>
<script src="http://119.193.215.98:8086/oz80/ozhviewer/jquery-ui.min.js"></script>
<link rel="stylesheet" href="http://119.193.215.98:8086/oz80/ozhviewer/ui.dynatree.css" type="text/css"/>
<script type="text/javascript" src="http://119.193.215.98:8086/oz80/ozhviewer/jquery.dynatree.js" charset="utf-8"></script>
<script type="text/javascript" src="http://119.193.215.98:8086/oz80/ozhviewer/OZJSViewer.js" charset="utf-8"></script>
</head> </head>
<body style="width:98%;height:98%"> <body style="width:98%;height:98%">
@ -51,7 +43,7 @@
var jsonData = '${jsObjData}'; var jsonData = '${jsObjData}';
oz = document.getElementById("OZViewer"); oz = document.getElementById("OZViewer");
oz.sendToActionScript("information.debug", "true"); oz.sendToActionScript("information.debug", "true");
oz.sendToActionScript("connection.servlet", 'http://119.193.215.98:8086'+"/oz80/server"); oz.sendToActionScript("connection.servlet", '${ozServerNm}'+"/oz80/server");
oz.sendToActionScript("connection.reportname", "/admin/adrAppSlctReport.ozr"); oz.sendToActionScript("connection.reportname", "/admin/adrAppSlctReport.ozr");
oz.sendToActionScript('connection.pcount', '1'); oz.sendToActionScript('connection.pcount', '1');
oz.sendToActionScript('connection.args1', 'jsonData=' + jsonData); //Json 파라미터 전달 oz.sendToActionScript('connection.args1', 'jsonData=' + jsonData); //Json 파라미터 전달
@ -80,7 +72,7 @@
opt["print_exportfrom"] = "server"; //인쇄 PDF 익스포트 작업을 서버와 통신하여 동작 opt["print_exportfrom"] = "server"; //인쇄 PDF 익스포트 작업을 서버와 통신하여 동작
opt["save_exportfrom"] = { "pdf" : "server" }; //PDF 익스포트 작업을 서버와 통신하여 동작 opt["save_exportfrom"] = { "pdf" : "server" }; //PDF 익스포트 작업을 서버와 통신하여 동작
start_ozjs("OZViewer", 'http://119.193.215.98:8086'+"/oz80/ozhviewer/", opt); start_ozjs("OZViewer", '${ozServerNm}'+"/oz80/ozhviewer/", opt);
</script> </script>
</body> </body>