diff --git a/src/main/java/com/example/newnique/auth/config/WebSecurityConfig.java b/src/main/java/com/example/newnique/auth/config/WebSecurityConfig.java index db608dd..0732221 100644 --- a/src/main/java/com/example/newnique/auth/config/WebSecurityConfig.java +++ b/src/main/java/com/example/newnique/auth/config/WebSecurityConfig.java @@ -57,6 +57,7 @@ public CorsConfigurationSource corsConfigurationSource() { config.setAllowCredentials(true); config.addAllowedOrigin("http://localhost:3000"); + config.addAllowedOrigin("https://fe-newneek.vercel.app/"); config.addAllowedMethod("GET"); config.addAllowedMethod("POST"); config.addAllowedMethod("PUT"); diff --git a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java index f3966a8..29e2a96 100644 --- a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java @@ -4,8 +4,6 @@ import com.example.newnique.auth.jwt.JwtUtil; import com.example.newnique.auth.security.UserDetailsImpl; import com.example.newnique.user.dto.LoginRequestDto; -import com.example.newnique.user.entity.User; -import com.example.newnique.user.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -16,7 +14,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import java.io.IOException; @@ -67,7 +64,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR response.setCharacterEncoding("UTF-8"); // JSON 응답 생성 - String json = String.format("{\"msg\": \"로그인이 완료 되었습니다.\", \"emoji\": \"%s\"}", emoji); + String json = "{\"msg\": \"로그인이 완료 되었습니다.\"}"; // JSON 응답 전송 PrintWriter writer = response.getWriter(); @@ -85,7 +82,6 @@ protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServle // JSON 응답 생성 String json = "{\"message\": \"이메일 혹은 비밀번호가 일치하지 않습니다.\",\"statusCode\": \"401\"}"; - // JSON 응답 전송 PrintWriter writer = response.getWriter(); writer.print(json); diff --git a/src/main/java/com/example/newnique/global/Scheduler.java b/src/main/java/com/example/newnique/global/Scheduler.java index bf9ec8b..29ef599 100644 --- a/src/main/java/com/example/newnique/global/Scheduler.java +++ b/src/main/java/com/example/newnique/global/Scheduler.java @@ -2,7 +2,6 @@ import com.example.newnique.news.entity.News; import com.example.newnique.news.repository.NewsRepository; -import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; @@ -54,7 +53,7 @@ public void updateNews() throws InterruptedException { // 원하는 뉴스 사이트의 URL을 지정 String url = "https://www.sedaily.com/"; - List mainCategories = Arrays.asList("증권", "부동산", "경제 · 금융", "산업","정치","사회","국제","오피니언","문화 · 스포츠","서경"); + List mainCategories = Arrays.asList("증권", "부동산", "경제 · 금융", "산업","정치","사회","국제","오피니언","문화 · 스포츠","서경");g Document doc = Jsoup.connect(url).get(); diff --git a/src/main/java/com/example/newnique/news/controller/NewsController.java b/src/main/java/com/example/newnique/news/controller/NewsController.java index e17acf9..3eb6994 100644 --- a/src/main/java/com/example/newnique/news/controller/NewsController.java +++ b/src/main/java/com/example/newnique/news/controller/NewsController.java @@ -76,6 +76,26 @@ public ResponseEntity> SearchNews( return ResponseEntity.ok(newsResponseDtoList); } + @GetMapping("/search/basic") + public ResponseEntity> SearchNewsBaSic( + @RequestParam("keyword") String keyword, + @RequestParam("page") int page, + @RequestParam("size") int size, + @RequestParam("sortBy") String sortBy, + @RequestParam("isAsc") boolean isAsc + ){ + + Map newsResponseDtoList = newsService.SearchNewsBaSic( + keyword, + page - 1, + size, + sortBy, + isAsc + ); + + return ResponseEntity.ok(newsResponseDtoList); + } + @GetMapping("/{newsId}") public ResponseEntity getNewsDetails(@PathVariable Long newsId) { NewsDetailsResponseDto newsDetails = newsService.getNewsDetails(newsId); diff --git a/src/main/java/com/example/newnique/news/dto/NewsDetailsResponseDto.java b/src/main/java/com/example/newnique/news/dto/NewsDetailsResponseDto.java index e9bb50e..903e9de 100644 --- a/src/main/java/com/example/newnique/news/dto/NewsDetailsResponseDto.java +++ b/src/main/java/com/example/newnique/news/dto/NewsDetailsResponseDto.java @@ -4,7 +4,6 @@ import lombok.Getter; import java.time.LocalDate; -import java.util.List; @Getter public class NewsDetailsResponseDto { diff --git a/src/main/java/com/example/newnique/news/service/NewsService.java b/src/main/java/com/example/newnique/news/service/NewsService.java index aa3cc89..2d85c99 100644 --- a/src/main/java/com/example/newnique/news/service/NewsService.java +++ b/src/main/java/com/example/newnique/news/service/NewsService.java @@ -20,7 +20,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; - import java.util.HashMap; import java.util.List; import java.util.Map;