feat: 환경변수 개발환경 별도 설정 (#36)

wafflestudio · Apr 2, 2024 · c3e920c · c3e920c
1 parent ef8eea4
commit c3e920c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/src/main/java/com/waruru/areyouhere/attendance/service/AttendanceRedisServiceImpl.java b/src/main/java/com/waruru/areyouhere/attendance/service/AttendanceRedisServiceImpl.java
@@ -133,6 +133,7 @@ public CurrentSessionAttendeeAttendance getCurrentSessionAttendanceInfo(String a
                         absentees.add(att);
                     }
                 });
+
         return CurrentSessionAttendeeAttendance.builder()
                 .attendees(attendees)
                 .absentees(absentees)

diff --git a/src/main/java/com/waruru/areyouhere/common/config/WebConfig.java b/src/main/java/com/waruru/areyouhere/common/config/WebConfig.java
@@ -4,6 +4,7 @@
 import com.waruru.areyouhere.auth.resolver.LoginArgumentResolver;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -17,6 +18,9 @@ public class WebConfig implements WebMvcConfigurer {
     private final LoginInterceptor loginInterceptor;
     private final LoginArgumentResolver loginArgumentResolver;
 
+    @Value("${cors.allowed-origins}")
+    private String[] allowedOrigins;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(loginInterceptor);
@@ -29,8 +33,11 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers)
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
+
+
+
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:5173")
+                .allowedOrigins(allowedOrigins)
                 .allowedMethods("GET","POST", "PUT", "DELETE", "OPTIONS", "HEAD")
                 .allowCredentials(true)
                 .maxAge(10000);

diff --git a/src/main/java/com/waruru/areyouhere/session/service/query/SessionQueryServiceImpl.java b/src/main/java/com/waruru/areyouhere/session/service/query/SessionQueryServiceImpl.java
@@ -65,6 +65,7 @@ public List<SessionAttendanceInfo> getRecentFive(Long courseId){
     @Override
     public List<SessionAttendanceInfo> getAll(Long courseId){
         List<SessionInfo> allSessions = sessionRepository.findSessionsWithAttendance(courseId);
+
         return allSessions == null || allSessions.isEmpty()
                 ? Collections.emptyList()
                 : allSessions.stream().map(allSession -> SessionAttendanceInfo.builder()

diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
@@ -26,3 +26,6 @@ spring:
 logging:
   level:
     root: info
+
+cors:
+  allowed-origins: http://localhost:5173
diff --git a/src/main/resources/application-temp.yaml b/src/main/resources/application-temp.yaml
@@ -3,9 +3,9 @@ spring.config.activate.on-profile: temp
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/areyouhere?createDatabaseIfNotExist=true&useSSL=false&serverTimezone=Asia/Seoul&CharacterEncoding=UTF-8
-    username: root
-    password: temporary
+    url: ${MYSQL_DATASOURCE_URL}
+    username: ${MYSQL_DATASOURCE_USERNAME}
+    password: ${ MYSQL_DATASOURCE_PASSWORD }
   jpa:
     show-sql: true
     hibernate:
@@ -16,5 +16,10 @@ spring:
     database: mysql
   data:
     redis:
-      host: localhost
-      port: 6379
+      host: ${ REDIS_DATASOURCE_HOST }
+      port: ${ REDIS_DATASOURCE_PORT }
+
+
+cors:
+  allowed-origins: https://areyouhere.today, https://www.areyouhere.today
+