This commit is contained in:
@jyuhsin
2025-10-31 17:50:29 +08:00
parent ca7771e732
commit 65612a4e67
3 changed files with 7 additions and 16 deletions
@@ -14,7 +14,7 @@ import java.util.Base64;
* @Version 1.0
* @Description TODO
*/
public class RsaUtils {
public class RsaUtil {
static {
Security.addProvider(new BouncyCastleProvider());
}
@@ -1,7 +1,6 @@
package com.budwk.app.sys.controller;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.codec.Base64Decoder;
import cn.hutool.core.codec.Base64Encoder;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
@@ -13,7 +12,7 @@ import com.budwk.app.base.enums.LoginType;
import com.budwk.app.base.exception.BaseException;
import com.budwk.app.base.interceptor.sLog.SLogService;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.RsaUtils;
import com.budwk.app.base.utils.RsaUtil;
import com.budwk.app.sys.models.Sys_log;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.sys.services.SysUserService;
@@ -42,13 +41,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Base64;
import java.util.Map;
import java.util.UUID;
@@ -269,9 +262,9 @@ public class SysLoginController {
public Object publicKey() {
try {
// 生成密钥对
KeyPair keyPair = RsaUtils.generateKeyPair();
String publicKeyStr = RsaUtils.getPublicKeyBase64(keyPair.getPublic());
String privateKeyStr = RsaUtils.getPrivateKeyBase64(keyPair.getPrivate());
KeyPair keyPair = RsaUtil.generateKeyPair();
String publicKeyStr = RsaUtil.getPublicKeyBase64(keyPair.getPublic());
String privateKeyStr = RsaUtil.getPrivateKeyBase64(keyPair.getPrivate());
// 生成 UUID 作为 keyId
String keyId = UUID.randomUUID().toString().replace("-", "");
@@ -2,8 +2,7 @@ package com.budwk.app.web.commons.auth.service;
import com.budwk.app.base.constant.RedisConstant;
import com.budwk.app.base.exception.BaseException;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.RsaUtils;
import com.budwk.app.base.utils.RsaUtil;
import com.wf.captcha.ArithmeticCaptcha;
import lombok.extern.slf4j.Slf4j;
import org.nutz.integration.jedis.RedisService;
@@ -14,7 +13,6 @@ import org.nutz.lang.random.R;
import org.nutz.lang.util.NutMap;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Base64;
@@ -118,6 +116,6 @@ public class ValidateService {
PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privateKeyBytes);
PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(keySpec);
// 解密密码
return RsaUtils.decrypt(password, privateKey);
return RsaUtil.decrypt(password, privateKey);
}
}