#309 修复时区中断单元测试的差异

This commit is contained in:
faysalmehmood
2022-09-18 21:58:59 +05:00
parent ea56687f5a
commit 689278e511
3 changed files with 23 additions and 5 deletions

View File

@@ -1,6 +1,8 @@
package cn.dev33.satoken.listener;
import java.util.Date;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.stp.SaLoginModel;
@@ -50,8 +52,9 @@ public class SaTokenListenerForConsolePrint implements SaTokenListener {
*/
@Override
public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
Date date = new Date(System.currentTimeMillis() + disableTime * 1000);
println("账号[" + loginId + "] " + service + " 服务被封禁,封禁等级=" + level + " (解封时间: " + SaFoxUtil.formatDate(date) + ")");
Instant instant = Instant.ofEpochMilli(System.currentTimeMillis() + disableTime * 1000);
ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(instant, ZoneId.systemDefault());
println("账号[" + loginId + "] " + service + " 服务被封禁,封禁等级=" + level + " (解封时间: " + SaFoxUtil.formatDate(zonedDateTime) + ")");
}
/**

View File

@@ -4,6 +4,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -106,6 +108,15 @@ public class SaFoxUtil {
public static String formatDate(Date date){
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
}
/**
* 将日期格式化 yyyy-MM-dd HH:mm:ss
* @param zonedDateTime 日期
* @return 格式化后的时间
*/
public static String formatDate(ZonedDateTime zonedDateTime) {
return zonedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
/**
* 从集合里查询数据