diff --git a/gukyuin/.idea/.gitignore b/gukyuin/.idea/.gitignore
new file mode 100644
index 0000000..c3f502a
--- /dev/null
+++ b/gukyuin/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 디폴트 무시된 파일
+/shelf/
+/workspace.xml
+# 에디터 기반 HTTP 클라이언트 요청
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/gukyuin/.idea/gradle.xml b/gukyuin/.idea/gradle.xml
new file mode 100644
index 0000000..b66d05a
--- /dev/null
+++ b/gukyuin/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/.idea/gukyuin.iml b/gukyuin/.idea/gukyuin.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/gukyuin/.idea/gukyuin.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/.idea/misc.xml b/gukyuin/.idea/misc.xml
new file mode 100644
index 0000000..2212740
--- /dev/null
+++ b/gukyuin/.idea/misc.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/.idea/modules.xml b/gukyuin/.idea/modules.xml
new file mode 100644
index 0000000..8d937d6
--- /dev/null
+++ b/gukyuin/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/.idea/vcs.xml b/gukyuin/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/gukyuin/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/label-send/.gradle/8.14/checksums/checksums.lock b/gukyuin/label-send/.gradle/8.14/checksums/checksums.lock
index f939e90..0e7c577 100644
Binary files a/gukyuin/label-send/.gradle/8.14/checksums/checksums.lock and b/gukyuin/label-send/.gradle/8.14/checksums/checksums.lock differ
diff --git a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock
index d691f7b..bb55efd 100644
Binary files a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock differ
diff --git a/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 5f98e05..cd131d4 100644
Binary files a/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin
index 19309fb..4e18399 100644
Binary files a/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin and b/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin differ
diff --git a/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.lock b/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.lock
index df9b025..0a2b870 100644
Binary files a/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.lock and b/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.lock differ
diff --git a/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.bin
index 3dd142e..62b2b3b 100644
Binary files a/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.bin differ
diff --git a/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.lock
index 751d52f..665264e 100644
Binary files a/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/pnu-update/.gradle/8.14/fileHashes/fileHashes.lock differ
diff --git a/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index a78e795..cb137ac 100644
Binary files a/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/gukyuin/pnu-update/.gradle/file-system.probe b/gukyuin/pnu-update/.gradle/file-system.probe
index 8c89478..9b8ae4b 100644
Binary files a/gukyuin/pnu-update/.gradle/file-system.probe and b/gukyuin/pnu-update/.gradle/file-system.probe differ
diff --git a/gukyuin/pnu-update/.idea/misc.xml b/gukyuin/pnu-update/.idea/misc.xml
index ab8d4ac..c6d45de 100644
--- a/gukyuin/pnu-update/.idea/misc.xml
+++ b/gukyuin/pnu-update/.idea/misc.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/gukyuin/pnu-update/.idea/vcs.xml b/gukyuin/pnu-update/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/gukyuin/pnu-update/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/pnu-update/build/reports/problems/problems-report.html b/gukyuin/pnu-update/build/reports/problems/problems-report.html
index 7ee1a2a..4380c13 100644
--- a/gukyuin/pnu-update/build/reports/problems/problems-report.html
+++ b/gukyuin/pnu-update/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
diff --git a/gukyuin/pnu-update/build/resources/main/application-prod.yml b/gukyuin/pnu-update/build/resources/main/application-prod.yml
index 471febd..9e54db2 100644
--- a/gukyuin/pnu-update/build/resources/main/application-prod.yml
+++ b/gukyuin/pnu-update/build/resources/main/application-prod.yml
@@ -37,32 +37,14 @@ spring:
transaction:
default-timeout: 300 # 5분 트랜잭션 타임아웃
- data:
- redis:
- host: 127.0.0.1
- port: 16379
- password: kamco
- servlet:
- multipart:
- enabled: true
- max-file-size: 4GB
- max-request-size: 4GB
- file-size-threshold: 10MB
+
server:
tomcat:
max-swallow-size: 4GB
max-http-form-post-size: 4GB
-jwt:
- secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b"
- access-token-validity-in-ms: 86400000 # 1일
- refresh-token-validity-in-ms: 604800000 # 7일
-
-token:
- refresh-cookie-name: kamco # 개발용 쿠키 이름
- refresh-cookie-secure: true # 로컬 http 테스트면 false
logging:
level:
diff --git a/gukyuin/pnu-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java b/gukyuin/pnu-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java
index 48c0a7d..7d5e182 100644
--- a/gukyuin/pnu-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java
+++ b/gukyuin/pnu-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java
@@ -56,9 +56,6 @@ public class GukYuinApiService {
@Value("${gukyuin.cdi}")
private String gukyuinCdiUrl;
- @Value("${file.dataset-dir}")
- private String datasetDir;
-
@Transactional
public ChngDetectMastDto.RegistResDto regist(ChnDetectMastReqDto chnDetectMastReq) {
diff --git a/gukyuin/pnu-update/src/main/resources/application-prod.yml b/gukyuin/pnu-update/src/main/resources/application-prod.yml
index 471febd..17cd96b 100644
--- a/gukyuin/pnu-update/src/main/resources/application-prod.yml
+++ b/gukyuin/pnu-update/src/main/resources/application-prod.yml
@@ -23,7 +23,6 @@ spring:
datasource:
url: jdbc:postgresql://kamco-cd-postgis:5432/kamco_cds
- #url: jdbc:postgresql://localhost:15432/kamco_cds
username: kamco_cds
password: kamco_cds_Q!W@E#R$
hikari:
@@ -37,86 +36,17 @@ spring:
transaction:
default-timeout: 300 # 5분 트랜잭션 타임아웃
- data:
- redis:
- host: 127.0.0.1
- port: 16379
- password: kamco
-
- servlet:
- multipart:
- enabled: true
- max-file-size: 4GB
- max-request-size: 4GB
- file-size-threshold: 10MB
-
server:
tomcat:
max-swallow-size: 4GB
max-http-form-post-size: 4GB
-jwt:
- secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b"
- access-token-validity-in-ms: 86400000 # 1일
- refresh-token-validity-in-ms: 604800000 # 7일
-
-token:
- refresh-cookie-name: kamco # 개발용 쿠키 이름
- refresh-cookie-secure: true # 로컬 http 테스트면 false
-
logging:
level:
root: INFO
- org.springframework.web: DEBUG
- org.springframework.security: DEBUG
-
- # 헬스체크 노이즈 핵심만 다운
- org.springframework.security.web.FilterChainProxy: INFO
- org.springframework.security.web.authentication.AnonymousAuthenticationFilter: INFO
- org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO
- org.springframework.web.servlet.DispatcherServlet: INFO
-
-
-mapsheet:
- upload:
- skipGdalValidation: true
- shp:
- baseurl: /app/detect/result #현재사용안함
-
-file:
- sync-root-dir: /kamco-nfs/images/
- sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir
- sync-file-extention: tfw,tif
-
- #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output
- dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과
- dataset-tmp-dir: ${file.dataset-dir}tmp/
-
- #model-dir: D:/kamco-nfs/ckpt/model/
- model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로
- model-tmp-dir: ${file.model-dir}tmp/
- model-file-extention: pth,json,py
-
- pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/
- pt-FileName: yolov8_6th-6m.pt
- dataset-response: /kamco-nfs/dataset/response/
-
-inference:
- url: http://127.0.0.1:8000/jobs
- batch-url: http://127.0.0.1:8000/batches
- geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로
- jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로
- inference-server-name: server1,server2,server3,server4
+ org.springframework.web: INFO
+ org.springframework.security: INFO
gukyuin:
url: http://127.0.0.1:5301
cdi: ${gukyuin.url}/api/kcd/cdi
-
-training-data:
- geojson-dir: /kamco-nfs/dataset/request/
-
-layer:
- geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
- wms-path: geoserver/cd
- wmts-path: geoserver/cd/gwc/service
- workspace: cd
diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin
index 7ea26d6..904e038 100644
Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin differ
diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock
index 1aa5066..dac7a2b 100644
Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock differ
diff --git a/gukyuin/stblt-check/.idea/stblt-check.iml b/gukyuin/stblt-check/.idea/stblt-check.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/gukyuin/stblt-check/.idea/stblt-check.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/stblt-check/.idea/vcs.xml b/gukyuin/stblt-check/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/gukyuin/stblt-check/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gukyuin/stblt-check/build/reports/problems/problems-report.html b/gukyuin/stblt-check/build/reports/problems/problems-report.html
index 385c9a4..e5c6a5c 100644
--- a/gukyuin/stblt-check/build/reports/problems/problems-report.html
+++ b/gukyuin/stblt-check/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
diff --git a/gukyuin/stblt-check/src/main/resources/application-prod.yml b/gukyuin/stblt-check/src/main/resources/application-prod.yml
index 471febd..56626fe 100644
--- a/gukyuin/stblt-check/src/main/resources/application-prod.yml
+++ b/gukyuin/stblt-check/src/main/resources/application-prod.yml
@@ -37,38 +37,11 @@ spring:
transaction:
default-timeout: 300 # 5분 트랜잭션 타임아웃
- data:
- redis:
- host: 127.0.0.1
- port: 16379
- password: kamco
-
- servlet:
- multipart:
- enabled: true
- max-file-size: 4GB
- max-request-size: 4GB
- file-size-threshold: 10MB
-
-server:
- tomcat:
- max-swallow-size: 4GB
- max-http-form-post-size: 4GB
-
-jwt:
- secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b"
- access-token-validity-in-ms: 86400000 # 1일
- refresh-token-validity-in-ms: 604800000 # 7일
-
-token:
- refresh-cookie-name: kamco # 개발용 쿠키 이름
- refresh-cookie-secure: true # 로컬 http 테스트면 false
-
logging:
level:
root: INFO
- org.springframework.web: DEBUG
- org.springframework.security: DEBUG
+ org.springframework.web: INFO
+ org.springframework.security: INFO
# 헬스체크 노이즈 핵심만 다운
org.springframework.security.web.FilterChainProxy: INFO
@@ -76,47 +49,9 @@ logging:
org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO
org.springframework.web.servlet.DispatcherServlet: INFO
-
-mapsheet:
- upload:
- skipGdalValidation: true
- shp:
- baseurl: /app/detect/result #현재사용안함
-
file:
- sync-root-dir: /kamco-nfs/images/
- sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir
- sync-file-extention: tfw,tif
-
- #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output
- dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과
- dataset-tmp-dir: ${file.dataset-dir}tmp/
-
- #model-dir: D:/kamco-nfs/ckpt/model/
- model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로
- model-tmp-dir: ${file.model-dir}tmp/
- model-file-extention: pth,json,py
-
- pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/
- pt-FileName: yolov8_6th-6m.pt
- dataset-response: /kamco-nfs/dataset/response/
-
-inference:
- url: http://127.0.0.1:8000/jobs
- batch-url: http://127.0.0.1:8000/batches
- geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로
- jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로
- inference-server-name: server1,server2,server3,server4
+ output-dir: /kamco-nfs/dataset/export/
gukyuin:
url: http://127.0.0.1:5301
cdi: ${gukyuin.url}/api/kcd/cdi
-
-training-data:
- geojson-dir: /kamco-nfs/dataset/request/
-
-layer:
- geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
- wms-path: geoserver/cd
- wmts-path: geoserver/cd/gwc/service
- workspace: cd