📝 格式化代码,修改文档

This commit is contained in:
xucun
2025-06-11 19:27:40 +08:00
parent 62eaf468fb
commit b4ff87b80b
5 changed files with 30 additions and 10 deletions

View File

@@ -80,14 +80,17 @@ public class InMemoryWechatTenantService implements WechatTenantService {
}
private WeChatPublicKeyInfo initWeChatPublicKeyInfo(WechatMetaBean meta) {
boolean enablePublicKey=StringUtils.hasLength(meta.getV3().getWeChatPayPublicKeyId()) && StringUtils.hasLength(meta.getV3().getWeChatPayPublicKeyPath());
boolean enablePublicKey=StringUtils.hasLength(meta.getV3().getWechatPayPublicKeyId()) &&
(StringUtils.hasLength(meta.getV3().getWechatPayPublicKeyPath())||StringUtils.hasLength(meta.getV3().getWechatPayPublicKeyAbsolutePath()));
if (!enablePublicKey) {
return null;
}
try {
String certPath=meta.getV3().getWeChatPayPublicKeyPath();
String certPath=meta.getV3().getWechatPayPublicKeyPath();
String certAbsolutePath = meta.getV3().getWechatPayPublicKeyAbsolutePath();
Resource resource =
resourceLoader.getResource(certPath == null ? "classpath:wechat/pub_key.pem" :
StringUtils.hasLength(certAbsolutePath) ? new FileSystemResource(certAbsolutePath) :
resourceLoader.getResource(!StringUtils.hasLength(certPath) ? "classpath:wechat/pub_key.pem" :
certPath.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX) ? certPath : ResourceUtils.CLASSPATH_URL_PREFIX + certPath);
PemReader pemReader = new PemReader(new InputStreamReader(resource.getInputStream()));
PemObject pemObject = pemReader.readPemObject();
@@ -95,10 +98,8 @@ public class InMemoryWechatTenantService implements WechatTenantService {
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
RSAPublicKey publicKey = (RSAPublicKey) keyFactory.generatePublic(keySpec);
// 生成公钥
WeChatPublicKeyInfo keyInfo = new WeChatPublicKeyInfo(publicKey, meta.getV3().getWeChatPayPublicKeyId(), meta.getTenantId());
return keyInfo;
return new WeChatPublicKeyInfo(publicKey, meta.getV3().getWechatPayPublicKeyId(), meta.getTenantId());
}catch (Exception e){
e.printStackTrace();
throw new PayException("An error occurred while generating the public key,Please check the format and content of the configured public key");
}
}

View File

@@ -80,14 +80,16 @@ public class WechatPayProperties {
/**
* wechat pay public key id
*/
private String weChatPayPublicKeyId;
private String wechatPayPublicKeyId;
/**
* see <a href="https://pay.weixin.qq.com/doc/v3/merchant/4012154180#4.1-%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1%E6%94%AF%E4%BB%98%E5%85%AC%E9%92%A5">
* </a>
* wechat pay public key
*/
private String weChatPayPublicKeyPath;
private String wechatPayPublicKeyPath;
private String wechatPayPublicKeyAbsolutePath;
/**
*

View File

@@ -448,7 +448,7 @@ public class SignatureProvider {
public boolean isSwitchVerifySignMethod(String tenantId) {
String publicKeyId=wechatMetaContainer.getWechatMeta(tenantId).getV3().getWeChatPayPublicKeyId();
String publicKeyId=wechatMetaContainer.getWechatMeta(tenantId).getV3().getWechatPayPublicKeyId();
Boolean switchVerifySignMethod = wechatMetaContainer.getWechatMeta(tenantId).getV3().getSwitchVerifySignMethod();
@@ -456,6 +456,6 @@ public class SignatureProvider {
}
public String getWechatPublicKeyId(String tenantId) {
return wechatMetaContainer.getWechatMeta(tenantId).getV3().getWeChatPayPublicKeyId();
return wechatMetaContainer.getWechatMeta(tenantId).getV3().getWechatPayPublicKeyId();
}
}