Merge pull request #98 from JNU-econovation/be

[BE] Term2 - Sprint2
JNU-econovation · Nov 28, 2023 · 98f857c · 98f857c
2 parents 98ab084 + 2c88366
commit 98f857c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BE/eeos/docker-compose.yml b/BE/eeos/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - mysql
     restart: always
     environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://eeos-mysql-dev:3306/eeos?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true
+      SPRING_DATASOURCE_URL: jdbc:mysql://eeos-mysql-dev:3306/eeos?useSSL=false&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: root
       SPRING_PROFILES_ACTIVE: dev

diff --git a/BE/eeos/src/main/resources/application-local-mysql.yml b/BE/eeos/src/main/resources/application-local-mysql.yml
@@ -3,7 +3,7 @@ spring:
     activate:
       on-profile: local-mysql
   datasource:
-    url: jdbc:mysql://localhost:13308/eeos?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://localhost:13308/eeos?useSSL=false&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true
     username: root
     password: root
     driver-class-name: com.mysql.cj.jdbc.Driver