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

Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
wyh 2023-10-13 18:17:14 +09:00
commit 79a7cab09d
6 changed files with 16 additions and 5 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

@ -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("192.168.0.176") || serverNm.contains("ljhtest")) {//로컬 및 개발서버 요청시 서버 경로 처리
ozServerNm = "http://119.193.215.98:8086";
// ozServerNm = "http://192.168.0.176:8091";

10
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -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();

3
src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
View File

@ -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);

2
src/main/resources/egovframework/egovProps/globals_dev.properties
View File

@ -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||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

2
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -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||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

2
src/main/resources/egovframework/egovProps/globals_svr.properties
View File

@ -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||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