From 33baaa855483571fc47ceba5cd6477d14491e27f Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 09:21:16 +0900 Subject: [PATCH 01/40] [#30] feature : findGroupList --- .../controller/GroupController.java | 17 +++++++++++++++ .../itemservice/service/IGroupService.java | 4 ++++ .../service/impl/GroupService.java | 21 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java index 45a65ed..734461a 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java @@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; + @RestController @Slf4j @RequiredArgsConstructor @@ -36,4 +39,18 @@ public ResponseEntity findItemInfoByGroupSeq(@PathVariable int groupSe return ResponseEntity.ok().body(groupDto); } + + @GetMapping("/group") // Group List 조회 + public ResponseEntity> findGroupList() throws Exception { + log.info(this.getClass().getName() + ".findGroupList Start!"); + + List groupDtoList = new ArrayList<>(); + + groupDtoList = groupService.findGroupList(); + + log.info(this.getClass().getName() + ".findGroupList End!"); + + return ResponseEntity.ok().body(groupDtoList); + } + } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/IGroupService.java b/ItemService/src/main/java/com/submarket/itemservice/service/IGroupService.java index 582b75f..7677100 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/IGroupService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/IGroupService.java @@ -2,6 +2,10 @@ import com.submarket.itemservice.dto.GroupDto; +import java.util.List; + public interface IGroupService { GroupDto findItemInfoByGroupSeq(GroupDto groupDto) throws Exception; + + List findGroupList() throws Exception; } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/GroupService.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/GroupService.java index d598d4d..326de96 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/GroupService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/GroupService.java @@ -10,6 +10,8 @@ import org.springframework.stereotype.Service; import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; @Service(value = "GroupService") @@ -36,4 +38,23 @@ public GroupDto findItemInfoByGroupSeq(GroupDto groupDto) throws Exception { log.info(this.getClass().getName() + ".findItemInfoByGroup End!"); return rDto; } + + @Override // Group List 조회 + @Transactional + public List findGroupList() throws Exception { + log.info(this.getClass().getName() + "findGroupList Start!"); + List groupDtoList = new ArrayList<>(); + Iterable groupEntityIterable = groupRepository.findAll(); + + + groupEntityIterable.forEach(groupEntity -> { + groupDtoList.add(GroupMapper.INSTANCE.groupEntityToGroupDto(groupEntity)); + }); + + log.info("groupList Size : " + groupDtoList.size()); + log.info(this.getClass().getName() + "findGroupList End!"); + + + return groupDtoList; + } } From 7d1984edf0cc0b24cf0599e9786511e24c0bb5c7 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 09:30:25 +0900 Subject: [PATCH 02/40] =?UTF-8?q?[#29]=20fix=20:=20Controller=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java new file mode 100644 index 0000000..a307315 --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java @@ -0,0 +1,32 @@ +package com.submarket.itemservice.controller; + +import com.submarket.itemservice.dto.CategoryDto; +import com.submarket.itemservice.service.impl.CategoryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@RestController +@RequiredArgsConstructor +public class CategoryController { + private final CategoryService categoryService; + + @GetMapping("/category") + public ResponseEntity> findAllCategory() throws Exception { + log.info(this.getClass().getName() + ">findAllCategory Start!"); + List categoryDtoList = new ArrayList<>(); + + categoryDtoList = categoryService.findAllCategory(); + + + log.info(this.getClass().getName() + ">findAllCategory End!"); + + return ResponseEntity.ok().body(categoryDtoList); + } +} From 5c1f3ace2aecba8e9f8167132d43650bff499a60 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 09:36:56 +0900 Subject: [PATCH 03/40] [#31] feature : findItemInfoByCategorySeq --- .../controller/CategoryController.java | 17 +++++++++++++++++ .../service/impl/CategoryService.java | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java index a307315..d7ca857 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -29,4 +30,20 @@ public ResponseEntity> findAllCategory() throws Exception { return ResponseEntity.ok().body(categoryDtoList); } + + @GetMapping("/category/{categorySeq}") + public ResponseEntity findItemInfoByCategorySeq(@PathVariable int categorySeq) throws Exception { + log.info(this.getClass().getName() + ".findItemInfoByCategorySeq Start!"); + + log.info("categorySeq : " + categorySeq); + CategoryDto pDto = new CategoryDto(); + pDto.setCategorySeq(categorySeq); + + CategoryDto categoryDto = categoryService.findCategory(pDto); + + log.info("categoryName : " + categoryDto.getCategoryName()); + + log.info(this.getClass().getName() + ".findItemInfoByCategorySeq End!"); + return ResponseEntity.ok().body(categoryDto); + } } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/CategoryService.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/CategoryService.java index d5ac52a..ecaef50 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/CategoryService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/CategoryService.java @@ -25,10 +25,16 @@ public class CategoryService implements ICategoryService { public CategoryDto findCategory(CategoryDto categoryDto) throws Exception { log.info(this.getClass().getName() + ".findCategory Start"); int categorySeq = categoryDto.getCategorySeq(); + CategoryDto rDto = new CategoryDto(); Optional categoryEntityOptional = categoryRepository.findById(categorySeq); - CategoryDto rDto = CategoryMapper.INSTANCE.categoryEntityToCategoryDto(categoryEntityOptional.get()); + if (categoryEntityOptional.isPresent()) { + rDto = CategoryMapper.INSTANCE.categoryEntityToCategoryDto(categoryEntityOptional.get()); + } else { + throw new RuntimeException("Category 정보를 찾을 수 없습니다"); + } + log.info(this.getClass().getName() + ".findCategory End"); return rDto; From 72d259e9b70f36230796691e102c26800853255a Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 10:11:34 +0900 Subject: [PATCH 04/40] =?UTF-8?q?[#40]=20feature=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 19 +++++++++++++++++++ .../userservice/jpa/UserRepository.java | 7 +++++++ .../userservice/service/IUserService.java | 6 +++++- .../userservice/service/impl/UserService.java | 18 ++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index 67ef347..89bd25a 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -103,4 +103,23 @@ public ResponseEntity changePassword(@RequestBody RequestChangePassword return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("이전 비밀번호를 확인해 주세요"); } + + @DeleteMapping("/user") + public ResponseEntity deleteUser(@RequestBody RequestUser requestUser) throws Exception { + /** + * 비밀번호가 일치한다면 + * 사용자 Status 0으로 변경 + */ + log.info(this.getClass().getName() + ".deleteUser Start!"); + UserDto pDto = new UserDto(); + pDto.setUserPassword(requestUser.getUserPassword()); + pDto.setUserId(requestUser.getUserId()); + + // TODO: 2022-05-23 요청 + userService.deleteUser(pDto); + + log.info(this.getClass().getName() + ".deleteUser Start!"); + + return null; + } } diff --git a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java index a2fcab1..22b9141 100644 --- a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java +++ b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java @@ -24,6 +24,13 @@ public interface UserRepository extends CrudRepository { @Query(value = "UPDATE user_info set user_password = :password WHERE user_seq = :userSeq", nativeQuery = true) void changeUserPassword(@Param("password") String password, @Param("userSeq") int userSeq); + // 사용자 status 변경 (회원탈퇴) + + @Transactional + @Modifying + @Query(value = "UPDATE user_info SET user_status = 0 WHERE user_seq = :userSeq", nativeQuery = true) + void deleteUserInfo(@Param("userSeq") int userSeq); + } diff --git a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java index e62bec6..68ea600 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java @@ -9,8 +9,12 @@ public interface IUserService extends UserDetailsService { UserDto getUserInfoByUserEmail(String userEmail); + int changeUserPassword(UserDto pDTO, String newPassword) throws Exception; + + int deleteUser(UserDto userDto) throws Exception; + UserDto getUserDetailsByUserId(String userId); - int changeUserPassword(UserDto pDTO, String newPassword) throws Exception; + } diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 785534a..3b2fde6 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -13,6 +13,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.ArrayList; @@ -85,7 +86,24 @@ public int changeUserPassword(UserDto pDTO, String newPassword) throws Exception } + @Override + @Transactional + public int deleteUser(UserDto userDto) throws Exception { + log.info(this.getClass().getName() + ".deleteUser Start!"); + // 비밀번호 일치 확인 + if (userCheckService.isTruePassword(userDto.getUserId(), userDto.getUserPassword())) { + // 비밀번호가 일치한다면 + int userSeq = 38; + userRepository.deleteUserInfo(userSeq); + } else { + throw new RuntimeException("사용자 비밀번호가 일치하지 않습니다"); + } + + log.info(this.getClass().getName() + ".deleteUser End!"); + + return 0; + } //####################################### JWT Don't change #######################################// @Override From 7c85aa7c7c55d0d3fac890b7b429ae048501f7ac Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 10:16:37 +0900 Subject: [PATCH 05/40] =?UTF-8?q?[#40]=20refactor=20:=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=ED=95=9C=20=ED=9A=8C=EC=9B=90=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/submarket/userservice/service/impl/UserService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 3b2fde6..7746355 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -110,7 +110,7 @@ public int deleteUser(UserDto userDto) throws Exception { public UserDto getUserDetailsByUserId(String userId) { UserEntity rEntity = userRepository.findByUserId(userId); - if (rEntity == null) { + if (rEntity == null || rEntity.getUserStatus() == 0) { throw new UsernameNotFoundException(userId); } @@ -126,7 +126,8 @@ public UserDetails loadUserByUsername(String userId) throws UsernameNotFoundExce log.info("username : " + userId); UserEntity rEntity = userRepository.findByUserId(userId); - if (rEntity == null) { + if (rEntity == null || rEntity.getUserStatus() == 0) { + // 사용자 정보가 없거나 탈퇴한 사용자라면 (401) throw new UsernameNotFoundException(userId); } From ac6052b5df35adc70591e8f99b1ad08e197b55a8 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 10:29:42 +0900 Subject: [PATCH 06/40] [#40] fix : TokenUtil --- .../java/com/submarket/userservice/util/TokenUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java b/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java index f75c3b0..b2ccf67 100644 --- a/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java +++ b/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java @@ -1,19 +1,23 @@ package com.submarket.userservice.util; import io.jsonwebtoken.Jwts; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; @Slf4j +@RequiredArgsConstructor public class TokenUtil { + private static Environment env; - public static String getUserIdByToken(HttpHeaders headers, String secret) { + public static String getUserIdByToken(HttpHeaders headers) { log.debug("Token Util Start!"); String token = headers.get("Authorization").get(0); // Get Token in headers String jwt = token.replace("Bearer", ""); // delete Bearer log.info("JWT : " + jwt); // TokenValue - String userId = Jwts.parser().setSigningKey(secret).parseClaimsJws(jwt).getBody().getSubject(); + String userId = Jwts.parser().setSigningKey(env.getProperty("token.secret")).parseClaimsJws(jwt).getBody().getSubject(); log.info("getUserId End"); From 224f9e166c067050054ec228cc870ea229579882 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 10:49:11 +0900 Subject: [PATCH 07/40] =?UTF-8?q?[#40]=20refactor=20:=20Token=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=97=AC=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userservice/controller/UserController.java | 10 ++++++++-- .../com/submarket/userservice/jpa/UserRepository.java | 4 ++-- .../userservice/service/impl/UserService.java | 3 +-- .../com/submarket/userservice/util/TokenUtil.java | 11 ++++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index 89bd25a..24e753c 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -4,11 +4,13 @@ import com.submarket.userservice.mapper.UserMapper; import com.submarket.userservice.service.impl.UserCheckService; import com.submarket.userservice.service.impl.UserService; +import com.submarket.userservice.util.TokenUtil; import com.submarket.userservice.vo.RequestChangePassword; import com.submarket.userservice.vo.RequestUser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.env.Environment; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -20,6 +22,7 @@ public class UserController { private final UserService userService; private final UserCheckService userCheckService; private final Environment env; + private final TokenUtil tokenUtil; /**<---------------------->회원가입*/ @PostMapping("/users") @@ -105,15 +108,18 @@ public ResponseEntity changePassword(@RequestBody RequestChangePassword } @DeleteMapping("/user") - public ResponseEntity deleteUser(@RequestBody RequestUser requestUser) throws Exception { + public ResponseEntity deleteUser(@RequestHeader HttpHeaders headers, @RequestBody RequestUser requestUser) throws Exception { /** * 비밀번호가 일치한다면 * 사용자 Status 0으로 변경 */ log.info(this.getClass().getName() + ".deleteUser Start!"); + + // GetUserId from Token + String userId = tokenUtil.getUserIdByToken(headers); UserDto pDto = new UserDto(); pDto.setUserPassword(requestUser.getUserPassword()); - pDto.setUserId(requestUser.getUserId()); + pDto.setUserId(userId); // TODO: 2022-05-23 요청 userService.deleteUser(pDto); diff --git a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java index 22b9141..20384bb 100644 --- a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java +++ b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java @@ -28,8 +28,8 @@ public interface UserRepository extends CrudRepository { @Transactional @Modifying - @Query(value = "UPDATE user_info SET user_status = 0 WHERE user_seq = :userSeq", nativeQuery = true) - void deleteUserInfo(@Param("userSeq") int userSeq); + @Query(value = "UPDATE user_info SET user_status = 0 WHERE user_id = :userId", nativeQuery = true) + void deleteUserInfo(@Param("userId") String userId); diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 7746355..98bb1a8 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -93,8 +93,7 @@ public int deleteUser(UserDto userDto) throws Exception { // 비밀번호 일치 확인 if (userCheckService.isTruePassword(userDto.getUserId(), userDto.getUserPassword())) { // 비밀번호가 일치한다면 - int userSeq = 38; - userRepository.deleteUserInfo(userSeq); + userRepository.deleteUserInfo(userDto.getUserId()); } else { throw new RuntimeException("사용자 비밀번호가 일치하지 않습니다"); } diff --git a/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java b/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java index b2ccf67..db1fbfd 100644 --- a/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java +++ b/UserService/src/main/java/com/submarket/userservice/util/TokenUtil.java @@ -3,18 +3,23 @@ import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; import org.springframework.http.HttpHeaders; +import org.springframework.stereotype.Service; @Slf4j @RequiredArgsConstructor +@Service public class TokenUtil { - private static Environment env; + private final Environment env; - public static String getUserIdByToken(HttpHeaders headers) { + + public String getUserIdByToken(HttpHeaders headers) { log.debug("Token Util Start!"); String token = headers.get("Authorization").get(0); // Get Token in headers - String jwt = token.replace("Bearer", ""); // delete Bearer + String jwt = token.replace("Bearer ", ""); // delete Bearer log.info("JWT : " + jwt); // TokenValue String userId = Jwts.parser().setSigningKey(env.getProperty("token.secret")).parseClaimsJws(jwt).getBody().getSubject(); From e9bba45bd27aa6b71aacdf9dddbbd7b773e62974 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 11:10:02 +0900 Subject: [PATCH 08/40] =?UTF-8?q?[#37]=20feature=20:=20Seller=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=20=EC=B0=BE=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SellerController.java | 26 ++++++++++++++++--- .../sellerservice/service/ISellerService.java | 3 +++ .../service/impl/SellerService.java | 17 ++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java index 4793a09..03e71e8 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java @@ -9,10 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -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.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @@ -50,5 +47,26 @@ public ResponseEntity deleteSeller(@RequestBody RequestSellerInfo reques return ResponseEntity.status(HttpStatus.OK).body("회원 탈퇴 완료"); } + + /**<------------------------>아이디 찾기 with UserEmail + * 만약 Email 이 같다면 아이디 정보 일부를 제공*/ + @GetMapping("/sellers/find-id/{sellerEmail}") + public ResponseEntity findSellerId(@PathVariable String sellerEmail) throws Exception { + log.info("-------------------- > " + this.getClass().getName() + "findSellerId Start!"); + // TODO: 2022-05-23 이메일로 사용자 정보 찾기 + SellerDto sellerDto = new SellerDto(); + + sellerDto.setSellerEmail(sellerEmail); + + sellerDto = sellerService.getSellerInfoBySellerEmail(sellerDto); + + if (sellerDto == null) { /** 유저 정보가 없을 경우 Not Found return */ + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("사용자를 찾을 수 없습니다."); + } + /** 사용자 정보가 있을 경우 수정 후 전송 */ + String sellerId = sellerDto.getSellerId().replaceAll("(?<=.{4}).", "*"); + log.info("-------------------- > " + this.getClass().getName() + "findUserId End!"); + return ResponseEntity.status(HttpStatus.OK).body(sellerId); + } } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java index 123eb40..c8adaed 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java @@ -9,6 +9,9 @@ public interface ISellerService extends UserDetailsService { int deleteSeller(SellerDto sellerDTO) throws Exception; + SellerDto getSellerInfoBySellerEmail(SellerDto sellerDto) throws Exception; + SellerDto getSellerDetailsByUserId(String sellerId); + } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java index 5eb4719..eabf47a 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java @@ -81,7 +81,24 @@ public int deleteSeller(SellerDto SellerDto) throws Exception { } + @Override + public SellerDto getSellerInfoBySellerEmail(SellerDto sellerDto) throws Exception { + log.info(this.getClass().getName() + ".getSellerInfoBySellerEmail Start !"); + String sellerEmail = sellerDto.getSellerEmail(); + + log.info("sellerEmail : " + sellerEmail); + SellerEntity sellerEntity = sellerRepository.findBySellerEmail(sellerEmail); + + if (sellerEntity == null) { + throw new RuntimeException("사용자 정보를 찾을 수 없습니다"); + } + + log.info(this.getClass().getName() + ".getSellerInfoBySellerEmail End !"); + SellerDto rDto = SellerMapper.INSTANCE.sellerEntityToSellerDto(sellerEntity); + + return rDto; + } //####################################### JWT Don't change #######################################// @Override From 18da15f8b7fa871ac9ce0ab47cacc75c9d3eb25e Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 13:15:39 +0900 Subject: [PATCH 09/40] =?UTF-8?q?[#38]=20feature=20:=20Seller=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SellerController.java | 34 +++++++++++++++++-- .../sellerservice/jpa/SellerRepository.java | 8 ++++- .../sellerservice/service/ISellerService.java | 1 + .../service/impl/SellerService.java | 22 ++++++++++++ .../sellerservice/util/DateUtil.java | 21 ++++++++++++ .../sellerservice/util/TokenUtil.java | 29 ++++++++++++++++ .../vo/RequestChangePassword.java | 9 +++++ 7 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 SellerService/src/main/java/com/submarket/sellerservice/util/DateUtil.java create mode 100644 SellerService/src/main/java/com/submarket/sellerservice/util/TokenUtil.java create mode 100644 SellerService/src/main/java/com/submarket/sellerservice/vo/RequestChangePassword.java diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java index 03e71e8..99e9e90 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java @@ -3,10 +3,13 @@ import com.submarket.sellerservice.dto.SellerDto; import com.submarket.sellerservice.mapper.SellerMapper; import com.submarket.sellerservice.service.impl.SellerService; +import com.submarket.sellerservice.util.TokenUtil; +import com.submarket.sellerservice.vo.RequestChangePassword; import com.submarket.sellerservice.vo.RequestSellerInfo; import com.submarket.sellerservice.vo.ResponseSellerInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -16,9 +19,10 @@ @Slf4j public class SellerController { private final SellerService sellerService; + private final TokenUtil tokenUtil; @PostMapping("/sellers") - public ResponseEntity createSeller(@RequestBody RequestSellerInfo sellerInfo) throws Exception{ + public ResponseEntity createSeller(@RequestBody RequestSellerInfo sellerInfo) throws Exception { log.info(this.getClass().getName() + ".createSeller Start!"); SellerDto SellerDto = SellerMapper.INSTANCE.requestSellerInfoToSellerDto(sellerInfo); @@ -33,6 +37,7 @@ public ResponseEntity createSeller(@RequestBody RequestSellerInfo seller return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("회원가입 실패"); } } + @PostMapping("/sellers/drop") public ResponseEntity deleteSeller(@RequestBody RequestSellerInfo requestSellerInfo) throws Exception { log.info(this.getClass().getName() + ".deleteSeller Start!"); @@ -48,8 +53,10 @@ public ResponseEntity deleteSeller(@RequestBody RequestSellerInfo reques return ResponseEntity.status(HttpStatus.OK).body("회원 탈퇴 완료"); } - /**<------------------------>아이디 찾기 with UserEmail - * 만약 Email 이 같다면 아이디 정보 일부를 제공*/ + /** + * <------------------------>아이디 찾기 with UserEmail + * 만약 Email 이 같다면 아이디 정보 일부를 제공 + */ @GetMapping("/sellers/find-id/{sellerEmail}") public ResponseEntity findSellerId(@PathVariable String sellerEmail) throws Exception { log.info("-------------------- > " + this.getClass().getName() + "findSellerId Start!"); @@ -68,5 +75,26 @@ public ResponseEntity findSellerId(@PathVariable String sellerEmail) thr log.info("-------------------- > " + this.getClass().getName() + "findUserId End!"); return ResponseEntity.status(HttpStatus.OK).body(sellerId); } + + @PatchMapping("/sellers/change-password") + public ResponseEntity changePassword(@RequestHeader HttpHeaders headers, @RequestBody RequestChangePassword + requestChangePassword) throws Exception { + log.info(this.getClass().getName() + ".changePassword Start!"); + int res = 0; + String sellerId = tokenUtil.getUserIdByToken(headers); + + res = sellerService.changePassword(requestChangePassword.getOldPassword(), + requestChangePassword.getNewPassword(), + sellerId); + + if (res == 0) { + log.info("비밀번호 변경 실패"); + throw new RuntimeException("비밀번호 변경 실패"); + } + + log.info(this.getClass().getName() + ".changePassword End!"); + return ResponseEntity.ok().body("비밀번호 변경 성공"); + } + } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java b/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java index 2ab3461..77a21c8 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java @@ -4,6 +4,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; import javax.transaction.Transactional; @@ -17,5 +18,10 @@ public interface SellerRepository extends CrudRepository @Transactional @Modifying @Query(value = "UPDATE seller_info SET seller_status = 0 WHERE seller_seq = :sellerSeq", nativeQuery = true) - void changeSellerStatus(int sellerSeq); + void changeSellerStatus(@Param("sellerSeq") int sellerSeq); + + @Transactional + @Modifying + @Query(value = "UPDATE seller_info SET seller_password = :sellerPassword WHERE seller_id = :sellerId", nativeQuery = true) + void changeSellerPassword(@Param("sellerPassword") String sellerPassword, @Param("sellerId") String sellerId); } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java index c8adaed..abf5c34 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java @@ -13,5 +13,6 @@ public interface ISellerService extends UserDetailsService { SellerDto getSellerDetailsByUserId(String sellerId); + int changePassword(String oldPassword, String newPassword, String sellerId) throws Exception; } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java index eabf47a..e71bcee 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java @@ -14,6 +14,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.ArrayList; import java.util.Optional; @@ -100,6 +101,27 @@ public SellerDto getSellerInfoBySellerEmail(SellerDto sellerDto) throws Exceptio return rDto; } + @Override + @Transactional // 비밀번호 변경 + public int changePassword(String oldPassword, String newPassword, String sellerId) throws Exception { + log.info(this.getClass().getName() + ".changePassword Start!"); + int res = 0; + SellerEntity sellerEntity = sellerRepository.findBySellerId(sellerId); + SellerDto sellerDto = new SellerDto(); + // 인코딩된 Password + sellerDto.setSellerId(sellerId); + sellerDto.setSellerPassword(oldPassword); + + if (sellerCheckService.checkSellerBySellerPassword(sellerDto)) { + // 비밀번호가 일치한다면 변경 실행 + sellerRepository.changeSellerPassword(passwordEncoder.encode(newPassword), sellerId); + res = 1; + } + + log.info(this.getClass().getName() + ".changePassword End!"); + return res; + } + //####################################### JWT Don't change #######################################// @Override public SellerDto getSellerDetailsByUserId(String sellerId) { diff --git a/SellerService/src/main/java/com/submarket/sellerservice/util/DateUtil.java b/SellerService/src/main/java/com/submarket/sellerservice/util/DateUtil.java new file mode 100644 index 0000000..7c6f9e5 --- /dev/null +++ b/SellerService/src/main/java/com/submarket/sellerservice/util/DateUtil.java @@ -0,0 +1,21 @@ +package com.submarket.sellerservice.util; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class DateUtil { + public static String getDateTime(String fm) { + + Date today = new Date(); + System.out.println(today); + + SimpleDateFormat date = new SimpleDateFormat(fm); + + return date.format(today); + } + + public static String getDateTime() { + return getDateTime("yyyy.MM.dd"); + + } +} diff --git a/SellerService/src/main/java/com/submarket/sellerservice/util/TokenUtil.java b/SellerService/src/main/java/com/submarket/sellerservice/util/TokenUtil.java new file mode 100644 index 0000000..85a2a2d --- /dev/null +++ b/SellerService/src/main/java/com/submarket/sellerservice/util/TokenUtil.java @@ -0,0 +1,29 @@ +package com.submarket.sellerservice.util; + +import io.jsonwebtoken.Jwts; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpHeaders; +import org.springframework.stereotype.Service; + +@Slf4j +@RequiredArgsConstructor +@Service +public class TokenUtil { + private final Environment env; + + + public String getUserIdByToken(HttpHeaders headers) { + log.debug("Token Util Start!"); + String token = headers.get("Authorization").get(0); // Get Token in headers + String jwt = token.replace("Bearer ", ""); // delete Bearer + + log.info("JWT : " + jwt); // TokenValue + String userId = Jwts.parser().setSigningKey(env.getProperty("token.secret")).parseClaimsJws(jwt).getBody().getSubject(); + + log.info("getUserId End"); + + return userId; + } +} diff --git a/SellerService/src/main/java/com/submarket/sellerservice/vo/RequestChangePassword.java b/SellerService/src/main/java/com/submarket/sellerservice/vo/RequestChangePassword.java new file mode 100644 index 0000000..28109db --- /dev/null +++ b/SellerService/src/main/java/com/submarket/sellerservice/vo/RequestChangePassword.java @@ -0,0 +1,9 @@ +package com.submarket.sellerservice.vo; + +import lombok.Data; + +@Data +public class RequestChangePassword { + private String oldPassword; + private String newPassword; +} From f23995d9ce80870e0e892fe377df62d5941d2acc Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 13:19:06 +0900 Subject: [PATCH 10/40] =?UTF-8?q?[#38]=20refactor=20:=20SellerCheckService?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sellerservice/service/impl/SellerCheckService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java index 50babd3..b3c85ed 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java @@ -57,8 +57,12 @@ public boolean checkSellerBySellerPassword(SellerDto SellerDto) throws Exception String sellerId = SellerDto.getSellerId(); SellerEntity sellerEntity = sellerRepository.findBySellerId(sellerId); + boolean checkPassword = passwordEncoder.matches(sellerPassword, sellerEntity.getSellerPassword()); + if (checkPassword == false) { + throw new RuntimeException("비밀번호가 일치하지 않습니다"); + } // 비밀번호가 일치하면 True - return passwordEncoder.matches(sellerPassword, sellerEntity.getSellerPassword()); + return true; } } From 973bac3195c194da1f77b285dd5f4f4442c2e56e Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 23:10:14 +0900 Subject: [PATCH 11/40] [#88] feature : API Test --- .idea/misc.xml | 3 ++ .../controller/MainController.java | 36 +++++++++++++++++++ .../sellerservice/dto/BusinessIdApiDto.java | 13 +++++++ 3 files changed, 52 insertions(+) create mode 100644 SellerService/src/main/java/com/submarket/sellerservice/dto/BusinessIdApiDto.java diff --git a/.idea/misc.xml b/.idea/misc.xml index c9fa22b..43b7105 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,4 +15,7 @@ + + \ No newline at end of file diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java index faf10be..18c72e9 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java @@ -1,10 +1,19 @@ package com.submarket.sellerservice.controller; +import com.submarket.sellerservice.dto.BusinessIdApiDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import java.util.*; @Slf4j @RestController @@ -25,5 +34,32 @@ public String health() { + ", token secret : " + env.getProperty("token.secret") + ", token expiration time : " + env.getProperty("token.expiration_time"); } + + @GetMapping("/test") + public BusinessIdApiDto test() throws Exception { + RestTemplate restTemplate = new RestTemplate(); + restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory()); // no body + String url = "https://api.odcloud.kr/api/nts-businessman/v1/status"; + + HttpHeaders headers = new HttpHeaders(); + headers.add("Authorization", env.getProperty("businessId")); + + List bNoList = new LinkedList<>(); + bNoList.add("00000000"); + + Map body = new HashMap<>(); + body.put("b_no", bNoList); + + HttpEntity> entity = new HttpEntity<>(body, headers); + + + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, entity, BusinessIdApiDto.class); + + + + return response.getBody(); + + + } } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/dto/BusinessIdApiDto.java b/SellerService/src/main/java/com/submarket/sellerservice/dto/BusinessIdApiDto.java new file mode 100644 index 0000000..ccd7523 --- /dev/null +++ b/SellerService/src/main/java/com/submarket/sellerservice/dto/BusinessIdApiDto.java @@ -0,0 +1,13 @@ +package com.submarket.sellerservice.dto; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class BusinessIdApiDto { + private int request_cnt; + private String status_code; + private List> data; +} From 1e98bc842b3ab651c71e90b7b9b5f409c1f62c8e Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Mon, 23 May 2022 23:31:21 +0900 Subject: [PATCH 12/40] =?UTF-8?q?[#88]=20feature=20:=20=EC=82=AC=EC=97=85?= =?UTF-8?q?=EC=9E=90=20=EB=B2=88=ED=98=B8=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SellerServiceApplication.java | 9 ++++ .../controller/MainController.java | 27 ------------ .../controller/SellerController.java | 20 ++++++++- .../service/ISellerCheckService.java | 4 ++ .../service/impl/SellerCheckService.java | 41 +++++++++++++++++++ 5 files changed, 73 insertions(+), 28 deletions(-) diff --git a/SellerService/src/main/java/com/submarket/sellerservice/SellerServiceApplication.java b/SellerService/src/main/java/com/submarket/sellerservice/SellerServiceApplication.java index 9bb1236..73517b1 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/SellerServiceApplication.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/SellerServiceApplication.java @@ -4,7 +4,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.context.annotation.Bean; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.web.client.RestTemplate; @SpringBootApplication @EnableEurekaClient @@ -19,4 +21,11 @@ public BCryptPasswordEncoder bCryptPasswordEncoder(){ return new BCryptPasswordEncoder(); } + @Bean + public RestTemplate restTemplate() { + RestTemplate restTemplate = new RestTemplate(); + restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory()); + return restTemplate; + } + } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java index 18c72e9..4de6fbb 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/MainController.java @@ -34,32 +34,5 @@ public String health() { + ", token secret : " + env.getProperty("token.secret") + ", token expiration time : " + env.getProperty("token.expiration_time"); } - - @GetMapping("/test") - public BusinessIdApiDto test() throws Exception { - RestTemplate restTemplate = new RestTemplate(); - restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory()); // no body - String url = "https://api.odcloud.kr/api/nts-businessman/v1/status"; - - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", env.getProperty("businessId")); - - List bNoList = new LinkedList<>(); - bNoList.add("00000000"); - - Map body = new HashMap<>(); - body.put("b_no", bNoList); - - HttpEntity> entity = new HttpEntity<>(body, headers); - - - ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, entity, BusinessIdApiDto.class); - - - - return response.getBody(); - - - } } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java index 99e9e90..1461bc6 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java @@ -2,6 +2,7 @@ import com.submarket.sellerservice.dto.SellerDto; import com.submarket.sellerservice.mapper.SellerMapper; +import com.submarket.sellerservice.service.impl.SellerCheckService; import com.submarket.sellerservice.service.impl.SellerService; import com.submarket.sellerservice.util.TokenUtil; import com.submarket.sellerservice.vo.RequestChangePassword; @@ -9,17 +10,24 @@ import com.submarket.sellerservice.vo.ResponseSellerInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + @RestController @RequiredArgsConstructor @Slf4j public class SellerController { private final SellerService sellerService; private final TokenUtil tokenUtil; + private final SellerCheckService sellerCheckService; @PostMapping("/sellers") public ResponseEntity createSeller(@RequestBody RequestSellerInfo sellerInfo) throws Exception { @@ -78,7 +86,7 @@ public ResponseEntity findSellerId(@PathVariable String sellerEmail) thr @PatchMapping("/sellers/change-password") public ResponseEntity changePassword(@RequestHeader HttpHeaders headers, @RequestBody RequestChangePassword - requestChangePassword) throws Exception { + requestChangePassword) throws Exception { log.info(this.getClass().getName() + ".changePassword Start!"); int res = 0; String sellerId = tokenUtil.getUserIdByToken(headers); @@ -96,5 +104,15 @@ public ResponseEntity changePassword(@RequestHeader HttpHeaders headers, return ResponseEntity.ok().body("비밀번호 변경 성공"); } + // 사업자 번호 유효성 검사 + @GetMapping("/seller/business/{businessId}") + public ResponseEntity> checkBusinessId(@PathVariable String businessId) throws Exception { + log.info(this.getClass().getName() + ".checkBusinessId Start!"); + + Map taxType = sellerCheckService.checkBusinessId(businessId); + + log.info(this.getClass().getName() + ".checkBusinessId End!"); + return ResponseEntity.ok().body(taxType); + } } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerCheckService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerCheckService.java index 7328328..5204e78 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerCheckService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerCheckService.java @@ -2,6 +2,8 @@ import com.submarket.sellerservice.dto.SellerDto; +import java.util.Map; + public interface ISellerCheckService { boolean checkSellerBySellerId(String sellerId) throws Exception; @@ -10,4 +12,6 @@ public interface ISellerCheckService { boolean checkSellerByBusinessId(String businessId) throws Exception; boolean checkSellerBySellerPassword(SellerDto SellerDto) throws Exception; + + Map checkBusinessId(String businessId) throws Exception; } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java index b3c85ed..1642cf5 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerCheckService.java @@ -1,18 +1,34 @@ package com.submarket.sellerservice.service.impl; +import com.submarket.sellerservice.dto.BusinessIdApiDto; import com.submarket.sellerservice.dto.SellerDto; import com.submarket.sellerservice.jpa.SellerRepository; import com.submarket.sellerservice.jpa.entity.SellerEntity; import com.submarket.sellerservice.service.ISellerCheckService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; @Service("SellerCheckService") @RequiredArgsConstructor +@Slf4j public class SellerCheckService implements ISellerCheckService { private final SellerRepository sellerRepository; private final BCryptPasswordEncoder passwordEncoder; + private final RestTemplate restTemplate; + private final Environment env; @Override // 아이디 중복 확인 public boolean checkSellerBySellerId(String sellerId) throws Exception { @@ -65,4 +81,29 @@ public boolean checkSellerBySellerPassword(SellerDto SellerDto) throws Exception // 비밀번호가 일치하면 True return true; } + + @Override + public Map checkBusinessId(String businessId) throws Exception { + log.info(this.getClass().getName() + "checkBusinessId Start!"); + + String url = "https://api.odcloud.kr/api/nts-businessman/v1/status"; + HttpHeaders headers = new HttpHeaders(); + headers.add("Authorization", env.getProperty("serviceKey")); + + List bNoList = new LinkedList<>(); + bNoList.add(businessId); + + Map body = new HashMap<>(); + body.put("b_no", bNoList); + + HttpEntity> entity = new HttpEntity<>(body, headers); + + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, entity, BusinessIdApiDto.class); + BusinessIdApiDto businessIdApiDto = response.getBody(); + Map objectMap = businessIdApiDto.getData().get(0); + + + log.info(this.getClass().getName() + "checkBusinessId End!"); + return objectMap; + } } From 05dff536db30c3a917f919b61fa445a5fcda64ea Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Wed, 25 May 2022 15:45:08 +0900 Subject: [PATCH 13/40] =?UTF-8?q?[#39]=20feature=20:=20Seller=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SellerController.java | 28 ++++++++++-- .../sellerservice/jpa/SellerRepository.java | 6 +++ .../sellerservice/service/ISellerService.java | 2 + .../service/impl/SellerService.java | 16 +++++++ .../submarket/sellerservice/util/CmmUtil.java | 44 +++++++++++++++++++ 5 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 SellerService/src/main/java/com/submarket/sellerservice/util/CmmUtil.java diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java index 1461bc6..302afe1 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java @@ -16,10 +16,10 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionContext; +import java.util.*; @RestController @RequiredArgsConstructor @@ -46,6 +46,26 @@ public ResponseEntity createSeller(@RequestBody RequestSellerInfo seller } } + @PatchMapping("/sellers") + public ResponseEntity modifySellerInfo(@RequestBody SellerDto sellerDto, + @RequestHeader HttpHeaders headers) throws Exception { + log.info(this.getClass().getName() + ".modifySellerInfo Start!"); + + String sellerId = tokenUtil.getUserIdByToken(headers); + sellerDto.setSellerId(sellerId); + + int res = sellerService.modifySellerInfo(sellerDto); + + if (res == 1) { + log.info("수정 완료"); + return ResponseEntity.ok().body("수정 성공"); + } + + log.info("수정 실패"); + log.info(this.getClass().getName() + ".modifySellerInfo End!"); + return ResponseEntity.ok().body("수정 실패 (500)"); + } + @PostMapping("/sellers/drop") public ResponseEntity deleteSeller(@RequestBody RequestSellerInfo requestSellerInfo) throws Exception { log.info(this.getClass().getName() + ".deleteSeller Start!"); diff --git a/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java b/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java index 77a21c8..4a911e0 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/jpa/SellerRepository.java @@ -24,4 +24,10 @@ public interface SellerRepository extends CrudRepository @Modifying @Query(value = "UPDATE seller_info SET seller_password = :sellerPassword WHERE seller_id = :sellerId", nativeQuery = true) void changeSellerPassword(@Param("sellerPassword") String sellerPassword, @Param("sellerId") String sellerId); + + @Transactional + @Modifying + @Query(value = "UPDATE seller_info SET seller_home = :sellerHome, seller_address = :sellerAddress, seller_address2 = :sellerAddress2 WHERE seller_id = :sellerId", nativeQuery = true) + void modifySellerInfo(@Param("sellerHome") String sellerHome, @Param("sellerAddress") String sellerAddress, + @Param("sellerAddress2") String sellerAddress2, @Param("sellerId") String sellerId); } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java index abf5c34..f52f6b7 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java @@ -15,4 +15,6 @@ public interface ISellerService extends UserDetailsService { int changePassword(String oldPassword, String newPassword, String sellerId) throws Exception; + int modifySellerInfo(SellerDto sellerDto) throws Exception; + } diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java index e71bcee..41153a8 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java @@ -6,6 +6,7 @@ import com.submarket.sellerservice.jpa.entity.SellerEntity; import com.submarket.sellerservice.mapper.SellerMapper; import com.submarket.sellerservice.service.ISellerService; +import com.submarket.sellerservice.util.CmmUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.User; @@ -122,6 +123,21 @@ public int changePassword(String oldPassword, String newPassword, String sellerI return res; } + @Override + @Transactional + public int modifySellerInfo(SellerDto sellerDto) throws Exception { + log.info(this.getClass().getName() + ".modifySellerInfo Start!"); + String sellerId = CmmUtil.nvl(sellerDto.getSellerId()); + String sellerHome = CmmUtil.nvl(sellerDto.getSellerHome()); + String sellerAddress = CmmUtil.nvl(sellerDto.getSellerAddress()); + String sellerAddress2 = CmmUtil.nvl(sellerDto.getSellerAddress2()); + + sellerRepository.modifySellerInfo(sellerHome, sellerAddress, sellerAddress2, sellerId); + + log.info(this.getClass().getName() + ".modifySellerInfo End!"); + return 1; + } + //####################################### JWT Don't change #######################################// @Override public SellerDto getSellerDetailsByUserId(String sellerId) { diff --git a/SellerService/src/main/java/com/submarket/sellerservice/util/CmmUtil.java b/SellerService/src/main/java/com/submarket/sellerservice/util/CmmUtil.java new file mode 100644 index 0000000..811add2 --- /dev/null +++ b/SellerService/src/main/java/com/submarket/sellerservice/util/CmmUtil.java @@ -0,0 +1,44 @@ +package com.submarket.sellerservice.util; + +public class CmmUtil { + public static String nvl(String str, String chg_str) { + String res; + + if (str == null) { + res = chg_str; + } else if (str.equals("")) { + res = chg_str; + } else { + res = str; + } + return res; + } + + public static String nvl(String str){ + return nvl(str,""); + } + + public static String checked(String str, String com_str){ + if(str.equals(com_str)){ + return " checked"; + }else{ + return ""; + } + } + + public static String checked(String[] str, String com_str){ + for(int i=0;i Date: Wed, 25 May 2022 18:08:24 +0900 Subject: [PATCH 14/40] [#94] refactor : GET: /category End --- .../controller/CategoryController.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java index d7ca857..9b86d26 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java @@ -10,7 +10,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -19,16 +21,28 @@ public class CategoryController { private final CategoryService categoryService; @GetMapping("/category") - public ResponseEntity> findAllCategory() throws Exception { + public ResponseEntity> findAllCategory() throws Exception { log.info(this.getClass().getName() + ">findAllCategory Start!"); - List categoryDtoList = new ArrayList<>(); + Map rMap = new HashMap<>(); - categoryDtoList = categoryService.findAllCategory(); + List categoryDtoList = categoryService.findAllCategory(); + + // Front 를 위해 Return Type 튜닝 + Map header = new HashMap<>(); + header.put("status", "1"); + header.put("resultCode", "200"); + + Map body = new HashMap<>(); + body.put("categorys", categoryDtoList); + Map entity = new HashMap<>(); + entity.put("header", header); + entity.put("body", body); + rMap.put("response", entity); log.info(this.getClass().getName() + ">findAllCategory End!"); - return ResponseEntity.ok().body(categoryDtoList); + return ResponseEntity.ok().body(rMap); } @GetMapping("/category/{categorySeq}") From 1e39b01526b30576e2f723a57c0145f0083db6fa Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Thu, 26 May 2022 09:19:53 +0900 Subject: [PATCH 15/40] =?UTF-8?q?ApiGateway=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../submarket/apigateway/ApiGatewayApplication.java | 2 ++ .../filter/AuthorizationHeaderFilter.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ApiGateway/src/main/java/com/submarket/apigateway/ApiGatewayApplication.java b/ApiGateway/src/main/java/com/submarket/apigateway/ApiGatewayApplication.java index f55b34e..ce55e5c 100644 --- a/ApiGateway/src/main/java/com/submarket/apigateway/ApiGatewayApplication.java +++ b/ApiGateway/src/main/java/com/submarket/apigateway/ApiGatewayApplication.java @@ -3,6 +3,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.context.annotation.Bean; +import org.springframework.core.env.Environment; @SpringBootApplication @EnableEurekaClient diff --git a/ApiGateway/src/main/java/com/submarket/apigateway/filter/AuthorizationHeaderFilter.java b/ApiGateway/src/main/java/com/submarket/apigateway/filter/AuthorizationHeaderFilter.java index 967c95a..78d5136 100644 --- a/ApiGateway/src/main/java/com/submarket/apigateway/filter/AuthorizationHeaderFilter.java +++ b/ApiGateway/src/main/java/com/submarket/apigateway/filter/AuthorizationHeaderFilter.java @@ -3,9 +3,12 @@ import com.google.common.net.HttpHeaders; import io.jsonwebtoken.Jwts; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.core.env.Environment; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; @@ -17,6 +20,14 @@ @Slf4j public class AuthorizationHeaderFilter extends AbstractGatewayFilterFactory { + @Autowired + private Environment env; + + AuthorizationHeaderFilter(Environment env) { + this.env = env; + } + + public AuthorizationHeaderFilter() { super(Config.class); } @@ -60,7 +71,7 @@ private boolean isJwtValid(String jwt) { String subject = null; try { - subject = Jwts.parser().setSigningKey("test1234") + subject = Jwts.parser().setSigningKey(env.getProperty("token.secret")) .parseClaimsJws(jwt).getBody() .getSubject(); From bb740762abfaa700551212e45b1ddde060645b8d Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Fri, 27 May 2022 14:36:34 +0900 Subject: [PATCH 16/40] =?UTF-8?q?[#94]=20refactor=20:=20GET:=20/category?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemservice/controller/CategoryController.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java index 9b86d26..cfb63d0 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java @@ -23,26 +23,18 @@ public class CategoryController { @GetMapping("/category") public ResponseEntity> findAllCategory() throws Exception { log.info(this.getClass().getName() + ">findAllCategory Start!"); - Map rMap = new HashMap<>(); + Map returnMap = new HashMap<>(); List categoryDtoList = categoryService.findAllCategory(); // Front 를 위해 Return Type 튜닝 - Map header = new HashMap<>(); - header.put("status", "1"); - header.put("resultCode", "200"); - Map body = new HashMap<>(); - body.put("categorys", categoryDtoList); - Map entity = new HashMap<>(); - entity.put("header", header); - entity.put("body", body); - rMap.put("response", entity); + returnMap.put("response", categoryDtoList); log.info(this.getClass().getName() + ">findAllCategory End!"); - return ResponseEntity.ok().body(rMap); + return ResponseEntity.ok().body(returnMap); } @GetMapping("/category/{categorySeq}") From 1130403218b9936345cadc14f4f5408b77444fbc Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 15:24:47 +0900 Subject: [PATCH 17/40] [#94] refactor : GET: /group --- .../itemservice/controller/CategoryController.java | 7 +++---- .../itemservice/controller/GroupController.java | 9 +++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java index cfb63d0..64e46fe 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/CategoryController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,18 +22,18 @@ public class CategoryController { @GetMapping("/category") public ResponseEntity> findAllCategory() throws Exception { log.info(this.getClass().getName() + ">findAllCategory Start!"); - Map returnMap = new HashMap<>(); + Map rMap = new HashMap<>(); List categoryDtoList = categoryService.findAllCategory(); // Front 를 위해 Return Type 튜닝 - returnMap.put("response", categoryDtoList); + rMap.put("response", categoryDtoList); log.info(this.getClass().getName() + ">findAllCategory End!"); - return ResponseEntity.ok().body(returnMap); + return ResponseEntity.ok().body(rMap); } @GetMapping("/category/{categorySeq}") diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java index 734461a..7ef7f34 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/GroupController.java @@ -11,7 +11,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @Slf4j @@ -41,16 +43,19 @@ public ResponseEntity findItemInfoByGroupSeq(@PathVariable int groupSe } @GetMapping("/group") // Group List 조회 - public ResponseEntity> findGroupList() throws Exception { + public ResponseEntity> findGroupList() throws Exception { log.info(this.getClass().getName() + ".findGroupList Start!"); + Map rMap = new HashMap<>(); List groupDtoList = new ArrayList<>(); + rMap.put("response", groupDtoList); + groupDtoList = groupService.findGroupList(); log.info(this.getClass().getName() + ".findGroupList End!"); - return ResponseEntity.ok().body(groupDtoList); + return ResponseEntity.ok().body(rMap); } } From d533a96caf7183f3c2876431886d696b4288c9f3 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 15:26:20 +0900 Subject: [PATCH 18/40] [#94] refactor : GET: /items --- .../submarket/itemservice/controller/ItemController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java index f3d6a3f..dba1663 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java @@ -8,7 +8,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @Slf4j @@ -18,13 +20,16 @@ public class ItemController { // TODO: 2022/05/16 로직 추가 @GetMapping("/items") - public ResponseEntity> findAllItem() throws Exception { + public ResponseEntity> findAllItem() throws Exception { log.info(this.getClass().getName() + ".findAllItem Start"); + Map rMap = new HashMap<>(); List itemDtoList = itemService.findAllItem(); + rMap.put("response", itemDtoList); + log.info(this.getClass().getName() + ".findAllItem End"); - return ResponseEntity.ok().body(itemDtoList); + return ResponseEntity.ok().body(rMap); } @GetMapping("/items/{itemSeq}") From 810440380f60921da65cf8e94190c69760d0cd5b Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 15:27:24 +0900 Subject: [PATCH 19/40] [#94] refactor : GET: /item/{itemSeq}/review --- .../itemservice/controller/ItemReviewController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java index 780c488..4c63c30 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java @@ -8,7 +8,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @Slf4j @@ -62,14 +64,19 @@ public ResponseEntity deleteItemReview(@PathVariable int reviewSeq) thro } @GetMapping("/item/{itemSeq}/review") - public ResponseEntity> findItemReviewInItem(@PathVariable int itemSeq) throws Exception { + public ResponseEntity> findItemReviewInItem(@PathVariable int itemSeq) throws Exception { log.info(this.getClass().getName() + "findItemReviewInItem Start!"); + Map rMap = new HashMap<>(); + List itemReviewDtoList = itemReviewService.findAllReviewInItem(itemSeq); + + rMap.put("response", itemReviewDtoList); + log.info(this.getClass().getName() + "findItemReviewInItem End!"); - return ResponseEntity.ok().body(itemReviewDtoList); + return ResponseEntity.ok().body(rMap); } } \ No newline at end of file From 47bf2fcba3cbb57965115849437117ccc2826adc Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 15:33:46 +0900 Subject: [PATCH 20/40] todo --- .../com/submarket/orderservice/controller/OrderController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OrderService/src/main/java/com/submarket/orderservice/controller/OrderController.java b/OrderService/src/main/java/com/submarket/orderservice/controller/OrderController.java index 157f328..4bd8d94 100644 --- a/OrderService/src/main/java/com/submarket/orderservice/controller/OrderController.java +++ b/OrderService/src/main/java/com/submarket/orderservice/controller/OrderController.java @@ -26,4 +26,7 @@ public ResponseEntity insertOrder(@RequestBody OrderDto orderDto) throws log.info(this.getClass().getName() + ".insertOrder End!"); return ResponseEntity.status(HttpStatus.CREATED).body("주문 생성 완료"); } + + // TODO: 2022/05/29 사용자 주문 조회 + // TODO: 2022/05/29 사업자 주문 조회 } From a662ee3cf8b3244725de2325f5654780bfc5769b Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 15:47:07 +0900 Subject: [PATCH 21/40] =?UTF-8?q?refactor=20:=20=EA=B5=AC=EB=8F=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userservice/controller/SubController.java | 18 ++++++++++++------ .../com/submarket/userservice/dto/SubDto.java | 3 +-- .../userservice/service/impl/SubService.java | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/UserService/src/main/java/com/submarket/userservice/controller/SubController.java b/UserService/src/main/java/com/submarket/userservice/controller/SubController.java index f8ec88a..0f26109 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/SubController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/SubController.java @@ -4,11 +4,11 @@ import com.submarket.userservice.jpa.entity.SubEntity; import com.submarket.userservice.mapper.SubMapper; import com.submarket.userservice.service.impl.SubService; +import com.submarket.userservice.util.TokenUtil; import com.submarket.userservice.vo.RequestSub; -import com.submarket.userservice.vo.ResponseSub; -import com.sun.nio.sctp.NotificationHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -22,15 +22,17 @@ @RequiredArgsConstructor public class SubController { private final SubService subService; + private final TokenUtil tokenUtil; @GetMapping("/sub") - public ResponseEntity findAllSub(@RequestBody RequestSub requestSub) throws Exception { + public ResponseEntity findAllSub(@RequestHeader HttpHeaders headers) throws Exception { log.info(this.getClass().getName() + ".findSub Start!"); - int userSeq = requestSub.getUserSeq(); + String userId = tokenUtil.getUserIdByToken(headers); + SubDto subDto = new SubDto(); - subDto.setUserSeq(userSeq); + subDto.setUserId(userId); List subEntityList = subService.findAllSub(subDto); if (subEntityList == null) { @@ -71,11 +73,15 @@ public ResponseEntity findOneSub(@PathVariable int subSeq) throws Except } @PostMapping("/sub") - public ResponseEntity createNewSub(@RequestBody RequestSub requestSub) { + public ResponseEntity createNewSub(@RequestHeader HttpHeaders headers, + @RequestBody RequestSub requestSub) { log.info(this.getClass().getName() + ".createNewSub Start!"); SubDto subDto = new SubDto(); + String userId = tokenUtil.getUserIdByToken(headers); + subDto.setItemSeq(requestSub.getItemSeq()); + subDto.setUserId(userId); int res = subService.createNewSub(subDto); diff --git a/UserService/src/main/java/com/submarket/userservice/dto/SubDto.java b/UserService/src/main/java/com/submarket/userservice/dto/SubDto.java index d39475a..a7e2aac 100644 --- a/UserService/src/main/java/com/submarket/userservice/dto/SubDto.java +++ b/UserService/src/main/java/com/submarket/userservice/dto/SubDto.java @@ -14,6 +14,5 @@ public class SubDto { private String subDate; private int subCount; private UserEntity user; - - private int userSeq; + private String userId; } diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java index 343a9f9..ab17bc1 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java @@ -31,13 +31,13 @@ public class SubService implements ISubService { @Override @Transactional public List findAllSub(SubDto subDto) throws RuntimeException{ - Optional user = userRepository.findById(subDto.getUserSeq()); + UserEntity user = userRepository.findByUserId(subDto.getUserId()); if (user == null) { log.info("User 정보 없음"); throw new EntityNotFoundException("User Entity Not Found"); } - Iterable subEntityIterable = subRepository.findByUser(user.get()); + Iterable subEntityIterable = subRepository.findByUser(user); log.info(this.getClass().getName() + ". find Sub Info"); @@ -81,7 +81,7 @@ public int createNewSub(SubDto subDto) { log.info(this.getClass().getName() + "createNewSub Start!"); int res = 0; - subDto.setUser(userRepository.findByUserId("dataofsg02")); // 수정 필요 + subDto.setUser(userRepository.findByUserId(subDto.getUserId())); // 수정 필요 subDto.setSubDate(DateUtil.getDateTime("dd")); subDto.setSubCount(1); log.info("itemSeq : " + subDto.getItemSeq()); From 9939d8c6aa1387c841c5743b0b80bee2e78f82d3 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 16:07:28 +0900 Subject: [PATCH 22/40] =?UTF-8?q?[#97]=20feature=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 17 +++++++++++++++ .../userservice/mapper/UserMapper.java | 3 +++ .../userservice/service/IUserService.java | 2 ++ .../userservice/service/impl/UserService.java | 15 +++++++++++++ .../userservice/vo/ResponseUser.java | 21 +++++++++++++++++++ 5 files changed, 58 insertions(+) create mode 100644 UserService/src/main/java/com/submarket/userservice/vo/ResponseUser.java diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index 24e753c..2c34d46 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -7,6 +7,7 @@ import com.submarket.userservice.util.TokenUtil; import com.submarket.userservice.vo.RequestChangePassword; import com.submarket.userservice.vo.RequestUser; +import com.submarket.userservice.vo.ResponseUser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.env.Environment; @@ -43,6 +44,22 @@ public ResponseEntity createUser(@RequestBody RequestUser requestUser) t return ResponseEntity.status(HttpStatus.CREATED).body("회원가입 성공"); } + @GetMapping("/user") + public ResponseEntity getUserInfo(@RequestHeader HttpHeaders headers) throws Exception { + // 사용자 토큰을 사용하여 사용자 정보 조회 + String userId = tokenUtil.getUserIdByToken(headers); + + if (userId.isEmpty()) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + UserDto userDto = userService.getUserInfoByUserId(userId); + + ResponseUser responseUser = UserMapper.INSTANCE.UserDtoToResponseUser(userDto); + + return ResponseEntity.ok().body(responseUser); + } + /**<------------------------>아이디 중복 확인*/ @GetMapping("/users/check-id/{userId}") public ResponseEntity checkUserById(@PathVariable String userId) throws Exception { diff --git a/UserService/src/main/java/com/submarket/userservice/mapper/UserMapper.java b/UserService/src/main/java/com/submarket/userservice/mapper/UserMapper.java index 583c4cd..b64e83e 100644 --- a/UserService/src/main/java/com/submarket/userservice/mapper/UserMapper.java +++ b/UserService/src/main/java/com/submarket/userservice/mapper/UserMapper.java @@ -3,6 +3,7 @@ import com.submarket.userservice.dto.UserDto; import com.submarket.userservice.jpa.entity.UserEntity; import com.submarket.userservice.vo.RequestUser; +import com.submarket.userservice.vo.ResponseUser; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; @@ -22,4 +23,6 @@ public interface UserMapper{ UserDto RequestUserToUserDto(RequestUser requestUser); + ResponseUser UserDtoToResponseUser(UserDto userDto); + } diff --git a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java index 68ea600..44366f0 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java @@ -15,6 +15,8 @@ public interface IUserService extends UserDetailsService { UserDto getUserDetailsByUserId(String userId); + UserDto getUserInfoByUserId(String userId); + } diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 98bb1a8..37e2296 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -62,6 +62,21 @@ public UserDto getUserInfoByUserEmail(String userEmail) { return rDTO; } + //####################################### 사용자 정보 조회 By UserId #######################################// + @Override + @Transactional + public UserDto getUserInfoByUserId(String userId) { + log.info(this.getClass().getName() + ".getUserInfoByUser Start!"); + + UserEntity userEntity = userRepository.findByUserId(userId); + + UserDto userDto = UserMapper.INSTANCE.userEntityToUserDto(userEntity); + + log.info(this.getClass().getName() + ".getUserInfoByUser End!"); + + return userDto; + } + @Override public int changeUserPassword(UserDto pDTO, String newPassword) throws Exception { log.info(this.getClass().getName() + "changeUserPassword Start!"); diff --git a/UserService/src/main/java/com/submarket/userservice/vo/ResponseUser.java b/UserService/src/main/java/com/submarket/userservice/vo/ResponseUser.java new file mode 100644 index 0000000..0845a8a --- /dev/null +++ b/UserService/src/main/java/com/submarket/userservice/vo/ResponseUser.java @@ -0,0 +1,21 @@ +package com.submarket.userservice.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotNull; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ResponseUser { + private String userId; + private String userName; + private String userEmail; + private String userAge; + private String userPn; + private String userAddress; + private String userAddress2; +} From e436458dd0442b0f2ff9e869e597421e289f168f Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 29 May 2022 16:22:58 +0900 Subject: [PATCH 23/40] =?UTF-8?q?[#96]=20feature=20:=20=EC=82=AC=EC=97=85?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SellerController.java | 26 +++++++++++++++++++ .../sellerservice/service/ISellerService.java | 2 ++ .../service/impl/SellerService.java | 15 +++++++++++ 3 files changed, 43 insertions(+) diff --git a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java index 302afe1..6e4bf39 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/controller/SellerController.java @@ -29,6 +29,32 @@ public class SellerController { private final TokenUtil tokenUtil; private final SellerCheckService sellerCheckService; + + @GetMapping("/seller") + public ResponseEntity getSellerInfo(@RequestHeader HttpHeaders headers) throws Exception { + log.info(this.getClass().getName() + ".getSellerInfo Start!"); + SellerDto pDto = new SellerDto(); + + String sellerId = tokenUtil.getUserIdByToken(headers); + pDto.setSellerId(sellerId); + + SellerDto sellerDto = sellerService.getSellerInfoBySellerId(pDto); + + log.info("seller Service End!"); + + ResponseSellerInfo sellerInfo = SellerMapper.INSTANCE.SellerDtoToResponseSellerInfo(sellerDto); + + if (sellerInfo == null) { + log.info(this.getClass().getName() + "userToken"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + + log.info(this.getClass().getName() + ".getSellerInfo End!"); + + return ResponseEntity.ok().body(sellerInfo); + } + @PostMapping("/sellers") public ResponseEntity createSeller(@RequestBody RequestSellerInfo sellerInfo) throws Exception { log.info(this.getClass().getName() + ".createSeller Start!"); diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java index f52f6b7..3239ad4 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/ISellerService.java @@ -11,6 +11,8 @@ public interface ISellerService extends UserDetailsService { SellerDto getSellerInfoBySellerEmail(SellerDto sellerDto) throws Exception; + SellerDto getSellerInfoBySellerId(SellerDto sellerDto) throws Exception; + SellerDto getSellerDetailsByUserId(String sellerId); int changePassword(String oldPassword, String newPassword, String sellerId) throws Exception; diff --git a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java index 41153a8..72d42a3 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/service/impl/SellerService.java @@ -102,6 +102,21 @@ public SellerDto getSellerInfoBySellerEmail(SellerDto sellerDto) throws Exceptio return rDto; } + @Override + public SellerDto getSellerInfoBySellerId(SellerDto sellerDto) throws Exception { + log.info(this.getClass().getName() + "getSellerInfoBySellerId Start!"); + String sellerId = sellerDto.getSellerId(); + + SellerEntity sellerEntity = sellerRepository.findBySellerId(sellerId); + + SellerDto rDto = SellerMapper.INSTANCE.sellerEntityToSellerDto(sellerEntity); + + + log.info(this.getClass().getName() + "getSellerInfoBySellerId End!"); + + return rDto; + } + @Override @Transactional // 비밀번호 변경 public int changePassword(String oldPassword, String newPassword, String sellerId) throws Exception { From e5c5279f9c52bb7d83739e494cb539fa604f072a Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Tue, 31 May 2022 09:13:36 +0900 Subject: [PATCH 24/40] =?UTF-8?q?[#102]=20feature=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 20 +++++++++ .../userservice/jpa/UserRepository.java | 5 +++ .../userservice/service/IUserService.java | 2 + .../userservice/service/impl/UserService.java | 21 +++++++++ .../submarket/userservice/util/CmmUtil.java | 44 +++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 100644 UserService/src/main/java/com/submarket/userservice/util/CmmUtil.java diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index 2c34d46..225d165 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -16,6 +16,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.Map; + @Slf4j @RestController @RequiredArgsConstructor @@ -46,6 +48,7 @@ public ResponseEntity createUser(@RequestBody RequestUser requestUser) t @GetMapping("/user") public ResponseEntity getUserInfo(@RequestHeader HttpHeaders headers) throws Exception { + log.info(this.getClass().getName() + "getUserInfo Start!"); // 사용자 토큰을 사용하여 사용자 정보 조회 String userId = tokenUtil.getUserIdByToken(headers); @@ -57,6 +60,7 @@ public ResponseEntity getUserInfo(@RequestHeader HttpHeaders heade ResponseUser responseUser = UserMapper.INSTANCE.UserDtoToResponseUser(userDto); + log.info(this.getClass().getName() + "getUserInfo End!"); return ResponseEntity.ok().body(responseUser); } @@ -124,6 +128,22 @@ public ResponseEntity changePassword(@RequestBody RequestChangePassword } + @PatchMapping("/user") + public ResponseEntity modifyUserInfo(@RequestHeader HttpHeaders headers, @RequestBody UserDto body) + throws Exception { + log.info(this.getClass().getName() + ".modifyUserInfo Start!"); + String userId = tokenUtil.getUserIdByToken(headers); + + body.setUserId(userId); + + int res = userService.modifyUserInfo(body); + if (res == 1) { + return ResponseEntity.ok().body("변경 성공"); + } else { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Server Error"); + } + } + @DeleteMapping("/user") public ResponseEntity deleteUser(@RequestHeader HttpHeaders headers, @RequestBody RequestUser requestUser) throws Exception { /** diff --git a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java index 20384bb..e08913a 100644 --- a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java +++ b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java @@ -31,6 +31,11 @@ public interface UserRepository extends CrudRepository { @Query(value = "UPDATE user_info SET user_status = 0 WHERE user_id = :userId", nativeQuery = true) void deleteUserInfo(@Param("userId") String userId); + @Transactional + @Modifying + @Query(value = "UPDATE user_info SET user_email = :userEmail, user_address = :userAddress, user_address2 = :userAddress2, user_pn = :userPn, user_age = :userAge WHERE user_id = :userId", nativeQuery = true) + void modifyUserInfo(@Param("userEmail") String userEmail, @Param("userAddress") String userAddress + , @Param("userAddress2") String userAddress2,@Param("userPn") String userPn, @Param("userAge") String userAge, @Param("userId") String userId); } diff --git a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java index 44366f0..edf7c5e 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/IUserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/IUserService.java @@ -17,6 +17,8 @@ public interface IUserService extends UserDetailsService { UserDto getUserInfoByUserId(String userId); + int modifyUserInfo(UserDto userDto) throws Exception; + } diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 37e2296..7e90548 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -5,6 +5,7 @@ import com.submarket.userservice.jpa.entity.UserEntity; import com.submarket.userservice.mapper.UserMapper; import com.submarket.userservice.service.IUserService; +import com.submarket.userservice.util.CmmUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.User; @@ -119,6 +120,26 @@ public int deleteUser(UserDto userDto) throws Exception { return 0; } + @Override // 사용자 정보 수정 + @Transactional + public int modifyUserInfo(UserDto userDto) throws Exception { + log.info(this.getClass().getName() + ".modifyUserInfo Start!"); + String userEmail = CmmUtil.nvl(userDto.getUserEmail()); + String userAddress = CmmUtil.nvl(userDto.getUserAddress()); + String userAddress2 = CmmUtil.nvl(userDto.getUserAddress2()); + String userId = CmmUtil.nvl(userDto.getUserId()); + String userAge = CmmUtil.nvl(userDto.getUserAge()); + String userPn = CmmUtil.nvl(userDto.getUserPn()); + + log.info("userId : " + userId); + log.info("userEmail : " + userEmail); + + userRepository.modifyUserInfo(userEmail, userAddress, userAddress2,userPn, userAge, userId); + + log.info(this.getClass().getName() + ".modifyUserInfo End!"); + return 1; + } + //####################################### JWT Don't change #######################################// @Override public UserDto getUserDetailsByUserId(String userId) { diff --git a/UserService/src/main/java/com/submarket/userservice/util/CmmUtil.java b/UserService/src/main/java/com/submarket/userservice/util/CmmUtil.java new file mode 100644 index 0000000..043f945 --- /dev/null +++ b/UserService/src/main/java/com/submarket/userservice/util/CmmUtil.java @@ -0,0 +1,44 @@ +package com.submarket.userservice.util; + +public class CmmUtil { + public static String nvl(String str, String chg_str) { + String res; + + if (str == null) { + res = chg_str; + } else if (str.equals("")) { + res = chg_str; + } else { + res = str; + } + return res; + } + + public static String nvl(String str){ + return nvl(str,""); + } + + public static String checked(String str, String com_str){ + if(str.equals(com_str)){ + return " checked"; + }else{ + return ""; + } + } + + public static String checked(String[] str, String com_str){ + for(int i=0;i Date: Tue, 31 May 2022 10:53:24 +0900 Subject: [PATCH 25/40] =?UTF-8?q?fix=20:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 8 ++++++++ .../submarket/userservice/controller/UserController.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 2cf033f..fbd5188 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -8,5 +8,13 @@ jdbc:mariadb://mymariadb.cvttgezbigrm.ap-northeast-2.rds.amazonaws.com:3306 $ProjectFileDir$ + + mongo + true + true + com.dbschema.MongoJdbcDriver + mongodb+srv://admin:4321@cluster0.ftn75.mongodb.net/?retryWrites=true&w=majority + $ProjectFileDir$ + \ No newline at end of file diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index 225d165..b0bb395 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -128,11 +128,12 @@ public ResponseEntity changePassword(@RequestBody RequestChangePassword } - @PatchMapping("/user") + @PostMapping("/user/modify") public ResponseEntity modifyUserInfo(@RequestHeader HttpHeaders headers, @RequestBody UserDto body) throws Exception { log.info(this.getClass().getName() + ".modifyUserInfo Start!"); String userId = tokenUtil.getUserIdByToken(headers); + log.info("userEmail in Controller : " + body.getUserEmail()); body.setUserId(userId); From 6f25524ead4d5ca49f1169cf66463a72e330dc4a Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Tue, 31 May 2022 16:26:47 +0900 Subject: [PATCH 26/40] =?UTF-8?q?[#15]=20refactor=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 8 -------- OrderService/.gitignore | 2 ++ .../submarket/userservice/controller/UserController.java | 7 +++++-- .../com/submarket/userservice/jpa/UserRepository.java | 4 ++-- .../submarket/userservice/service/impl/UserService.java | 2 +- .../submarket/userservice/vo/RequestChangePassword.java | 1 - 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index fbd5188..2cf033f 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -8,13 +8,5 @@ jdbc:mariadb://mymariadb.cvttgezbigrm.ap-northeast-2.rds.amazonaws.com:3306 $ProjectFileDir$ - - mongo - true - true - com.dbschema.MongoJdbcDriver - mongodb+srv://admin:4321@cluster0.ftn75.mongodb.net/?retryWrites=true&w=majority - $ProjectFileDir$ - \ No newline at end of file diff --git a/OrderService/.gitignore b/OrderService/.gitignore index d15a461..9de688a 100644 --- a/OrderService/.gitignore +++ b/OrderService/.gitignore @@ -33,3 +33,5 @@ build/ .vscode/ /src/main/resources/application.yml + +../.idea diff --git a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java index b0bb395..7b24456 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/UserController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/UserController.java @@ -113,10 +113,13 @@ public ResponseEntity findUserId(@PathVariable String userEmail) throws /**<------------------------>비밀번호 변경*/ @PostMapping("/users/changePassword") - public ResponseEntity changePassword(@RequestBody RequestChangePassword request) throws Exception { + public ResponseEntity changePassword(@RequestHeader HttpHeaders headers, + @RequestBody RequestChangePassword request) throws Exception { + String userId = tokenUtil.getUserIdByToken(headers); + log.info("userId : " + userId); UserDto pDTO = new UserDto(); - pDTO.setUserId(request.getUserId()); + pDTO.setUserId(userId); pDTO.setUserPassword(request.getOldPassword()); int check = userService.changeUserPassword(pDTO, request.getNewPassword()); diff --git a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java index e08913a..dd4a5aa 100644 --- a/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java +++ b/UserService/src/main/java/com/submarket/userservice/jpa/UserRepository.java @@ -21,8 +21,8 @@ public interface UserRepository extends CrudRepository { // 비밀번호 변경 @Transactional @Modifying - @Query(value = "UPDATE user_info set user_password = :password WHERE user_seq = :userSeq", nativeQuery = true) - void changeUserPassword(@Param("password") String password, @Param("userSeq") int userSeq); + @Query(value = "UPDATE user_info set user_password = :password WHERE user_id = :userId", nativeQuery = true) + void changeUserPassword(@Param("password") String password, @Param("userId") String userId); // 사용자 status 변경 (회원탈퇴) diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java index 7e90548..ed70ceb 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/UserService.java @@ -90,7 +90,7 @@ public int changeUserPassword(UserDto pDTO, String newPassword) throws Exception // 만약 비밀번호가 일치한다면 if (checkPassword) { log.info("비밀번호 일치"); - userRepository.changeUserPassword(passwordEncoder.encode(newPassword), pDTO.getUserSeq()); + userRepository.changeUserPassword(passwordEncoder.encode(newPassword), pDTO.getUserId()); log.info(this.getClass().getName() + "changeUserPassword End!"); return 1; // 성공 diff --git a/UserService/src/main/java/com/submarket/userservice/vo/RequestChangePassword.java b/UserService/src/main/java/com/submarket/userservice/vo/RequestChangePassword.java index 4a53d12..78b54f9 100644 --- a/UserService/src/main/java/com/submarket/userservice/vo/RequestChangePassword.java +++ b/UserService/src/main/java/com/submarket/userservice/vo/RequestChangePassword.java @@ -4,7 +4,6 @@ @Data public class RequestChangePassword { - private String userId; private String oldPassword; private String newPassword; } From 03bf28a34995600a8b1e2500b99910ce18c8a263 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Wed, 1 Jun 2022 23:27:45 +0900 Subject: [PATCH 27/40] =?UTF-8?q?[#107]=20feature=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20Token=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ItemService/pom.xml | 29 ++++++++++++ .../controller/ItemReviewController.java | 23 ++++++++++ .../submarket/itemservice/dto/ItemDto.java | 3 +- .../itemservice/dto/ItemReviewDto.java | 2 +- .../itemservice/jpa/ItemReviewRepository.java | 2 + .../itemservice/jpa/entity/ItemEntity.java | 3 +- .../jpa/entity/ItemReviewEntity.java | 2 +- .../itemservice/security/WebSecurity.java | 24 ++++++++++ .../service/IItemReviewService.java | 2 + .../service/impl/ItemReviewService.java | 19 ++++++++ .../submarket/itemservice/util/CmmUtil.java | 44 +++++++++++++++++++ .../submarket/itemservice/util/DateUtil.java | 21 +++++++++ .../submarket/itemservice/util/TokenUtil.java | 29 ++++++++++++ 13 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 ItemService/src/main/java/com/submarket/itemservice/security/WebSecurity.java create mode 100644 ItemService/src/main/java/com/submarket/itemservice/util/CmmUtil.java create mode 100644 ItemService/src/main/java/com/submarket/itemservice/util/DateUtil.java create mode 100644 ItemService/src/main/java/com/submarket/itemservice/util/TokenUtil.java diff --git a/ItemService/pom.xml b/ItemService/pom.xml index 3672d12..d86514f 100644 --- a/ItemService/pom.xml +++ b/ItemService/pom.xml @@ -76,6 +76,35 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml + + + + org.springframework.security + spring-security-web + + + + org.springframework.security + spring-security-web + + + + org.springframework.security + spring-security-config + + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + javax.xml.bind + jaxb-api + 2.1 + diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java index 4c63c30..c4a36cc 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java @@ -2,13 +2,17 @@ import com.submarket.itemservice.dto.ItemReviewDto; import com.submarket.itemservice.service.impl.ItemReviewService; +import com.submarket.itemservice.util.CmmUtil; +import com.submarket.itemservice.util.TokenUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -17,6 +21,7 @@ @RequiredArgsConstructor public class ItemReviewController { private final ItemReviewService itemReviewService; + private final TokenUtil tokenUtil; @PostMapping("/item/{itemSeq}/review") public ResponseEntity saveReview(@RequestBody ItemReviewDto itemReviewDto, @PathVariable int itemSeq) throws Exception { @@ -79,4 +84,22 @@ public ResponseEntity> findItemReviewInItem(@PathVariable in return ResponseEntity.ok().body(rMap); } + @GetMapping("/item/review") + public ResponseEntity> findReviewByUserId(@RequestHeader HttpHeaders headers) throws Exception { + String userId = CmmUtil.nvl(tokenUtil.getUserIdByToken(headers)); + + Map rMap = new HashMap<>(); + + List itemReviewDtoList = itemReviewService.findAllReviewByUserId(userId); + + if (itemReviewDtoList == null) { + itemReviewDtoList = new LinkedList(); + } + + rMap.put("response", itemReviewDtoList); + + + return ResponseEntity.ok().body(rMap); + } + } \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java index 7bf7ec5..a788692 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java +++ b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java @@ -10,7 +10,7 @@ @AllArgsConstructor public class ItemDto { private int itemSeq; - private int sellerSeq; + private String sellerId; private String itemTitle; private String itemContents; @@ -21,6 +21,7 @@ public class ItemDto { private CategoryEntity category; private int itemStatus; // 활성화 + private String imagePath; // TODO: 2022/05/11 FK 설정 } \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemReviewDto.java b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemReviewDto.java index 345bd93..e910f5c 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemReviewDto.java +++ b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemReviewDto.java @@ -10,7 +10,7 @@ @NoArgsConstructor public class ItemReviewDto { private Integer reviewSeq; - private int userSeq; + private String userId; private int reviewStar; private String reviewContents; private String reviewDate; diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemReviewRepository.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemReviewRepository.java index 445b5d5..d8251b4 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemReviewRepository.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemReviewRepository.java @@ -22,6 +22,8 @@ public interface ItemReviewRepository extends CrudRepository findByItem(ItemEntity item); + @Transactional + List findAllByUserId(String userId); @Transactional @Modifying @Query(value = "UPDATE item_review_info SET review_contents = :reviewContents, review_date = :reviewDate, review_star = :reviewStar WHERE review_seq = :reviewSeq", nativeQuery = true) diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java index ad9e182..b1bb6e3 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java @@ -24,7 +24,7 @@ public class ItemEntity { private Integer itemSeq; @Column(nullable = false) - private Integer sellerSeq; + private String sellerId; @Column(length = 300, nullable = false) private String itemTitle; @@ -54,4 +54,5 @@ public class ItemEntity { private List reviews; // TODO: 2022/05/11 Img 등록 추가 + private String imagePath; } diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemReviewEntity.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemReviewEntity.java index 738c670..8f8f2e6 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemReviewEntity.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemReviewEntity.java @@ -22,7 +22,7 @@ public class ItemReviewEntity { private Integer reviewSeq; @Column(nullable = false) - private int userSeq; + private String userId; @Column(nullable = false) private int reviewStar; diff --git a/ItemService/src/main/java/com/submarket/itemservice/security/WebSecurity.java b/ItemService/src/main/java/com/submarket/itemservice/security/WebSecurity.java new file mode 100644 index 0000000..3bea63d --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/security/WebSecurity.java @@ -0,0 +1,24 @@ +package com.submarket.itemservice.security; + +import lombok.AllArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +@EnableWebSecurity +@AllArgsConstructor +public class WebSecurity extends WebSecurityConfigurerAdapter { + private final Environment env; + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable(); + + http.authorizeRequests().antMatchers("/**") + .hasIpAddress("127.0.0.1"); // IP + http.headers().frameOptions().disable(); + } +} \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/IItemReviewService.java b/ItemService/src/main/java/com/submarket/itemservice/service/IItemReviewService.java index 09a7d17..de814d0 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/IItemReviewService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/IItemReviewService.java @@ -12,4 +12,6 @@ public interface IItemReviewService { int deleteReview(ItemReviewDto itemReviewDto) throws Exception; List findAllReviewInItem(int itemSeq) throws Exception; + + List findAllReviewByUserId(String userId) throws Exception; } \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemReviewService.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemReviewService.java index df2df0c..ff5f73b 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemReviewService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemReviewService.java @@ -8,6 +8,7 @@ import com.submarket.itemservice.mapper.ItemMapper; import com.submarket.itemservice.mapper.ItemReviewMapper; import com.submarket.itemservice.service.IItemReviewService; +import com.submarket.itemservice.util.CmmUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -93,4 +94,22 @@ public List findAllReviewInItem(int itemSeq) throws Exception { }); return reviewDtoList; } + + @Override + @Transactional + public List findAllReviewByUserId(String userId) throws Exception { + log.info(this.getClass().getName() + ".findAllReviewByUserId Start!"); + List itemReviewDtoList = new LinkedList<>(); + + List itemReviewEntityList = new LinkedList<>(); + + itemReviewEntityList = itemReviewRepository.findAllByUserId(CmmUtil.nvl(userId)); + + itemReviewEntityList.forEach(e -> { + itemReviewDtoList.add(ItemReviewMapper.INSTANCE.itemReviewEntityToItemDto(e)); + }); + + log.info(this.getClass().getName() + ".findAllReviewByUserId End!"); + return itemReviewDtoList; + } } \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/util/CmmUtil.java b/ItemService/src/main/java/com/submarket/itemservice/util/CmmUtil.java new file mode 100644 index 0000000..8c66b14 --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/util/CmmUtil.java @@ -0,0 +1,44 @@ +package com.submarket.itemservice.util; + +public class CmmUtil { + public static String nvl(String str, String chg_str) { + String res; + + if (str == null) { + res = chg_str; + } else if (str.equals("")) { + res = chg_str; + } else { + res = str; + } + return res; + } + + public static String nvl(String str){ + return nvl(str,""); + } + + public static String checked(String str, String com_str){ + if(str.equals(com_str)){ + return " checked"; + }else{ + return ""; + } + } + + public static String checked(String[] str, String com_str){ + for(int i=0;i Date: Wed, 1 Jun 2022 23:49:05 +0900 Subject: [PATCH 28/40] [#106] refactor : itemService/review --- .../itemservice/controller/ItemReviewController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java index c4a36cc..faa38f4 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemReviewController.java @@ -3,6 +3,7 @@ import com.submarket.itemservice.dto.ItemReviewDto; import com.submarket.itemservice.service.impl.ItemReviewService; import com.submarket.itemservice.util.CmmUtil; +import com.submarket.itemservice.util.DateUtil; import com.submarket.itemservice.util.TokenUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,10 +25,15 @@ public class ItemReviewController { private final TokenUtil tokenUtil; @PostMapping("/item/{itemSeq}/review") - public ResponseEntity saveReview(@RequestBody ItemReviewDto itemReviewDto, @PathVariable int itemSeq) throws Exception { + public ResponseEntity saveReview(@RequestHeader HttpHeaders headers, + @RequestBody ItemReviewDto itemReviewDto, @PathVariable int itemSeq) throws Exception { log.info(this.getClass().getName() + ".saveReview Start!"); // TODO: 2022-05-16 사용자가 이미 작성한 리뷰가 있는지 확인 with UserSeq + String userId = CmmUtil.nvl(tokenUtil.getUserIdByToken(headers)); + itemReviewDto.setUserId(userId); + itemReviewDto.setReviewDate(DateUtil.getDateTime("yyyyMMdd")); + if (itemReviewDto.equals(null)) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("리뷰 정보를 입력해주세요"); } @@ -40,7 +46,7 @@ public ResponseEntity saveReview(@RequestBody ItemReviewDto itemReviewDt return ResponseEntity.status(HttpStatus.CREATED).body("리뷰 작성 완료"); } - @PatchMapping("/item/review/{reviewSeq}") + @PostMapping("/item/review/{reviewSeq}/modify") public ResponseEntity modifyItemReview(@RequestBody ItemReviewDto itemReviewDto, @PathVariable int reviewSeq) throws Exception { log.info(this.getClass().getName() + ".modifyItemReview Start!"); @@ -54,7 +60,7 @@ public ResponseEntity modifyItemReview(@RequestBody ItemReviewDto itemRe return ResponseEntity.status(HttpStatus.OK).body("리뷰 변경 완료"); } - @DeleteMapping("/item/review/{reviewSeq}") + @PostMapping("/item/review/{reviewSeq}/delete") public ResponseEntity deleteItemReview(@PathVariable int reviewSeq) throws Exception { log.info(this.getClass().getName() + ".deleteReview Start!"); From 3aa760ef66e970d3e540a7ae657513399d0d8a9f Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Wed, 1 Jun 2022 23:55:08 +0900 Subject: [PATCH 29/40] [#106] refactor : itemService/item --- .../controller/ItemController.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java index dba1663..04f39f7 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java @@ -2,8 +2,11 @@ import com.submarket.itemservice.dto.ItemDto; import com.submarket.itemservice.service.impl.ItemService; +import com.submarket.itemservice.util.CmmUtil; +import com.submarket.itemservice.util.TokenUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -17,8 +20,26 @@ @RequiredArgsConstructor public class ItemController { private final ItemService itemService; + private final TokenUtil tokenUtil; // TODO: 2022/05/16 로직 추가 + + @PostMapping("/items") + public ResponseEntity saveItem(@RequestHeader HttpHeaders headers, @RequestBody ItemDto itemDto) throws Exception { + String sellerId = CmmUtil.nvl(tokenUtil.getUserIdByToken(headers)); + + if (itemDto == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("상품 정보 오류"); + } + int res = itemService.saveItem(itemDto); + + if (res == 0) { + ResponseEntity.status(500).body("ServerError"); + } + + return ResponseEntity.status(HttpStatus.CREATED).body("상품 등록 완료"); + } + @GetMapping("/items") public ResponseEntity> findAllItem() throws Exception { log.info(this.getClass().getName() + ".findAllItem Start"); @@ -51,7 +72,7 @@ public ResponseEntity findOneItem(@PathVariable int itemSeq) throws Exce return ResponseEntity.ok().body(itemDto); } - @DeleteMapping("/items/{itemSeq}") + @PostMapping("/items/{itemSeq}/off") public ResponseEntity offItem(@PathVariable int itemSeq) throws Exception { // TODO: 2022/05/16 비활성화, 사업자 인증 ItemDto itemDto = new ItemDto(); @@ -61,7 +82,7 @@ public ResponseEntity offItem(@PathVariable int itemSeq) throws Exceptio return ResponseEntity.ok().body("비활성화 완료"); } - @PatchMapping("/items/{itemSeq}") + @PostMapping("/items/{itemSeq}/on") public ResponseEntity onItem(@PathVariable int itemSeq) throws Exception { ItemDto itemDto = new ItemDto(); itemDto.setItemSeq(itemSeq); @@ -70,7 +91,7 @@ public ResponseEntity onItem(@PathVariable int itemSeq) throws Exception return ResponseEntity.ok().body("활성화 완료"); } - @PutMapping("/items") + @PostMapping("/items/modify") public ResponseEntity modifyItem(@RequestBody ItemDto itemDto) throws Exception { // TODO: 2022-05-16 상품 이미지 로직 추가 log.info(this.getClass().getName()); From ee9fac2a077903249da43d091b86eec6a332e266 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Fri, 3 Jun 2022 13:24:53 +0900 Subject: [PATCH 30/40] [#91] feature : S3 Test ( Image Upload ) --- ItemService/pom.xml | 9 ++ .../itemservice/coinfig/S3Config.java | 33 ++++++ .../controller/MainController.java | 15 +++ .../itemservice/service/IS3Service.java | 7 ++ .../itemservice/service/impl/S3Service.java | 109 ++++++++++++++++++ 5 files changed, 173 insertions(+) create mode 100644 ItemService/src/main/java/com/submarket/itemservice/coinfig/S3Config.java create mode 100644 ItemService/src/main/java/com/submarket/itemservice/service/IS3Service.java create mode 100644 ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java diff --git a/ItemService/pom.xml b/ItemService/pom.xml index d86514f..4a09735 100644 --- a/ItemService/pom.xml +++ b/ItemService/pom.xml @@ -29,6 +29,7 @@ org.springframework.cloud spring-cloud-starter-netflix-eureka-client + 3.1.2 @@ -105,6 +106,14 @@ jaxb-api 2.1 + + + + + org.springframework.cloud + spring-cloud-starter-aws + 2.0.1.RELEASE + diff --git a/ItemService/src/main/java/com/submarket/itemservice/coinfig/S3Config.java b/ItemService/src/main/java/com/submarket/itemservice/coinfig/S3Config.java new file mode 100644 index 0000000..c9be32d --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/coinfig/S3Config.java @@ -0,0 +1,33 @@ +package com.submarket.itemservice.coinfig; + +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/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java index 270bc9d..23c9b6f 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java @@ -4,11 +4,17 @@ import com.submarket.itemservice.jpa.ItemRepository; import com.submarket.itemservice.jpa.ItemReviewRepository; import com.submarket.itemservice.service.impl.ItemService; +import com.submarket.itemservice.service.impl.S3Service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +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 @Slf4j @@ -20,6 +26,7 @@ public class MainController { private final ItemService itemService; private final ItemRepository itemRepository; private final ItemReviewRepository itemReviewRepository; + private final S3Service s3Service; @GetMapping("/health") public String health() { @@ -30,4 +37,12 @@ public String health() { + ", token secret : " + env.getProperty("token.secret") + ", token expiration time : " + env.getProperty("token.expiration_time"); } + + @PostMapping("/images") + public String upload(@RequestParam("images") MultipartFile multipartFile) throws IOException { + + String rStr = s3Service.uploadImageInS3(multipartFile, "static"); + + return rStr; + } } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/IS3Service.java b/ItemService/src/main/java/com/submarket/itemservice/service/IS3Service.java new file mode 100644 index 0000000..52a4940 --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/service/IS3Service.java @@ -0,0 +1,7 @@ +package com.submarket.itemservice.service; + +import org.springframework.web.multipart.MultipartFile; + +public interface IS3Service { + String uploadImageInS3(MultipartFile multipartFile, String dirName) throws Exception; +} diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java new file mode 100644 index 0000000..99cf23e --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java @@ -0,0 +1,109 @@ +package com.submarket.itemservice.service.impl; + +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.CannedAccessControlList; +import com.amazonaws.services.s3.model.PutObjectRequest; +import com.submarket.itemservice.service.IS3Service; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpStatusCodeException; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Optional; +import java.util.UUID; + +@Service +@Slf4j +@RequiredArgsConstructor +public class S3Service implements IS3Service { + + private final AmazonS3Client amazonS3Client; + private final Environment env; + + @Value("${s3.bucket}") + public String url; + + @Value("${cloud.aws.s3.bucket}") + public String bucket; // S3 버킷 이름 + + @Override + public String uploadImageInS3(MultipartFile multipartFile, String dirName) throws IOException { + String rPath = ""; + // 사진 저장 후 사진 Path 를 return 함 + + try { + File uploadFile = uploadInLocal(multipartFile) // 파일 변환할 수 없으면 에러 + .orElseThrow(() -> new IllegalArgumentException("error: MultipartFile -> File convert fail")); + + uploadInS3(uploadFile, dirName); + + rPath = env.getProperty("s3.bucket") + "/" + dirName + "/" + multipartFile.getOriginalFilename(); + // 파일 저장 후 파일 Path return + + } catch (HttpStatusCodeException statusCodeException) { + int code = statusCodeException.getRawStatusCode(); + log.info("statusCodeException : " + code + "(" + statusCodeException.getMessage() + ")"); + + rPath = "/"; + + } catch (IllegalArgumentException illegalArgumentException) { + log.info("IllegalArgumentException : " + illegalArgumentException.getMessage()); + log.info("사진 저장 실패"); + // TODO: 2022-06-03 Add None image in static Path + rPath = "/"; + + } catch (Exception exception) { + log.info("Exception : " + exception); + rPath = "/"; + } finally { + + return rPath; + + } + } + + private String uploadInS3(File uploadFile, String dirName) { + + String fileName = dirName + "/" + uploadFile.getName(); // S3에 저장된 파일 이름 + String uploadImageUrl = putS3(uploadFile, fileName); // s3로 업로드 + removeFileInLocal(uploadFile); + return uploadImageUrl; + } + + private String putS3(File uploadFile, String fileName) { + + amazonS3Client.putObject(new PutObjectRequest(bucket, fileName, uploadFile).withCannedAcl(CannedAccessControlList.PublicRead)); + return amazonS3Client.getUrl(bucket, fileName).toString(); + } + + + + private Optional uploadInLocal(MultipartFile file) throws IOException { + + File convertFile = new File(System.getProperty("user.dir") + "/" + file.getOriginalFilename()); + if (convertFile.createNewFile()) { // 바로 위에서 지정한 경로에 File 이 생성됨 (경로가 잘못되었다면 생성 불가능) + try (FileOutputStream fos = new FileOutputStream(convertFile)) { // FileOutputStream 데이터를 파일에 바이트 스트림으로 저장하기 위함 + fos.write(file.getBytes()); + } + return Optional.of(convertFile); + } + + return Optional.empty(); + } + + + private void removeFileInLocal(File targetFile) { + + if (targetFile.delete()) { + log.info("File delete success"); + return; + } + log.info("File delete fail"); + } +} From 3c7645e7976223259ad07f5dc598289b402bc193 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sat, 4 Jun 2022 15:20:44 +0900 Subject: [PATCH 31/40] =?UTF-8?q?[#91]=20refactor=20:=20S3=20Upload=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/submarket/itemservice/service/impl/S3Service.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java index 99cf23e..2aa1d6e 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/S3Service.java @@ -41,9 +41,7 @@ public String uploadImageInS3(MultipartFile multipartFile, String dirName) throw File uploadFile = uploadInLocal(multipartFile) // 파일 변환할 수 없으면 에러 .orElseThrow(() -> new IllegalArgumentException("error: MultipartFile -> File convert fail")); - uploadInS3(uploadFile, dirName); - - rPath = env.getProperty("s3.bucket") + "/" + dirName + "/" + multipartFile.getOriginalFilename(); + rPath = uploadInS3(uploadFile, dirName); // 파일 저장 후 파일 Path return } catch (HttpStatusCodeException statusCodeException) { @@ -61,6 +59,7 @@ public String uploadImageInS3(MultipartFile multipartFile, String dirName) throw } catch (Exception exception) { log.info("Exception : " + exception); rPath = "/"; + } finally { return rPath; @@ -70,7 +69,7 @@ public String uploadImageInS3(MultipartFile multipartFile, String dirName) throw private String uploadInS3(File uploadFile, String dirName) { - String fileName = dirName + "/" + uploadFile.getName(); // S3에 저장된 파일 이름 + String fileName = dirName + "/" + UUID.randomUUID() + uploadFile.getName(); // S3에 저장된 파일 이름 String uploadImageUrl = putS3(uploadFile, fileName); // s3로 업로드 removeFileInLocal(uploadFile); return uploadImageUrl; From 64ebb306e8a2f7206a71d81593d056d343d30127 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sat, 4 Jun 2022 16:10:03 +0900 Subject: [PATCH 32/40] =?UTF-8?q?[#91]=20refactor=20:=20=EC=83=81=ED=92=88?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemservice/controller/ItemController.java | 4 ++++ .../itemservice/controller/MainController.java | 8 +------- .../java/com/submarket/itemservice/dto/ItemDto.java | 8 +++++++- .../itemservice/jpa/entity/ItemEntity.java | 8 ++++++-- .../itemservice/service/impl/ItemService.java | 13 +++++++++++++ 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java index 04f39f7..d69e354 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/ItemController.java @@ -6,6 +6,7 @@ import com.submarket.itemservice.util.TokenUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.omg.CosNaming.NamingContextPackage.NotFound; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -26,7 +27,10 @@ public class ItemController { @PostMapping("/items") public ResponseEntity saveItem(@RequestHeader HttpHeaders headers, @RequestBody ItemDto itemDto) throws Exception { + log.info(this.getClass().getName() + ".saveItem Start!"); + String sellerId = CmmUtil.nvl(tokenUtil.getUserIdByToken(headers)); + itemDto.setSellerId(sellerId); if (itemDto == null) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("상품 정보 오류"); diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java index 23c9b6f..83a84a8 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/MainController.java @@ -1,5 +1,6 @@ package com.submarket.itemservice.controller; +import com.submarket.itemservice.dto.ItemDto; import com.submarket.itemservice.jpa.CategoryRepository; import com.submarket.itemservice.jpa.ItemRepository; import com.submarket.itemservice.jpa.ItemReviewRepository; @@ -38,11 +39,4 @@ public String health() { + ", token expiration time : " + env.getProperty("token.expiration_time"); } - @PostMapping("/images") - public String upload(@RequestParam("images") MultipartFile multipartFile) throws IOException { - - String rStr = s3Service.uploadImageInS3(multipartFile, "static"); - - return rStr; - } } diff --git a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java index a788692..5133604 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java +++ b/ItemService/src/main/java/com/submarket/itemservice/dto/ItemDto.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.web.multipart.MultipartFile; @Data @NoArgsConstructor @@ -21,7 +22,12 @@ public class ItemDto { private CategoryEntity category; private int itemStatus; // 활성화 - private String imagePath; + + private String mainImagePath; // DB에 저장되어 있는 이미지 정보 + private String subImagePath; + + private MultipartFile mainImage; // Front 에서 넘어온 이미지 + private MultipartFile subImage; // Image 2 // TODO: 2022/05/11 FK 설정 } \ No newline at end of file diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java index b1bb6e3..ec93eaf 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java @@ -41,6 +41,12 @@ public class ItemEntity { @Column(nullable = false) private int itemStatus; + @Column(nullable = false, length = 300) // Main 이미지는 Null 일 수 없음 + private String mainImagePath; + + @Column(nullable = true, length = 300) + private String subImagePath; + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JsonIgnore private CategoryEntity category; @@ -53,6 +59,4 @@ public class ItemEntity { @JsonIgnore private List reviews; - // TODO: 2022/05/11 Img 등록 추가 - private String imagePath; } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java index 16e8bf3..83a7b8d 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java @@ -28,6 +28,7 @@ public class ItemService implements IItemService { private final ItemRepository itemRepository; private final GroupRepository groupRepository; private final CategoryService categoryService; + private final S3Service s3Service; @Override @Transactional @@ -45,10 +46,22 @@ public int saveItem(ItemDto itemDto) throws Exception { itemDto.setCategory(categoryEntity); itemDto.setItemStatus(1); + // 상품 이미지 등록 S3 Service (File, dirName) return : S3 Image Path + /** Main Image 는 항상 NotNull */ + String mainImagePath = s3Service.uploadImageInS3(itemDto.getMainImage(), "images"); + String subImagePath = s3Service.uploadImageInS3(itemDto.getSubImage(), "images"); + + itemDto.setSubImagePath(subImagePath); + itemDto.setMainImagePath(mainImagePath); + + // 이미지 정보가 없다면 Exception -> return "/" (기본 Image Path) + log.info("" + itemDto.getCategory()); ItemEntity itemEntity = ItemMapper.INSTANCE.itemDtoToItemEntity(itemDto); itemRepository.save(itemEntity); + + log.info(this.getClass().getName() + ".saveItem End"); return 1; } From 25dd889a59d63159c4928a902cae6ace49bd882c Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sat, 4 Jun 2022 16:27:41 +0900 Subject: [PATCH 33/40] =?UTF-8?q?[#105]=20feature=20:=20Seller=EA=B0=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=ED=95=9C=20=EB=AA=A8=EB=93=A0=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SellerItemController.java | 40 +++++++++++++++++++ .../itemservice/jpa/ItemRepository.java | 4 ++ .../itemservice/service/IItemService.java | 2 + .../itemservice/service/impl/ItemService.java | 35 ++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 ItemService/src/main/java/com/submarket/itemservice/controller/SellerItemController.java diff --git a/ItemService/src/main/java/com/submarket/itemservice/controller/SellerItemController.java b/ItemService/src/main/java/com/submarket/itemservice/controller/SellerItemController.java new file mode 100644 index 0000000..34000d6 --- /dev/null +++ b/ItemService/src/main/java/com/submarket/itemservice/controller/SellerItemController.java @@ -0,0 +1,40 @@ +package com.submarket.itemservice.controller; + +import com.submarket.itemservice.dto.ItemDto; +import com.submarket.itemservice.service.impl.ItemService; +import com.submarket.itemservice.util.TokenUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@Slf4j +@RequiredArgsConstructor +public class SellerItemController { + private final ItemService itemService; + private final TokenUtil tokenUtil; + + + @GetMapping("/item/seller") + public ResponseEntity> findItemInfoBySellerId(@RequestHeader HttpHeaders headers) throws Exception { + log.info(this.getClass().getName() + "findItemInfoBySellerId Start!"); + String sellerId = tokenUtil.getUserIdByToken(headers); + Map rMap = new HashMap<>(); + + List itemDtoList = itemService.findItemBySellerId(sellerId); + + rMap.put("response", itemDtoList); + + log.info(this.getClass().getName() + "findItemInfoBySellerId End!"); + return ResponseEntity.status(HttpStatus.OK).body(rMap); + } +} diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemRepository.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemRepository.java index d70dc7a..e43d743 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemRepository.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/ItemRepository.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository; import javax.transaction.Transactional; +import java.util.List; import java.util.Optional; @Repository @@ -17,6 +18,9 @@ public interface ItemRepository extends CrudRepository { @Transactional Optional findById(Integer integer); + @Transactional + List findAllBySellerId(String sellerId); + @Modifying @Transactional @Query(value = "UPDATE item_info SET item_status = 0 WHERE item_seq = :itemSeq", nativeQuery = true) diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/IItemService.java b/ItemService/src/main/java/com/submarket/itemservice/service/IItemService.java index 9507021..f5bdcc4 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/IItemService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/IItemService.java @@ -18,6 +18,8 @@ public interface IItemService { int modifyItem(ItemDto itemDto) throws Exception; + List findItemBySellerId(String sellerId) throws Exception; + } diff --git a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java index 83a7b8d..d02169c 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java +++ b/ItemService/src/main/java/com/submarket/itemservice/service/impl/ItemService.java @@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpStatusCodeException; import javax.transaction.Transactional; import java.util.LinkedList; @@ -130,4 +131,38 @@ public int modifyItem(ItemDto itemDto) throws Exception { itemDto.getItemCount(), itemDto.getItemTitle()); return 1; } + + @Override + @Transactional + public List findItemBySellerId(String sellerId) throws Exception { + // Seller 등록한 상품 조회 + log.info(this.getClass().getName() + "findItemBySellerId Start!"); + + List itemDtoList = new LinkedList<>(); + try { + List itemEntityList = itemRepository.findAllBySellerId(sellerId); + + log.info("Repository End"); + List finalItemDtoList = itemDtoList; + itemEntityList.forEach(item -> { + finalItemDtoList.add(ItemMapper.INSTANCE.itemEntityToItemDto(item)); + }); + + itemDtoList = finalItemDtoList; + + + } catch (HttpStatusCodeException statusCodeException) { + int code = statusCodeException.getRawStatusCode(); + log.info(code + "(HttpStatusCodeException) : " + statusCodeException); + itemDtoList = new LinkedList<>(); + + } catch (Exception e) { + log.info("Exception : " + e); + itemDtoList = new LinkedList<>(); + } finally { + log.info(this.getClass().getName() + "findItemBySellerId End!"); + return itemDtoList; + + } + } } From 231328ff2c46730f784fec4f68bd6b84808fe148 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sat, 4 Jun 2022 16:47:40 +0900 Subject: [PATCH 34/40] =?UTF-8?q?[#105]=20feature=20:=20=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94=EB=90=9C=20=EA=B5=AC=EB=8F=85=20=EC=88=98=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemservice/jpa/entity/ItemEntity.java | 1 - .../userservice/controller/SubController.java | 14 +++++++++++ .../userservice/jpa/SubRepository.java | 3 +++ .../userservice/service/ISubService.java | 2 ++ .../userservice/service/impl/SubService.java | 23 +++++++++++++++++++ 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java index ec93eaf..ca3240b 100644 --- a/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java +++ b/ItemService/src/main/java/com/submarket/itemservice/jpa/entity/ItemEntity.java @@ -56,7 +56,6 @@ public class ItemEntity { private GroupEntity group; @OneToMany(mappedBy = "item") - @JsonIgnore private List reviews; } diff --git a/UserService/src/main/java/com/submarket/userservice/controller/SubController.java b/UserService/src/main/java/com/submarket/userservice/controller/SubController.java index 0f26109..39e206b 100644 --- a/UserService/src/main/java/com/submarket/userservice/controller/SubController.java +++ b/UserService/src/main/java/com/submarket/userservice/controller/SubController.java @@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; +import java.util.Map; @RestController @@ -130,4 +132,16 @@ public ResponseEntity updateSub(@RequestBody RequestSub requestSub) thro } + + @GetMapping("/seller/sub") + public ResponseEntity findSubCount(@RequestBody Map request) throws Exception { + // Seller 가 보유하고 있는 상품의 SeqList 를 넘겨주면 총 구독 수를 표시 + log.info(this.getClass().getName() + "findSubCount"); + List itemSeqList = new LinkedList<>(); + itemSeqList = (List) request.get("itemSeqList"); + + int count = subService.findSubCount(itemSeqList); + + return ResponseEntity.status(HttpStatus.OK).body(count); + } } diff --git a/UserService/src/main/java/com/submarket/userservice/jpa/SubRepository.java b/UserService/src/main/java/com/submarket/userservice/jpa/SubRepository.java index 8c9f47f..4446be1 100644 --- a/UserService/src/main/java/com/submarket/userservice/jpa/SubRepository.java +++ b/UserService/src/main/java/com/submarket/userservice/jpa/SubRepository.java @@ -26,4 +26,7 @@ public interface SubRepository extends CrudRepository { @Transactional @Query(value = "SELECT * FROM sub_info WHERE sub_date = :subDate", nativeQuery = true) Iterable findUpdateSub(String subDate); + + @Transactional + List findAllByItemSeq(Integer itemSeq); } diff --git a/UserService/src/main/java/com/submarket/userservice/service/ISubService.java b/UserService/src/main/java/com/submarket/userservice/service/ISubService.java index bf30ae8..54e25e5 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/ISubService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/ISubService.java @@ -15,4 +15,6 @@ public interface ISubService { int updateSub(SubDto subDto); int cancelSub(SubDto subDto) throws Exception; + + int findSubCount(List itemSeqList) throws Exception; } diff --git a/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java b/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java index ab17bc1..c6318b8 100644 --- a/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java +++ b/UserService/src/main/java/com/submarket/userservice/service/impl/SubService.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpStatusCodeException; import javax.persistence.EntityNotFoundException; import javax.transaction.Transactional; @@ -130,4 +131,26 @@ public int cancelSub(SubDto subDto) throws Exception{ log.info(this.getClass().getName() + "cancelSub End!"); return 1; } + + @Override + public int findSubCount(List itemSeqList) throws Exception { + log.info(this.getClass().getName() + "findSubCount"); + int count = 0; + try { + for (Integer itemSeq : itemSeqList) { + List subEntityList = subRepository.findAllByItemSeq(itemSeq); + count += subEntityList.size(); + } + + } catch (HttpStatusCodeException statusCodeException) { + int code = statusCodeException.getRawStatusCode(); + log.info( code + "HttpStatusCodeException : " + statusCodeException); + + } catch (Exception e) { + log.info("Exception : " + e); + + } finally { + return count; + } + } } From 95c7863a04619080b01c83e63af64db10a73bf1c Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sat, 4 Jun 2022 17:00:45 +0900 Subject: [PATCH 35/40] =?UTF-8?q?OrderDto=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/submarket/orderservice/dto/OrderDto.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OrderService/src/main/java/com/submarket/orderservice/dto/OrderDto.java b/OrderService/src/main/java/com/submarket/orderservice/dto/OrderDto.java index 149c7e6..e46c773 100644 --- a/OrderService/src/main/java/com/submarket/orderservice/dto/OrderDto.java +++ b/OrderService/src/main/java/com/submarket/orderservice/dto/OrderDto.java @@ -11,8 +11,8 @@ public class OrderDto { private String orderId; private int itemSeq; - private int userSeq; - private int sellerSeq; + private String userId; + private String sellerId; private String orderDate; } From 2d4e32085fcfa0a3bd74b0fa5e3399a4f2b4d240 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 5 Jun 2022 14:14:59 +0900 Subject: [PATCH 36/40] [#78] feature : Add Spring Cloud Config --- ApiGateway/.gitignore | 1 + ApiGateway/pom.xml | 12 + ConfigService/.gitignore | 35 ++ ConfigService/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + ConfigService/mvnw | 316 ++++++++++++++++++ ConfigService/mvnw.cmd | 188 +++++++++++ ConfigService/pom.xml | 69 ++++ .../ConfigServiceApplication.java | 15 + .../ConfigServiceApplicationTests.java | 14 + ItemService/.gitignore | 3 +- ItemService/pom.xml | 11 + SellerService/.gitignore | 3 +- SellerService/pom.xml | 11 + .../security/AuthenticationFilter.java | 2 +- UserService/.gitignore | 1 + UserService/pom.xml | 11 + .../security/AuthenticationFilter.java | 2 +- 18 files changed, 692 insertions(+), 4 deletions(-) create mode 100644 ConfigService/.gitignore create mode 100644 ConfigService/.mvn/wrapper/maven-wrapper.jar create mode 100644 ConfigService/.mvn/wrapper/maven-wrapper.properties create mode 100755 ConfigService/mvnw create mode 100644 ConfigService/mvnw.cmd create mode 100644 ConfigService/pom.xml create mode 100644 ConfigService/src/main/java/com/submarket/configservice/ConfigServiceApplication.java create mode 100644 ConfigService/src/test/java/com/submarket/configservice/ConfigServiceApplicationTests.java diff --git a/ApiGateway/.gitignore b/ApiGateway/.gitignore index d15a461..9fbbc11 100644 --- a/ApiGateway/.gitignore +++ b/ApiGateway/.gitignore @@ -33,3 +33,4 @@ build/ .vscode/ /src/main/resources/application.yml +/src/main/resources/bootstrap.yml diff --git a/ApiGateway/pom.xml b/ApiGateway/pom.xml index 4410723..98bb485 100644 --- a/ApiGateway/pom.xml +++ b/ApiGateway/pom.xml @@ -59,6 +59,18 @@ jaxb-api 2.1 + + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + diff --git a/ConfigService/.gitignore b/ConfigService/.gitignore new file mode 100644 index 0000000..9601622 --- /dev/null +++ b/ConfigService/.gitignore @@ -0,0 +1,35 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +/src/main/resources/application.yml \ No newline at end of file diff --git a/ConfigService/.mvn/wrapper/maven-wrapper.jar b/ConfigService/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/ConfigService/.mvn/wrapper/maven-wrapper.properties b/ConfigService/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b7cb93e --- /dev/null +++ b/ConfigService/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/ConfigService/mvnw b/ConfigService/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/ConfigService/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/ConfigService/mvnw.cmd b/ConfigService/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/ConfigService/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/ConfigService/pom.xml b/ConfigService/pom.xml new file mode 100644 index 0000000..e1d5e28 --- /dev/null +++ b/ConfigService/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.4 + + + com.submarket + configservice + 0.0.1-SNAPSHOT + ConfigService + ConfigService + + 1.8 + 2021.0.3 + + + + org.springframework.cloud + spring-cloud-config-server + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/ConfigService/src/main/java/com/submarket/configservice/ConfigServiceApplication.java b/ConfigService/src/main/java/com/submarket/configservice/ConfigServiceApplication.java new file mode 100644 index 0000000..a69a1fa --- /dev/null +++ b/ConfigService/src/main/java/com/submarket/configservice/ConfigServiceApplication.java @@ -0,0 +1,15 @@ +package com.submarket.configservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootApplication +@EnableConfigServer +public class ConfigServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfigServiceApplication.class, args); + } + +} diff --git a/ConfigService/src/test/java/com/submarket/configservice/ConfigServiceApplicationTests.java b/ConfigService/src/test/java/com/submarket/configservice/ConfigServiceApplicationTests.java new file mode 100644 index 0000000..3b6d03c --- /dev/null +++ b/ConfigService/src/test/java/com/submarket/configservice/ConfigServiceApplicationTests.java @@ -0,0 +1,14 @@ +package com.submarket.configservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootTest +class ConfigServiceApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/ItemService/.gitignore b/ItemService/.gitignore index 9601622..21fcd4e 100644 --- a/ItemService/.gitignore +++ b/ItemService/.gitignore @@ -32,4 +32,5 @@ build/ ### VS Code ### .vscode/ -/src/main/resources/application.yml \ No newline at end of file +/src/main/resources/application.yml +/src/main/resources/bootstrap.yml \ No newline at end of file diff --git a/ItemService/pom.xml b/ItemService/pom.xml index 4a09735..d3452f0 100644 --- a/ItemService/pom.xml +++ b/ItemService/pom.xml @@ -107,6 +107,17 @@ 2.1 + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + diff --git a/SellerService/.gitignore b/SellerService/.gitignore index 9601622..21fcd4e 100644 --- a/SellerService/.gitignore +++ b/SellerService/.gitignore @@ -32,4 +32,5 @@ build/ ### VS Code ### .vscode/ -/src/main/resources/application.yml \ No newline at end of file +/src/main/resources/application.yml +/src/main/resources/bootstrap.yml \ No newline at end of file diff --git a/SellerService/pom.xml b/SellerService/pom.xml index 2bb777c..1e53c8d 100644 --- a/SellerService/pom.xml +++ b/SellerService/pom.xml @@ -104,6 +104,17 @@ jakarta.validation-api 2.0.2 + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + diff --git a/SellerService/src/main/java/com/submarket/sellerservice/security/AuthenticationFilter.java b/SellerService/src/main/java/com/submarket/sellerservice/security/AuthenticationFilter.java index c180735..ea9da7c 100644 --- a/SellerService/src/main/java/com/submarket/sellerservice/security/AuthenticationFilter.java +++ b/SellerService/src/main/java/com/submarket/sellerservice/security/AuthenticationFilter.java @@ -66,7 +66,7 @@ protected void successfulAuthentication(HttpServletRequest request, String token = Jwts.builder() .setSubject(userDetails.getSellerId()) .setExpiration(new Date(System.currentTimeMillis() + - Long.parseLong("10000000"))) + Long.parseLong(env.getProperty("token.expiration_time")))) .signWith(SignatureAlgorithm.HS512, env.getProperty("token.secret")) .compact(); diff --git a/UserService/.gitignore b/UserService/.gitignore index d15a461..9fbbc11 100644 --- a/UserService/.gitignore +++ b/UserService/.gitignore @@ -33,3 +33,4 @@ build/ .vscode/ /src/main/resources/application.yml +/src/main/resources/bootstrap.yml diff --git a/UserService/pom.xml b/UserService/pom.xml index adac419..25213dc 100644 --- a/UserService/pom.xml +++ b/UserService/pom.xml @@ -145,6 +145,17 @@ jackson-dataformat-xml + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + diff --git a/UserService/src/main/java/com/submarket/userservice/security/AuthenticationFilter.java b/UserService/src/main/java/com/submarket/userservice/security/AuthenticationFilter.java index 2514a00..549eaf8 100644 --- a/UserService/src/main/java/com/submarket/userservice/security/AuthenticationFilter.java +++ b/UserService/src/main/java/com/submarket/userservice/security/AuthenticationFilter.java @@ -64,7 +64,7 @@ protected void successfulAuthentication(HttpServletRequest request, String token = Jwts.builder() .setSubject(userDetails.getUserId()) .setExpiration(new Date(System.currentTimeMillis() + - Long.parseLong("10000000"))) + Long.parseLong(env.getProperty("token.expiration_time")))) .signWith(SignatureAlgorithm.HS512, env.getProperty("token.secret")) .compact(); From c666a2ff8ea4a9abdcf88b58f18d7b660518f842 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 5 Jun 2022 14:25:16 +0900 Subject: [PATCH 37/40] [#78] feature : Add Actuator --- ApiGateway/pom.xml | 6 ++++++ ItemService/pom.xml | 6 ++++++ SellerService/pom.xml | 6 ++++++ UserService/pom.xml | 7 +++++++ 4 files changed, 25 insertions(+) diff --git a/ApiGateway/pom.xml b/ApiGateway/pom.xml index 98bb485..f8c8aaf 100644 --- a/ApiGateway/pom.xml +++ b/ApiGateway/pom.xml @@ -71,6 +71,12 @@ org.springframework.cloud spring-cloud-starter-bootstrap + + + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/ItemService/pom.xml b/ItemService/pom.xml index d3452f0..4c18017 100644 --- a/ItemService/pom.xml +++ b/ItemService/pom.xml @@ -118,6 +118,12 @@ spring-cloud-starter-bootstrap + + + org.springframework.boot + spring-boot-starter-actuator + + diff --git a/SellerService/pom.xml b/SellerService/pom.xml index 1e53c8d..9056e0f 100644 --- a/SellerService/pom.xml +++ b/SellerService/pom.xml @@ -115,6 +115,12 @@ org.springframework.cloud spring-cloud-starter-bootstrap + + + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/UserService/pom.xml b/UserService/pom.xml index 25213dc..e350dfe 100644 --- a/UserService/pom.xml +++ b/UserService/pom.xml @@ -156,6 +156,13 @@ spring-cloud-starter-bootstrap + + + + org.springframework.boot + spring-boot-starter-actuator + + From fc67088a1a9f62547bf3a0c5451818cd7d643591 Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 5 Jun 2022 14:34:24 +0900 Subject: [PATCH 38/40] [#78] feature : Test RabbitMQ --- ApiGateway/pom.xml | 6 ++++++ ItemService/pom.xml | 6 ++++++ SellerService/pom.xml | 6 ++++++ UserService/pom.xml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/ApiGateway/pom.xml b/ApiGateway/pom.xml index f8c8aaf..95ca6b3 100644 --- a/ApiGateway/pom.xml +++ b/ApiGateway/pom.xml @@ -77,6 +77,12 @@ org.springframework.boot spring-boot-starter-actuator + + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + diff --git a/ItemService/pom.xml b/ItemService/pom.xml index 4c18017..6fee217 100644 --- a/ItemService/pom.xml +++ b/ItemService/pom.xml @@ -124,6 +124,12 @@ spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + + diff --git a/SellerService/pom.xml b/SellerService/pom.xml index 9056e0f..b56250a 100644 --- a/SellerService/pom.xml +++ b/SellerService/pom.xml @@ -121,6 +121,12 @@ org.springframework.boot spring-boot-starter-actuator + + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + diff --git a/UserService/pom.xml b/UserService/pom.xml index e350dfe..7a62a47 100644 --- a/UserService/pom.xml +++ b/UserService/pom.xml @@ -163,6 +163,12 @@ spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + + From 4e08a9f6940d5632f48231f4b5a83f20c9299acf Mon Sep 17 00:00:00 2001 From: JeongSeonggil Date: Sun, 5 Jun 2022 14:38:15 +0900 Subject: [PATCH 39/40] Maven --- .idea/compiler.xml | 12 +++++++++--- .idea/encodings.xml | 1 + ...azonaws_aws_java_sdk_cloudformation_1_11_415.xml | 13 +++++++++++++ ...en__com_amazonaws_aws_java_sdk_core_1_11_415.xml | 13 +++++++++++++ ...ven__com_amazonaws_aws_java_sdk_ec2_1_11_415.xml | 13 +++++++++++++ ...ven__com_amazonaws_aws_java_sdk_kms_1_11_415.xml | 13 +++++++++++++ ...aven__com_amazonaws_aws_java_sdk_s3_1_11_415.xml | 13 +++++++++++++ .../Maven__com_amazonaws_jmespath_java_1_11_415.xml | 13 +++++++++++++ ...on_dataformat_jackson_dataformat_cbor_2_13_1.xml | 13 +++++++++++++ ...on_dataformat_jackson_dataformat_yaml_2_13_1.xml | 13 +++++++++++++ ...aven__com_googlecode_javaewah_JavaEWAH_1_1_7.xml | 13 +++++++++++++ .idea/libraries/Maven__com_jcraft_jsch_0_1_55.xml | 13 +++++++++++++ .idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml | 13 +++++++++++++ .../Maven__com_rabbitmq_amqp_client_5_13_1.xml | 13 +++++++++++++ ...aven__com_rabbitmq_http_client_2_1_0_RELEASE.xml | 13 +++++++++++++ .../libraries/Maven__net_jodah_typetools_0_6_2.xml | 13 +++++++++++++ ..._jgit_org_eclipse_jgit_5_12_0_202106070339_r.xml | 13 +++++++++++++ ...lipse_jgit_http_apache_5_12_0_202106070339_r.xml | 13 +++++++++++++ ..._eclipse_jgit_ssh_jsch_5_12_0_202106070339_r.xml | 13 +++++++++++++ ...__org_springframework_amqp_spring_amqp_2_4_2.xml | 13 +++++++++++++ ...org_springframework_amqp_spring_rabbit_2_4_2.xml | 13 +++++++++++++ ...ramework_boot_spring_boot_starter_amqp_2_6_4.xml | 13 +++++++++++++ ...spring_cloud_aws_autoconfigure_2_0_1_RELEASE.xml | 13 +++++++++++++ ...cloud_spring_cloud_aws_context_2_0_1_RELEASE.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_aws_core_2_0_1_RELEASE.xml | 13 +++++++++++++ ...springframework_cloud_spring_cloud_bus_3_1_0.xml | 13 +++++++++++++ ...springframework_cloud_spring_cloud_bus_3_1_2.xml | 13 +++++++++++++ ...ngframework_cloud_spring_cloud_commons_3_1_3.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_commons_3_1_3_SNAPSHOT.xml | 6 +++--- ...ework_cloud_spring_cloud_config_client_3_1_2.xml | 13 +++++++++++++ ...ework_cloud_spring_cloud_config_client_3_1_3.xml | 13 +++++++++++++ ...ud_spring_cloud_config_client_3_1_3_SNAPSHOT.xml | 13 +++++++++++++ ...ework_cloud_spring_cloud_config_server_3_1_3.xml | 13 +++++++++++++ ...ngframework_cloud_spring_cloud_context_3_1_3.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_context_3_1_3_SNAPSHOT.xml | 6 +++--- ...rk_cloud_spring_cloud_function_context_3_2_4.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_function_context_3_2_5.xml | 13 +++++++++++++ ...spring_cloud_function_context_3_2_5_SNAPSHOT.xml | 13 +++++++++++++ ...ework_cloud_spring_cloud_function_core_3_2_4.xml | 13 +++++++++++++ ...ework_cloud_spring_cloud_function_core_3_2_5.xml | 13 +++++++++++++ ...ud_spring_cloud_function_core_3_2_5_SNAPSHOT.xml | 13 +++++++++++++ ...oud_spring_cloud_loadbalancer_3_1_3_SNAPSHOT.xml | 6 +++--- ...g_cloud_netflix_eureka_client_3_1_3_SNAPSHOT.xml | 6 +++--- ...ngframework_cloud_spring_cloud_starter_3_1_3.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_starter_3_1_3_SNAPSHOT.xml | 6 +++--- ...cloud_spring_cloud_starter_aws_2_0_1_RELEASE.xml | 13 +++++++++++++ ...k_cloud_spring_cloud_starter_bootstrap_3_1_2.xml | 13 +++++++++++++ ...k_cloud_spring_cloud_starter_bootstrap_3_1_3.xml | 13 +++++++++++++ ...pring_cloud_starter_bootstrap_3_1_3_SNAPSHOT.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_starter_bus_amqp_3_1_0.xml | 13 +++++++++++++ ...rk_cloud_spring_cloud_starter_bus_amqp_3_1_2.xml | 13 +++++++++++++ ...work_cloud_spring_cloud_starter_config_3_1_2.xml | 13 +++++++++++++ ...d_spring_cloud_starter_config_3_1_3_SNAPSHOT.xml | 13 +++++++++++++ ...ng_cloud_starter_loadbalancer_3_1_3_SNAPSHOT.xml | 6 +++--- ...starter_netflix_eureka_client_3_1_3_SNAPSHOT.xml | 13 ------------- ...oud_spring_cloud_starter_stream_rabbit_3_2_3.xml | 13 +++++++++++++ ...oud_spring_cloud_starter_stream_rabbit_3_2_4.xml | 13 +++++++++++++ ...g_cloud_starter_stream_rabbit_3_2_4_SNAPSHOT.xml | 13 +++++++++++++ ...ingframework_cloud_spring_cloud_stream_3_2_3.xml | 13 +++++++++++++ ...ingframework_cloud_spring_cloud_stream_3_2_4.xml | 13 +++++++++++++ ...ork_cloud_spring_cloud_stream_3_2_4_SNAPSHOT.xml | 13 +++++++++++++ ...loud_spring_cloud_stream_binder_rabbit_3_2_3.xml | 13 +++++++++++++ ...loud_spring_cloud_stream_binder_rabbit_3_2_4.xml | 13 +++++++++++++ ...ng_cloud_stream_binder_rabbit_3_2_4_SNAPSHOT.xml | 13 +++++++++++++ ...spring_cloud_stream_binder_rabbit_core_3_2_3.xml | 13 +++++++++++++ ...spring_cloud_stream_binder_rabbit_core_3_2_4.xml | 13 +++++++++++++ ...oud_stream_binder_rabbit_core_3_2_4_SNAPSHOT.xml | 13 +++++++++++++ ...rk_integration_spring_integration_amqp_5_5_9.xml | 13 +++++++++++++ ...rk_integration_spring_integration_core_5_5_9.xml | 13 +++++++++++++ ...ork_integration_spring_integration_jmx_5_5_9.xml | 13 +++++++++++++ ...org_springframework_retry_spring_retry_1_3_1.xml | 13 +++++++++++++ ..._org_springframework_spring_messaging_5_3_16.xml | 13 +++++++++++++ .../Maven__software_amazon_ion_ion_java_1_0_2.xml | 13 +++++++++++++ .idea/misc.xml | 1 + .idea/modules.xml | 1 + 75 files changed, 862 insertions(+), 34 deletions(-) create mode 100644 .idea/libraries/Maven__com_amazonaws_aws_java_sdk_cloudformation_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_amazonaws_aws_java_sdk_core_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_amazonaws_aws_java_sdk_ec2_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_amazonaws_aws_java_sdk_kms_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_amazonaws_aws_java_sdk_s3_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_amazonaws_jmespath_java_1_11_415.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_cbor_2_13_1.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_1.xml create mode 100644 .idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_7.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_0_1_55.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml create mode 100644 .idea/libraries/Maven__com_rabbitmq_amqp_client_5_13_1.xml create mode 100644 .idea/libraries/Maven__com_rabbitmq_http_client_2_1_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__net_jodah_typetools_0_6_2.xml create mode 100644 .idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_12_0_202106070339_r.xml create mode 100644 .idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_http_apache_5_12_0_202106070339_r.xml create mode 100644 .idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_ssh_jsch_5_12_0_202106070339_r.xml create mode 100644 .idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_6_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_aws_autoconfigure_2_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_aws_context_2_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_aws_core_2_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_bus_3_1_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_bus_3_1_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_3_1_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_3_1_3_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_server_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_context_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_context_3_2_5.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_context_3_2_5_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_core_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_core_3_2_5.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_core_3_2_5_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_aws_2_0_1_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_bootstrap_3_1_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_bootstrap_3_1_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_bootstrap_3_1_3_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_bus_amqp_3_1_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_bus_amqp_3_1_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_3_1_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_3_1_3_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_3_1_3_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_stream_rabbit_3_2_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_stream_rabbit_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_stream_rabbit_3_2_4_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_3_2_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_3_2_4_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_3_2_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_3_2_4_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_core_3_2_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_core_3_2_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_stream_binder_rabbit_core_3_2_4_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_springframework_integration_spring_integration_amqp_5_5_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_5_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_integration_spring_integration_jmx_5_5_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_retry_spring_retry_1_3_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_messaging_5_3_16.xml create mode 100644 .idea/libraries/Maven__software_amazon_ion_ion_java_1_0_2.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ec318ab..41a9b46 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -8,16 +8,20 @@ - - + + + + - + + + @@ -33,12 +37,14 @@