From 5f56d7f93fc1a61c936412b93ab62151ef0252de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9C=A4=EC=A3=BC?= <155442976+iamyuunzo@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:11:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?REFACTOR:=20admin=20->=20admin-api=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20TransactionType=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#51)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/admin/admin/controller/AdminAuthController.java | 2 +- src/main/java/dev/admin/global/config/SecurityConfig.java | 6 +++--- .../java/dev/admin/transaction/enums/TransactionType.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/admin/admin/controller/AdminAuthController.java b/src/main/java/dev/admin/admin/controller/AdminAuthController.java index 90d7c08..35f9c4e 100644 --- a/src/main/java/dev/admin/admin/controller/AdminAuthController.java +++ b/src/main/java/dev/admin/admin/controller/AdminAuthController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/admin") +@RequestMapping("/admin-api") @RequiredArgsConstructor public class AdminAuthController { diff --git a/src/main/java/dev/admin/global/config/SecurityConfig.java b/src/main/java/dev/admin/global/config/SecurityConfig.java index 5e0e3e7..2d9dba6 100644 --- a/src/main/java/dev/admin/global/config/SecurityConfig.java +++ b/src/main/java/dev/admin/global/config/SecurityConfig.java @@ -37,12 +37,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers("/test/**").permitAll() // ✅ 여기를 추가! .requestMatchers( - "/admin/login", - "/admin/logout", + "/admin-api/login", + "/admin-api/logout", "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**" - ).permitAll() .requestMatchers("/admin/me", "/admin-api/**").authenticated() + ).permitAll() .requestMatchers("/admin-api/me", "/admin-api/**").authenticated() .anyRequest().denyAll() ) .sessionManagement(sess -> sess.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) diff --git a/src/main/java/dev/admin/transaction/enums/TransactionType.java b/src/main/java/dev/admin/transaction/enums/TransactionType.java index 0a09734..ec33847 100644 --- a/src/main/java/dev/admin/transaction/enums/TransactionType.java +++ b/src/main/java/dev/admin/transaction/enums/TransactionType.java @@ -1,5 +1,5 @@ package dev.admin.transaction.enums; public enum TransactionType { - DEPOSIT, WITHDRAW, CONVERT, PURCHASE, REFUND, RECEIVE + DEPOSIT, WITHDRAW, CONVERT, PURCHASE, REFUND, RECEIVE,AUTO_CONVERT } 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 2/2] =?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)); } }