From a3bbf17d072a1dfc5cd03e2bd5a9c3807e9e5a15 Mon Sep 17 00:00:00 2001 From: yyytir777 Date: Sat, 1 Jun 2024 23:59:12 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Feat]=20:=20=EC=9D=B4=EB=AA=A8=ED=8B=B0?= =?UTF-8?q?=EC=BD=98=20S3=20=EC=97=85=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cb9b845..fe8302e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,9 +1,16 @@ spring: + application: + name: demo + datasource: - url: jdbc:mysql://localhost:3306/neordinary_hackathon_6th + url: jdbc:mysql://hackathon-m-rds.ciwy7obdgrgx.ap-northeast-2.rds.amazonaws.com/hackathon_m + username: ${{ secret.DATABASE_USERNAME }} + password: ${{ secret.DATABASE_PASSWORD }} + driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root +# url: jdbc:mysql://localhost:3306/hackathon_m +# username: root +# password: 1108 sql: init: mode: never @@ -16,4 +23,13 @@ spring: use_sql_comments: true hbm2ddl: auto: update - default_batch_fetch_size: 1000 \ No newline at end of file + +cloud: + aws: + s3: + bucket: image-model-demo + path: + upload: upload + credentials: + access-key: ${{ secret.AWS_ACCESSKEY }} + secret-key: ${{ secret.AWS_SECRETKEY }} \ No newline at end of file From 818914d31bed107127dc4285299b38f51a1c2ca2 Mon Sep 17 00:00:00 2001 From: yyytir777 Date: Sun, 2 Jun 2024 00:12:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Feat]=20:=20=EC=9D=B4=EB=AA=A8=ED=8B=B0?= =?UTF-8?q?=EC=BD=98=20S3=20=EC=97=85=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index beb0101..0fa9791 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,4 +46,4 @@ jobs: sudo docker rm hackathonm || true sudo docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/hackathonm:latest || true - sudo docker run --name hackathonm -d -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/hackathonm:latest \ No newline at end of file + sudo docker run --name hackathonm -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/hackathonm:latest \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fe8302e..1a7df3f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,11 +3,11 @@ spring: name: demo datasource: + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://hackathon-m-rds.ciwy7obdgrgx.ap-northeast-2.rds.amazonaws.com/hackathon_m username: ${{ secret.DATABASE_USERNAME }} password: ${{ secret.DATABASE_PASSWORD }} - driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://localhost:3306/hackathon_m # username: root # password: 1108 From a8c44854021f7743eca3baa462fcb09d2edade9f Mon Sep 17 00:00:00 2001 From: yyytir777 Date: Sun, 2 Jun 2024 00:24:20 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Feat]=20:=20=EC=9D=B4=EB=AA=A8=ED=8B=B0?= =?UTF-8?q?=EC=BD=98=20S3=20=EC=97=85=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1a7df3f..aa42dba 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,8 +5,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://hackathon-m-rds.ciwy7obdgrgx.ap-northeast-2.rds.amazonaws.com/hackathon_m - username: ${{ secret.DATABASE_USERNAME }} - password: ${{ secret.DATABASE_PASSWORD }} + username: admin + password: admin123 # url: jdbc:mysql://localhost:3306/hackathon_m # username: root From 8ff1e344a173d5c92b5f2fa98ea6b7d2d4c41a1d Mon Sep 17 00:00:00 2001 From: yyytir777 Date: Sun, 2 Jun 2024 02:55:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Feat]=20:=20suggestion=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{LoginController.java => MemberController.java} | 4 ++-- .../demo/controller/request/GameRoomCreateRequest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) rename src/main/java/hackerthon/demo/controller/{LoginController.java => MemberController.java} (96%) diff --git a/src/main/java/hackerthon/demo/controller/LoginController.java b/src/main/java/hackerthon/demo/controller/MemberController.java similarity index 96% rename from src/main/java/hackerthon/demo/controller/LoginController.java rename to src/main/java/hackerthon/demo/controller/MemberController.java index 101797c..b4dbc79 100644 --- a/src/main/java/hackerthon/demo/controller/LoginController.java +++ b/src/main/java/hackerthon/demo/controller/MemberController.java @@ -14,8 +14,8 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/member") -public class LoginController { +@RequestMapping("/api/v1/member") +public class MemberController { private final MemberService memberService; diff --git a/src/main/java/hackerthon/demo/controller/request/GameRoomCreateRequest.java b/src/main/java/hackerthon/demo/controller/request/GameRoomCreateRequest.java index 03908f6..2d0cf45 100644 --- a/src/main/java/hackerthon/demo/controller/request/GameRoomCreateRequest.java +++ b/src/main/java/hackerthon/demo/controller/request/GameRoomCreateRequest.java @@ -13,6 +13,8 @@ import lombok.Builder; import lombok.Getter; +import java.util.ArrayList; + @Getter public class GameRoomCreateRequest { @@ -44,6 +46,7 @@ public static GameRoom toEntity(GameRoomCreateRequest request, Member host) { .gameType(request.getGameType()) .roomStatus(RoomStatus.RECRUIT) .host(host) + .gifticons(new ArrayList<>()) .build(); } }