add cdms nginx infomation for production

2026-02-24 20:08:21 +09:00
parent a4c3fc5185
commit ab52256c05
7 changed files with 20 additions and 50 deletions
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -21,13 +21,7 @@ services:
      start_period: 10s

  kamco-cd-api:
-    build:
-      context: .
-      dockerfile: Dockerfile-prod
-      args:
-        UID: 1000        # manager01 UID
-        GID: 1000        # manager01 GID
-    image: kamco-cd-api:${IMAGE_TAG:-latest}
+    image: kamco-api-app:260219
    container_name: kamco-cd-api
    user: "1000:1000"
    environment:
--- a/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java
+++ b/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java
@@ -285,13 +285,17 @@ public class FIleChecker {

    List<Folder> folderList = List.of();

-    try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {
+    log.info("[FIND_FOLDER] DIR : {} {} {} {}",dirPath,sortType,maxDepth,startPath);

+    int childDirCount = getChildFolderCount(startPath.toFile());
+    log.info("[FIND_FOLDER] START_PATH_CHILD_DIR_COUNT : {}", childDirCount);
+
+    try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {
      folderList =
          stream
              .filter(Files::isDirectory)
-              .filter(p -> !p.toString().equals(dirPath))
-              .map(
+            .filter(p -> !p.toAbsolutePath().normalize().equals(startPath.toAbsolutePath().normalize()))
+            .map(
                  path -> {
                    int depth = path.getNameCount();

@@ -302,11 +306,6 @@ public class FIleChecker {

                    boolean isShowHide =
                        !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에 kamco-nfs 하위만 나오도록 처리
-                    //              boolean isValid =
-                    //                !NameValidator.containsKorean(folderNm)
-                    //                  && !NameValidator.containsWhitespaceRegex(folderNm)
-                    //                  && !parentFolderNm.equals("kamco-nfs");
-
                    File file = new File(fullPath);
                    int childCnt = getChildFolderCount(file);
                    String lastModified = getLastModified(file);
@@ -358,22 +357,6 @@ public class FIleChecker {
    return getFolderAll(dirPath, "name", 1);
  }

-  public static List<Folder> getFolderAll(String dirPath, String sortType) {
-    return getFolderAll(dirPath, sortType, 1);
-  }
-
-  public static int getChildFolderCount(String dirPath) {
-    File directory = new File(dirPath);
-    File[] childFolders = directory.listFiles(File::isDirectory);
-
-    int childCnt = 0;
-    if (childFolders != null) {
-      childCnt = childFolders.length;
-    }
-
-    return childCnt;
-  }
-
  public static int getChildFolderCount(File directory) {
    File[] childFolders = directory.listFiles(File::isDirectory);

@@ -385,11 +368,6 @@ public class FIleChecker {
    return childCnt;
  }

-  public static String getLastModified(String dirPath) {
-    File file = new File(dirPath);
-    return dttmFormat.format(new Date(file.lastModified()));
-  }
-
  public static String getLastModified(File file) {
    return dttmFormat.format(new Date(file.lastModified()));
  }
--- a/src/main/java/com/kamco/cd/kamcoback/config/OpenApiConfig.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/OpenApiConfig.java
@@ -24,7 +24,7 @@ public class OpenApiConfig {
  @Value("${swagger.dev-url:https://kamco.dev-api.gs.dabeeo.com}")
  private String devUrl;

-  @Value("${swagger.prod-url:https://api.kamco.com}")
+  @Value("${swagger.prod-url:https://aicd-api.e-kamco.com:12013}")
  private String prodUrl;

  @Bean
@@ -51,9 +51,9 @@ public class OpenApiConfig {
      servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
      //      servers.add(new Server().url(prodUrl).description("운영 서버"));
    } else if ("prod".equals(profile)) {
-      //      servers.add(new Server().url(prodUrl).description("운영 서버"));
+      servers.add(new Server().url(prodUrl).description("운영 서버"));
      servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
-      servers.add(new Server().url(devUrl).description("개발 서버"));
+
    } else {
      servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
      servers.add(new Server().url(devUrl).description("개발 서버"));
--- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
@@ -336,10 +336,9 @@ public class MapSheetMngService {

  public FoldersDto getFolderAll(SrchFoldersDto srchDto) {

-    Path startPath = Paths.get(syncRootDir + srchDto.getDirPath());
    String dirPath = syncRootDir + srchDto.getDirPath();
-    String sortType = "name desc";

+    log.info("[FIND_FOLDER] DIR : {}",dirPath);
    List<FIleChecker.Folder> folderList =
        FIleChecker.getFolderAll(dirPath).stream()
            .filter(dir -> dir.getIsValid().equals(true))
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -97,8 +97,8 @@ file:
  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
+#  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 추론결과
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -74,8 +74,8 @@ file:
  #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
+#  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/
@@ -88,6 +88,7 @@ file:

  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
@@ -106,5 +107,6 @@ training-data:

 layer:
  geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  path: /geoserver/cd/gwc/service/
+  wms-path: geoserver/cd
+  wmts-path: geoserver/cd/gwc/service
  workspace: cd
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -84,12 +84,9 @@ mapsheet:
    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       # image upload temp dir
+  sync-tmp-dir: /kamco-nfs/repo/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/model_output/ #변경 model_output
  dataset-dir: /kamco-nfs/model_output/export/  # 마운트경로 AI 추론결과