From 5e4a6d1f1a8995b3564a69bdc7c4133c42353aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Thu, 12 Oct 2023 13:43:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A0=EC=94=A8=20API=20serviceKey=20?= =?UTF-8?q?=EB=B0=8F=20URL=20=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/flight/service/BasFlightService.java | 11 ++++++++--- .../biz/api/ctr/cntrl/service/CtrCntrlService.java | 12 +++++++++--- src/main/resources/application.properties | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index 72543f7..510ca75 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -76,7 +76,12 @@ public class BasFlightService { @Value("${spring.config.activate.on-profile:}") private String profile; - + + @Value("${weather.api.url}") + private String weatherUrl; + + @Value("${weather.api.key}") + private String weatherKey; private final FltPlanBasRepository fltPlanBasRepository; private final FltPlanArcrftRepository fltPlanArcrftRepository; private final FltPlanAreaRepository fltPlanAreaRepository; @@ -713,8 +718,8 @@ public class BasFlightService { return schedule; } public JSONObject getWeather(BasFlightWeatherModel rq) throws IOException, ParseException { - StringBuilder urlBuilder = new StringBuilder("http://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/getVilageFcst"); - urlBuilder.append("?" + URLEncoder.encode("serviceKey","UTF-8") + "=r6RMUsk3Vtama7D6uq7MiWV9dTC9MwfIIr4%2F45y0uVNw6BaYbgpKmL%2BLUDFVTfIYUmEe4K%2FaniEjdV9mg5t82Q%3D%3D"); + StringBuilder urlBuilder = new StringBuilder(weatherUrl); + urlBuilder.append("?" + URLEncoder.encode("serviceKey","UTF-8") + weatherKey); urlBuilder.append("&" + URLEncoder.encode("pageNo","UTF-8") + "=" + URLEncoder.encode(rq.getPageNo(),"UTF-8")); urlBuilder.append("&" + URLEncoder.encode("numOfRows","UTF-8") + "=" + URLEncoder.encode(rq.getNumOfRows(), "UTF-8")); /*한 페이지 결과 수*/ urlBuilder.append("&" + URLEncoder.encode("dataType","UTF-8") + "=" + URLEncoder.encode("JSON", "UTF-8")); /*요청자료형식(XML/JSON) Default: XML*/ diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 0c8bb31..4d95154 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -24,6 +24,7 @@ import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.locationtech.jts.geom.Coordinate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -86,7 +87,12 @@ public class CtrCntrlService { private CtrTrnsLctnService ctrTrnsLctnService; @Autowired private FltPlanCtrCntrlRelRepository relRepository; - + + @Value("${weather.api.url}") + private String weatherUrl; + + @Value("${weather.api.key}") + private String weatherKey; private final CtrCntrlQueryRepository query; private final CtrCntrlBasRepository cntrlBasRepository; private final CtrCntrlHstryRepository cntrlHstryRepository; @@ -617,7 +623,7 @@ public class CtrCntrlService { public JSONObject getWeather(CtrCntrlWeatherModel rq) throws IOException, ParseException { - StringBuilder urlBuilder = new StringBuilder("http://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/getVilageFcst"); + StringBuilder urlBuilder = new StringBuilder(weatherUrl); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); Calendar c1 = Calendar.getInstance(); @@ -697,7 +703,7 @@ public class CtrCntrlService { String Snx = String.format("%.0f",nx); String Sny = String.format("%.0f",ny); - urlBuilder.append("?" + URLEncoder.encode("serviceKey","UTF-8") + "=r6RMUsk3Vtama7D6uq7MiWV9dTC9MwfIIr4%2F45y0uVNw6BaYbgpKmL%2BLUDFVTfIYUmEe4K%2FaniEjdV9mg5t82Q%3D%3D"); + urlBuilder.append("?" + URLEncoder.encode("serviceKey","UTF-8") + weatherKey); urlBuilder.append("&" + URLEncoder.encode("pageNo","UTF-8") + "=" + URLEncoder.encode("1","UTF-8")); urlBuilder.append("&" + URLEncoder.encode("numOfRows","UTF-8") + "=" + URLEncoder.encode("14", "UTF-8")); /*한 페이지 결과 수*/ urlBuilder.append("&" + URLEncoder.encode("dataType","UTF-8") + "=" + URLEncoder.encode("JSON", "UTF-8")); /*요청자료형식(XML/JSON) Default: XML*/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6bd6a95..6a1466e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,6 +14,9 @@ naver.api.url=https://naveropenapi.apigw.ntruss.com/map-reversegeocode/v2/gc spring.jwt.secret=jwtsecretkey spring.jwt.prefix=palnet +## Weather key #### +weather.api.url = http://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/getVilageFcst +weather.api.key = =r6RMUsk3Vtama7D6uq7MiWV9dTC9MwfIIr4%2F45y0uVNw6BaYbgpKmL%2BLUDFVTfIYUmEe4K%2FaniEjdV9mg5t82Q%3D%3D ### AWS S3 #### #cloud.aws.credentials.accessKey=AKIAW75VMZKFTMBRXK4I