From 1ef15377bbf3924bcdd26ab99eb3bf63d06c2355 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 22 Dec 2024 00:02:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=EA=B0=9C=ED=96=89=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 - 불필요한 개행 제거 - EOF 개행 추가 --- .../solidconnection/config/cors/CorsPropertiesConfig.java | 2 +- .../com/example/solidconnection/siteuser/domain/SiteUser.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java b/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java index 55e47bd90..68144d733 100644 --- a/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java +++ b/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java @@ -14,4 +14,4 @@ public class CorsPropertiesConfig { private List allowedOrigins; -} \ No newline at end of file +} diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index d548ff852..e518a5efb 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -85,7 +85,6 @@ public class SiteUser { @OneToMany(mappedBy = "siteUser", cascade = CascadeType.ALL, orphanRemoval = true) private List gpaScoreList = new ArrayList<>(); - public SiteUser( String email, String nickname, From 2554b711a01b22a6907061069727a65fb5c4197c Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 22 Dec 2024 00:06:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=EC=98=A4=ED=83=80=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 - down 하는 곳에서 Starting 이라 에코하고 있던 것을 수정 --- local_compose_down.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local_compose_down.sh b/local_compose_down.sh index e45cda18f..8892b1697 100755 --- a/local_compose_down.sh +++ b/local_compose_down.sh @@ -2,11 +2,11 @@ set -e -echo "Starting all docker containers..." +echo "Stopping all docker containers..." docker-compose -f docker-compose.local.yml down echo "Pruning unused Docker images..." docker image prune -f -echo "Containers are up and running." +echo "Containers are down and not running." docker-compose ps -a From 898c18e674c838aa940fa3f2de5b15d4cb73b205 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 22 Dec 2024 00:08:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20docker-compose=20=EB=A5=BC=20do?= =?UTF-8?q?cker=20compose=20=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | Bin 1154 -> 1154 bytes local_compose_down.sh | 4 ++-- local_compose_up.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index acdcee3b78f7518548a07db083f5cd2070bac25a..a07f6d77b95a903a0b2ef7d7e620278d8a540a83 100644 GIT binary patch delta 13 UcmZqTY~q}-ZepF##si0#0VPuftN;K2 delta 12 TcmZqTY~q}-j!}2x`pe7!9FGLK diff --git a/local_compose_down.sh b/local_compose_down.sh index 8892b1697..32792e490 100755 --- a/local_compose_down.sh +++ b/local_compose_down.sh @@ -3,10 +3,10 @@ set -e echo "Stopping all docker containers..." -docker-compose -f docker-compose.local.yml down +docker compose -f docker-compose.local.yml down echo "Pruning unused Docker images..." docker image prune -f echo "Containers are down and not running." -docker-compose ps -a +docker compose ps -a diff --git a/local_compose_up.sh b/local_compose_up.sh index 67ef9d0ba..400861e57 100755 --- a/local_compose_up.sh +++ b/local_compose_up.sh @@ -14,10 +14,10 @@ if [ ! -d "redis_data_local" ]; then fi echo "Starting all docker containers..." -docker-compose -f docker-compose.local.yml up -d +docker compose -f docker-compose.local.yml up -d echo "Pruning unused Docker images..." docker image prune -f echo "Containers are up and running." -docker-compose ps -a +docker compose ps -a