From 95bd125ac1291ea76ad54408d63176a757d5468b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98jminkkk=E2=80=99?= <102847513+jminkkk@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:59:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20import=20=EB=AC=B8=20=EC=B5=9C?= =?UTF-8?q?=EC=A0=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/codezap/auth/service/AuthService.java | 2 +- .../main/java/codezap/global/cors/WebCorsConfiguration.java | 1 + .../src/main/java/codezap/member/service/MemberService.java | 4 ++-- .../src/main/java/codezap/tag/controller/TagController.java | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/codezap/auth/service/AuthService.java b/backend/src/main/java/codezap/auth/service/AuthService.java index f45be414d..5af9e21ef 100644 --- a/backend/src/main/java/codezap/auth/service/AuthService.java +++ b/backend/src/main/java/codezap/auth/service/AuthService.java @@ -6,11 +6,11 @@ import codezap.auth.dto.LoginAndCredentialDto; import codezap.auth.dto.request.LoginRequest; import codezap.auth.dto.response.LoginResponse; +import codezap.auth.encryption.PasswordEncryptor; import codezap.auth.provider.CredentialProvider; import codezap.global.exception.CodeZapException; import codezap.member.domain.Member; import codezap.member.repository.MemberRepository; -import codezap.auth.encryption.PasswordEncryptor; import lombok.RequiredArgsConstructor; @Service diff --git a/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java b/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java index 074abc96d..7f941e979 100644 --- a/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java +++ b/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java @@ -6,6 +6,7 @@ @Configuration public class WebCorsConfiguration implements WebMvcConfigurer { + @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") diff --git a/backend/src/main/java/codezap/member/service/MemberService.java b/backend/src/main/java/codezap/member/service/MemberService.java index e2da246a2..b97b00061 100644 --- a/backend/src/main/java/codezap/member/service/MemberService.java +++ b/backend/src/main/java/codezap/member/service/MemberService.java @@ -5,6 +5,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import codezap.auth.encryption.PasswordEncryptor; +import codezap.auth.encryption.SaltGenerator; import codezap.category.domain.Category; import codezap.category.repository.CategoryRepository; import codezap.global.exception.CodeZapException; @@ -13,8 +15,6 @@ import codezap.member.dto.request.SignupRequest; import codezap.member.dto.response.FindMemberResponse; import codezap.member.repository.MemberRepository; -import codezap.auth.encryption.PasswordEncryptor; -import codezap.auth.encryption.SaltGenerator; import lombok.RequiredArgsConstructor; @Service diff --git a/backend/src/main/java/codezap/tag/controller/TagController.java b/backend/src/main/java/codezap/tag/controller/TagController.java index ced0796aa..3cda2e907 100644 --- a/backend/src/main/java/codezap/tag/controller/TagController.java +++ b/backend/src/main/java/codezap/tag/controller/TagController.java @@ -6,8 +6,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import codezap.auth.configuration.AuthenticationPrinciple; -import codezap.member.dto.MemberDto; import codezap.tag.dto.response.FindAllTagsResponse; import codezap.template.service.facade.MemberTemplateApplicationService; import lombok.RequiredArgsConstructor; From 66a1d5c570e2a824d150ec5c861fcbf1db3d8e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98jminkkk=E2=80=99?= <102847513+jminkkk@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:19:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix(cors):=20main=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20origin=20=20cors=20=ED=97=88=EC=9A=A9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/codezap/global/cors/WebCorsConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java b/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java index 7f941e979..f2522c83a 100644 --- a/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java +++ b/backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java @@ -12,6 +12,7 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowCredentials(true) .allowedOriginPatterns("https://*.code-zap.com") + .allowedOrigins("https://code-zap.com") .allowedMethods("*") .exposedHeaders("*"); }