From 8fa323414acf34deda03dd0567555f7c0f11daad Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Fri, 7 Feb 2025 14:49:08 +0900
Subject: [PATCH] =?UTF-8?q?map=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/MemberAuthSuccessHandler.java      |  8 +++++++-
 .../localhost/mapper/NetmemberMapper.java      |  4 +++-
 .../localhost/service/NetmemberService.java    | 18 ++++++++++++++++--
 src/main/resources/mapper/netmemberMapper.xml  |  7 +++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/company/localhost/common/security/handler/MemberAuthSuccessHandler.java b/src/main/java/io/company/localhost/common/security/handler/MemberAuthSuccessHandler.java
index d79fa78..45b3d53 100644
--- a/src/main/java/io/company/localhost/common/security/handler/MemberAuthSuccessHandler.java
+++ b/src/main/java/io/company/localhost/common/security/handler/MemberAuthSuccessHandler.java
@@ -16,6 +16,7 @@ package io.company.localhost.common.security.handler;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.company.localhost.common.dto.ApiResponse;
+import io.company.localhost.common.dto.MapDto;
 import io.company.localhost.common.security.service.TokenService;
 import io.company.localhost.service.NetmemberService;
 import io.company.localhost.vo.MemberVo;
@@ -33,6 +34,8 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Component("successHandler")
@@ -63,7 +66,10 @@ public class MemberAuthSuccessHandler implements AuthenticationSuccessHandler {
         String loginToken = tokenService.generateToken(username, "login");
 
         // DB에 저장
-        netmemberService.updateMemberToken(username, loginToken);
+        MapDto map = new MapDto();
+        map.put("id", username);
+        map.put("token", loginToken);
+        netmemberService.updateMemberToken(map);
 
 		response.setStatus(HttpStatus.OK.value());
 		response.setContentType(MediaType.APPLICATION_JSON_VALUE);
diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java
index 39fbbc1..4849b6e 100644
--- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java
+++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java
@@ -26,13 +26,15 @@ public interface NetmemberMapper {
 
 	MemberVo findByLoginId(String id);
 	
-	int updateMemberToken(String id, String token);
+	int updateMemberToken(MapDto map);
 	
 	int insertMember(MapDto map);
 	
 	int selectCheckId(String memberIds);
 	
 	int selectPwReset(MapDto map);
+	
+	String selectPassword(String id);
 
 	int updatePassword(MapDto map);
 
diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java
index 889d93f..cbbb701 100644
--- a/src/main/java/io/company/localhost/service/NetmemberService.java
+++ b/src/main/java/io/company/localhost/service/NetmemberService.java
@@ -96,8 +96,8 @@ public class NetmemberService {
 	 * @param id, token
 	 * @return
 	 */
-	public void updateMemberToken(String id, String token) {
-		memberMapper.updateMemberToken(id, token);
+	public void updateMemberToken(MapDto map) {
+		memberMapper.updateMemberToken(map);
 	}
 
 	/**
@@ -109,6 +109,20 @@ public class NetmemberService {
 	public boolean selectPwReset(MapDto map) {
 		return memberMapper.selectPwReset(map) > 0;
 	}
+	
+	/**
+	 * 기존 비밀번호 체크
+	 * 
+	 * @param map
+	 * @return
+	 */
+	public boolean selectPassword(MapDto map) {
+	    String currentPassword = memberMapper.selectPassword(map.getString("id"));
+	    String newPassword = map.getString("password");
+	    
+	    // 기존 비밀번호, 새 비밀번호 같은지 확인
+	    return !passwordEncoder.matches(newPassword, currentPassword);
+	}
 
 	/**
 	 * 비밀번호 재설정
diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml
index 72e17d3..9dff499 100644
--- a/src/main/resources/mapper/netmemberMapper.xml
+++ b/src/main/resources/mapper/netmemberMapper.xml
@@ -105,6 +105,13 @@
         AND MEMBERPWR = #{pwhintRes}
 	</select>
 	
+	<!-- 비밀번호 재설정 기존 비밀번호 체크 -->
+	<select id="selectPassword">
+	    SELECT MEMBERPWD
+	    FROM netmember
+	    WHERE MEMBERIDS = #{id}
+	</select>
+	
 	<!-- 비밀번호 재설정 -->
 	<update id="updatePassword">
 		UPDATE netmember