Merge branch 'master' of http://gitea.palntour.com/pav/pav-server.git

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<? extends BasicResponse> extendpsw(@PathVariable String userPswd){
+	public ResponseEntity<? extends BasicResponse> extendpsw(@RequestBody String userPswd){
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
 			PtyCstmrBas result = service.extendpsw(userPswd);

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())) {

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());

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<PtyCrtfyhpBas> confirmSms(String hpno , String crtfyNo){
+    public List<PtyCrtfyhpBas> confirmSms(String hpno, String crtfyNo) {
         QPtyCrtfyhpBas qEntity = QPtyCrtfyhpBas.ptyCrtfyhpBas;
 
         Date now = Calendar.getInstance().getTime();

src/test/java/com/palnet/ControlServerApplicationTests.java

@@ -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() {
-//	}
-
-}