|
|
@ -18,7 +18,6 @@ import com.palnet.comn.utils.HttpUtils; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
import java.time.Instant; |
|
|
|
import java.time.Instant; |
|
|
@ -217,18 +216,21 @@ public class JwtService { |
|
|
|
* @param refreshToken |
|
|
|
* @param refreshToken |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public JwtRsModel findRefreshtoken(int cstmrSno, String refreshToken) { |
|
|
|
public JwtRsModel findRefreshtoken(int cstmrSno, String refreshToken) throws Exception { |
|
|
|
JwtUserModel userDetails = query.findRefreshtoken(cstmrSno, refreshToken); |
|
|
|
JwtUserModel userDetails = query.findRefreshtoken(cstmrSno, refreshToken); |
|
|
|
|
|
|
|
|
|
|
|
if (userDetails == null) { |
|
|
|
if (userDetails == null) { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String accessToken = jwtTokenUtil.generateToken(userDetails); |
|
|
|
String createAccessToken = jwtTokenUtil.generateToken(userDetails); |
|
|
|
|
|
|
|
String createRefreshToken = jwtTokenUtil.generateRefreshToken(userDetails); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.refreshTokenSave(cstmrSno, createRefreshToken); |
|
|
|
|
|
|
|
|
|
|
|
JwtRsModel result = new JwtRsModel(); |
|
|
|
JwtRsModel result = new JwtRsModel(); |
|
|
|
result.setAccessToken(accessToken); |
|
|
|
result.setAccessToken(createAccessToken); |
|
|
|
result.setRefreshToken(refreshToken); |
|
|
|
result.setRefreshToken(createRefreshToken); |
|
|
|
result.setAuth(userDetails.getAuth()); |
|
|
|
result.setAuth(userDetails.getAuth()); |
|
|
|
result.setUserId(userDetails.getUserId()); |
|
|
|
result.setUserId(userDetails.getUserId()); |
|
|
|
result.setCstmrSno(userDetails.getCstmrSno()); |
|
|
|
result.setCstmrSno(userDetails.getCstmrSno()); |
|
|
|