From 0cb72deaa9578effd9181ab89a63c65cc9e65ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?=
 <박재우@host.docker.internal>
Date: Mon, 6 Nov 2023 10:24:01 +0900
Subject: [PATCH] =?UTF-8?q?path=20properties=20yml=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD=20,?=
 =?UTF-8?q?=20util=20@value=20=EC=B6=94=EA=B0=80=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?=
 =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comn/file/service/ComnFileService.java    |  2 +-
 .../com/palnet/comn/utils/FlightUtils.java    | 15 ++++++++++++--
 .../java/com/palnet/comn/utils/PdfUtils.java  |  2 +-
 pav-server/src/main/resources/application.yml | 20 +++++++++++++++----
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
index 7e6c9346..ba77dbaf 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
@@ -50,7 +50,7 @@ public class ComnFileService {
     private final HttpServletResponse response;
 
 
-    @Value("${base-url}")
+    @Value("${url.base.file}")
     private String BASE_PATH;
     private final String DOWNLOAD_URL = "/api/comn/file/download";
     private final String NORMAL_FORDER_PATH = "normal/";
diff --git a/pav-server/src/main/java/com/palnet/comn/utils/FlightUtils.java b/pav-server/src/main/java/com/palnet/comn/utils/FlightUtils.java
index ea951d61..e411089c 100644
--- a/pav-server/src/main/java/com/palnet/comn/utils/FlightUtils.java
+++ b/pav-server/src/main/java/com/palnet/comn/utils/FlightUtils.java
@@ -27,12 +27,23 @@ import org.locationtech.proj4j.BasicCoordinateTransform;
 import org.locationtech.proj4j.CRSFactory;
 import org.locationtech.proj4j.CoordinateReferenceSystem;
 import org.locationtech.proj4j.ProjCoordinate;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
+@Component
 public class FlightUtils {
 	//기본좌표를 받아 버퍼좌표를 생성하는 유틸
+
+	private static String basePath;
+	
+	@Value("${url.base.coord}")
+    public void setPath(String value) {
+		basePath = value;
+    }
+    
 	public static Coordinate[] createBuffer(Coordinate[] lineCoords, Integer bufval) {
 		GeometryFactory geometryFactory = new GeometryFactory();
 		LineString line = new GeometryFactory().createLineString(lineCoords);
@@ -149,12 +160,12 @@ public class FlightUtils {
 	
 	public static JSONObject getCoordinateGis(Coordinate coordinate) throws IOException, ParseException {
 		
-		String path = "C:\\Users\\Jaewoo\\Downloads\\pal\\pav\\kac\\coordinate\\CoordinateFolder\\";
-		
 		String baseFileName = "all_location.geojson";
 		
 		JSONObject obj = new JSONObject();
 		
+		String path = basePath;
+		
 		while(true) {
 			
 			File file = new File(path+baseFileName);
diff --git a/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java b/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
index 41477374..7ccdc095 100644
--- a/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
+++ b/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
@@ -32,7 +32,7 @@ public class PdfUtils {
     
     private final TemplateEngine templateEngine;
     
-    @Value("${base-url}")
+    @Value("${url.base.file}")
     private String BASE_PATH;
     
     private final String PDF_FORDER_PATH = "od/";
diff --git a/pav-server/src/main/resources/application.yml b/pav-server/src/main/resources/application.yml
index 7524bc61..6a394ee5 100644
--- a/pav-server/src/main/resources/application.yml
+++ b/pav-server/src/main/resources/application.yml
@@ -63,7 +63,10 @@ api:
     client-secret-key: Q4K4OtUYol
     search-url : https://openapi.naver.com/v1/search/local.json
 
-base-url: files/
+url:
+  base:
+    file: files/
+    coord: C:\\Users\\Jaewoo\\Downloads\\pal\\pav\\kac\\coordinate\\CoordinateFolder\\
 
 --- 
 
@@ -110,7 +113,10 @@ api:
     client-secret-key: Q4K4OtUYol
     search-url : https://openapi.naver.com/v1/search/local.json
     
-base-url: /data/server/files/
+url:
+  base:
+    file: /data/server/files/
+    coord: /data/coord/coordinateFolder
 
 --- 
 
@@ -166,7 +172,10 @@ api:
     client-secret-key: Q4K4OtUYol
     search-url : https://openapi.naver.com/v1/search/local.json
 
-base-url: /data/server/files/
+url:
+  base:
+    file: /data/server/files/
+    coord: /data/coord/coordinateFolder
 
 --- 
 
@@ -218,4 +227,7 @@ api:
     client-secret-key: Q4K4OtUYol
     search-url : https://openapi.naver.com/v1/search/local.json
 
-base-url: /data/server/files/
\ No newline at end of file
+url:
+  base:
+    file: /data/server/files/
+    coord: /data/coord/coordinateFolder