From 852178ee621810fcccd5c0bfe3e379206a42700e Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:27:37 +0900
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=EC=84=9C=EB=B8=8C=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EC=9D=84=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 서브모듈을 통해 private repository 로 yml 을 관리할 수 있게 한다.
---
 .gitmodules               | 3 +++
 src/main/resources/secret | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 src/main/resources/secret

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..a7033a673
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/main/resources/secret"]
+	path = src/main/resources/secret
+	url = https://github.com/solid-connection/solid-connect-secret
diff --git a/src/main/resources/secret b/src/main/resources/secret
new file mode 160000
index 000000000..5305b3c6b
--- /dev/null
+++ b/src/main/resources/secret
@@ -0,0 +1 @@
+Subproject commit 5305b3c6b1d4cdd8c02ae162ff2d578cd1f014fc

From 27a678120e0b08b9f37ae65e8c08c2c522fc4df4 Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:35:43 +0900
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?=
 =?UTF-8?q?=EC=95=A1=EC=85=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 서브모듈을 체크하웃하도록 한다.
---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac375db23..5b278f8ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Create application-secret.yml
-      run: echo "${{ secrets.APPLICATION_SECRET }}" > src/main/resources/application-secret.yml
+    - name: Set secret files
+      uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.SUBMODULE_ACCESS_TOKEN }}
+        submodules: true
 
-    - name: Create application-prod.yml
-      run: echo "${{ secrets.APPLICATION_PROD }}" > src/main/resources/application-prod.yml
-    
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:

From 8758365a8cfe013d1c52c4ffc4a952a529ecf933 Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:45:16 +0900
Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=EB=A1=9C=EC=BB=AC=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=EC=9D=B4=20=EC=8B=9C=ED=81=AC=EB=A6=BF=20yml=20?=
 =?UTF-8?q?=EC=9D=84=20=EC=B0=B8=EC=A1=B0=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-local.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index fa7eebacb..a4ebfbc4d 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -2,6 +2,7 @@ spring:
   config:
     activate:
       on-profile: local
+    import: classpath:/secret/application-secret.yml
 
   jpa:
     hibernate:
@@ -28,3 +29,6 @@ spring:
 
 kakao:
   redirect_uri: "http://localhost:8080/auth/kakao"
+
+university:
+  term: 2024-2-a

From 829ef4f780aabed1e9f8cc020899a9c1ec060112 Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:45:30 +0900
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=EB=B0=B0=ED=8F=AC=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=EC=9D=B4=20=EC=8B=9C=ED=81=AC=EB=A6=BF=20yml=20?=
 =?UTF-8?q?=EC=9D=84=20=EC=B0=B8=EC=A1=B0=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 55193a7b3..a2635bb99 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,16 +1,4 @@
 spring:
-  profiles:
-    group:
-      prod:
-        - prod
-        - secret
-      local:
-        - local
-        - secret
-      test:
-        - test
-        - secret
-
   servlet:
     multipart:
       max-file-size: 10MB
@@ -38,4 +26,11 @@ jwt:
 
 kakao:
   token_url: "https://kauth.kakao.com/oauth/token"
-  user_info_url: "https://kapi.kakao.com/v2/user/me"
\ No newline at end of file
+  user_info_url: "https://kapi.kakao.com/v2/user/me"
+
+---
+spring:
+  config:
+    activate:
+      on-profile: prod
+    import: classpath:/secret/application-prod.yml

From f0d51d374c096e260fc407eeff1a3941f0dfaaab Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:46:18 +0900
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20JWT=20=EC=8B=9C=ED=81=AC=EB=A6=BF?=
 =?UTF-8?q?=20=ED=82=A4=EB=A5=BC=20secret=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a2635bb99..59e19f87b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,10 +20,6 @@ spring:
     init:
       mode: never
 
-jwt:
-  secret:
-    aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
-
 kakao:
   token_url: "https://kauth.kakao.com/oauth/token"
   user_info_url: "https://kapi.kakao.com/v2/user/me"

From c356e6a38359bc3d4149bf36d2041b25330c34b8 Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 17:46:55 +0900
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=99=98=EA=B2=BD=EA=B3=BC=20secret.yml=20=EA=B4=80=EA=B3=84?=
 =?UTF-8?q?=20=EB=81=8A=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 4dc996907..3f35fb97e 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -22,5 +22,25 @@ spring:
       host: localhost
       port: 6379
 
+# 빈 생성 성공만을 위한 가짜 데이터
 kakao:
-  redirect_uri: "http://localhost:8080/auth/kakao"
+  redirect_uri: kakao-redirect-uri-for-test
+  client_id: kakao-client-id-for-test-012345678910
+
+jwt:
+  secret: jwt-secret-key-for-test-012345678910
+
+cloud:
+  aws:
+    credentials:
+      access-key: access-key-for-test-012345678910
+      secret-key: secret-key-for-test-012345678910
+    region:
+      static: ap-northeast-2
+    stack:
+      auto: false
+    s3:
+      bucket: s3-bucket-for-test-012345678910
+
+university:
+  term: 2099-1

From c32388cea840c861b44c58921279f9910fc54ee8 Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sat, 10 Aug 2024 18:09:27 +0900
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EB=AA=A8=EB=93=88=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/secret | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/secret b/src/main/resources/secret
index 5305b3c6b..fd9f77d08 160000
--- a/src/main/resources/secret
+++ b/src/main/resources/secret
@@ -1 +1 @@
-Subproject commit 5305b3c6b1d4cdd8c02ae162ff2d578cd1f014fc
+Subproject commit fd9f77d088b63d48d227ae6763ac69b1c8491180