diff --git a/src/main/java/com/letmeknow/auth/filter/auth/AuthenticationProcessFilter.java b/src/main/java/com/letmeknow/auth/filter/auth/AuthenticationProcessFilter.java index d2816a0..270b93d 100644 --- a/src/main/java/com/letmeknow/auth/filter/auth/AuthenticationProcessFilter.java +++ b/src/main/java/com/letmeknow/auth/filter/auth/AuthenticationProcessFilter.java @@ -43,7 +43,7 @@ public class AuthenticationProcessFilter extends OncePerRequestFilter { private final JwtService jwtService; private final ObjectMapper objectMapper; - private static final List NO_CHECK_URL = Arrays.asList("/api/auth", "/auth/member"); + private static final List NO_CHECK_URL = Arrays.asList("/api/auth", "/auth/member", "/support"); /** * "/auth/login"으로 시작하는 URL 요청은 logIn 검증 및 authenticate X diff --git a/src/main/java/com/letmeknow/config/security/CorsConfig.java b/src/main/java/com/letmeknow/config/security/CorsConfig.java index ca05990..276b58b 100644 --- a/src/main/java/com/letmeknow/config/security/CorsConfig.java +++ b/src/main/java/com/letmeknow/config/security/CorsConfig.java @@ -1,5 +1,6 @@ package com.letmeknow.config.security; +import com.letmeknow.enumstorage.SpringProfile; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,6 +16,12 @@ public class CorsConfig { @Value("${allowed-origin}") private String allowedOrigin; + @Value("${spring.profiles.active}") + private String activeProfile; + + @Value("${server.port}") + private String port; + @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); @@ -23,8 +30,13 @@ public CorsConfigurationSource corsConfigurationSource() { config.setAllowedHeaders(List.of("Authorization", "AuthorizationRefresh, DeviceToken")); config.setExposedHeaders(List.of("Authorization", "AuthorizationRefresh, DeviceToken")); - String httpsDomain = allowedOrigin.replace("http", "https"); - config.setAllowedOrigins(List.of(allowedOrigin, httpsDomain)); + String withPort = allowedOrigin; + if (activeProfile.equals(SpringProfile.LOCAL.getProfile())) { + withPort += ":" + port; + } + + String domain = allowedOrigin.replace("http", "https"); + config.setAllowedOrigins(List.of(withPort, domain)); config.setAllowedMethods(List.of("*")); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); diff --git a/src/main/java/com/letmeknow/config/security/SecurityConfig.java b/src/main/java/com/letmeknow/config/security/SecurityConfig.java index 1551c62..163d8ff 100644 --- a/src/main/java/com/letmeknow/config/security/SecurityConfig.java +++ b/src/main/java/com/letmeknow/config/security/SecurityConfig.java @@ -64,6 +64,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .antMatchers("/api/member/**").permitAll() .antMatchers("/api/request/**").permitAll() .antMatchers("/auth/**").permitAll() + + .antMatchers("/support/**").permitAll() .anyRequest().authenticated() ); diff --git a/src/main/java/com/letmeknow/controller/SupportController.java b/src/main/java/com/letmeknow/controller/SupportController.java new file mode 100644 index 0000000..ac389d7 --- /dev/null +++ b/src/main/java/com/letmeknow/controller/SupportController.java @@ -0,0 +1,14 @@ +package com.letmeknow.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value = "/support") +public class SupportController { + @GetMapping + public String getSupportPage() { + return "support/support"; + } +} diff --git a/src/main/java/com/letmeknow/repository/board/BoardRepositoryImpl.java b/src/main/java/com/letmeknow/repository/board/BoardRepositoryImpl.java index 2e028cf..0f2ce32 100644 --- a/src/main/java/com/letmeknow/repository/board/BoardRepositoryImpl.java +++ b/src/main/java/com/letmeknow/repository/board/BoardRepositoryImpl.java @@ -1,16 +1,9 @@ package com.letmeknow.repository.board; -import com.letmeknow.entity.Board; -import com.querydsl.jpa.impl.JPAQueryFactory; +import javax.persistence.EntityManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; -import javax.persistence.EntityManager; -import java.util.List; - -import static com.letmeknow.entity.QBoard.board; -import static com.letmeknow.entity.notification.QSubscription.subscription; - @Repository @RequiredArgsConstructor public class BoardRepositoryImpl implements BoardRepositoryQueryDsl { diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 323260c..969db84 100755 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,5 +1,10 @@ diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index c3663ac..c9403d9 100755 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -6,9 +6,9 @@ - + - + Let Me Know diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 210792a..164011d 100755 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -12,30 +12,16 @@
-

LetMeKnow

-

회원 기능

-

- 로그인 -

-

-

- 내 정보 - 로그아웃 -

-

상품 기능

-

- 상품 등록 - 상품 목록 -

-

주문 기능

+

Let Me Know!

+

대학교 단과대 게시판 구독 서비스

- 상품 주문 - 주문 내역 + 이 서비스는 대학교 단과대 게시판의 새로운 글을 알려주는 서비스입니다.
+ + 게시판을 찾아 구독하고, 새로운 글이 올라오면 알림을 받아보세요!

-
diff --git a/src/main/resources/templates/support/support.html b/src/main/resources/templates/support/support.html new file mode 100644 index 0000000..c60f3e4 --- /dev/null +++ b/src/main/resources/templates/support/support.html @@ -0,0 +1,26 @@ + + + + Hello + + + + + +
+ +
+ +
+

개발자에게 문의하기

+

+ cha3088@gmail.com +

+

+ GitHub +

+
+
+ + +