From 3ba3b05f2fd6cf30aa7bfe93422161ba8ce6e334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dean=5B=EB=B0=B1=EB=B3=91=EB=82=A8=5D?= Date: Wed, 11 Feb 2026 06:29:30 +0900 Subject: [PATCH] change prod properties --- Dockerfile-prod | 3 +- docker-compose-dev.yml | 4 --- docker-compose-prod.yml | 6 +--- .../mapsheet/service/MapSheetMngService.java | 1 - .../model/ModelMngApiController.java | 15 --------- .../model/service/ModelMngService.java | 21 ------------ .../kamcoback/upload/UploadApiController.java | 15 --------- src/main/resources/application-dev.yml | 17 +++++----- src/main/resources/application-prod.yml | 32 ++++++++++++------- 9 files changed, 32 insertions(+), 82 deletions(-) diff --git a/Dockerfile-prod b/Dockerfile-prod index 72355443..fdd5b00d 100644 --- a/Dockerfile-prod +++ b/Dockerfile-prod @@ -1,6 +1,5 @@ # 1단계에서 만든 로컬 베이스 이미지를 사용 -FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0 -FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0 +FROM 127.0.0.1:18082/kamco-cd/base-java21-gdal:1.0 # 사용자 설정 (앱 별로 다를 수 있으므로 여기에 유지) ARG UID=1000 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 40b43467..295c7ee5 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -15,10 +15,6 @@ services: - SPRING_PROFILES_ACTIVE=dev - TZ=Asia/Seoul volumes: - - /mnt/nfs_share/images:/app/original-images - - /mnt/nfs_share/model_output:/app/model-outputs - - /mnt/nfs_share/train_dataset:/app/train-dataset - - /mnt/nfs_share/tmp:/app/tmp - /kamco-nfs:/kamco-nfs networks: - kamco-cds diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index cf30cfff..8c586f5c 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -15,11 +15,7 @@ services: - SPRING_PROFILES_ACTIVE=dev - TZ=Asia/Seoul volumes: - - /mnt/nfs_share/images:/app/original-images - - /mnt/nfs_share/model_output:/app/model-outputs - - /mnt/nfs_share/train_dataset:/app/train-dataset - - /mnt/nfs_share/tmp:/app/tmp - - /kamco-nfs:/kamco-nfs + - /data:/kamco-nfs networks: - kamco-cds restart: unless-stopped diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index d41f6615..a8dfb4d9 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java @@ -134,7 +134,6 @@ public class MapSheetMngService { } MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy()); - String targetYearDir = mngDto.getMngPath(); // 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음 // if (!overwrite) { diff --git a/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java index 4a09286c..3fc5d2ae 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java @@ -41,21 +41,6 @@ public class ModelMngApiController { private final ModelMngService modelMngService; - @Value("${file.sync-root-dir}") - private String syncRootDir; - - @Value("${file.sync-tmp-dir}") - private String syncTmpDir; - - @Value("${file.sync-file-extention}") - private String syncFileExtention; - - @Value("${file.dataset-dir}") - private String datasetDir; - - @Value("${file.dataset-tmp-dir}") - private String datasetTmpDir; - @Value("${file.model-dir}") private String modelDir; diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index aadcce9b..ae3e2ff7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -35,27 +35,6 @@ public class ModelMngService { private final UploadService uploadService; - @Value("${file.sync-root-dir}") - private String syncRootDir; - - @Value("${file.sync-tmp-dir}") - private String syncTmpDir; - - @Value("${file.sync-file-extention}") - private String syncFileExtention; - - @Value("${file.dataset-dir}") - private String datasetDir; - - @Value("${file.dataset-tmp-dir}") - private String datasetTmpDir; - - @Value("${file.model-dir}") - private String modelDir; - - @Value("${file.model-tmp-dir}") - private String modelTmpDir; - @Value("${file.pt-path}") private String ptPath; diff --git a/src/main/java/com/kamco/cd/kamcoback/upload/UploadApiController.java b/src/main/java/com/kamco/cd/kamcoback/upload/UploadApiController.java index 97e4ce51..e999c676 100644 --- a/src/main/java/com/kamco/cd/kamcoback/upload/UploadApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/upload/UploadApiController.java @@ -29,27 +29,12 @@ public class UploadApiController { private final UploadService uploadService; - @Value("${file.sync-root-dir}") - private String syncRootDir; - - @Value("${file.sync-tmp-dir}") - private String syncTmpDir; - - @Value("${file.sync-file-extention}") - private String syncFileExtention; - @Value("${file.dataset-dir}") private String datasetDir; @Value("${file.dataset-tmp-dir}") private String datasetTmpDir; - @Value("${file.model-dir}") - private String modelDir; - - @Value("${file.model-tmp-dir}") - private String modelTmpDir; - /* @Operation(summary = "데이터셋 대용량 업로드 세션 시작", description = "데이터셋 대용량 파일 업로드 세션을 시작합니다.") @ApiResponses( diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a17ca543..bce1c2de 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -83,24 +83,25 @@ mapsheet: upload: skipGdalValidation: true shp: - baseurl: /app/tmp/detect/result + baseurl: /app/tmp/detect/result #현재사용안함 file: #sync-root-dir: D:/kamco-nfs/images/ sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp + 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/dataset/ - dataset-dir: /kamco-nfs/dataset/export/ + #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-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py @@ -110,8 +111,8 @@ file: 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/dataset/shp/shp-exporter.jar + geojson-dir: /kamco-nfs/requests/ # 추론실행을 위한 파일생성경로 + jar-path: /kamco-nfs/repo/jar/shp-exporter.jar inference-server-name: server1,server2,server3,server4 gukyuin: @@ -120,7 +121,7 @@ gukyuin: cdi: ${gukyuin.url}/api/kcd/cdi training-data: - geojson-dir: /kamco-nfs/model_output/labeling/ + geojson-dir: /kamco-nfs/dataset/request/ layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 306498e3..6d6a5c8e 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -35,28 +35,39 @@ 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 - - + baseurl: /app/detect/result #현재사용안함 file: #sync-root-dir: D:/kamco-nfs/images/ sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp + sync-tmp-dir: ${file.sync-root-dir}/tmp # image upload temp dir sync-file-extention: tfw,tif sync-auto-exception-start-year: 2025 sync-auto-exception-before-year-cnt: 3 - #dataset-dir: D:/kamco-nfs/dataset/ #으로 변경 model_output - dataset-dir: /kamco-nfs/model_output/export/ + #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-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py @@ -66,13 +77,12 @@ file: 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/shp/shp-exporter.jar + 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 + url: http://127.0.0.1:5301 cdi: ${gukyuin.url}/api/kcd/cdi training-data: