diff --git a/server/.gradle/8.8/executionHistory/executionHistory.bin b/server/.gradle/8.8/executionHistory/executionHistory.bin index a9ba397..6911b42 100644 Binary files a/server/.gradle/8.8/executionHistory/executionHistory.bin and b/server/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/server/.gradle/8.8/executionHistory/executionHistory.lock b/server/.gradle/8.8/executionHistory/executionHistory.lock index edd473e..f7e5ff2 100644 Binary files a/server/.gradle/8.8/executionHistory/executionHistory.lock and b/server/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/server/.gradle/8.8/fileHashes/fileHashes.bin b/server/.gradle/8.8/fileHashes/fileHashes.bin index 30d3817..d255b56 100644 Binary files a/server/.gradle/8.8/fileHashes/fileHashes.bin and b/server/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/server/.gradle/8.8/fileHashes/fileHashes.lock b/server/.gradle/8.8/fileHashes/fileHashes.lock index 8329e5b..f49c164 100644 Binary files a/server/.gradle/8.8/fileHashes/fileHashes.lock and b/server/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/server/.gradle/8.8/fileHashes/resourceHashesCache.bin b/server/.gradle/8.8/fileHashes/resourceHashesCache.bin index e5f7b81..7a961a7 100644 Binary files a/server/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/server/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3329301..d5232f0 100644 Binary files a/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/server/build/classes/java/main/com/example/hackathon/dataset/domain/DataField.class b/server/build/classes/java/main/com/example/hackathon/dataset/domain/DataField.class new file mode 100644 index 0000000..92ce03d Binary files /dev/null and b/server/build/classes/java/main/com/example/hackathon/dataset/domain/DataField.class differ diff --git a/server/build/resources/main/application.properties b/server/build/resources/main/application.properties index dd9e05e..fb15f41 100644 --- a/server/build/resources/main/application.properties +++ b/server/build/resources/main/application.properties @@ -55,13 +55,17 @@ #app.cors.allowedOrigins=http://localhost:3000,http://localhost:8080,https://port-0-hackathon-be-lyqylohp8957ca6e.sel5.cloudtype.app/ #app.oauth2.authorizedRedirectUris=http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect -spring.datasource.url=jdbc:mariadb://svc.sel5.cloudtype.app:31837/hackathon?characterEncoding=UTF-8&serverTimezone=UTC -spring.datasource.username=root -spring.datasource.password=0322! -spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +#OAuth2 +#??? +spring.security.oauth2.client.registration.google.client-id=240772131497-d17ho20q4gb42n5s42ncohdh5k9379rc.apps.googleusercontent.com +spring.security.oauth2.client.registration.google.client-secret=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 +spring.security.oauth2.client.registration.google.redirect-uri=http://glogglogglog-env.eba-fuksumx7.ap-northeast-2.elasticbeanstalk.com/oauth2/callback/google +spring.security.oauth2.client.registration.google.scope=email,profile -spring.jpa.show-sql=true -spring.jpa.hibernate.ddl-auto=create +spring.security.oauth2.client.registration.github.client-id=4260b239158564b38116 +spring.security.oauth2.client.registration.github.client-secret=40bbeeda1c6175ec4819cf96e427e631e7b5aa8e +spring.security.oauth2.client.registration.github.redirect-uri=http://localhost:8080/oauth2/callback/github +spring.security.oauth2.client.registration.github.scope=user:email,read:user app.auth.tokenSecret=04ca023b39512e46d0c2cf4b48d5aac61d34302994c87ed4eff225dcf3b0a218739f3897051a057f9b846a69ea2927a587044164b7bae5e1306219d50b588cb1 app.auth.tokenExpirationMsec = 864000000 @@ -76,25 +80,10 @@ cloud.aws.s3.bucket=glog-image-bucket cloud.aws.region.static=ap-northeast-2 cloud.aws.stack.auto=false -# spring boot 2.5.x to use script -spring.sql.init.mode=always -# script use after hibernate initilalization -spring.jpa.defer-datasource-initialization=true - -#OAuth2 -#??? -spring.security.oauth2.client.registration.google.client-id=240772131497-d17ho20q4gb42n5s42ncohdh5k9379rc.apps.googleusercontent.com -spring.security.oauth2.client.registration.google.client-secret=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 -spring.security.oauth2.client.registration.google.redirect-uri=http://glogglogglog-env.eba-fuksumx7.ap-northeast-2.elasticbeanstalk.com/oauth2/callback/google -spring.security.oauth2.client.registration.google.scope=email,profile - -spring.security.oauth2.client.registration.github.client-id=4260b239158564b38116 -spring.security.oauth2.client.registration.github.client-secret=40bbeeda1c6175ec4819cf96e427e631e7b5aa8e -spring.security.oauth2.client.registration.github.redirect-uri=http://localhost:8080/oauth2/callback/github -spring.security.oauth2.client.registration.github.scope=user:email,read:user - -# ?? ??? ?? ?? ?? (10MB? ??) -spring.servlet.multipart.max-file-size=10MB +spring.datasource.url=jdbc:mariadb://svc.sel5.cloudtype.app:31837/hackathon?characterEncoding=UTF-8&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=0322! +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver -# ?? ??? ?? ?? ?? (10MB? ??) -spring.servlet.multipart.max-request-size=10MB +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=update \ No newline at end of file diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsController.class.uniqueId9 b/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsController.class.uniqueId9 deleted file mode 100644 index 780673c..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsController.class.uniqueId9 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsS3Config.class.uniqueId3 b/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsS3Config.class.uniqueId3 deleted file mode 100644 index 25aef80..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsS3Config.class.uniqueId3 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsUtils.class.uniqueId1 b/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsUtils.class.uniqueId1 deleted file mode 100644 index 050e6c4..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/AwsUtils.class.uniqueId1 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/HackathonApplication.class.uniqueId6 b/server/build/tmp/compileJava/compileTransaction/stash-dir/HackathonApplication.class.uniqueId6 deleted file mode 100644 index 9fd839c..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/HackathonApplication.class.uniqueId6 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationFailureHandler.class.uniqueId4 b/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationFailureHandler.class.uniqueId4 deleted file mode 100644 index fe994bb..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationFailureHandler.class.uniqueId4 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationSuccessHandler.class.uniqueId0 b/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationSuccessHandler.class.uniqueId0 deleted file mode 100644 index e137455..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2AuthenticationSuccessHandler.class.uniqueId0 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2UserInfoFactory.class.uniqueId5 b/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2UserInfoFactory.class.uniqueId5 deleted file mode 100644 index c574a74..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/OAuth2UserInfoFactory.class.uniqueId5 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/SecurityConfig.class.uniqueId8 b/server/build/tmp/compileJava/compileTransaction/stash-dir/SecurityConfig.class.uniqueId8 deleted file mode 100644 index 839ed12..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/SecurityConfig.class.uniqueId8 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/TokenAuthenticationFilter.class.uniqueId2 b/server/build/tmp/compileJava/compileTransaction/stash-dir/TokenAuthenticationFilter.class.uniqueId2 deleted file mode 100644 index 39a455e..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/TokenAuthenticationFilter.class.uniqueId2 and /dev/null differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/WebMvcConfig.class.uniqueId7 b/server/build/tmp/compileJava/compileTransaction/stash-dir/WebMvcConfig.class.uniqueId7 deleted file mode 100644 index a9694c2..0000000 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/WebMvcConfig.class.uniqueId7 and /dev/null differ diff --git a/server/build/tmp/compileJava/previous-compilation-data.bin b/server/build/tmp/compileJava/previous-compilation-data.bin index 223018f..500852e 100644 Binary files a/server/build/tmp/compileJava/previous-compilation-data.bin and b/server/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/server/src/main/java/com/example/hackathon/dataset/domain/DataField.java b/server/src/main/java/com/example/hackathon/dataset/domain/DataField.java new file mode 100644 index 0000000..3baad48 --- /dev/null +++ b/server/src/main/java/com/example/hackathon/dataset/domain/DataField.java @@ -0,0 +1,18 @@ +package com.example.hackathon.dataset.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class DataField { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Column(name = "titleName") + private String titleName; + @Column(name = "image") + private String image; +} diff --git a/server/src/main/java/com/example/hackathon/dataset/repository/DataFieldRepository.java b/server/src/main/java/com/example/hackathon/dataset/repository/DataFieldRepository.java new file mode 100644 index 0000000..0f9752c --- /dev/null +++ b/server/src/main/java/com/example/hackathon/dataset/repository/DataFieldRepository.java @@ -0,0 +1,9 @@ +package com.example.hackathon.dataset.repository; + +import com.example.hackathon.dataset.domain.DataField; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DataFieldRepository extends JpaRepository { +}