diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java index 9df1f26..5279408 100644 --- a/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java @@ -122,10 +122,10 @@ public class AcntCstmrController { return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } - @PostMapping(value = "/profile/pwcheck/{userPswd}") + @PostMapping(value = "/profile/pwcheck") @ApiOperation(value = "회원 기존 패스워드 확인") @Tag(name = "회원관리", description = "회원 관련 API") - public ResponseEntity extendpsw(@PathVariable String userPswd){ + public ResponseEntity extendpsw(@RequestBody String userPswd){ Map resultMap = new HashMap(); try { PtyCstmrBas result = service.extendpsw(userPswd); diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java index b2df348..243aa05 100644 --- a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java @@ -253,7 +253,10 @@ public class AcntCstmrService { PtyCstmrBas userEntity = ptyCstmrBasRepository.findById(userId).orElse(null); // 3. RQ의 유저 패스워드를 암호화 처리 - userPswd = EncryptUtils.sha256Encrypt(userPswd); + if(!userPswd.isEmpty() && userPswd != null){ + userPswd = EncryptUtils.sha256Encrypt(userPswd); + } + // 4. RQ의 암호화한 패스워드와 DB에서 조회한 유저의 패스워드랑 비교 if(!userPswd.equals(userEntity.getUserPswd())) { diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java index 4807ee3..aa0e792 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java @@ -17,5 +17,5 @@ public class BasDronRqModel extends ComnPagingModel { private String ownerNm; - + } diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java index bcc271f..c8fd557 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java @@ -64,7 +64,6 @@ public class BasGroupJoinService { boolean isReJoin = query.isReJoin(rq.getCstmrSno(), rq.getGroupId()); //참여 정보 입력 하기 - if(!isReJoin) { PtyCstmrGroup entity2 = new PtyCstmrGroup(); entity2.setGroupId(rq.getGroupId()); diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java index faaeb26..aa3f4c7 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java @@ -16,10 +16,10 @@ import java.util.List; @Log4j2 @Repository @RequiredArgsConstructor -public class PtyCrtfyhpBasQueryRepository{ +public class PtyCrtfyhpBasQueryRepository { private final JPAQueryFactory query; - public List confirmSms(String hpno , String crtfyNo){ + public List confirmSms(String hpno, String crtfyNo) { QPtyCrtfyhpBas qEntity = QPtyCrtfyhpBas.ptyCrtfyhpBas; Date now = Calendar.getInstance().getTime(); @@ -29,7 +29,7 @@ public class PtyCrtfyhpBasQueryRepository{ BooleanBuilder builder = new BooleanBuilder(); builder.and(qEntity.crtfyhpNo.eq(crtfyNo)); - + builder.and(qEntity.crtfyhpYn.eq("N")); // builder.and(qEntity.createDt.between(LocalDateTime.now().minusMinutes(5), LocalDateTime.now())); builder.and(qEntity.createDt.goe(prevTime)); diff --git a/src/test/java/com/palnet/ControlServerApplicationTests.java b/src/test/java/com/palnet/ControlServerApplicationTests.java deleted file mode 100644 index b2d00d3..0000000 --- a/src/test/java/com/palnet/ControlServerApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.palnet; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class ControlServerApplicationTests { - -// @Test -// void contextLoads() { -// } - -}