日期UTC转换修改为+8时区

src/main/java/cn/quantgroup/xyqb/model/UserInfoRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserInfoEntity;
+import cn.quantgroup.xyqb.util.DateUtils;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 
@@ -50,8 +51,9 @@ public class UserInfoRet implements Serializable {
      * @return UserInfoRet
      */
     public static UserInfoRet getUserDetail(UserInfoEntity userInfoEntity) {
-        long createTimeStamp = userInfoEntity.getCreatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
-        long updateTimeStamp = userInfoEntity.getUpdatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
+        Long createTimeStamp = DateUtils.getTimestamp(userInfoEntity.getCreatedAt());
+        Long updateTimeStamp = DateUtils.getTimestamp(userInfoEntity.getUpdatedAt());
+
         UserInfoRet userDetailRet = new UserInfoRet();
         userDetailRet.setId(userInfoEntity.getId());
         userDetailRet.setUserId(userInfoEntity.getUserId());

src/main/java/cn/quantgroup/xyqb/model/UserRegisterMqMessage.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.util.DateUtils;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -35,8 +36,8 @@ public class UserRegisterMqMessage implements Serializable {
     private Long updatedAt;
 
     public UserRegisterMqMessage(User user) {
-        Long createTimeStamp = user.getCreatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
-        Long updateTimeStamp = user.getUpdatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
+        Long createTimeStamp = DateUtils.getTimestamp(user.getCreatedAt());
+        Long updateTimeStamp = DateUtils.getTimestamp(user.getUpdatedAt());
         this.setId(user.getId());
         this.setPhoneNo(user.getPhoneNo());
         this.setEnable(user.getEnable());

src/main/java/cn/quantgroup/xyqb/model/UserRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.util.DateUtils;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Objects;
 
@@ -48,8 +50,8 @@ public class UserRet implements Serializable {
         if(Objects.isNull(user)){
             return;
         }
-        Long createTimeStamp = user.getCreatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
-        Long updateTimeStamp = user.getUpdatedAt().toInstant(ZoneOffset.UTC).toEpochMilli();
+        Long createTimeStamp = DateUtils.getTimestamp(user.getCreatedAt());
+        Long updateTimeStamp = DateUtils.getTimestamp(user.getUpdatedAt());
         this.setId(user.getId());
         this.setPhoneNo(user.getPhoneNo());
         this.setEnable(user.getEnable());

src/main/java/cn/quantgroup/xyqb/service/captcha/impl/GeetestLogServiceImpl.java

@@ -6,6 +6,7 @@ import cn.quantgroup.xyqb.model.ClientType;
 import cn.quantgroup.xyqb.model.SettingType;
 import cn.quantgroup.xyqb.repository.IGeetestLogRepository;
 import cn.quantgroup.xyqb.service.captcha.IGeetestLogService;
+import cn.quantgroup.xyqb.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Calendar;
@@ -40,14 +42,14 @@ public class GeetestLogServiceImpl implements IGeetestLogService {
         geetestLogEntity.setChallenge(imgMap.getOrDefault("reChallenge", ""));
         geetestLogEntity.setCaptchaId(imgMap.getOrDefault("gt", ""));
         if (imgMap.containsKey(Constants.QG_CAPTCHA_INITDT)) {
-            geetestLogEntity.setInitializeDt(Date.from(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_INITDT)).toInstant(ZoneOffset.UTC)));
+            geetestLogEntity.setInitializeDt(DateUtils.convertDate(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_INITDT))));
         }
         if (imgMap.containsKey(Constants.QG_CAPTCHA_REGISTERDT)) {
-            geetestLogEntity.setRegisterDt(Date.from(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_REGISTERDT)).toInstant(ZoneOffset.UTC)));
+            geetestLogEntity.setRegisterDt(DateUtils.convertDate(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_REGISTERDT))));
         }
 
         if (imgMap.containsKey(Constants.QG_CAPTCHA_REGISTERREDT)) {
-            geetestLogEntity.setRegisterReDt(Date.from(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_REGISTERREDT)).toInstant(ZoneOffset.UTC)));
+            geetestLogEntity.setRegisterReDt(DateUtils.convertDate(LocalDateTime.parse(imgMap.get(Constants.QG_CAPTCHA_REGISTERREDT))));
         }
         geetestLogEntity = geetestLogRepository.saveAndFlush(geetestLogEntity);
         return geetestLogEntity.getId();

src/main/java/cn/quantgroup/xyqb/util/DateUtils.java

@@ -4,6 +4,9 @@ import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -57,4 +60,17 @@ public class DateUtils {
     public static long dayDiff(Date bDate, Date eDate) {
         return  ((bDate.getTime() - eDate.getTime()) / (1000 * 3600 * 24));
     }
+
+    public static Long getTimestamp(String dateTime) {
+        LocalDateTime time = LocalDateTime.parse(dateTime, java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        return time.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+    }
+
+    public static Long getTimestamp(LocalDateTime dateTime) {
+        return dateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+    }
+
+    public static Date convertDate(LocalDateTime dateTime) {
+        return Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
+    }
 }