From 9e523a715f502a77e9dd8c4d94f37e47bc9b2ae5 Mon Sep 17 00:00:00 2001 From: bestdevmgp Date: Mon, 2 Dec 2024 16:48:23 +0900 Subject: [PATCH 1/5] set S3 --- build.gradle | 2 ++ .../java/com/galendar/global/s3/S3Config.java | 28 +++++++++++++++++++ src/main/resources/application-real1.yml | 10 +++++++ src/main/resources/application-real2.yml | 10 +++++++ src/main/resources/application.yml | 10 +++++++ 5 files changed, 60 insertions(+) create mode 100644 src/main/java/com/galendar/global/s3/S3Config.java diff --git a/build.gradle b/build.gradle index de23f2c..1896976 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,8 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' } tasks.named('test') { diff --git a/src/main/java/com/galendar/global/s3/S3Config.java b/src/main/java/com/galendar/global/s3/S3Config.java new file mode 100644 index 0000000..5139114 --- /dev/null +++ b/src/main/java/com/galendar/global/s3/S3Config.java @@ -0,0 +1,28 @@ +package com.galendar.global.s3; + +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class S3Config { + @Value("${cloud.aws.credentials.access-key}") + private String accessKey; + @Value("${cloud.aws.credentials.secret-key}") + private String secretKey; + @Value("${cloud.aws.region.static}") + private String region; + + @Bean + public AmazonS3Client amazonS3Client() { + BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey); + return (AmazonS3Client) AmazonS3ClientBuilder.standard() + .withRegion(region) + .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) + .build(); + } +} diff --git a/src/main/resources/application-real1.yml b/src/main/resources/application-real1.yml index 5853491..6adf428 100644 --- a/src/main/resources/application-real1.yml +++ b/src/main/resources/application-real1.yml @@ -44,3 +44,13 @@ crawling: subject-url: /sub/ it-list-url: list.php?int_gbn=1&Txt_bcode=030510001 days-to-search: 3 + +cloud: + aws: + s3: + bucket: ${BUCKET_NAME} + stack.auto: false + region.static: ${S3_REGION} + credentials: + accessKey: ${S3_ACCESS_KEY} + secretKey: ${S3_SECRET_KEY} \ No newline at end of file diff --git a/src/main/resources/application-real2.yml b/src/main/resources/application-real2.yml index fe58037..de6e8e2 100644 --- a/src/main/resources/application-real2.yml +++ b/src/main/resources/application-real2.yml @@ -44,3 +44,13 @@ crawling: subject-url: /sub/ it-list-url: list.php?int_gbn=1&Txt_bcode=030510001 days-to-search: 3 + +cloud: + aws: + s3: + bucket: ${BUCKET_NAME} + stack.auto: false + region.static: ${S3_REGION} + credentials: + accessKey: ${S3_ACCESS_KEY} + secretKey: ${S3_SECRET_KEY} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 75720a4..fc7615d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -44,3 +44,13 @@ crawling: subject-url: /sub/ it-list-url: list.php?int_gbn=1&Txt_bcode=030510001 days-to-search: 3 + +cloud: + aws: + s3: + bucket: ${BUCKET_NAME} + stack.auto: false + region.static: ${S3_REGION} + credentials: + accessKey: ${S3_ACCESS_KEY} + secretKey: ${S3_SECRET_KEY} \ No newline at end of file From f5ce2c8da3f22b1425cc0d008cc71ebc857e9e6a Mon Sep 17 00:00:00 2001 From: bestdevmgp Date: Mon, 2 Dec 2024 17:00:29 +0900 Subject: [PATCH 2/5] feat: file upload --- src/main/java/com/galendar/domain/file/UploadController.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/galendar/domain/file/UploadController.java diff --git a/src/main/java/com/galendar/domain/file/UploadController.java b/src/main/java/com/galendar/domain/file/UploadController.java new file mode 100644 index 0000000..2c76e48 --- /dev/null +++ b/src/main/java/com/galendar/domain/file/UploadController.java @@ -0,0 +1,4 @@ +package com.galendar.domain.file; + +public class UploadController { +} From 3640b6902d8e50ef6f3cfb590e0d60411a35aa09 Mon Sep 17 00:00:00 2001 From: bestdevmgp Date: Mon, 2 Dec 2024 17:01:31 +0900 Subject: [PATCH 3/5] feat: file upload --- .../domain/file/UploadController.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/main/java/com/galendar/domain/file/UploadController.java b/src/main/java/com/galendar/domain/file/UploadController.java index 2c76e48..2bcba02 100644 --- a/src/main/java/com/galendar/domain/file/UploadController.java +++ b/src/main/java/com/galendar/domain/file/UploadController.java @@ -1,4 +1,42 @@ package com.galendar.domain.file; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.ObjectMetadata; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +@RestController +@RequestMapping("/upload") +@RequiredArgsConstructor public class UploadController { + + private final AmazonS3Client amazonS3Client; + + @Value("${BUCKET_NAME}") + private String bucket; + + @PostMapping + public ResponseEntity uploadFile(@RequestParam("file")MultipartFile file) { + try { + String fileName = file.getOriginalFilename(); + String fileUrl = "https://" + bucket + "/test" + fileName; + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(file.getContentType()); + metadata.setContentLength(file.getSize()); + amazonS3Client.putObject(bucket, fileName, file.getInputStream(), metadata); + return ResponseEntity.ok(fileUrl); + } catch (IOException e) { + e.printStackTrace(); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + } + } } From df006d266a3dff2c272240e1944b2fd97f85c8fc Mon Sep 17 00:00:00 2001 From: bestdevmgp Date: Mon, 2 Dec 2024 17:07:28 +0900 Subject: [PATCH 4/5] optimize all imports --- .../auth/controller/AuthController.java | 12 ++++------- .../dto/request/AuthenticationRequest.java | 1 - .../domain/auth/service/AuthServiceImpl.java | 1 - .../controller/BookmarkController.java | 7 +------ .../bookmark/entity/BookmarkEntity.java | 16 ++------------- .../contest/dto/request/ContestRequest.java | 1 - .../domain/contest/entity/ContestEntity.java | 20 ++----------------- .../contest/entity/ContestRegionEntity.java | 16 ++------------- .../contest/entity/ContestTargetEntity.java | 15 ++------------ .../domain/contest/mapper/ContestMapper.java | 1 - .../email/controller/EmailController.java | 2 -- .../email/dto/request/EmailSendRequest.java | 3 ++- .../email/dto/request/EmailVerifyRequest.java | 4 +++- .../domain/email/entity/EmailEntity.java | 13 ++---------- .../exception/EmailNotVerifiedException.java | 1 - .../email/service/EmailServiceImpl.java | 3 --- .../profile/controller/ProfileController.java | 1 - .../region/controller/RegionController.java | 6 +----- .../galendar/domain/region/dto/RegionDTO.java | 7 +------ .../domain/region/entity/RegionEntity.java | 12 ++--------- .../domain/region/mapper/RegionMapper.java | 2 -- .../region/service/RegionServiceImpl.java | 2 -- .../target/controller/TargetController.java | 9 +-------- .../galendar/domain/target/dto/TargetDTO.java | 7 +------ .../domain/target/entity/TargetEntity.java | 13 ++---------- .../domain/target/mapper/TargetMapper.java | 4 ---- .../domain/target/service/TargetService.java | 1 - .../domain/upload/UploadController.java | 6 +----- .../com/galendar/domain/user/dto/User.java | 6 +----- .../domain/user/entity/UserEntity.java | 14 ++----------- .../global/common/entity/BaseTimeEntity.java | 4 ---- .../global/exception/CustomException.java | 1 - .../exception/response/ErrorResponse.java | 1 - .../java/com/galendar/global/jwt/JwtUtil.java | 10 +--------- .../jwt/exception/TokenTypeException.java | 1 - .../jwt/filter/JwtAuthenticationFilter.java | 2 -- .../global/jwt/filter/JwtExceptionFilter.java | 1 - .../com/galendar/global/s3/S3ServiceImpl.java | 7 +------ .../security/CustomUserDetailsService.java | 1 - .../global/security/UserSecurity.java | 2 -- .../handler/JwtAccessDeniedHandler.java | 1 - .../handler/JwtAuthenticationEntryPoint.java | 3 --- 42 files changed, 34 insertions(+), 206 deletions(-) diff --git a/src/main/java/com/galendar/domain/auth/controller/AuthController.java b/src/main/java/com/galendar/domain/auth/controller/AuthController.java index 8a5f1bc..0024c9e 100644 --- a/src/main/java/com/galendar/domain/auth/controller/AuthController.java +++ b/src/main/java/com/galendar/domain/auth/controller/AuthController.java @@ -5,20 +5,16 @@ import com.galendar.domain.auth.dto.request.SignupRequest; import com.galendar.domain.auth.dto.response.JsonWebTokenResponse; import com.galendar.domain.auth.service.AuthService; -import com.galendar.domain.auth.service.AuthServiceImpl; -import com.galendar.domain.user.dto.User; -import com.galendar.domain.user.entity.UserEntity; -import com.galendar.domain.user.repository.UserRepository; import com.galendar.global.common.dto.response.ResponseData; -import com.galendar.global.security.CustomUserDetails; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Tag(name = "인증", description = "인증 관련 api입니다.") @RestController diff --git a/src/main/java/com/galendar/domain/auth/dto/request/AuthenticationRequest.java b/src/main/java/com/galendar/domain/auth/dto/request/AuthenticationRequest.java index 35173cd..9cbfe57 100644 --- a/src/main/java/com/galendar/domain/auth/dto/request/AuthenticationRequest.java +++ b/src/main/java/com/galendar/domain/auth/dto/request/AuthenticationRequest.java @@ -1,6 +1,5 @@ package com.galendar.domain.auth.dto.request; -import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java b/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java index cb94b5a..123d742 100644 --- a/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java +++ b/src/main/java/com/galendar/domain/auth/service/AuthServiceImpl.java @@ -4,7 +4,6 @@ import com.galendar.domain.auth.dto.request.RefreshTokenRequest; import com.galendar.domain.auth.dto.request.SignupRequest; import com.galendar.domain.auth.dto.response.JsonWebTokenResponse; -import com.galendar.domain.email.entity.EmailEntity; import com.galendar.domain.email.exception.EmailNotVerifiedException; import com.galendar.domain.email.repository.EmailRepository; import com.galendar.domain.user.dto.User; diff --git a/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java b/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java index ba13e1f..c13d2f8 100644 --- a/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java +++ b/src/main/java/com/galendar/domain/bookmark/controller/BookmarkController.java @@ -10,12 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java b/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java index 5766070..d5baa0b 100644 --- a/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java +++ b/src/main/java/com/galendar/domain/bookmark/entity/BookmarkEntity.java @@ -3,20 +3,8 @@ import com.galendar.domain.contest.entity.ContestEntity; import com.galendar.domain.user.entity.UserEntity; import com.galendar.global.common.entity.BaseTimeEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import jakarta.persistence.UniqueConstraint; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import jakarta.persistence.*; +import lombok.*; @Entity @Table(name = "tb_bookmark", uniqueConstraints = { diff --git a/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java b/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java index 0601b01..33f3049 100644 --- a/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java +++ b/src/main/java/com/galendar/domain/contest/dto/request/ContestRequest.java @@ -1,6 +1,5 @@ package com.galendar.domain.contest.dto.request; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java index 0d4c3a5..251f18a 100644 --- a/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java +++ b/src/main/java/com/galendar/domain/contest/entity/ContestEntity.java @@ -3,25 +3,9 @@ import com.galendar.domain.contest.entity.enums.ContestCost; import com.galendar.domain.user.entity.UserEntity; import com.galendar.global.common.entity.BaseTimeEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; +import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; import java.time.LocalDate; import java.util.ArrayList; diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java index 506e7df..ba25c47 100644 --- a/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java +++ b/src/main/java/com/galendar/domain/contest/entity/ContestRegionEntity.java @@ -1,20 +1,8 @@ package com.galendar.domain.contest.entity; import com.galendar.domain.region.entity.RegionEntity; -import com.galendar.domain.target.entity.TargetEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import jakarta.persistence.*; +import lombok.*; @Entity @Table(name = "tb_contest_region") diff --git a/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java b/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java index 30a4294..fdbc016 100644 --- a/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java +++ b/src/main/java/com/galendar/domain/contest/entity/ContestTargetEntity.java @@ -1,19 +1,8 @@ package com.galendar.domain.contest.entity; import com.galendar.domain.target.entity.TargetEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import jakarta.persistence.*; +import lombok.*; @Entity @Table(name = "tb_contest_target") diff --git a/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java b/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java index a73192c..582a642 100644 --- a/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java +++ b/src/main/java/com/galendar/domain/contest/mapper/ContestMapper.java @@ -3,7 +3,6 @@ import com.galendar.domain.contest.dto.request.RegisterContestRequest; import com.galendar.domain.contest.entity.ContestEntity; import com.galendar.domain.user.entity.UserEntity; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/galendar/domain/email/controller/EmailController.java b/src/main/java/com/galendar/domain/email/controller/EmailController.java index ed1f440..f5e30fd 100644 --- a/src/main/java/com/galendar/domain/email/controller/EmailController.java +++ b/src/main/java/com/galendar/domain/email/controller/EmailController.java @@ -3,11 +3,9 @@ import com.galendar.domain.email.dto.request.EmailSendRequest; import com.galendar.domain.email.dto.request.EmailVerifyRequest; import com.galendar.domain.email.service.EmailVerificationService; -import com.galendar.domain.email.service.EmailVerificationServiceImpl; import com.galendar.global.common.dto.response.ResponseData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java b/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java index b606ae3..2954914 100644 --- a/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java +++ b/src/main/java/com/galendar/domain/email/dto/request/EmailSendRequest.java @@ -2,7 +2,8 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import lombok.*; +import lombok.Getter; +import lombok.Setter; @Getter diff --git a/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java b/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java index 4ad25c4..a298897 100644 --- a/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java +++ b/src/main/java/com/galendar/domain/email/dto/request/EmailVerifyRequest.java @@ -3,7 +3,9 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @NoArgsConstructor diff --git a/src/main/java/com/galendar/domain/email/entity/EmailEntity.java b/src/main/java/com/galendar/domain/email/entity/EmailEntity.java index 4268e3d..7c119df 100644 --- a/src/main/java/com/galendar/domain/email/entity/EmailEntity.java +++ b/src/main/java/com/galendar/domain/email/entity/EmailEntity.java @@ -1,16 +1,7 @@ package com.galendar.domain.email.entity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import jakarta.persistence.*; +import lombok.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java b/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java index 2c10b24..e052ff2 100644 --- a/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java +++ b/src/main/java/com/galendar/domain/email/exception/EmailNotVerifiedException.java @@ -1,6 +1,5 @@ package com.galendar.domain.email.exception; -import com.galendar.domain.user.exception.UserNotFoundException; import com.galendar.global.exception.CustomException; public class EmailNotVerifiedException extends CustomException { diff --git a/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java b/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java index 2133436..e7ffa56 100644 --- a/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java +++ b/src/main/java/com/galendar/domain/email/service/EmailServiceImpl.java @@ -5,14 +5,12 @@ import com.galendar.global.exception.CustomException; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.util.FileCopyUtils; @@ -20,7 +18,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/galendar/domain/profile/controller/ProfileController.java b/src/main/java/com/galendar/domain/profile/controller/ProfileController.java index 8fbfe61..5e2d3a8 100644 --- a/src/main/java/com/galendar/domain/profile/controller/ProfileController.java +++ b/src/main/java/com/galendar/domain/profile/controller/ProfileController.java @@ -8,7 +8,6 @@ import java.util.Arrays; import java.util.List; -import java.util.stream.Stream; @Hidden @RestController diff --git a/src/main/java/com/galendar/domain/region/controller/RegionController.java b/src/main/java/com/galendar/domain/region/controller/RegionController.java index 8c6a154..aa844f9 100644 --- a/src/main/java/com/galendar/domain/region/controller/RegionController.java +++ b/src/main/java/com/galendar/domain/region/controller/RegionController.java @@ -10,11 +10,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/galendar/domain/region/dto/RegionDTO.java b/src/main/java/com/galendar/domain/region/dto/RegionDTO.java index bee8ca6..49cfc06 100644 --- a/src/main/java/com/galendar/domain/region/dto/RegionDTO.java +++ b/src/main/java/com/galendar/domain/region/dto/RegionDTO.java @@ -1,11 +1,6 @@ package com.galendar.domain.region.dto; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Builder @NoArgsConstructor diff --git a/src/main/java/com/galendar/domain/region/entity/RegionEntity.java b/src/main/java/com/galendar/domain/region/entity/RegionEntity.java index a64452c..ffe524a 100644 --- a/src/main/java/com/galendar/domain/region/entity/RegionEntity.java +++ b/src/main/java/com/galendar/domain/region/entity/RegionEntity.java @@ -1,17 +1,9 @@ package com.galendar.domain.region.entity; import com.galendar.global.common.entity.BaseTimeEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; @Entity @Table(name="tb_region") diff --git a/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java b/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java index 19c7a2c..b878847 100644 --- a/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java +++ b/src/main/java/com/galendar/domain/region/mapper/RegionMapper.java @@ -3,8 +3,6 @@ import com.galendar.domain.region.dto.RegionDTO; import com.galendar.domain.region.dto.request.RegisterRegionRequest; import com.galendar.domain.region.entity.RegionEntity; -import com.galendar.domain.target.dto.request.RegisterTargetRequest; -import com.galendar.domain.target.entity.TargetEntity; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java b/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java index 50fab5c..86e847e 100644 --- a/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java +++ b/src/main/java/com/galendar/domain/region/service/RegionServiceImpl.java @@ -2,10 +2,8 @@ import com.galendar.domain.region.dto.RegionDTO; import com.galendar.domain.region.dto.request.RegisterRegionRequest; -import com.galendar.domain.region.entity.RegionEntity; import com.galendar.domain.region.mapper.RegionMapper; import com.galendar.domain.region.repository.RegionRepository; - import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/galendar/domain/target/controller/TargetController.java b/src/main/java/com/galendar/domain/target/controller/TargetController.java index afdacc1..1c274dc 100644 --- a/src/main/java/com/galendar/domain/target/controller/TargetController.java +++ b/src/main/java/com/galendar/domain/target/controller/TargetController.java @@ -1,6 +1,5 @@ package com.galendar.domain.target.controller; -import com.galendar.domain.region.dto.RegionDTO; import com.galendar.domain.target.dto.TargetDTO; import com.galendar.domain.target.dto.request.RegisterTargetRequest; import com.galendar.domain.target.service.TargetService; @@ -10,14 +9,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/galendar/domain/target/dto/TargetDTO.java b/src/main/java/com/galendar/domain/target/dto/TargetDTO.java index 49462ec..9d4c9c5 100644 --- a/src/main/java/com/galendar/domain/target/dto/TargetDTO.java +++ b/src/main/java/com/galendar/domain/target/dto/TargetDTO.java @@ -1,11 +1,6 @@ package com.galendar.domain.target.dto; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Builder @AllArgsConstructor diff --git a/src/main/java/com/galendar/domain/target/entity/TargetEntity.java b/src/main/java/com/galendar/domain/target/entity/TargetEntity.java index ba53eb4..2fb64bb 100644 --- a/src/main/java/com/galendar/domain/target/entity/TargetEntity.java +++ b/src/main/java/com/galendar/domain/target/entity/TargetEntity.java @@ -1,18 +1,9 @@ package com.galendar.domain.target.entity; import com.galendar.global.common.entity.BaseTimeEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Entity @Table(name="tb_target") diff --git a/src/main/java/com/galendar/domain/target/mapper/TargetMapper.java b/src/main/java/com/galendar/domain/target/mapper/TargetMapper.java index 7e3b800..64263ef 100644 --- a/src/main/java/com/galendar/domain/target/mapper/TargetMapper.java +++ b/src/main/java/com/galendar/domain/target/mapper/TargetMapper.java @@ -1,9 +1,5 @@ package com.galendar.domain.target.mapper; -import com.galendar.domain.contest.dto.request.RegisterContestRequest; -import com.galendar.domain.contest.entity.ContestEntity; -import com.galendar.domain.region.dto.RegionDTO; -import com.galendar.domain.region.entity.RegionEntity; import com.galendar.domain.target.dto.TargetDTO; import com.galendar.domain.target.dto.request.RegisterTargetRequest; import com.galendar.domain.target.entity.TargetEntity; diff --git a/src/main/java/com/galendar/domain/target/service/TargetService.java b/src/main/java/com/galendar/domain/target/service/TargetService.java index f61db41..f4aff52 100644 --- a/src/main/java/com/galendar/domain/target/service/TargetService.java +++ b/src/main/java/com/galendar/domain/target/service/TargetService.java @@ -1,6 +1,5 @@ package com.galendar.domain.target.service; -import com.galendar.domain.region.dto.RegionDTO; import com.galendar.domain.target.dto.TargetDTO; import com.galendar.domain.target.dto.request.RegisterTargetRequest; diff --git a/src/main/java/com/galendar/domain/upload/UploadController.java b/src/main/java/com/galendar/domain/upload/UploadController.java index 3351f7f..3a97bf5 100644 --- a/src/main/java/com/galendar/domain/upload/UploadController.java +++ b/src/main/java/com/galendar/domain/upload/UploadController.java @@ -6,11 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @Tag(name = "File", description = "") diff --git a/src/main/java/com/galendar/domain/user/dto/User.java b/src/main/java/com/galendar/domain/user/dto/User.java index d07ff1b..a9c0d12 100644 --- a/src/main/java/com/galendar/domain/user/dto/User.java +++ b/src/main/java/com/galendar/domain/user/dto/User.java @@ -1,11 +1,7 @@ package com.galendar.domain.user.dto; import com.galendar.domain.user.entity.enums.UserRole; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Builder @AllArgsConstructor diff --git a/src/main/java/com/galendar/domain/user/entity/UserEntity.java b/src/main/java/com/galendar/domain/user/entity/UserEntity.java index bc49577..0646a54 100644 --- a/src/main/java/com/galendar/domain/user/entity/UserEntity.java +++ b/src/main/java/com/galendar/domain/user/entity/UserEntity.java @@ -2,19 +2,9 @@ import com.galendar.domain.user.entity.enums.UserRole; import com.galendar.global.common.entity.BaseTimeEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; @Entity(name = "tb_user") @Builder diff --git a/src/main/java/com/galendar/global/common/entity/BaseTimeEntity.java b/src/main/java/com/galendar/global/common/entity/BaseTimeEntity.java index 633e407..0355016 100644 --- a/src/main/java/com/galendar/global/common/entity/BaseTimeEntity.java +++ b/src/main/java/com/galendar/global/common/entity/BaseTimeEntity.java @@ -1,13 +1,9 @@ package com.galendar.global.common.entity; -import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; -import lombok.AccessLevel; import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/com/galendar/global/exception/CustomException.java b/src/main/java/com/galendar/global/exception/CustomException.java index 53dac19..83adcd6 100644 --- a/src/main/java/com/galendar/global/exception/CustomException.java +++ b/src/main/java/com/galendar/global/exception/CustomException.java @@ -3,7 +3,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.RequiredArgsConstructor; @AllArgsConstructor @Getter diff --git a/src/main/java/com/galendar/global/exception/response/ErrorResponse.java b/src/main/java/com/galendar/global/exception/response/ErrorResponse.java index c929bce..becca4e 100644 --- a/src/main/java/com/galendar/global/exception/response/ErrorResponse.java +++ b/src/main/java/com/galendar/global/exception/response/ErrorResponse.java @@ -3,7 +3,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import org.springframework.http.HttpStatus; @AllArgsConstructor @Setter diff --git a/src/main/java/com/galendar/global/jwt/JwtUtil.java b/src/main/java/com/galendar/global/jwt/JwtUtil.java index 6dcd668..3db8e27 100644 --- a/src/main/java/com/galendar/global/jwt/JwtUtil.java +++ b/src/main/java/com/galendar/global/jwt/JwtUtil.java @@ -8,15 +8,7 @@ import com.galendar.global.jwt.enums.JwtType; import com.galendar.global.jwt.exception.TokenTypeException; import com.galendar.global.security.CustomUserDetails; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.ExpiredJwtException; -import io.jsonwebtoken.Header; -import io.jsonwebtoken.Jws; -import io.jsonwebtoken.JwtException; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.MalformedJwtException; -import io.jsonwebtoken.SignatureAlgorithm; -import io.jsonwebtoken.UnsupportedJwtException; +import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.SignatureException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/galendar/global/jwt/exception/TokenTypeException.java b/src/main/java/com/galendar/global/jwt/exception/TokenTypeException.java index c31f052..5190414 100644 --- a/src/main/java/com/galendar/global/jwt/exception/TokenTypeException.java +++ b/src/main/java/com/galendar/global/jwt/exception/TokenTypeException.java @@ -1,6 +1,5 @@ package com.galendar.global.jwt.exception; -import com.galendar.domain.user.exception.UserNotFoundException; import com.galendar.global.exception.CustomException; public class TokenTypeException extends CustomException { diff --git a/src/main/java/com/galendar/global/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/galendar/global/jwt/filter/JwtAuthenticationFilter.java index 2ce1d70..6e1bd32 100644 --- a/src/main/java/com/galendar/global/jwt/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/galendar/global/jwt/filter/JwtAuthenticationFilter.java @@ -6,10 +6,8 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpHeaders; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; diff --git a/src/main/java/com/galendar/global/jwt/filter/JwtExceptionFilter.java b/src/main/java/com/galendar/global/jwt/filter/JwtExceptionFilter.java index 56370c6..f6cfe36 100644 --- a/src/main/java/com/galendar/global/jwt/filter/JwtExceptionFilter.java +++ b/src/main/java/com/galendar/global/jwt/filter/JwtExceptionFilter.java @@ -1,7 +1,6 @@ package com.galendar.global.jwt.filter; import com.fasterxml.jackson.databind.ObjectMapper; -import com.galendar.global.exception.CustomException; import com.galendar.global.exception.response.ErrorResponse; import io.jsonwebtoken.JwtException; import jakarta.servlet.FilterChain; diff --git a/src/main/java/com/galendar/global/s3/S3ServiceImpl.java b/src/main/java/com/galendar/global/s3/S3ServiceImpl.java index 8950714..df1b4d6 100644 --- a/src/main/java/com/galendar/global/s3/S3ServiceImpl.java +++ b/src/main/java/com/galendar/global/s3/S3ServiceImpl.java @@ -8,12 +8,7 @@ import org.springframework.web.multipart.MultipartFile; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; -import software.amazon.awssdk.services.s3.model.DeleteObjectResponse; -import software.amazon.awssdk.services.s3.model.GetUrlRequest; -import software.amazon.awssdk.services.s3.model.PutObjectRequest; -import software.amazon.awssdk.services.s3.model.PutObjectResponse; -import software.amazon.awssdk.services.s3.model.S3Response; +import software.amazon.awssdk.services.s3.model.*; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/com/galendar/global/security/CustomUserDetailsService.java b/src/main/java/com/galendar/global/security/CustomUserDetailsService.java index 2086cd6..f5fe356 100644 --- a/src/main/java/com/galendar/global/security/CustomUserDetailsService.java +++ b/src/main/java/com/galendar/global/security/CustomUserDetailsService.java @@ -1,7 +1,6 @@ package com.galendar.global.security; import com.galendar.domain.user.dto.User; -import com.galendar.domain.user.entity.UserEntity; import com.galendar.domain.user.exception.UserNotFoundException; import com.galendar.domain.user.mapper.UserMapper; import com.galendar.domain.user.repository.UserRepository; diff --git a/src/main/java/com/galendar/global/security/UserSecurity.java b/src/main/java/com/galendar/global/security/UserSecurity.java index 7434316..cbfed6d 100644 --- a/src/main/java/com/galendar/global/security/UserSecurity.java +++ b/src/main/java/com/galendar/global/security/UserSecurity.java @@ -2,8 +2,6 @@ import com.galendar.domain.user.dto.User; import com.galendar.domain.user.entity.UserEntity; -import com.galendar.domain.user.mapper.UserMapper; -import lombok.RequiredArgsConstructor; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/galendar/global/security/handler/JwtAccessDeniedHandler.java b/src/main/java/com/galendar/global/security/handler/JwtAccessDeniedHandler.java index c7fb743..a66b0b8 100644 --- a/src/main/java/com/galendar/global/security/handler/JwtAccessDeniedHandler.java +++ b/src/main/java/com/galendar/global/security/handler/JwtAccessDeniedHandler.java @@ -1,7 +1,6 @@ package com.galendar.global.security.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import com.galendar.global.exception.CustomException; import com.galendar.global.exception.response.ErrorResponse; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/galendar/global/security/handler/JwtAuthenticationEntryPoint.java b/src/main/java/com/galendar/global/security/handler/JwtAuthenticationEntryPoint.java index f6b22fc..18bd568 100644 --- a/src/main/java/com/galendar/global/security/handler/JwtAuthenticationEntryPoint.java +++ b/src/main/java/com/galendar/global/security/handler/JwtAuthenticationEntryPoint.java @@ -1,7 +1,6 @@ package com.galendar.global.security.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import com.galendar.global.exception.CustomException; import com.galendar.global.exception.response.ErrorResponse; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -11,8 +10,6 @@ import org.springframework.security.web.AuthenticationEntryPoint; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { @Override From ca33837c7b9a1e4c2b0eca24d3f20d97ee4c92d0 Mon Sep 17 00:00:00 2001 From: bestdevmgp Date: Mon, 2 Dec 2024 17:16:20 +0900 Subject: [PATCH 5/5] =?UTF-8?q?S3=20=EA=B5=AC=ED=98=84=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C.=20build.gradle=EC=9D=98=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EC=9D=98=EC=A1=B4=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 361a2ed..e7abd9b 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'org.jsoup:jsoup:1.17.2' - implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1' +// implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test'