diff --git a/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/pnu-update/.gradle/8.14/executionHistory/executionHistory.bin index 4e18399..885e1ac 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 0a2b870..73fed4a 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 62b2b3b..650261c 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 665264e..6834fb7 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/8.14/fileHashes/resourceHashesCache.bin b/gukyuin/pnu-update/.gradle/8.14/fileHashes/resourceHashesCache.bin index 3eeea2e..70c2795 100644 Binary files a/gukyuin/pnu-update/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/gukyuin/pnu-update/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/pnu-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock index cb137ac..eb7dad5 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 9b8ae4b..1810118 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/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class b/gukyuin/pnu-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class index d2e40f7..92e4893 100644 Binary files a/gukyuin/pnu-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class and b/gukyuin/pnu-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class differ diff --git a/gukyuin/pnu-update/build/libs/pnu-update.jar b/gukyuin/pnu-update/build/libs/pnu-update.jar index a724563..eb7b50a 100644 Binary files a/gukyuin/pnu-update/build/libs/pnu-update.jar and b/gukyuin/pnu-update/build/libs/pnu-update.jar differ diff --git a/gukyuin/pnu-update/build/reports/problems/problems-report.html b/gukyuin/pnu-update/build/reports/problems/problems-report.html index 4380c13..7ee1a2a 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-dev.yml b/gukyuin/pnu-update/build/resources/main/application-dev.yml index d7611e7..1bc93ff 100644 --- a/gukyuin/pnu-update/build/resources/main/application-dev.yml +++ b/gukyuin/pnu-update/build/resources/main/application-dev.yml @@ -50,26 +50,6 @@ spring: 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일 - #access-token-validity-in-ms: 60000 # 1분 - #refresh-token-validity-in-ms: 300000 # 5분 - -token: - refresh-cookie-name: kamco-dev # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: root: INFO @@ -82,55 +62,6 @@ logging: org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO org.springframework.web.servlet.DispatcherServlet: INFO - -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /app/tmp/detect/result #현재사용안함 - - - -file: - #sync-root-dir: D:/kamco-nfs/images/ - sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: /kamco-nfs/requests/temp # image upload temp dir - #sync-tmp-dir: ${file.sync-root-dir}/tmp - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2024 - sync-auto-exception-before-year-cnt: 3 - - #dataset-dir: D:/kamco-nfs/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/model/v6-cls-checkpoints/ - pt-FileName: yolov8_6th-6m.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://192.168.2.183:8000/jobs - batch-url: http://192.168.2.183:8000/batches - geojson-dir: /kamco-nfs/requests/ # 추론실행을 위한 파일생성경로 - jar-path: /kamco-nfs/repo/jar/shp-exporter.jar - inference-server-name: server1,server2,server3,server4 - gukyuin: - #url: http://localhost:8080 url: http://192.168.2.129: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/pnu-update/build/resources/main/application-local.yml b/gukyuin/pnu-update/build/resources/main/application-local.yml index cb09429..2720076 100644 --- a/gukyuin/pnu-update/build/resources/main/application-local.yml +++ b/gukyuin/pnu-update/build/resources/main/application-local.yml @@ -16,99 +16,18 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - # url: jdbc:postgresql://localhost:5432/local_0128 username: kamco_cds password: kamco_cds_Q!W@E#R$ - # username: postgres - # password: 1234 hikari: minimum-idle: 1 maximum-pool-size: 5 - data: - redis: - host: 192.168.2.109 - port: 6379 - 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-local # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: org.hibernate.SQL: debug org.hibernate.orm.jdbc.bind: trace -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /Users/bokmin/detect/result - - - -file: - sync-root-dir: C:/Users/gypark/kamco-nfs/images/ - #sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp/ - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2025 - sync-auto-exception-before-year-cnt: 3 - - dataset-dir: C:/Users/gypark/kamco-nfs/dataset/ - #dataset-dir: /kamco-nfs/dataset/export/ - dataset-tmp-dir: ${file.dataset-dir}tmp/ - - model-dir: C:/Users/gypark/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/classification/ - pt-FileName: v5-best.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://10.100.0.11:8000/jobs - batch-url: http://10.100.0.11:8000/batches - geojson-dir: /kamco-nfs/requests/ - jar-path: jar/makeshp-1.0.0.jar - inference-server-name: server1,server2,server3,server4 - gukyuin: - #url: http://localhost:8080 url: http://192.168.2.129:5301 cdi: ${gukyuin.url}/api/kcd/cdi -training-data: - geojson-dir: /kamco-nfs/model_output/labeling/ - -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/pnu-update/build/resources/main/application-prod.yml b/gukyuin/pnu-update/build/resources/main/application-prod.yml index 9e54db2..dfa7a27 100644 --- a/gukyuin/pnu-update/build/resources/main/application-prod.yml +++ b/gukyuin/pnu-update/build/resources/main/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,68 +36,12 @@ spring: transaction: default-timeout: 300 # 5분 트랜잭션 타임아웃 - - - -server: - tomcat: - max-swallow-size: 4GB - max-http-form-post-size: 4GB - - 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/pnu-update/build/tmp/compileJava/previous-compilation-data.bin b/gukyuin/pnu-update/build/tmp/compileJava/previous-compilation-data.bin index fbfcc03..85332e0 100644 Binary files a/gukyuin/pnu-update/build/tmp/compileJava/previous-compilation-data.bin and b/gukyuin/pnu-update/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gukyuin/pnu-update/src/main/resources/application-dev.yml b/gukyuin/pnu-update/src/main/resources/application-dev.yml index d7611e7..1bc93ff 100644 --- a/gukyuin/pnu-update/src/main/resources/application-dev.yml +++ b/gukyuin/pnu-update/src/main/resources/application-dev.yml @@ -50,26 +50,6 @@ spring: 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일 - #access-token-validity-in-ms: 60000 # 1분 - #refresh-token-validity-in-ms: 300000 # 5분 - -token: - refresh-cookie-name: kamco-dev # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: root: INFO @@ -82,55 +62,6 @@ logging: org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO org.springframework.web.servlet.DispatcherServlet: INFO - -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /app/tmp/detect/result #현재사용안함 - - - -file: - #sync-root-dir: D:/kamco-nfs/images/ - sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: /kamco-nfs/requests/temp # image upload temp dir - #sync-tmp-dir: ${file.sync-root-dir}/tmp - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2024 - sync-auto-exception-before-year-cnt: 3 - - #dataset-dir: D:/kamco-nfs/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/model/v6-cls-checkpoints/ - pt-FileName: yolov8_6th-6m.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://192.168.2.183:8000/jobs - batch-url: http://192.168.2.183:8000/batches - geojson-dir: /kamco-nfs/requests/ # 추론실행을 위한 파일생성경로 - jar-path: /kamco-nfs/repo/jar/shp-exporter.jar - inference-server-name: server1,server2,server3,server4 - gukyuin: - #url: http://localhost:8080 url: http://192.168.2.129: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/pnu-update/src/main/resources/application-local.yml b/gukyuin/pnu-update/src/main/resources/application-local.yml index cb09429..2720076 100644 --- a/gukyuin/pnu-update/src/main/resources/application-local.yml +++ b/gukyuin/pnu-update/src/main/resources/application-local.yml @@ -16,99 +16,18 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - # url: jdbc:postgresql://localhost:5432/local_0128 username: kamco_cds password: kamco_cds_Q!W@E#R$ - # username: postgres - # password: 1234 hikari: minimum-idle: 1 maximum-pool-size: 5 - data: - redis: - host: 192.168.2.109 - port: 6379 - 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-local # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: org.hibernate.SQL: debug org.hibernate.orm.jdbc.bind: trace -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /Users/bokmin/detect/result - - - -file: - sync-root-dir: C:/Users/gypark/kamco-nfs/images/ - #sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp/ - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2025 - sync-auto-exception-before-year-cnt: 3 - - dataset-dir: C:/Users/gypark/kamco-nfs/dataset/ - #dataset-dir: /kamco-nfs/dataset/export/ - dataset-tmp-dir: ${file.dataset-dir}tmp/ - - model-dir: C:/Users/gypark/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/classification/ - pt-FileName: v5-best.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://10.100.0.11:8000/jobs - batch-url: http://10.100.0.11:8000/batches - geojson-dir: /kamco-nfs/requests/ - jar-path: jar/makeshp-1.0.0.jar - inference-server-name: server1,server2,server3,server4 - gukyuin: - #url: http://localhost:8080 url: http://192.168.2.129:5301 cdi: ${gukyuin.url}/api/kcd/cdi -training-data: - geojson-dir: /kamco-nfs/model_output/labeling/ - -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/pnu-update/src/main/resources/application-prod.yml b/gukyuin/pnu-update/src/main/resources/application-prod.yml index 17cd96b..dfa7a27 100644 --- a/gukyuin/pnu-update/src/main/resources/application-prod.yml +++ b/gukyuin/pnu-update/src/main/resources/application-prod.yml @@ -36,11 +36,6 @@ spring: transaction: default-timeout: 300 # 5분 트랜잭션 타임아웃 -server: - tomcat: - max-swallow-size: 4GB - max-http-form-post-size: 4GB - logging: level: root: INFO