diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java
index 0349b1a9..54643e53 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java
@@ -18,7 +18,6 @@ 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 java.time.Instant;
@@ -217,18 +216,21 @@ public class JwtService {
      * @param refreshToken
      * @return
      */
-    public JwtRsModel findRefreshtoken(int cstmrSno, String refreshToken) {
+    public JwtRsModel findRefreshtoken(int cstmrSno, String refreshToken) throws Exception {
         JwtUserModel userDetails = query.findRefreshtoken(cstmrSno, refreshToken);
 
         if (userDetails == 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();
-        result.setAccessToken(accessToken);
-        result.setRefreshToken(refreshToken);
+        result.setAccessToken(createAccessToken);
+        result.setRefreshToken(createRefreshToken);
         result.setAuth(userDetails.getAuth());
         result.setUserId(userDetails.getUserId());
         result.setCstmrSno(userDetails.getCstmrSno());
diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java
index 92546921..80148049 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java
@@ -59,7 +59,7 @@ public class SunRiseSetService {
         // continue 20240201
         List<String> locations = getLocation();
 //        LocalDate targetDate = LocalDate.now();
-        LocalDate targetDate = LocalDate.of(2024, 4, 1);
+        LocalDate targetDate = LocalDate.of(2024, 5, 1);
         LocalDate end = targetDate.plusMonths(6);
         List<SunRiseSetRs> sunRiseSet = new ArrayList<>();
 
diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java
index 18be4a6c..160af1c2 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java
@@ -222,6 +222,7 @@ public class PtyCstmrQueryRepository {
                 .from(basEntity)
                 .where(builder)
                 .fetchFirst();
+
         if (entity != null) {
             JwtUserModel model = new JwtUserModel();
             model.setAuth(entity.getAuthId());