diff --git a/label/label-to-review/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/label/label-to-review/.gradle/buildOutputCleanup/buildOutputCleanup.lock index bc04f09..4d27b0f 100644 Binary files a/label/label-to-review/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/label/label-to-review/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/label/label-to-review/.gradle/file-system.probe b/label/label-to-review/.gradle/file-system.probe index 9a4dc8c..e860189 100644 Binary files a/label/label-to-review/.gradle/file-system.probe and b/label/label-to-review/.gradle/file-system.probe differ diff --git a/label/label-to-review/build/resources/main/application.yml b/label/label-to-review/build/resources/main/application.yml index b6d0803..113c2f6 100644 --- a/label/label-to-review/build/resources/main/application.yml +++ b/label/label-to-review/build/resources/main/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: kamco-change-detection-api + name: kamco-label-to-review profiles: active: prod # 사용할 프로파일 지정 (ex. dev, prod, test) @@ -21,11 +21,6 @@ spring: max-lifetime: 1800000 leak-detection-threshold: 60000 - data: - redis: - host: localhost - port: 6379 - password: jpa: hibernate: ddl-auto: update # 테이블이 없으면 생성, 있으면 업데이트 @@ -40,11 +35,6 @@ logging: 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 # actuator management: health: diff --git a/label/label-to-review/build/tmp/compileJava/previous-compilation-data.bin b/label/label-to-review/build/tmp/compileJava/previous-compilation-data.bin index 5325165..8f5576e 100644 Binary files a/label/label-to-review/build/tmp/compileJava/previous-compilation-data.bin and b/label/label-to-review/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/label/label-to-review/src/main/resources/application-dev.yml b/label/label-to-review/src/main/resources/application-dev.yml index 498806e..b70101e 100644 --- a/label/label-to-review/src/main/resources/application-dev.yml +++ b/label/label-to-review/src/main/resources/application-dev.yml @@ -23,7 +23,6 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - #url: jdbc:postgresql://localhost:15432/kamco_cds username: kamco_cds password: kamco_cds_Q!W@E#R$ hikari: @@ -37,102 +36,9 @@ spring: transaction: default-timeout: 300 # 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일 - #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 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/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/label/label-to-review/src/main/resources/application-prod.yml b/label/label-to-review/src/main/resources/application-prod.yml index 471febd..d085d26 100644 --- a/label/label-to-review/src/main/resources/application-prod.yml +++ b/label/label-to-review/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,9 @@ 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 - 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 - -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/label/label-to-review/src/main/resources/application.yml b/label/label-to-review/src/main/resources/application.yml index b6d0803..113c2f6 100644 --- a/label/label-to-review/src/main/resources/application.yml +++ b/label/label-to-review/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: kamco-change-detection-api + name: kamco-label-to-review profiles: active: prod # 사용할 프로파일 지정 (ex. dev, prod, test) @@ -21,11 +21,6 @@ spring: max-lifetime: 1800000 leak-detection-threshold: 60000 - data: - redis: - host: localhost - port: 6379 - password: jpa: hibernate: ddl-auto: update # 테이블이 없으면 생성, 있으면 업데이트 @@ -40,11 +35,6 @@ logging: 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 # actuator management: health: