Skip to content

Commit

Permalink
Merge branch 'be/feat/#4-book-detail' into book
Browse files Browse the repository at this point in the history
  • Loading branch information
G1Huh committed Jan 5, 2025
2 parents be1a0ff + a7954b3 commit 0304ee1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ public ResponseEntity removeHearts(@PathVariable BookId bookId,
return ResponseEntity.ok().build();
}

}
}
2 changes: 1 addition & 1 deletion be/src/main/resources/application-db-local.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spring:
datasource:
url: jdbc:mysql://localhost:3307/aladdinDB?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
url: jdbc:mysql://localhost:3306/venus?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
username: root
password: 1234
jpa:
Expand Down
2 changes: 1 addition & 1 deletion be/src/test/java/movlit/be/acceptance/AcceptanceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public abstract class AcceptanceTest {
public static final DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0");
// public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:7.2");
public static final MySQLContainer<?> MYSQL = new MySQLContainer<>(MYSQL_IMAGE)
.withDatabaseName("venus").withUsername("root").withPassword("1111").withReuse(true);
.withDatabaseName("venus").withUsername("root").withPassword("1234").withReuse(true);
// public static final GenericContainer<?> REDIS = new GenericContainer<>(REDIS_IMAGE).withReuse(true);

static {
Expand Down

0 comments on commit 0304ee1

Please sign in to comment.