diff --git a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index 0a2f754..cc4f3e3 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; @@ -26,12 +27,17 @@ import java.util.List; import java.util.Map; @Slf4j -@RequiredArgsConstructor @RestController @RequestMapping(value = "/api/bas/flight", produces = {MediaType.APPLICATION_JSON_VALUE}) public class BasFlightController { private final BasFlightService basFlightService; + private final Environment env; + + public BasFlightController(BasFlightService basFlightService, Environment env) { + this.basFlightService = basFlightService; + this.env = env; + } @GetMapping("/area") public ResponseEntity getAirArea() throws IOException, ParseException { @@ -266,13 +272,13 @@ public class BasFlightController { try { text = URLEncoder.encode(query, "UTF-8"); } catch (UnsupportedEncodingException e) { - throw new RuntimeException("검색어 ㅇ ㅣㄴ코딩 실패", e); + throw new RuntimeException("검색어 인코딩 실패", e); } - String apiURL = "https://openapi.naver.com/v1/search/local.json?query=" + text + "&display=5"; + String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5"; Map requestHeaders = new HashMap<>(); - requestHeaders.put("X-Naver-Client-Id", "WGEct3bJhQC0pyMsP_GK"); - requestHeaders.put("X-Naver-Client-Secret", "Q4K4OtUYol"); + requestHeaders.put("X-Naver-Client-Id", env.getProperty("api.naver.client-id")); + requestHeaders.put("X-Naver-Client-Secret", env.getProperty("api.naver.client-secret-key")); String responseBody = basFlightService.searchArea(apiURL, requestHeaders); JSONParser parser = new JSONParser(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56ca77a..4079316 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -84,6 +84,12 @@ message: exchange-name: websocket.drone.exchange routing-key: websocket.drone.routing.# +api: + naver: + client-id: WGEct3bJhQC0pyMsP_GK + client-secret-key: Q4K4OtUYol + search-url : https://openapi.naver.com/v1/search/local.json + --- spring: @@ -126,6 +132,12 @@ netty: thread: boss: 1 worker: 1 + +api: + naver: + client-id: WGEct3bJhQC0pyMsP_GK + client-secret-key: Q4K4OtUYol + search-url : https://openapi.naver.com/v1/search/local.json --- @@ -188,6 +200,13 @@ message: queue-name: websocket.drone.queue exchange-name: websocket.drone.exchange routing-key: websocket.drone.routing.# + +api: + naver: + client-id: WGEct3bJhQC0pyMsP_GK + client-secret-key: Q4K4OtUYol + search-url : https://openapi.naver.com/v1/search/local.json + --- spring: @@ -248,4 +267,10 @@ message: websocket: queue-name: websocket.drone.queue exchange-name: websocket.drone.exchange - routing-key: websocket.drone.routing.# \ No newline at end of file + routing-key: websocket.drone.routing.# + +api: + naver: + client-id: WGEct3bJhQC0pyMsP_GK + client-secret-key: Q4K4OtUYol + search-url : https://openapi.naver.com/v1/search/local.json \ No newline at end of file