zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

add method

Browse Source
This commit is contained in:
Looly
2022-10-26 10:54:56 +08:00
parent 6064586ef9
commit c79cdc1f6f
17 changed files with 131 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
View File

@@ -388,7 +388,7 @@ public class JWT implements RegisteredPayload<JWT> {
// 校验时间字段
try {
JWTValidator.of(this).validateDate(DateUtil.date(), leeway);
JWTValidator.of(this).validateDate(DateUtil.now(), leeway);
} catch (final ValidateException e) {
return false;
}

4
hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
View File

@@ -90,7 +90,7 @@ public class JWTValidator {
* @since 5.7.3
*/
public JWTValidator validateDate() throws ValidateException {
return validateDate(DateUtil.beginOfSecond(DateUtil.date()));
return validateDate(DateUtil.beginOfSecond(DateUtil.now()));
}
/**
@@ -190,7 +190,7 @@ public class JWTValidator {
private static void validateDate(final JWTPayload payload, Date now, final long leeway) throws ValidateException {
if (null == now) {
// 默认当前时间
now = DateUtil.date();
now = DateUtil.now();
// truncate millis
now.setTime(now.getTime() / 1000 * 1000);
}

4
hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
View File

@@ -50,11 +50,11 @@ public class JSONUtilTest {
public void toJsonStrTest() {
final UserA a1 = new UserA();
a1.setA("aaaa");
a1.setDate(DateUtil.date());
a1.setDate(DateUtil.now());
a1.setName("AAAAName");
final UserA a2 = new UserA();
a2.setA("aaaa222");
a2.setDate(DateUtil.date());
a2.setDate(DateUtil.now());
a2.setName("AAAA222Name");
final ArrayList<UserA> list = ListUtil.of(a1, a2);

18
hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
View File

@@ -13,13 +13,13 @@ public class JWTValidatorTest {
@Test(expected = ValidateException.class)
public void expiredAtTest(){
final String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE0Nzc1OTJ9.isvT0Pqx0yjnZk53mUFSeYFJLDs-Ls9IsNAm86gIdZo";
JWTValidator.of(token).validateDate(DateUtil.date());
JWTValidator.of(token).validateDate(DateUtil.now());
}
@Test(expected = ValidateException.class)
public void issueAtTest(){
final String token = JWT.of()
.setIssuedAt(DateUtil.date())
.setIssuedAt(DateUtil.now())
.setKey("123456".getBytes())
.sign();
@@ -30,18 +30,18 @@ public class JWTValidatorTest {
@Test
public void issueAtPassTest(){
final String token = JWT.of()
.setIssuedAt(DateUtil.date())
.setIssuedAt(DateUtil.now())
.setKey("123456".getBytes())
.sign();
// 签发时间早于被检查的时间
JWTValidator.of(token).validateDate(DateUtil.date());
JWTValidator.of(token).validateDate(DateUtil.now());
}
@Test(expected = ValidateException.class)
public void notBeforeTest(){
final JWT jwt = JWT.of()
.setNotBefore(DateUtil.date());
.setNotBefore(DateUtil.now());
JWTValidator.of(jwt).validateDate(DateUtil.yesterday());
}
@@ -49,14 +49,14 @@ public class JWTValidatorTest {
@Test
public void notBeforePassTest(){
final JWT jwt = JWT.of()
.setNotBefore(DateUtil.date());
JWTValidator.of(jwt).validateDate(DateUtil.date());
.setNotBefore(DateUtil.now());
JWTValidator.of(jwt).validateDate(DateUtil.now());
}
@Test
public void validateAlgorithmTest(){
final String token = JWT.of()
.setNotBefore(DateUtil.date())
.setNotBefore(DateUtil.now())
.setKey("123456".getBytes())
.sign();
@@ -79,7 +79,7 @@ public class JWTValidatorTest {
.setPayload("username", "hutool")
.setExpiresAt(DateUtil.parse("2021-10-13 09:59:00"));
JWTValidator.of(jwt).validateDate(DateUtil.date());
JWTValidator.of(jwt).validateDate(DateUtil.now());
}
@Test