From b0375dfcc0e346e324ad5b8555c1cd0248c0d614 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 14:17:29 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20docker=20logging=EC=9D=84=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20restart=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/production/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml index be22e934..13866087 100644 --- a/docker/production/docker-compose.yml +++ b/docker/production/docker-compose.yml @@ -4,7 +4,7 @@ services: user-service: image: ghcr.io/kernel180-be12/final-4team-icebang/user-service:latest container_name: user-service - restart: always + restart: on-failure:3 ports: - "80:8080" - "443:8080" @@ -18,7 +18,7 @@ services: pre-processing-service: image: ghcr.io/kernel180-be12/final-4team-icebang/pre-processing-service:latest container_name: pre-processing-service - restart: always + restart: on-failure:3 ports: - "8000:8000" networks: From bf08d577d9c0035746dc58593e5181356d45d441 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 14:49:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20EmailServiceImpl=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../email/service/EmailServiceImpl.java | 32 +++++++++---------- .../email/service/MockEmailService.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java index 82047271..22150929 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java @@ -1,16 +1,16 @@ -package site.icebang.domain.email.service; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.stereotype.Service; - -import lombok.RequiredArgsConstructor; - -import site.icebang.domain.email.dto.EmailRequest; - -@Service -@RequiredArgsConstructor -@ConditionalOnMissingBean(EmailService.class) -public class EmailServiceImpl implements EmailService { - @Override - public void send(EmailRequest emailRequest) {} -} +//package site.icebang.domain.email.service; +// +//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +//import org.springframework.stereotype.Service; +// +//import lombok.RequiredArgsConstructor; +// +//import site.icebang.domain.email.dto.EmailRequest; +// +//@Service +//@RequiredArgsConstructor +//@ConditionalOnMissingBean(EmailService.class) +//public class EmailServiceImpl implements EmailService { +// @Override +// public void send(EmailRequest emailRequest) {} +//} diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java index c4bff4f5..ebab6b73 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java @@ -8,7 +8,7 @@ import site.icebang.domain.email.dto.EmailRequest; @Service -@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) +//@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) @Slf4j public class MockEmailService implements EmailService { From 9e36414368b2fff10bc18bafb78c6d5c9b0bf5e7 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 14:49:38 +0900 Subject: [PATCH 3/3] chore: fix lint --- .../email/service/EmailServiceImpl.java | 20 +++++++++---------- .../email/service/MockEmailService.java | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java index 22150929..cd8ba706 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/EmailServiceImpl.java @@ -1,16 +1,16 @@ -//package site.icebang.domain.email.service; +// package site.icebang.domain.email.service; // -//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -//import org.springframework.stereotype.Service; +// import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +// import org.springframework.stereotype.Service; // -//import lombok.RequiredArgsConstructor; +// import lombok.RequiredArgsConstructor; // -//import site.icebang.domain.email.dto.EmailRequest; +// import site.icebang.domain.email.dto.EmailRequest; // -//@Service -//@RequiredArgsConstructor -//@ConditionalOnMissingBean(EmailService.class) -//public class EmailServiceImpl implements EmailService { +// @Service +// @RequiredArgsConstructor +// @ConditionalOnMissingBean(EmailService.class) +// public class EmailServiceImpl implements EmailService { // @Override // public void send(EmailRequest emailRequest) {} -//} +// } diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java index ebab6b73..7530667d 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java @@ -1,6 +1,5 @@ package site.icebang.domain.email.service; -import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; @@ -8,7 +7,7 @@ import site.icebang.domain.email.dto.EmailRequest; @Service -//@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) +// @Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) @Slf4j public class MockEmailService implements EmailService {