diff --git a/src/main/java/com/cleanengine/coin/configuration/WebSocketConfig.java b/src/main/java/com/cleanengine/coin/configuration/WebSocketConfig.java index 8c34c4bd..2341cfd7 100644 --- a/src/main/java/com/cleanengine/coin/configuration/WebSocketConfig.java +++ b/src/main/java/com/cleanengine/coin/configuration/WebSocketConfig.java @@ -1,6 +1,7 @@ package com.cleanengine.coin.configuration; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; @@ -11,14 +12,8 @@ @EnableWebSocketMessageBroker public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { - private static final String[] ALLOWED_ORIGINS = { - "http://localhost:63342", - "http://localhost:63343", - "http://localhost:8080", - "http://localhost:5500", - "http://localhost:5173", - "https://investfuture.my" - }; + @Value("${spring.security.allowed-origins}") + private String[] allowedOrigins; @Override public void configureMessageBroker(MessageBrokerRegistry config) { @@ -34,9 +29,7 @@ public void registerStompEndpoints(StompEndpointRegistry registry) { private void registerEndpoint(StompEndpointRegistry registry, String endpoint) { registry.addEndpoint(endpoint) - .setAllowedOrigins(ALLOWED_ORIGINS); + .setAllowedOrigins(allowedOrigins); } -} - - +} \ No newline at end of file diff --git a/src/main/java/com/cleanengine/coin/configuration/apiSwagger/SwaggerConfig.java b/src/main/java/com/cleanengine/coin/configuration/apiSwagger/SwaggerConfig.java index 8c4ee557..9c52f45d 100644 --- a/src/main/java/com/cleanengine/coin/configuration/apiSwagger/SwaggerConfig.java +++ b/src/main/java/com/cleanengine/coin/configuration/apiSwagger/SwaggerConfig.java @@ -3,41 +3,26 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.security.SecurityRequirement; -import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; @Configuration public class SwaggerConfig { + @Bean public OpenAPI openAPI() { // API 기본 정보 설정 Info info = new Info() - .title("investFuture API Document") + .title("InvestFuture API Document") .version("1.0") - .description( - "환영합니다.\n") + .description("Private API 호출 시 Cookie에 직접 설정해주세요!\n") .contact(new io.swagger.v3.oas.models.info.Contact().email("billage.official@gmail.com")); - // JWT 인증 방식 설정 - String jwtScheme = "jwtAuth"; - SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtScheme); - Components components = new Components() - .addSecuritySchemes(jwtScheme, new SecurityScheme() - .name("Authorization") - .type(SecurityScheme.Type.HTTP) - .in(SecurityScheme.In.HEADER) - .scheme("Bearer") - .bearerFormat("JWT")); - // Swagger UI 설정 및 보안 추가 return new OpenAPI() .addServersItem(new Server().url("http://localhost:8080")) // 추가적인 서버 URL 설정 가능 - .components(components) - .info(info) - .addSecurityItem(securityRequirement); + .info(info); } + } \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e7402301..88ad9a86 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,10 +24,10 @@ spring: token-uri: https://kauth.kakao.com/oauth/token user-info-uri: https://kapi.kakao.com/v2/user/me user-name-attribute: id - allowed-origins: http://localhost:63342,http://localhost:8080,http://localhost:5500,http://localhost:5173,https://investfuture.my + allowed-origins: http://localhost:63342,http://localhost:63343,http://localhost:8080,http://localhost:5500,http://localhost:5173,http://localhost:3000,https://investfuture.my endpoints: public: - paths: /api/login,/api/asset,/api/oauth2,/api/healthcheck,/api/coin/realtime,/api/coin/min,/api/minute-ohlc,/v3/api-docs,/swagger,/swagger-ui,/swagger-ui.html,/swagger-resources,/webjars,/h2-console,/favicon.ico,/actuator,/test + paths: /api/login,/api/asset,/api/oauth2,/api/healthcheck,/api/coin/realtime,/api/coin/min,/api/minute-ohlc,/api/swagger,/h2-console,/actuator,/test websocket: paths: /api/coin/min,/api/coin/realtime,/api/coin/orderbook jwt: @@ -40,8 +40,14 @@ spring: hibernate: jdbc: time_zone: Asia/Seoul -order: - tickers: BTC, TRUMP + +springdoc: + api-docs: + path: /api/swagger/v3/api-docs + swagger-ui: + path: /api/swagger/swagger-ui.html + url: /api/swagger/v3/api-docs + server: forward-headers-strategy: native