Merge pull request #61 from CleanEngine/dev

caniro · web-flow · commit c120bbeba063 · 2025-05-22T16:22:03.000+09:00
Dev
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,5 @@ out/
 .vscode/
 
 ### 로컬 환경변수 ###
-local.properties
+local.properties
+/logs
diff --git a/src/main/java/com/cleanengine/coin/chart/controller/ChartDataController.java b/src/main/java/com/cleanengine/coin/chart/controller/ChartDataController.java
@@ -2,9 +2,9 @@
 
 
 import com.cleanengine.coin.chart.dto.RealTimeOhlcDto;
-//import com.cleanengine.coin.chart.Dto.RealTimeTradeDto;
-import com.cleanengine.coin.chart.service.*;
 import com.cleanengine.coin.chart.service.ChartSubscriptionService;
+import com.cleanengine.coin.chart.service.RealTimeOhlcService;
+import com.cleanengine.coin.common.annotation.WorkingServerProfile;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -14,6 +14,7 @@
 import java.time.LocalDateTime;
 
 @Component
+@WorkingServerProfile
 @RequiredArgsConstructor
 @Slf4j
 public class ChartDataController {
@@ -45,7 +46,7 @@ public void publishRealTimeOhlc() {
                     RealTimeOhlcDto ohlcData = realTimeOhlcService.getRealTimeOhlc(ticker);
 
                     if (ohlcData == null) {
-                        log.warn("티커 {}의 실시간 OHLC 데이터가 없습니다. 빈 데이터 전송", ticker);
+                        log.debug("티커 {}의 실시간 OHLC 데이터가 없습니다. 빈 데이터 전송", ticker);
                         RealTimeOhlcDto emptyData = new RealTimeOhlcDto();
                         emptyData.setTicker(ticker);
                         emptyData.setTimestamp(LocalDateTime.now());
diff --git a/src/main/java/com/cleanengine/coin/chart/controller/PrevRateScheduler.java b/src/main/java/com/cleanengine/coin/chart/controller/PrevRateScheduler.java
@@ -1,10 +1,12 @@
 package com.cleanengine.coin.chart.controller;
 
+import com.cleanengine.coin.common.annotation.WorkingServerProfile;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
+@WorkingServerProfile
 @RequiredArgsConstructor
 public class PrevRateScheduler {
     private final PrevRateController prevRateController;
diff --git a/src/main/java/com/cleanengine/coin/chart/controller/RealTimeRateScheduler.java b/src/main/java/com/cleanengine/coin/chart/controller/RealTimeRateScheduler.java
@@ -1,10 +1,12 @@
 package com.cleanengine.coin.chart.controller;
 
+import com.cleanengine.coin.common.annotation.WorkingServerProfile;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
+@WorkingServerProfile
 @RequiredArgsConstructor
 public class RealTimeRateScheduler {
     private final RealTimeTradeController realTimeTradeController;
diff --git a/src/main/java/com/cleanengine/coin/chart/controller/WebSocketMessageController.java b/src/main/java/com/cleanengine/coin/chart/controller/WebSocketMessageController.java
@@ -36,7 +36,7 @@ public void subscribeRealTimeOhlc(RealTimeTradeMappingDto request) {
         RealTimeOhlcDto latestOhlcData = realTimeOhlcService.getRealTimeOhlc(ticker);
 
         if (latestOhlcData == null) {
-            log.warn("티커 {}의 실시간 OHLC 데이터가 없습니다.", ticker);
+            log.debug("티커 {}의 실시간 OHLC 데이터가 없습니다.", ticker);
             // 데이터가 없으면 빈 데이터 전송
             messagingTemplate.convertAndSend("/topic/realTimeOhlc/" + ticker, createEmptyRealTimeOhlcDto(ticker));
         } else {
diff --git a/src/main/java/com/cleanengine/coin/chart/service/RealTimeTradeService.java b/src/main/java/com/cleanengine/coin/chart/service/RealTimeTradeService.java
@@ -30,7 +30,7 @@ public RealTimeDataDto generateRealTimeData(String ticker){
 
         // 거래 데이터가 없는 경우 처리
         if(tradeEventDto == null){
-            log.warn("실시간 거래 데이터가 존재하지않습니다: {}", ticker);
+            log.debug("실시간 거래 데이터가 존재하지않습니다: {}", ticker);
             return new RealTimeDataDto(ticker, 0, 0, 0, LocalDateTime.now(), UUID.randomUUID().toString());
         }
 
diff --git a/src/main/java/com/cleanengine/coin/common/annotation/WorkingServerProfile.java b/src/main/java/com/cleanengine/coin/common/annotation/WorkingServerProfile.java
@@ -0,0 +1,14 @@
+package com.cleanengine.coin.common.annotation;
+
+import org.springframework.context.annotation.Profile;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Profile("!it & (prod | dev)")
+public @interface WorkingServerProfile {
+}
diff --git a/src/main/java/com/cleanengine/coin/configuration/bootstrap/DBInitRunner.java b/src/main/java/com/cleanengine/coin/configuration/bootstrap/DBInitRunner.java
@@ -18,7 +18,7 @@
 import java.util.List;
 
 @Component
-@Profile("dev")
+@Profile({"dev & !it"})
 @Order(1)
 @RequiredArgsConstructor
 public class DBInitRunner implements CommandLineRunner {
diff --git a/src/main/java/com/cleanengine/coin/realitybot/api/ApiScheduler.java b/src/main/java/com/cleanengine/coin/realitybot/api/ApiScheduler.java
@@ -1,5 +1,6 @@
 package com.cleanengine.coin.realitybot.api;
 
+import com.cleanengine.coin.common.annotation.WorkingServerProfile;
 import com.cleanengine.coin.realitybot.dto.Ticks;
 import com.cleanengine.coin.realitybot.service.OrderGenerateService;
 import com.cleanengine.coin.realitybot.service.TickService;
@@ -15,6 +16,7 @@
 
 @Slf4j
 @Component
+@WorkingServerProfile
 @RequiredArgsConstructor
 public class ApiScheduler implements DisposableBean {
 
diff --git a/src/main/java/com/cleanengine/coin/realitybot/service/OrderGenerateService.java b/src/main/java/com/cleanengine/coin/realitybot/service/OrderGenerateService.java
@@ -182,7 +182,7 @@ private void createOrderWithFallback(String ticker,boolean isBuy, double volume,
         try {
             orderService.createOrderWithBot(ticker, isBuy, volume, price);
         } catch (DomainValidationException e) {
-            log.warn("잔량 부족: {}", e.getMessage());
+            log.debug("잔량 부족: {}", e.getMessage());
             try {
                 resetBot();
                 orderService.createOrderWithBot(ticker, isBuy, volume, price);
diff --git a/src/main/java/com/cleanengine/coin/user/login/application/CustomSuccessHandler.java b/src/main/java/com/cleanengine/coin/user/login/application/CustomSuccessHandler.java
@@ -1,7 +1,6 @@
 package com.cleanengine.coin.user.login.application;
 
 import com.cleanengine.coin.user.login.infra.CustomOAuth2User;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -29,21 +28,18 @@ public CustomSuccessHandler(JWTUtil jwtUtil) {
 
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-                                        Authentication authentication) throws IOException, ServletException {
+                                        Authentication authentication) throws IOException {
         CustomOAuth2User customUserDetails = (CustomOAuth2User) authentication.getPrincipal();
 
         Integer userId = customUserDetails.getUserId();
-        String provider = customUserDetails.getProvider();
-        String providerUserId = customUserDetails.getProviderUserId();
         // TODO : JWT 토큰 만료시간 고려
-        String token = jwtUtil.createJwt(userId, provider, providerUserId, (long) 60 * 60 * 24 * 1000);
+        String token = jwtUtil.createJwt(userId, (long) 60 * 60 * 24 * 1000);
 
         response.addCookie(createCookie("access_token", token));
         response.sendRedirect(frontendUrl);
     }
 
     private Cookie createCookie(String key, String value) {
-
         Cookie cookie = new Cookie(key, value);
         cookie.setMaxAge(60 * 60 * 24);
         cookie.setPath("/");
diff --git a/src/main/java/com/cleanengine/coin/user/login/application/JWTFilter.java b/src/main/java/com/cleanengine/coin/user/login/application/JWTFilter.java
@@ -12,6 +12,7 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -33,8 +34,8 @@ public JWTFilter(JWTUtil jwtUtil, EndpointConfig endpointConfig) {
     }
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
-                                    FilterChain filterChain) throws ServletException, IOException {
+    protected void doFilterInternal(HttpServletRequest request, @NotNull HttpServletResponse response,
+                                    @NotNull FilterChain filterChain) throws ServletException, IOException {
         String requestUri = request.getRequestURI();
 
         if (endpointConfig.isPublicPath(requestUri)) {
@@ -61,15 +62,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
             // JWT 토큰 검증 및 클레임 파싱 (이 과정에서 서명 검증 실패하면 JwtException 발생)
             Integer userId = jwtUtil.getUserId(authorizationToken);
-            String provider = jwtUtil.getProvider(authorizationToken);
-            String providerUserId = jwtUtil.getProviderUserId(authorizationToken);
 
             // 토큰 만료 검증
             if (jwtUtil.isExpired(authorizationToken)) {
                 throw new IllegalArgumentException("Token is expired");
             }
 
-            Authentication authToken = getAuthentication(userId, provider, providerUserId);
+            Authentication authToken = getAuthentication(userId);
             SecurityContextHolder.getContext().setAuthentication(authToken);
 
             filterChain.doFilter(request, response);
@@ -82,11 +81,9 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         }
     }
 
-    private static Authentication getAuthentication(Integer userId, String provider, String providerUserId) {
+    private static Authentication getAuthentication(Integer userId) {
         UserOAuthDetails userOAuthDetails = new UserOAuthDetails();
         userOAuthDetails.setUserId(userId);
-        userOAuthDetails.setProvider(provider);
-        userOAuthDetails.setProviderUserId(providerUserId);
         CustomOAuth2User customOAuth2User = new CustomOAuth2User(userOAuthDetails);
 
         // 스프링 시큐리티 인증 토큰 생성
diff --git a/src/main/java/com/cleanengine/coin/user/login/application/JWTUtil.java b/src/main/java/com/cleanengine/coin/user/login/application/JWTUtil.java
@@ -25,26 +25,14 @@ public Integer getUserId(String token) {
 
     }
 
-    public String getProvider(String token) {
-
-        return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("provider", String.class);
-    }
-
-    public String getProviderUserId(String token) {
-
-        return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("providerUserId", String.class);
-    }
-
     public Boolean isExpired(String token) {
 
         return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().getExpiration().before(new Date());
     }
 
-    public String createJwt(Integer userId, String provider, String providerUserId, Long expiredMs) {
+    public String createJwt(Integer userId, Long expiredMs) {
         return Jwts.builder()
                 .claim("userId", userId)
-                .claim("provider", provider)
-                .claim("providerUserId", providerUserId)
                 .issuedAt(new Date(System.currentTimeMillis()))
                 .expiration(new Date(System.currentTimeMillis() + expiredMs))
                 .signWith(secretKey)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -15,7 +15,7 @@ spring:
     properties:
       hibernate:
         format_sql: true
-        show_sql: true
+        show_sql: false
   security:
     oauth2:
       client:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -27,7 +27,7 @@ spring:
     allowed-origins: http://localhost:63342,http://localhost:8080,http://localhost:5500,http://localhost:5173,https://investfuture.my
     endpoints:
       public:
-        paths: /api/login,/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
+        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
       websocket:
         paths: /api/coin/min,/api/coin/realtime,/api/coin/orderbook
   jwt:
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true">
+
+    <property name="LOG_PATTERN" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %-5level %logger{36} - %msg%n"/>
+    <property name="LOG_DIR" value="./logs"/>
+
+    <!-- 공통: 콘솔 출력 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- prod 환경: 파일 출력 + 롤링 -->
+    <springProfile name="prod">
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <file>${LOG_DIR}/was1.log</file>
+            <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+                <level>WARN</level>
+            </filter>
+            <encoder>
+                <pattern>${LOG_PATTERN}</pattern>
+                <charset>UTF-8</charset>
+            </encoder>
+            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                <fileNamePattern>${LOG_DIR}/was1.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+                <maxFileSize>10MB</maxFileSize>
+                <maxHistory>30</maxHistory>
+                <totalSizeCap>100MB</totalSizeCap>
+            </rollingPolicy>
+        </appender>
+
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- local, dev 환경: 콘솔만 출력 -->
+    <springProfile name="local,dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public RealTimeDataDto generateRealTimeData(String ticker){`
`30`	`30`
`31`	`31`	`// 거래 데이터가 없는 경우 처리`
`32`	`32`	`if(tradeEventDto == null){`
`33`		`- log.warn("실시간 거래 데이터가 존재하지않습니다: {}", ticker);`
	`33`	`+ log.debug("실시간 거래 데이터가 존재하지않습니다: {}", ticker);`
`34`	`34`	`return new RealTimeDataDto(ticker, 0, 0, 0, LocalDateTime.now(), UUID.randomUUID().toString());`
`35`	`35`	`}`
`36`	`36`