From 27db32363b205fdc5cfe73ea0e874887a7e49a79 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 24 Mar 2025 10:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=9C=8D=E5=8A=A1=20?= =?UTF-8?q?=E7=A7=98=E9=92=A5=E6=96=87=E4=BB=B6=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=88=90=20=20=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/wechat/config/WechatConfig.java | 9 +++-- .../hd/wechat/config/XcxProperties.java | 8 +++- ...itional-spring-configuration-metadata.json | 10 +++++ .../src/main/resources/application.yml | 40 +++++++++++++++++++ 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/config/WechatConfig.java b/wechat-server/src/main/java/com/evotech/hd/wechat/config/WechatConfig.java index e60a84d..850aebd 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/config/WechatConfig.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/config/WechatConfig.java @@ -23,9 +23,11 @@ public class WechatConfig { RSAPublicKeyConfig config = new RSAPublicKeyConfig.Builder() .merchantId(xcxProperties().getMchid()) .merchantSerialNumber(xcxProperties().getSerialNo()) - .privateKeyFromPath(xcxProperties().getPrivateKeyPath()) + .privateKey(xcxProperties().getPrivateKeyString()) +// .privateKeyFromPath(xcxProperties().getPrivateKeyPath()) .publicKeyId(xcxProperties().getPublicKeyId()) - .publicKeyFromPath(xcxProperties().getPublicKeyPath()) +// .publicKeyFromPath(xcxProperties().getPublicKeyPath()) + .publicKey(xcxProperties().getPublicKeyString()) .apiV3Key(xcxProperties().getApiV3Key()) .build(); return config; @@ -58,7 +60,8 @@ public class WechatConfig { RSAPublicKeyNotificationConfig rsaPublicKeyNotificationConfig() { RSAPublicKeyNotificationConfig config = new RSAPublicKeyNotificationConfig.Builder() .publicKeyId(xcxProperties().getPublicKeyId()) - .publicKeyFromPath(xcxProperties().getPublicKeyPath()) +// .publicKeyFromPath(xcxProperties().getPublicKeyPath()) + .publicKey(xcxProperties().getPublicKeyString()) .apiV3Key(xcxProperties().getApiV3Key()) .build(); return config; diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/config/XcxProperties.java b/wechat-server/src/main/java/com/evotech/hd/wechat/config/XcxProperties.java index e3f261a..d5296eb 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/config/XcxProperties.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/config/XcxProperties.java @@ -22,7 +22,9 @@ public class XcxProperties { private String apiV3Key; - private String privateKeyPath; +// private String privateKeyPath; + + private String privateKeyString; private String notifyUrl; @@ -32,6 +34,8 @@ public class XcxProperties { private String publicKeyId; - private String publicKeyPath; +// private String publicKeyPath; + + private String publicKeyString; } diff --git a/wechat-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/wechat-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 4b52dd7..1adda40 100644 --- a/wechat-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/wechat-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -98,5 +98,15 @@ "name": "hbyt.gzh.wallet_recharge_template_id", "type": "java.lang.String", "description": "A description for 'hbyt.gzh.wallet_recharge_template_id'" + }, + { + "name": "hbyt.xcx.private_key_string", + "type": "java.lang.String", + "description": "A description for 'hbyt.xcx.private_key_string'" + }, + { + "name": "hbyt.xcx.public_key_string", + "type": "java.lang.String", + "description": "A description for 'hbyt.xcx.public_key_string'" } ]} \ No newline at end of file diff --git a/wechat-server/src/main/resources/application.yml b/wechat-server/src/main/resources/application.yml index 2af0775..3284be6 100644 --- a/wechat-server/src/main/resources/application.yml +++ b/wechat-server/src/main/resources/application.yml @@ -54,10 +54,50 @@ hbyt: serial_no: 32B3AF8FD49920B7455E6A38B7A2AFE9004632D0 # 商户API证书私钥 private_key_path: src/main/resources/static/key/apiclient_key.pem + private_key_string: | + -----BEGIN PRIVATE KEY----- + MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDELHk4ENctyx2X + SFbvb7Cy96wQp3y1xMHPt1vb/JSyuHYPzVi9BsORkGfavkeOtRSv/tWWeiqYlxs+ + JF/FTHga5V0Q+DmOItmEfxdCvpJfNxAy1dMSq7RpkoAypzjmhS1uDOaM7zzUqX2Z + pOVhV1JNx+64q4E2WfnVRCOBj7/RZfFfOqOWeWUo98ziVwsk7Tw8DSK4/8MKHSst + WCfwVNKQVP1yrefZNz+vtRNHBovpJltnujt2YbIhLC7fbOsy+N4cDN4hKiqczukv + qnbjU7qHJur2bImawPU+KBMEEFvVEihDniB1h5HSTqB55aU9B5GEO3ZuFl9f93dC + 0raZaAaPAgMBAAECggEAYqwL/MtbsEjuBV35fE2tjxdMkMPt0m+5HIWZyrjtAkgN + +jzLWajBTcJYuoni7EDguvVu8VVZf47hwQwCr/aaosyjVxnDuV6GEkLqrEO20/Wa + TDeJB2ceQ8vQd6ns0OZDx4rtnA3phv4JkvKB/cgyObVKudBqGbCAHWk8grqPPP8s + AAW+2vdsqpceI6CLlWQNiTmaxT67kISPrRY8P7wwrrEog7YYcU0UAyxW2WilisPE + IaXy+tuTxTcsVbXDEi2Yo3VFm9AudgG5+Vtxo3ZtalJOwFNi8MTjeQhK4qgM5PwO + gydqZmox5AZ/kabDG4V1pl//6I5H1Uc7d7JVhBF44QKBgQDr85C+td2OKUN5RhAx + KvVQtEyNVeU1n3NVExszW+j6QSXiN2SdSqOMn/XiYQGoH/HFbKEfZAXfvfaRTEQC + Rs0Vmp26bxXAO0t8gi1x+iZ6XA3MRimzx6QDDRQzH1R0Jr4AaIYqphvxVIcgrHBJ + KRxUokDJqm0UXL3JL58ZJnA87QKBgQDU16kIcLqYoyp1Q0HLTJIpflDAoy1u4ul0 + TLPb1l38sbSQdgobAJoOsuyfSX2VEukbw2o2oBWwhXs/2Onn1fR3k0AJr7xskckh + +bV4ema+YFgkCsvtXr941w4wwwGtvPvQIv4CcGvndKyptP4pFW/HlevW6gIyGkBK + deDpqXZd6wKBgCuuovx7pPHdt80q6HKB1nrDdmywG0grJen5KI8AlAhIqV/RC4KH + P/IX5yiq9uiOSW9YZhfup5u9inlp2illvDAkuNC8IhW9pIL/grRYMGl0w2UvFCdh + bX7XHAc+5J7AUWq37ybUK9Yo5P9qjTsuLj2I8F+lep5LcSNe+qBoWl0dAoGAMN1K + O1vWGxDqwH0ub8QmkkwjsfZEif6iZkbty/zNGySZNclDzKs4s0M0u+UdZcovpmYY + zm22TQ54G1JrcQRX2dP+kbq84ZgeuyQfG4fOasqnsa6g3uAvyUhmQ5+hlQecME64 + TksNGthYg6W/7CK1xPaQbIjQ9Du+otmpRzvWpv0CgYEAp0qkxXS1yoDbWuwQy3B/ + F3BngGf3SlHO37xwhGE2gOiKIOv0nLhp1ylyrAysloIvZzExCQkOj7OyWfz/hM/l + fS+WJSkaCzqiggAS3lT4zsn6URmI3MlWpWPqke6xq/+9HOmkiuDQ6uLhgcenm1T4 + Mp1tXVhA/d8Nd5Omp/UQnzs= + -----END PRIVATE KEY----- + # 微信支付公钥ID public_key_id: PUB_KEY_ID_0116958859212025012300219100001373 # 微信支付公钥 public_key_path: src/main/resources/static/key/pub_key.pem + public_key_string: > + -----BEGIN PUBLIC KEY----- + MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5IBW62BcctzRG5cBrdx8 + asfPszU1Rf/PK0/Is5oWQez8cV3Id5gwJTHqZ6ybHZq1Zw7owr23PnDmymuYIykB + JwI0ckQuzNkxsxhCOOUqMK9UZKdnUkxO2dplA7qrQiDdfVOAs+tMdmsI4P3hEdTP + zrLQMMD5gRicKfn1SFEkZQKDgvmcNNirjBC5pNYCIHSa79F3g86wpFPbiui29o/l + 1tnqLWXpCQaHQ1W3i32Na1uI4/4186ekMYhbx0JEgNGFvbpE3inxrsKQBx5Bkg3p + lbr3Yydj2qKo7RMM8HGVIrFcgOD5aEdTgxyM7WpO56kFh4w6CqCcchk1bE2ZZrqc + FwIDAQAB + -----END PUBLIC KEY----- # 支付回调地址 notify_url: https://api.evo-techina.com/wechat/wechatpay/prepayback/msg # Native支付回调地址