From ffa252624f50d2589fe2adf96eaece8a99d40490 Mon Sep 17 00:00:00 2001
From: "tae.y" <0211ilyoil@gmail.com>
Date: Tue, 13 Aug 2024 18:45:52 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=A9=20::=20(#691)=20yml=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    | 20 +++++++++++++++++++
 .../src/main/resources/application-local.yml  | 15 ++++++++++++++
 .../src/main/resources/application-prod.yml   | 15 ++++++++++++++
 .../src/main/resources/application.yml        | 19 ++++++++++++------
 4 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 jobis-infrastructure/src/main/resources/application-dev.yml
 create mode 100644 jobis-infrastructure/src/main/resources/application-local.yml
 create mode 100644 jobis-infrastructure/src/main/resources/application-prod.yml

diff --git a/jobis-infrastructure/src/main/resources/application-dev.yml b/jobis-infrastructure/src/main/resources/application-dev.yml
new file mode 100644
index 000000000..dafeb432a
--- /dev/null
+++ b/jobis-infrastructure/src/main/resources/application-dev.yml
@@ -0,0 +1,20 @@
+spring:
+  config:
+    activate:
+      on-profile: dev
+
+  datasource:
+    url: jdbc:mysql://${DB_URL:localhost}:3306/${DB_NAME:jobis}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
+    username: ${DB_USERNAME:root}
+    password: ${DB_PASSWORD:11111111}
+
+  data:
+    redis:
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
+      password: ${REDIS_PASSWORD:asdf}
+
+  jpa:
+    properties:
+      hibernate:
+        show_sql: false
diff --git a/jobis-infrastructure/src/main/resources/application-local.yml b/jobis-infrastructure/src/main/resources/application-local.yml
new file mode 100644
index 000000000..c0391a0f1
--- /dev/null
+++ b/jobis-infrastructure/src/main/resources/application-local.yml
@@ -0,0 +1,15 @@
+spring:
+  config:
+    activate:
+      on-profile: local
+
+  datasource:
+    url: jdbc:mysql://${DB_URL:localhost}:3306/${DB_NAME:jobis}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
+    username: ${DB_USERNAME:root}
+    password: ${DB_PASSWORD:070211}
+
+  data:
+    redis:
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
+      password: ${REDIS_PASSWORD:asdf}
\ No newline at end of file
diff --git a/jobis-infrastructure/src/main/resources/application-prod.yml b/jobis-infrastructure/src/main/resources/application-prod.yml
new file mode 100644
index 000000000..37553ce34
--- /dev/null
+++ b/jobis-infrastructure/src/main/resources/application-prod.yml
@@ -0,0 +1,15 @@
+spring:
+  config:
+    activate:
+      on-profile: prod
+
+  datasource:
+    url: jdbc:mysql://${DB_URL:localhost}:3306/${DB_NAME:jobis}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
+    username: ${DB_USERNAME:root}
+    password: ${DB_PASSWORD:11111111}
+
+  data:
+    redis:
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
+      password: ${REDIS_PASSWORD:asdf}
\ No newline at end of file
diff --git a/jobis-infrastructure/src/main/resources/application.yml b/jobis-infrastructure/src/main/resources/application.yml
index 304dda0dd..db283a431 100644
--- a/jobis-infrastructure/src/main/resources/application.yml
+++ b/jobis-infrastructure/src/main/resources/application.yml
@@ -1,9 +1,16 @@
+server:
+  port: 8080
+  shutdown: graceful
+
 spring:
+  profiles:
+    active: ${PROFILE:local}
+
+  lifecycle:
+    timeout-per-shutdown-phase: "60s"
+
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DB_URL:localhost}:3306/${DB_NAME:jobis}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
-    username: ${DB_USERNAME:root}
-    password: ${DB_PASSWORD:11111111}
 
   flyway:
     enabled: ${FLYWAY_ENABLED:false}
@@ -95,8 +102,8 @@ logging:
           EC2MetadataUtils: error
 
 fcm:
-  path: ${FCM_PATH}
+  path: ${FCM_PATH:d}
 
 slack:
-  url: ${SLACK_URL}
-  token: ${SLACK_TOKEN}
\ No newline at end of file
+  url: ${SLACK_URL:d}
+  token: ${SLACK_TOKEN:d}
\ No newline at end of file

From 2040c8f144b1adf452dd3d8e0b2a246c6cdf62ce Mon Sep 17 00:00:00 2001
From: "tae.y" <0211ilyoil@gmail.com>
Date: Tue, 13 Aug 2024 18:47:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=B7=20::=20(#691)=20=ED=99=94?=
 =?UTF-8?q?=EA=B2=AC=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B0=A9?=
 =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 09bde11d5..3ffdf337f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,5 +44,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          S3_BUCKET: ${{ secret.S3_BUCKET }}
         run: ./gradlew test build sonarqube --info