fix:

SunjooAI · Jul 6, 2024 · 1912ba3 · 1912ba3
1 parent 6a2256b
commit 1912ba3
Show file tree

Hide file tree

Showing 19 changed files with 102 additions and 1,187 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -27,8 +27,8 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-#        env:
-#          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+        env:
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
         run: ./gradlew build
 
       - name: Log in to Docker Hub

diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin
diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock
diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin
diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock
diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build/libs/drinktionary-0.0.1-SNAPSHOT-plain.jar b/build/libs/drinktionary-0.0.1-SNAPSHOT-plain.jar
diff --git a/build/libs/drinktionary-0.0.1-SNAPSHOT.jar b/build/libs/drinktionary-0.0.1-SNAPSHOT.jar
diff --git a/build/reports/tests/test/classes/com.sunjoo.drinktionary.DrinktionaryApplicationTests.html b/build/reports/tests/test/classes/com.sunjoo.drinktionary.DrinktionaryApplicationTests.html
diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html
@@ -38,11 +38,7 @@ <h1>Test Summary</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<<<<<<< HEAD
-<div class="counter">0.570s</div>
-=======
-<div class="counter">0.297s</div>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<div class="counter">0.304s</div>
 <p>duration</p>
 </div>
 </td>
@@ -89,11 +85,7 @@ <h2>Packages</h2>
 <td>1</td>
 <td>0</td>
 <td>0</td>
-<<<<<<< HEAD
-<td>0.570s</td>
-=======
-<td>0.297s</td>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<td>0.304s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -120,11 +112,7 @@ <h2>Classes</h2>
 <td>1</td>
 <td>0</td>
 <td>0</td>
-<<<<<<< HEAD
-<td>0.570s</td>
-=======
-<td>0.297s</td>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<td>0.304s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -138,11 +126,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<<<<<<< HEAD
-<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 3. 오후 2:31:48</p>
-=======
-<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 1. 오후 3:35:17</p>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 6. 오후 9:55:12</p>
 </div>
 </div>
 </body>

diff --git a/build/reports/tests/test/packages/com.sunjoo.drinktionary.html b/build/reports/tests/test/packages/com.sunjoo.drinktionary.html
@@ -40,11 +40,7 @@ <h1>Package com.sunjoo.drinktionary</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<<<<<<< HEAD
-<div class="counter">0.570s</div>
-=======
-<div class="counter">0.297s</div>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<div class="counter">0.304s</div>
 <p>duration</p>
 </div>
 </td>
@@ -87,11 +83,7 @@ <h2>Classes</h2>
 <td>1</td>
 <td>0</td>
 <td>0</td>
-<<<<<<< HEAD
-<td>0.570s</td>
-=======
-<td>0.297s</td>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<td>0.304s</td>
 <td class="success">100%</td>
 </tr>
 </table>
@@ -104,11 +96,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<<<<<<< HEAD
-<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 3. 오후 2:31:48</p>
-=======
-<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 1. 오후 3:35:17</p>
->>>>>>> c169d83be4958de498693b9b6e494da014272690
+<a href="http://www.gradle.org">Gradle 8.8</a> at 2024. 7. 6. 오후 9:55:12</p>
 </div>
 </div>
 </body>

diff --git a/build/test-results/test/TEST-com.sunjoo.drinktionary.DrinktionaryApplicationTests.xml b/build/test-results/test/TEST-com.sunjoo.drinktionary.DrinktionaryApplicationTests.xml
diff --git a/build/test-results/test/binary/output.bin b/build/test-results/test/binary/output.bin
diff --git a/build/test-results/test/binary/output.bin.idx b/build/test-results/test/binary/output.bin.idx
diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -8,9 +8,9 @@ spring:
     name: drinktionary
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://sunjoo-drinktionary.clau8wyu484y.ap-northeast-2.rds.amazonaws.com:3306/sunjoo?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&createDatabaseIfNotExist=true
+    url: jdbc:mysql://sunjoo-drinktionary.clau8wyu484y.ap-northeast-2.rds.amazonaws.com:3306/sunjoo
     username: root
-    password: sunjoo-drinktionary0628
+    password: ${DB_PASSWORD}
   jpa:
     hibernate:
       ddl-auto: validate