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

Merge branch 'tolag'

Browse Source
This commit is contained in:
leejunho 2023-07-14 16:39:58 +09:00
commit 670c74cffc
5 changed files with 5 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/web/StreamDocsController.java
View File

@ -208,7 +208,7 @@ public class StreamDocsController {
}else { }else {
System.out.println("종료가 안된 경우XXXXXXXXXXXXXXX"); System.out.println("종료가 안된 경우XXXXXXXXXXXXXXX");
//return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now())); //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); //PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);

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

@ -174,7 +174,7 @@ Globals.prod.islocal=local
#\uac1c\ubc1c\uc11c\ubc84 #\uac1c\ubc1c\uc11c\ubc84
Globals.ozFontPath=/home/oz80/fontTestDir/ Globals.ozFontPath=/home/oz80/fontTestDir/
#oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac #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.devSchedulerIp=192.168.0.200
#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data #Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data
Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out

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

@ -181,7 +181,7 @@ Globals.prod.islocal=local
#\uac1c\ubc1c\uc11c\ubc84 #\uac1c\ubc1c\uc11c\ubc84
Globals.ozFontPath=/home/oz80/fontTestDir/ Globals.ozFontPath=/home/oz80/fontTestDir/
#oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac #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.176
Globals.oz.devSchedulerIp=192.168.0.200 Globals.oz.devSchedulerIp=192.168.0.200
#scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4. #scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4.

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

@ -175,7 +175,7 @@ Globals.prod.islocal=local
#\uac1c\ubc1c\uc11c\ubc84 #\uac1c\ubc1c\uc11c\ubc84
Globals.ozFontPath=/home/oz80/fontTestDir/ Globals.ozFontPath=/home/oz80/fontTestDir/
#oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac #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.176
Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data 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

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

@ -173,7 +173,7 @@ Globals.prod.islocal=real
#\uac1c\ubc1c\uc11c\ubc84 #\uac1c\ubc1c\uc11c\ubc84
#Globals.ozFontPath=/home/oz80/fontTestDir/ #Globals.ozFontPath=/home/oz80/fontTestDir/
#oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac #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.176
Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data 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