Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-24 54b50b89b9f083a892e954a8401a7203af87d4a2

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java

@@ -5,6 +5,7 @@
import org.apache.poi.util.IOUtils;

import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;

@@ -54,18 +55,23 @@
    public InputStream getPrivateKeyStream() {
        // 需要证书释放
        byte[] certData;
        InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(this.privateKeyPath);
//        InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(this.privateKeyPath);
        InputStream certStream = null;
        try {
            certStream = new FileInputStream(this.privateKeyPath);
            certData = IOUtils.toByteArray(certStream);
        } catch (IOException e) {
            e.printStackTrace();
            throw new RuntimeException("私钥文件未找到");
        }finally {
            if(null != certStream){
            try {
                certStream.close();
            } catch (IOException e) {
                log.error("私钥流关闭异常");
            }
        }
        }
        return new ByteArrayInputStream(certData);
    }
}