From ae5f670d03fad472c543ec97689a89b51c30b1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Mon, 22 Jan 2024 13:28:51 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=EA=B8=B0=EC=A1=B4=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=20=ED=8C=A8=EC=8A=A4=EC=9B=8C=EB=93=9C=20=ED=99=95=EC=95=88=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=98=20RQ=EB=A5=BC=20=EA=B0=9D=EC=B2=B4?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B0=9B=EA=B2=8C?= =?UTF-8?q?=EB=81=94=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acnt/cstmr/controller/AcntCstmrController.java | 14 +++++--------- .../api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java | 11 +++++++++++ .../api/acnt/cstmr/service/AcntCstmrService.java | 11 ++++------- 3 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java index 43e08bef..29326929 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.palnet.biz.api.acnt.cstmr.model.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -16,11 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; -import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel; import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService; import com.palnet.biz.api.comn.response.BasicResponse; import com.palnet.biz.api.comn.response.ErrorResponse; @@ -157,17 +153,17 @@ public class AcntCstmrController { } /** - * 회원 기존 패스워드 확인, + * 회원 기존 패스워드 확인, * userPswd 값에 있는 회원 암호가 맞는지 확인합니다. - * @param userPswdMap + * @param rq * @return */ @PostMapping(value = "/profile/pwcheck") @Operation(summary = "기존 회원의 패스워드 확인", description = " jwt토큰에 등록된 유저정보와 패스워드가 일치하는지 확인합니다. 입력 예시 -> userPswd : test1234 ") - public ResponseEntity extendpsw(@Parameter(name="userPswd", description = "유저 비밀번호", in = ParameterIn.QUERY, example = "test1234") String userPswd){ + public ResponseEntity extendpsw(@RequestBody AcntCstmrPswdCheckRQ rq){ Map resultMap = new HashMap(); try { - boolean result = service.extendpsw(userPswd); // 기존 암호가 맞는지 확인하는 기능. + boolean result = service.extendpsw(rq); // 기존 암호가 맞는지 확인하는 기능. resultMap.put("result", result); } catch (CustomException e) { diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java new file mode 100644 index 00000000..53dc13ce --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java @@ -0,0 +1,11 @@ +package com.palnet.biz.api.acnt.cstmr.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class AcntCstmrPswdCheckRQ { + + @Schema(description = "유저의 비밀번호", example = "test1234") + private String userPswd; +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java index 4dbfb279..e177b9db 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java @@ -5,18 +5,13 @@ import java.util.List; import javax.persistence.EntityManagerFactory; +import com.palnet.biz.api.acnt.cstmr.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; -import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel; -import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.jpa.entity.PtyCstmrBas; @@ -259,8 +254,10 @@ public class AcntCstmrService { * @param userPswd * @return */ - public boolean extendpsw(String userPswd){ + public boolean extendpsw(AcntCstmrPswdCheckRQ rq){ boolean result = false; + String userPswd = rq.getUserPswd(); + // 1. 토큰 유저 정보 불러오기 Integer userId = jwtTokenUtil.getCstmrSnoByToken();