Merge branch 'master' into test6.9.24

@@ -3,6 +3,7 @@ package com.yohoufo.order.service.pay.weixin;
 import com.yohoufo.common.utils.HttpClient;
 import com.yohoufo.common.utils.HttpClient;
 import com.yohoufo.order.config.WeixinPayConfig;
 import com.yohoufo.order.config.WeixinPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.WxUfoHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.WxUfoHttpSslClient;
+import com.yohoufo.order.service.pay.weixin.ssl.YoufuWxHttpSslClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -13,7 +14,7 @@ import org.springframework.stereotype.Service;
 public class YoufuMiniappWeixinPayService extends AbstractWeixinPayService {
 public class YoufuMiniappWeixinPayService extends AbstractWeixinPayService {
 
 
     @Autowired
     @Autowired
-    private WxUfoHttpSslClient httpSslClient;
+    private YoufuWxHttpSslClient httpSslClient;
 
 
     @Override
     @Override
     protected String getMchId() {
     protected String getMchId() {