Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-30 7a7c01d8ae0c0f2d7ffcaf8de5a7a1d49ba92c10

 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 {