application-dev.yml, application-local.yml 분리 (Issue #163) (#164)

* refactor: application-dev.yml, application-local.yml 분리

* fix: cd 스크립트에 프로파일 설정 추가

.github/workflows/backend_cd.yml

@@ -67,6 +67,7 @@ jobs:
           sudo nohup java \
           -Dauth.github.client-id=${{ secrets.CLIENT_ID_GITHUB }} \
           -Dauth.github.client-secret=${{ secrets.CLIENT_SECRET_GITHUB }} \
+          --spring.profiles.active=dev \
           -jar ${{ env.ARTIFACT_DIRECTORY }}/${{ env.ARTIFACT_NAME }}.jar \
           --server.port=80 &
 

backend/src/main/resources/application-common.yml

@@ -0,0 +1,39 @@
+spring:
+  h2:
+    console:
+      enabled: true
+      path: /h2-console
+  datasource:
+    url: jdbc:h2:mem:database;
+    driver-class-name: org.h2.Driver
+  jpa:
+    show-sql: true
+    defer-datasource-initialization: true
+    properties:
+      hibernate:
+        format_sql: true
+        highlight_sql: true
+    hibernate:
+      ddl-auto: create
+
+springdoc:
+  default-consumes-media-type: application/json
+  default-produces-media-type: application/json
+  swagger-ui:
+    path: /api-docs
+    disable-swagger-default-url: true
+    display-request-duration: true
+    operations-sorter: alpha
+    tags-sorter: alpha
+
+logging:
+  level:
+    org.springframework.orm.jpa: DEBUG
+    org.springframework.orm.transaction: DEBUG
+    org.hibernate.SQL: debug
+    org.hibernate.orm.jdbc.bind: trace
+
+security:
+  jwt:
+    secret-key: 7b3dc341c033816045cc11c6f9fba3187f4dbdb7
+    expiration-time: 3600000 # 1 hour

backend/src/main/resources/application-dev.yml

@@ -0,0 +1,9 @@
+api-host: http://3.38.80.28
+client-host: http://3.38.11.109
+
+auth:
+  github:
+    client-id: develup-test-develup-test-develup-test-develup-test-develup-test
+    client-secret: develup-test-develup-test-develup-test-develup-test-develup-test
+    redirect-uri: ${api-host}/auth/social/callback/github
+    client-uri: ${client-host}

backend/src/main/resources/application-local.yml

@@ -0,0 +1,9 @@
+api-host: http://localhost:8080
+client-host: http://localhost:3000
+
+auth:
+  github:
+    client-id: develup-test-develup-test-develup-test-develup-test-develup-test
+    client-secret: develup-test-develup-test-develup-test-develup-test-develup-test
+    redirect-uri: ${api-host}/auth/social/callback/github
+    client-uri: ${client-host}

backend/src/main/resources/application.yml

@@ -1,49 +1,5 @@
 spring:
-  h2:
-    console:
-      enabled: true
-      path: /h2-console
-  datasource:
-    url: jdbc:h2:mem:database;
-    driver-class-name: org.h2.Driver
-  jpa:
-    show-sql: true
-    defer-datasource-initialization: true
-    properties:
-      hibernate:
-        format_sql: true
-        highlight_sql: true
-    hibernate:
-      ddl-auto: create
-
-springdoc:
-  default-consumes-media-type: application/json
-  default-produces-media-type: application/json
-  swagger-ui:
-    path: /api-docs
-    disable-swagger-default-url: true
-    display-request-duration: true
-    operations-sorter: alpha
-    tags-sorter: alpha
-
-logging:
-  level:
-    org.springframework.orm.jpa: DEBUG
-    org.springframework.orm.transaction: DEBUG
-    org.hibernate.SQL: debug
-    org.hibernate.orm.jdbc.bind: trace
-
-api-host: http://localhost:8080
-client-host: http://localhost:3000
-
-auth:
-  github:
-    client-id: develup-test-develup-test-develup-test-develup-test-develup-test
-    client-secret: develup-test-develup-test-develup-test-develup-test-develup-test
-    redirect-uri: ${api-host}/auth/social/callback/github
-    client-uri: ${client-host}
-
-security:
-  jwt:
-    secret-key: 7b3dc341c033816045cc11c6f9fba3187f4dbdb7
-    expiration-time: 3600000 # 1 hour
+  profiles:
+    group:
+      local: local, common
+      dev: dev, common

backend/src/main/resources/data.sql

@@ -19,8 +19,8 @@ VALUES ('[email protected]', 'GITHUB', '1234', '구름', 'www.naver.com');
 INSERT INTO member (email, provider, social_id, name, image_url)
 VALUES ('[email protected]', 'GITHUB', '1234', '리브', 'www.naver.com');
 
-INSERT INTO member (id, email, provider, social_id, name, image_url)
-VALUES (3, '[email protected]', 'GITHUB', '1234', '아톰', 'www.naver.com');
+INSERT INTO member (email, provider, social_id, name, image_url)
+VALUES ('[email protected]', 'GITHUB', '1234', '아톰', 'www.naver.com');
 
 INSERT INTO submission (member_id, mission_id, url, comment)
 VALUES (1, 1, 'https://github.com/develup-mission/java-smoking/pull/1', '코멘트 1');