From 772a2589061f58549c8bbf1490fdc153bedb584a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 06 十二月 2022 15:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
index f6021ff..7b35942 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
@@ -352,12 +352,8 @@
     public static String doRefund(String url, String data,String mchId,Boolean isTest) throws Exception{
         KeyStore keyStore  = KeyStore.getInstance("PKCS12");
         //P12文件目录 证书路径,这里需要你自己修改,linux下还是windows下的根路径
-        String filepath = "";
-        if(isTest){
-            filepath = "D:\\wx\\WXCertUtil\\cert\\";
-        }else{
-            filepath = "/mnt/data/refund/huacheng/";
-        }
+        String filepath = "/mnt/data/refund/huacheng/";
+
         System.out.println("filepath->"+filepath);
         FileInputStream instream = new FileInputStream(filepath+"apiclient_cert.p12");
         try {

--
Gitblit v1.7.1