From 27af35e5c5d3dd6ccd288422137856e58ebebc9c Mon Sep 17 00:00:00 2001 From: seongjunkim Date: Fri, 19 Jan 2024 12:29:20 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20ShortUrlService=EA=B0=80=20=EB=A1=A4?= =?UTF-8?q?=EB=B0=B1=EB=90=98=EC=96=B4=EC=84=9C=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Back-end-secret | 2 +- .../com/strcat/service/ShortUrlService.java | 66 ------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 src/main/java/com/strcat/service/ShortUrlService.java diff --git a/Back-end-secret b/Back-end-secret index ef5b415..b21a050 160000 --- a/Back-end-secret +++ b/Back-end-secret @@ -1 +1 @@ -Subproject commit ef5b41537bab229964ccfb96bfb3bd6a13298ce2 +Subproject commit b21a050a7ff41da36991e2b4bcb636e3941f77a4 diff --git a/src/main/java/com/strcat/service/ShortUrlService.java b/src/main/java/com/strcat/service/ShortUrlService.java deleted file mode 100644 index 200cb0e..0000000 --- a/src/main/java/com/strcat/service/ShortUrlService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.strcat.service; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.strcat.exception.NotAcceptableException; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.http.client.ClientHttpRequestExecution; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.util.UriComponentsBuilder; - -@Service -public class ShortUrlService { - private final String id; - private final String secret; - - @Autowired - public ShortUrlService(@Value("${naver.client.id}") String id, - @Value("${naver.client.secret}") String secret) { - this.id = id; - this.secret = secret; - } - - public String generateUrl(String originUrl) { - // 헤더 설정 - HttpHeaders headers = new HttpHeaders(); - headers.set("X-Naver-Client-Id", id); - headers.set("X-Naver-Client-Secret", secret); - - // 쿼리 파라미터 설정 - String API_URL = "https://openapi.naver.com/v1/util/shorturl"; - UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(API_URL) - .queryParam("url", originUrl); - - RestTemplate restTemplate = new RestTemplate(); - - //header 설정 - restTemplate.setInterceptors(List.of( - (HttpRequest request, byte[] body, ClientHttpRequestExecution execution) -> { - request.getHeaders().addAll(headers); - return execution.execute(request, body); - } - )); - - try { - String json = restTemplate.getForEntity(builder.toUriString(), String.class).getBody(); - - return extractUrl(json); - } catch (Exception err) { - throw new NotAcceptableException("url 단축 실패"); - } - } - - private String extractUrl(String rawResponse) throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - - JsonNode jsonNode = objectMapper.readTree(rawResponse).get("result"); - - return jsonNode.get("url").asText(); - } -}