Skip to content

Commit

Permalink
Merge pull request #11 from PKNU-Assemble/feat/#10
Browse files Browse the repository at this point in the history
feat: 국내 드라마, 영화 데이터 필드 추가
  • Loading branch information
JONG-KYEONG authored Aug 13, 2024
2 parents 09ea536 + 018ab2d commit c08394e
Show file tree
Hide file tree
Showing 21 changed files with 43 additions and 27 deletions.
Binary file modified server/.gradle/8.8/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified server/.gradle/8.8/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified server/.gradle/8.8/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified server/.gradle/8.8/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified server/.gradle/8.8/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file not shown.
43 changes: 16 additions & 27 deletions server/build/resources/main/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified server/build/tmp/compileJava/previous-compilation-data.bin
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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<DataField, Long> {
}

0 comments on commit c08394e

Please sign in to comment.