From 22b473f35651db7431a083bbbe3eb1296240f15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EC=A4=80?= <105282117+sengjun0624@users.noreply.github.com> Date: Wed, 4 Jun 2025 20:28:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?:recycle:=20refactor:=20HealthCheck=20Contr?= =?UTF-8?q?oller=EA=B0=80=20Security=EC=97=90=20=EC=95=88=EA=B1=B8?= =?UTF-8?q?=EB=A6=AC=EA=B2=8C=20=EC=88=98=EC=A0=95=20(#54)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/dev/admin/global/config/SecurityConfig.java | 11 ++++++----- .../java/dev/admin/global/config/SwaggerConfig.java | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/admin/global/config/SecurityConfig.java b/src/main/java/dev/admin/global/config/SecurityConfig.java index 2d9dba6..d97c359 100644 --- a/src/main/java/dev/admin/global/config/SecurityConfig.java +++ b/src/main/java/dev/admin/global/config/SecurityConfig.java @@ -34,15 +34,16 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http .csrf(csrf -> csrf.disable()) .authorizeHttpRequests(auth -> auth - .requestMatchers("/test/**").permitAll() // ✅ 여기를 추가! + .requestMatchers("/admin-api/health").permitAll() // ✅ 여기를 추가! .requestMatchers( "/admin-api/login", "/admin-api/logout", - "/swagger-ui.html", - "/swagger-ui/**", - "/v3/api-docs/**" - ).permitAll() .requestMatchers("/admin-api/me", "/admin-api/**").authenticated() + "/admin-api/swagger-ui.html", + "/admin-api/swagger-ui/**", + "/admin-api/v3/api-docs/**" + ).permitAll() + .requestMatchers("/admin-api/me", "/admin-api/**").authenticated() .anyRequest().denyAll() ) .sessionManagement(sess -> sess.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) diff --git a/src/main/java/dev/admin/global/config/SwaggerConfig.java b/src/main/java/dev/admin/global/config/SwaggerConfig.java index fc3ee55..f998316 100644 --- a/src/main/java/dev/admin/global/config/SwaggerConfig.java +++ b/src/main/java/dev/admin/global/config/SwaggerConfig.java @@ -43,6 +43,9 @@ public OpenAPI openAPI() { Server localServer = new Server() .url("http://localhost:8080") .description("Local development server"); + Server prodServer = new Server() + .url("https://api.tokkit.site:8080") + .description("Local development server"); return new OpenAPI() .components(new Components() @@ -53,6 +56,6 @@ public OpenAPI openAPI() { .title("토킷(TOKKIT) ADMIN API 명세서") .description("토킷(TOKKIT) ADMIN API 명세서입니다.") .version("1.0.0")) - .servers(List.of(defaultServer, localServer)); + .servers(List.of(defaultServer, localServer,prodServer)); } } From 8225058383d3e0a5f8c38310ccb62d8aa5e2fadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EC=A4=80?= <105282117+sengjun0624@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:43:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[MAIN]=20=EB=A9=94=EC=9D=B8=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0=20(#56)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [DEPLOY] v1.0.1 (#45) * :recycle: refactor: Update CorsFilter (#40) * :sparkles: Feat: Add Unified Log Service (#42) * :sparkles: feat: Add Unified Log Service * :recycle: refactor: Modify DateTime Type * :recycle: refactor: Add UnifiedLogResponseDto (#44) * REFACTOR: admin -> admin-api 수정 및 TransactionType 추가 (#51) (#52) * [DEPLOY] v1.0.4 (#55) * REFACTOR: admin -> admin-api 수정 및 TransactionType 추가 (#51) * :recycle: refactor: HealthCheck Controller가 Security에 안걸리게 수정 (#54) --------- Co-authored-by: 조윤주 <155442976+iamyuunzo@users.noreply.github.com> --------- Co-authored-by: 조윤주 <155442976+iamyuunzo@users.noreply.github.com> --- src/main/java/dev/admin/global/config/CorsConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/dev/admin/global/config/CorsConfig.java b/src/main/java/dev/admin/global/config/CorsConfig.java index 1eb50cf..165dfb0 100644 --- a/src/main/java/dev/admin/global/config/CorsConfig.java +++ b/src/main/java/dev/admin/global/config/CorsConfig.java @@ -13,6 +13,7 @@ public class CorsConfig { private static final String SERVER_URL = "https://admin.tokkit.site"; private static final String USER_SERVER_URL = "https://www.tokkit.site"; + private static final String API_SERVER_URL = "https://api.tokkit.site"; private static final String FRONT_LOCALHOST_URL = "http://localhost:3000"; private static final String SERVER_LOCALHOST_URL = "http://localhost:8080"; From d208ee0a887e0df3533d2484ae5c528fcd5906de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EC=A4=80?= <105282117+sengjun0624@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:50:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?:bug:=20fix:=20HealthCheck=20Controller?= =?UTF-8?q?=EA=B0=80=20=EA=B3=A0=EC=A0=95=20URL=20=EC=9D=B4=EB=8D=98=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95=20(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/dev/admin/global/config/RedisConfig.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/admin/global/config/RedisConfig.java b/src/main/java/dev/admin/global/config/RedisConfig.java index 0cd5261..2a76427 100644 --- a/src/main/java/dev/admin/global/config/RedisConfig.java +++ b/src/main/java/dev/admin/global/config/RedisConfig.java @@ -1,5 +1,6 @@ package dev.admin.global.config; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -9,14 +10,22 @@ @Configuration public class RedisConfig { + private final RedisProperties redisProperties; + + public RedisConfig(RedisProperties redisProperties) { + this.redisProperties = redisProperties; + } + @Bean public RedisConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(); + return new LettuceConnectionFactory( + redisProperties.getHost(), + redisProperties.getPort() + ); } - // RedisTemplate 등록 @Bean public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) { return new StringRedisTemplate(connectionFactory); } -} \ No newline at end of file +}