From 6eaa82df666bc15916771489d0bef0663c03e22e Mon Sep 17 00:00:00 2001 From: JoJunHwa Date: Thu, 22 May 2025 19:30:01 +0900 Subject: [PATCH 1/2] feat: change docker config, database(mariaDB to MySQL) --- build.gradle | 3 ++- compose.yaml | 20 ++++++++++---------- src/main/resources/application-local.yml | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 3b1a564..796ba83 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,8 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' - runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.3.3' +// runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.3.3' + runtimeOnly 'mysql:mysql-connector-java:8.0.33' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' diff --git a/compose.yaml b/compose.yaml index a32d7d2..547f119 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,17 +1,17 @@ services: - mariadb: - image: 'mariadb:latest' + mysql_spring: # mariadb -> mysql로 변경 + image: 'mysql:8.0' # mariadb:latest -> mysql:8.0으로 변경 environment: - - 'MYSQL_DATABASE=hi_meow' + - 'MYSQL_DATABASE=hi_meow_spring' - 'MYSQL_USER=admin' - 'MYSQL_PASSWORD=1234' - - 'MARIADB_ROOT_PASSWORD=1234' + - 'MYSQL_ROOT_PASSWORD=1234' # MARIADB_ROOT_PASSWORD -> MYSQL_ROOT_PASSWORD로 변경 ports: - - '3306:3306' + - '3307:3306' volumes: - - mariadb_data:/var/lib/mysql + - mysql_spring_data:/var/lib/mysql # mariadb_data -> mysql_data로 변경 healthcheck: - test: mariadb --user=root --password=1234 -e 'SELECT 1;' + test: mysql --user=root --password=1234 -e 'SELECT 1;' # mariadb -> mysql로 변경 interval: 1s timeout: 1s retries: 5 @@ -25,14 +25,14 @@ services: - '8080:8080' environment: - 'SPRING_PROFILES_ACTIVE=local' - - 'SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/hi_meow' + - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql_spring:3306/hi_meow_spring' # 호스트 이름 변경 - 'SPRING_DATASOURCE_USERNAME=admin' - 'SPRING_DATASOURCE_PASSWORD=1234' - 'LOGGING_LEVEL_ROOT=INFO' - 'LOGGING_LEVEL_COM_EXAMPLE=DEBUG' depends_on: - mariadb: + mysql_spring: # mariadb -> mysql로 변경 condition: service_healthy volumes: - mariadb_data: \ No newline at end of file + mysql_spring_data: # mariadb_data -> mysql_data로 변경 \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index c7b764f..1a0d19f 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mariadb://localhost:3306/hi_meow + url: jdbc:mysql://mysql_spring:3306/hi_meow_spring # mariadb → mysql, 호스트명과 DB명 변경 username: admin password: 1234 - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver # MariaDB 드라이버 → MySQL 드라이버 jpa: hibernate: ddl-auto: update @@ -11,7 +11,7 @@ spring: properties: hibernate: format_sql: true - dialect: org.hibernate.dialect.MariaDBDialect + dialect: org.hibernate.dialect.MySQLDialect # MariaDBDialect → MySQLDialect mvc: cors: allowed-origins: http://localhost:80,http://localhost:3000 From aa658ea217029f0ab82b62419ee6f21ee69b3b53 Mon Sep 17 00:00:00 2001 From: JoJunHwa Date: Thu, 22 May 2025 21:14:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20API=20=EC=84=9C=EB=B2=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=EB=A7=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B2=A0?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=85=98=EC=9D=84=20=ED=97=88=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose.yaml | 20 ++++++++++---------- src/main/resources/application-local.yml | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compose.yaml b/compose.yaml index 547f119..0c2a2b3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,17 +1,17 @@ services: - mysql_spring: # mariadb -> mysql로 변경 - image: 'mysql:8.0' # mariadb:latest -> mysql:8.0으로 변경 + mysql: + image: 'mysql:8.0' environment: - - 'MYSQL_DATABASE=hi_meow_spring' + - 'MYSQL_DATABASE=hi_meow' - 'MYSQL_USER=admin' - 'MYSQL_PASSWORD=1234' - - 'MYSQL_ROOT_PASSWORD=1234' # MARIADB_ROOT_PASSWORD -> MYSQL_ROOT_PASSWORD로 변경 + - 'MYSQL_ROOT_PASSWORD=1234' ports: - - '3307:3306' + - '3306:3306' volumes: - - mysql_spring_data:/var/lib/mysql # mariadb_data -> mysql_data로 변경 + - mysql_data:/var/lib/mysql healthcheck: - test: mysql --user=root --password=1234 -e 'SELECT 1;' # mariadb -> mysql로 변경 + test: mysql --user=root --password=1234 -e 'SELECT 1;' interval: 1s timeout: 1s retries: 5 @@ -25,14 +25,14 @@ services: - '8080:8080' environment: - 'SPRING_PROFILES_ACTIVE=local' - - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql_spring:3306/hi_meow_spring' # 호스트 이름 변경 + - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hi_meow' - 'SPRING_DATASOURCE_USERNAME=admin' - 'SPRING_DATASOURCE_PASSWORD=1234' - 'LOGGING_LEVEL_ROOT=INFO' - 'LOGGING_LEVEL_COM_EXAMPLE=DEBUG' depends_on: - mysql_spring: # mariadb -> mysql로 변경 + mysql: condition: service_healthy volumes: - mysql_spring_data: # mariadb_data -> mysql_data로 변경 \ No newline at end of file + mysql_data: \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 1a0d19f..2d1d7e0 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mysql://mysql_spring:3306/hi_meow_spring # mariadb → mysql, 호스트명과 DB명 변경 + url: jdbc:mysql://mysql_spring:3306/hi_meow username: admin password: 1234 - driver-class-name: com.mysql.cj.jdbc.Driver # MariaDB 드라이버 → MySQL 드라이버 + driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: ddl-auto: update @@ -11,7 +11,7 @@ spring: properties: hibernate: format_sql: true - dialect: org.hibernate.dialect.MySQLDialect # MariaDBDialect → MySQLDialect + dialect: org.hibernate.dialect.MySQLDialect mvc: cors: allowed-origins: http://localhost:80,http://localhost:3000