优化商户私钥配置方式 (#11)

* 优化商户私钥配置方式

* 修复错误字

---------

Co-authored-by: jeanwu <[email protected]>

.env.example

@@ -4,8 +4,8 @@ MCHID=1800000001
 # 商户号绑定的AppID
 APPID=wxaaaaaaaaaaaaa1
 
-# 商户号私钥
-PRIVATE_KEY=-----BEGIN PRIVATE KEY-----\n……\n-----END PRIVATE KEY-----\n
+# 商户号私钥文件的本地路径
+PRIVATE_KEY_PATH=/date/XXX.pem
 
 # 商户号公钥序列号
 SERIAL_NUMBER=72AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2

.gitignore

@@ -23,4 +23,5 @@ hs_err_pid*
 replay_pid*
 
 # config
+.pem
 .env

README.md

@@ -17,12 +17,15 @@
 - gradle-8.0
 ## 使用入门
 ### 1、下载代码
-`git clone https://github.com/wechatpay-apiv3/transferbatch-demo-java.git`
-### 2、补充信息
-复制.env.example文件为[.env](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#features.external-config)，按照注释说明补充信息。
-### 3、运行项目
+`git clone https://github.com/wujunjiesd/transferbatch-demo-java.git`
+### 2、创建.env文件
+`cd transferbatch-demo-java`<br>
+`cp .env.example .env`
+### 3、完善.env内容
+打开[.env](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#features.external-config)文件，按照注释说明填写配置信息。
+### 4、运行项目
 `gradle bootRun`
-### 4、体验Demo
+### 5、体验Demo
 在浏览器输入：http://localhost:8080/create.html
 
 ## 常见问题

src/main/java/transfer/dto/MerchantConfig.java

@@ -24,12 +24,12 @@ public void setAppid(String appid) {
     this.appid = appid;
   }
 
-  public String getPrivateKey() {
-    return privateKey;
+  public String getPrivateKeyPath() {
+    return privateKeyPath;
   }
 
-  public void setPrivateKey(String privateKey) {
-    this.privateKey = privateKey;
+  public void setPrivateKeyPath(String privateKeyPath) {
+    this.privateKeyPath = privateKeyPath;
   }
 
   public String getSerialNumber() {
@@ -54,8 +54,8 @@ public void setApiV3Key(String apiV3Key) {
   @Value("${appid}")
   private String appid;
 
-  @Value("${private-key}")
-  private String privateKey;
+  @Value("${private-key-path}")
+  private String privateKeyPath;
 
   @Value("${serial-number}")
   private String serialNumber;
@@ -73,7 +73,7 @@ public RSAAutoCertificateConfig getRSAConfig() {
           config =
               new RSAAutoCertificateConfig.Builder()
                   .merchantId(mchid)
-                  .privateKey(privateKey)
+                  .privateKeyFromPath(privateKeyPath)
                   .merchantSerialNumber(serialNumber)
                   .apiV3Key(apiV3Key)
                   .build();

src/main/java/transfer/dto/TransferDetailInput.java

@@ -1,6 +1,6 @@
 package transfer.dto;
 
-// 创建批次单入餐
+// 创建批次单入参
 public class TransferDetailInput {
 
   private String outDetailNo;

src/main/java/transfer/mapper/BatchTransferOrderMapper.java

@@ -1,6 +1,7 @@
 package transfer.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import transfer.dto.BatchTransferOrderEntity;
 
@@ -9,7 +10,8 @@
 @Repository
 public interface BatchTransferOrderMapper {
 
-  BatchTransferOrderEntity query(String mchid, String outBatchNo);
+  BatchTransferOrderEntity query(
+      @Param("mchid") String mchid, @Param("outBatchNo") String outBatchNo);
 
   void create(BatchTransferOrderEntity entity);
 

src/main/java/transfer/mapper/TransferDetailOrderMapper.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import transfer.dto.TransferDetailOrderEntity;
 
@@ -10,9 +11,13 @@
 @Repository
 public interface TransferDetailOrderMapper {
 
-  TransferDetailOrderEntity query(String mchid, String outBatchNo, String outDetailNo);
+  TransferDetailOrderEntity query(
+      @Param("mchid") String mchid,
+      @Param("outBatchNo") String outBatchNo,
+      @Param("outDetailNo") String outDetailNo);
 
-  ArrayList<TransferDetailOrderEntity> find(String mchid, String outBatchNo);
+  ArrayList<TransferDetailOrderEntity> find(
+      @Param("mchid") String mchid, @Param("outBatchNo") String outBatchNo);
 
   void create(TransferDetailOrderEntity entity);
 

src/main/resources/application-dev.yml

@@ -14,6 +14,6 @@ mybatis:
 envconfig:
     mchid: ${MCHID}
     appid: ${APPID}
-    private-key: ${PRIVATE_KEY}
+    private-key-path: ${PRIVATE_KEY_PATH}
     serial-number: ${SERIAL_NUMBER}
     apiv3-key: ${APIV3_KEY}