로그인시 기본정보 추가

- email
- 전화번호
- 전화번호(국가번호)
- 생일

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRsModel.java

@@ -1,6 +1,7 @@
 package com.palnet.biz.api.acnt.jwt.model;
 
 import java.io.Serializable;
+import java.time.Instant;
 
 import lombok.Data;
 
@@ -17,5 +18,9 @@ public class JwtRsModel implements Serializable {
 	
 	private String auth;
 
+	private Instant brthdyDate;
+	private String clncd;
+	private String hpno;
+	private String email;
 
 }

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java

@@ -1,58 +1,46 @@
 package com.palnet.biz.api.acnt.jwt.service;
 
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService;
 import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel;
 import com.palnet.biz.api.acnt.jwt.model.JwtRqModel;
 import com.palnet.biz.api.acnt.jwt.model.JwtRsModel;
 import com.palnet.biz.api.acnt.jwt.model.JwtUserModel;
 import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
-import com.palnet.biz.api.comn.response.ErrorResponse;
-import com.palnet.biz.api.comn.response.SuccessResponse;
-import com.palnet.biz.jpa.entity.CtrCntrlBas;
 import com.palnet.biz.jpa.entity.PtyCstmrBas;
 import com.palnet.biz.jpa.entity.PtyCstmrConectHist;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrConectHistRepository;
+import com.palnet.biz.jpa.repository.pty.PtyCstmrDtlRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository;
 import com.palnet.comn.code.ErrorCode;
 import com.palnet.comn.exception.CustomException;
-import com.palnet.comn.utils.DateUtils;
 import com.palnet.comn.utils.EncryptUtils;
 import com.palnet.comn.utils.HttpUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import lombok.extern.log4j.Log4j2;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
+@Slf4j
+@RequiredArgsConstructor
 @Service
-@Log4j2
 public class JwtService {
-	@Autowired
-	private PtyCstmrBasRepository ptyCstmrBasRepository;
 
-	@Autowired
+    private final PtyCstmrBasRepository ptyCstmrBasRepository;
-	private PtyCstmrConectHistRepository ptyCstmrConectHistRepository;
+    private final PtyCstmrDtlRepository ptyCstmrDtlRepository;
-	
+    private final PtyCstmrConectHistRepository ptyCstmrConectHistRepository;
-	@Autowired
+    private final JwtUserDetailsService userDetailsService;
-	private JwtUserDetailsService userDetailsService;
+    private final PtyCstmrQueryRepository query;
-	
+    private final JwtTokenUtil jwtTokenUtil;
-	@Autowired
-	private PtyCstmrQueryRepository query ;
-	
-	@Autowired
-	private JwtTokenUtil jwtTokenUtil;
 
     /**
      * 로그인 처리
+     *
      * @param rq
      * @return
      */
@@ -126,6 +114,14 @@ public class JwtService {
             result.setAuth(userDetails.getAuth());
             result.setUserId(userDetails.getUserId());
             result.setCstmrSno(userDetails.getCstmrSno());
+
+            ptyCstmrDtlRepository.findById(userDetails.getCstmrSno()).ifPresent(ptyCstmrDtl -> {
+                result.setClncd(ptyCstmrDtl.getClncd());
+                result.setHpno(ptyCstmrDtl.getHpno());
+                result.setEmail(ptyCstmrDtl.getEmail());
+                result.setBrthdyDate(ptyCstmrDtl.getBrthdyDate());
+            });
+
             //토큰 저장 처리
             log.debug("========= refresh>>>>" + refreshToken);
             this.refreshTokenSave(userDetails.getCstmrSno(), refreshToken);
@@ -158,6 +154,7 @@ public class JwtService {
 
     /**
      * 로그인 이력 저장
+     *
      * @param cstmrSno
      * @param loginYn
      * @param errorCode
@@ -178,6 +175,7 @@ public class JwtService {
 
     /**
      * refresh Token 저장 처리
+     *
      * @param cstmrSno
      * @param refreshToken
      * @return
@@ -199,6 +197,7 @@ public class JwtService {
 
     /**
      * 프로필 조회
+     *
      * @param cstmrSno
      * @return
      * @throws Exception
@@ -212,6 +211,7 @@ public class JwtService {
 
     /**
      * token 만료시 refresh 토큰으로 재검색
+     *
      * @param cstmrSno
      * @param refreshToken
      * @return

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtUserDetailsService.java

@@ -1,36 +1,24 @@
 package com.palnet.biz.api.acnt.jwt.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
 import com.palnet.biz.api.acnt.jwt.model.JwtUserModel;
-import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository;
-import com.palnet.comn.utils.JsonUtils;
-
 import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
-@Log4j2
 public class JwtUserDetailsService implements UserDetailsService {
 
-	@Autowired
+    private final PtyCstmrQueryRepository query;
-	private PtyCstmrQueryRepository query ;
-	
-	@Autowired
-	private PtyCstmrBasRepository repository;
-	
-	
 
     @Override
     public JwtUserModel loadUserByUsername(String username) {
 
         JwtUserModel model = query.findUserPassword(username);
-//		log.debug("jwtUser>>>>" + JsonUtils.toJson(model));
+
         if (model == null) {
             return null;
         } else {

pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrDtlRepository.java

@@ -1,12 +1,9 @@
 package com.palnet.biz.jpa.repository.pty;
 
+import com.palnet.biz.jpa.entity.PtyCstmrDtl;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.palnet.biz.jpa.entity.CtrCntrlBas;
-import com.palnet.biz.jpa.entity.PtyCstmrDtl;
-import com.palnet.biz.jpa.entity.PtyTermsBas;
-
 @Repository
 public interface PtyCstmrDtlRepository extends JpaRepository<PtyCstmrDtl, Integer>{