diff --git a/src/main/java/kcc/com/cmm/web/StreamDocsController.java b/src/main/java/kcc/com/cmm/web/StreamDocsController.java index 4ced97bf..afaece4d 100644 --- a/src/main/java/kcc/com/cmm/web/StreamDocsController.java +++ b/src/main/java/kcc/com/cmm/web/StreamDocsController.java @@ -208,7 +208,7 @@ public class StreamDocsController { }else { System.out.println("종료가 안된 경우XXXXXXXXXXXXXXX"); //return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now())); - return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "오류 되었습니다.", LocalDateTime.now())); + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "사건이 종료되지 않았습니다.", LocalDateTime.now())); } //PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO); diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 3654249f..c1650804 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -174,7 +174,7 @@ Globals.prod.islocal=local #\uac1c\ubc1c\uc11c\ubc84 Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac -Globals.oz.devServerIp=192.168.0.176:8091 +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 diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 82defcc6..2acb261f 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -181,7 +181,7 @@ Globals.prod.islocal=local #\uac1c\ubc1c\uc11c\ubc84 Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac -Globals.oz.devServerIp=192.168.0.176:8091 +Globals.oz.devServerIp=192.168.0.176:8086 #Globals.oz.devSchedulerIp=192.168.0.176 Globals.oz.devSchedulerIp=192.168.0.200 #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. diff --git a/src/main/resources/egovframework/egovProps/globals_pst.properties b/src/main/resources/egovframework/egovProps/globals_pst.properties index 8f038060..c6bd13a2 100644 --- a/src/main/resources/egovframework/egovProps/globals_pst.properties +++ b/src/main/resources/egovframework/egovProps/globals_pst.properties @@ -175,7 +175,7 @@ Globals.prod.islocal=local #\uac1c\ubc1c\uc11c\ubc84 Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac -Globals.oz.devServerIp=192.168.0.176:8091 +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 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 716cd270..9606f957 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -173,7 +173,7 @@ Globals.prod.islocal=real #\uac1c\ubc1c\uc11c\ubc84 #Globals.ozFontPath=/home/oz80/fontTestDir/ #oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac -Globals.oz.devServerIp=192.168.0.176:8091 +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