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

fix code

Browse Source
This commit is contained in:
Looly
2023-03-23 23:50:59 +08:00
parent e81a63c6ad
commit c8309ef5fb
57 changed files with 764 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
View File

@@ -1,8 +1,9 @@
package cn.hutool.json.jwt.signers;
import cn.hutool.core.codec.binary.Base64;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ByteUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.crypto.asymmetric.Sign;
import java.nio.charset.Charset;
@@ -63,7 +64,7 @@ public class AsymmetricJWTSigner implements JWTSigner {
@Override
public boolean verify(final String headerBase64, final String payloadBase64, final String signBase64) {
return sign.verify(
StrUtil.bytes(StrUtil.format("{}.{}", headerBase64, payloadBase64), charset),
ByteUtil.toBytes(StrUtil.format("{}.{}", headerBase64, payloadBase64), charset),
Base64.decode(signBase64));
}

7
hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
View File

@@ -1,7 +1,8 @@
package cn.hutool.json.jwt.signers;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ByteUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.crypto.digest.HMac;
import java.nio.charset.Charset;
@@ -58,8 +59,8 @@ public class HMacJWTSigner implements JWTSigner {
public boolean verify(final String headerBase64, final String payloadBase64, final String signBase64) {
final String sign = sign(headerBase64, payloadBase64);
return hMac.verify(
StrUtil.bytes(sign, charset),
StrUtil.bytes(signBase64, charset));
ByteUtil.toBytes(sign, charset),
ByteUtil.toBytes(signBase64, charset));
}
@Override

11
hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.json.jwt;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ByteUtil;
import cn.hutool.json.jwt.signers.AlgorithmUtil;
import cn.hutool.json.jwt.signers.JWTSigner;
import cn.hutool.json.jwt.signers.JWTSignerUtil;
@@ -10,12 +10,7 @@ import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.Base64;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
public class JWTTest {
@@ -96,7 +91,7 @@ public class JWTTest {
"eyJ1c2VyX25hbWUiOiJhZG1pbiIsInNjb3BlIjpbImFsbCJdLCJleHAiOjE2MjQwMDQ4MjIsInVzZXJJZCI6MSwiYXV0aG9yaXRpZXMiOlsiUk9MRV_op5LoibLkuozlj7ciLCJzeXNfbWVudV8xIiwiUk9MRV_op5LoibLkuIDlj7ciLCJzeXNfbWVudV8yIl0sImp0aSI6ImQ0YzVlYjgwLTA5ZTctNGU0ZC1hZTg3LTVkNGI5M2FhNmFiNiIsImNsaWVudF9pZCI6ImhhbmR5LXNob3AifQ." +
"aixF1eKlAKS_k3ynFnStE7-IRGiD5YaqznvK2xEjBew";
final boolean verify = JWT.of(token).setKey(StrUtil.utf8Bytes("123456")).verify();
final boolean verify = JWT.of(token).setKey(ByteUtil.toUtf8Bytes("123456")).verify();
Assert.assertTrue(verify);
}