diff --git a/build.gradle b/build.gradle index 9222ab9..9a4990e 100644 --- a/build.gradle +++ b/build.gradle @@ -34,8 +34,8 @@ dependencies { implementation group: 'org.springframework.cloud', name: 'spring-cloud-gcp-starter', version: '1.2.5.RELEASE' implementation group: 'org.springframework.cloud', name: 'spring-cloud-gcp-storage', version: '1.2.5.RELEASE' annotationProcessor 'org.projectlombok:lombok' -// runtimeOnly 'com.h2database:h2' - implementation 'mysql:mysql-connector-java' + runtimeOnly 'com.h2database:h2' +// implementation 'mysql:mysql-connector-java' } diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/Folder.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/Folder.java index 4bc9fbd..2e42fec 100644 --- a/src/main/java/com/SollutionChallenge/HighLight/Folder/Folder.java +++ b/src/main/java/com/SollutionChallenge/HighLight/Folder/Folder.java @@ -29,7 +29,7 @@ public class Folder { private Long id; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) + @JoinColumn(name = "user_id") private User userId; @Column(nullable = false) diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderRequestDto.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderRequestDto.java index f8d98de..c135082 100644 --- a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderRequestDto.java +++ b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderRequestDto.java @@ -13,7 +13,7 @@ @AllArgsConstructor public class FolderRequestDto { - private User userId; + private Long userId; private String folderName; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8a714b6..118fdca 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -22,8 +22,23 @@ spring.cloud.gcp.storage.project-id=heroic-habitat-376713 spring.cloud.gcp.storage.bucket=leturn-file-bucket #db -#spring.datasource.driver-class-name= -#spring.datasource.url= -#spring.datasource.username= +#spring.datasource.url=jdbc:mysql://localhost:3306/HighLight?serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true +#spring.datasource.username=root #spring.datasource.password= +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password= + + + +# google login +google.auth.url=https://oauth2.googleapis.com/ +google.login.url=https://accounts.google.com/ +google.redirect.uri=http://localhost:8080/google/login/redirect +google.client.id=907385257015-gp3hqfll9khmcgm6lv3re3u5htqohuhr.apps.googleusercontent.com +google.secret=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 +google.auth.scope=profile,email,openid