diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppKeyPairResult.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppKeyPairResult.java index 92777fa..dfcc9bc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppKeyPairResult.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppKeyPairResult.java @@ -1,7 +1,7 @@ package com.ruoyi.system.domain.vo; /** - * RSA 密钥对生成结果。 + * RSA 密钥对生成结果,公钥为 X.509 PEM,私钥为 PKCS#8 PEM。 * privateKey 只在生成接口本次响应中出现,服务端绝不持久化。 */ public class AppKeyPairResult { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java index e5b0ccd..30dbd96 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsServiceImpl.java @@ -60,8 +60,8 @@ public class AppsServiceImpl extends ServiceImpl implement generator.initialize(RSA_KEY_SIZE); KeyPair keyPair = generator.generateKeyPair(); return new AppKeyPairResult("RSA", RSA_KEY_SIZE, - Base64.getEncoder().encodeToString(keyPair.getPublic().getEncoded()), - Base64.getEncoder().encodeToString(keyPair.getPrivate().getEncoded())); + toPem("PUBLIC KEY", keyPair.getPublic().getEncoded()), + toPem("PRIVATE KEY", keyPair.getPrivate().getEncoded())); } catch (Exception e) { throw new CustomException("RSA 密钥对生成失败", e); } @@ -439,6 +439,12 @@ public class AppsServiceImpl extends ServiceImpl implement } } + /** 将 DER 密钥编码为标准 PEM,正文固定每行 64 个字符。 */ + private String toPem(String type, byte[] encodedKey) { + String body = Base64.getMimeEncoder(64, new byte[] { '\n' }).encodeToString(encodedKey); + return "-----BEGIN " + type + "-----\n" + body + "\n-----END " + type + "-----"; + } + private void validateIds(Long[] ids) { if (ids == null || ids.length == 0) throw new CustomException("请选择要删除的商户"); for (Long id : ids) if (id == null) throw new CustomException("商户 ID 不能为空");