Skip to content

[MAIN] 메인 충돌 해결 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sengjun0624 merged 7 commits into from
Jun 4, 2025
Merged

[MAIN] 메인 충돌 해결 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c51a936
[DEPLOY] v1.0.1 (#45)
sengjun0624 May 28, 2025
c458021
:recycle: refactor: Cors Filter 수정
sengjun0624 May 29, 2025
dc76d5d
Merge pull request #50 from Team-Tokkit/develop
iamyuunzo Jun 4, 2025
750e937
REFACTOR: admin -> admin-api 수정 및 TransactionType 추가 (#51) (#52)
iamyuunzo Jun 4, 2025
b8ea25c
Merge branch 'develop'
sengjun0624 Jun 4, 2025
22334be
Merge branch 'main' of https://github.com/Team-Tokkit/Tokkit-Server-A…
sengjun0624 Jun 4, 2025
e264b0b
[DEPLOY] v1.0.4 (#55)
sengjun0624 Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/dev/admin/global/config/CorsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/dev/admin/global/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/dev/admin/global/config/SwaggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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));
}
}