order 修改 HttpOrderUtil

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpOrderUtil.java

+package com.liquidnet.commons.lang.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class HttpOrderUtil {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * get请求
+     *
+     * @param url
+     * @param params 请求参数
+     * @return
+     */
+    public String get(String url, MultiValueMap<String, String> params) {
+        return get(url, params, null);
+    }
+
+    /**
+     * get请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @return
+     */
+    public String get(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
+        return request(url, params, headers, HttpMethod.GET);
+    }
+
+    /**
+     * post请求
+     *
+     * @param url
+     * @param params 请求参数
+     * @return
+     */
+    public String post(String url, MultiValueMap<String, String> params) {
+        return post(url, params, null);
+    }
+
+    /**
+     * post请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @return
+     */
+    public String post(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
+        return request(url, params, headers, HttpMethod.POST);
+    }
+
+    /**
+     * put请求
+     *
+     * @param url
+     * @param params 请求参数
+     * @return
+     */
+    public String put(String url, MultiValueMap<String, String> params) {
+        return put(url, params, null);
+    }
+
+    /**
+     * put请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @return
+     */
+    public String put(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
+        return request(url, params, headers, HttpMethod.PUT);
+    }
+
+    /**
+     * delete请求
+     *
+     * @param url
+     * @param params 请求参数
+     * @return
+     */
+    public String delete(String url, MultiValueMap<String, String> params) {
+        return delete(url, params, null);
+    }
+
+    /**
+     * delete请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @return
+     */
+    public String delete(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
+        return request(url, params, headers, HttpMethod.DELETE);
+    }
+
+    /**
+     * 表单请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @param method  请求方式
+     * @return
+     */
+    public String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
+        if (params == null) {
+            params = new LinkedMultiValueMap<>();
+        }
+        return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
+    }
+
+    /**
+     * http请求
+     *
+     * @param url
+     * @param params    请求参数
+     * @param headers   请求头
+     * @param method    请求方式
+     * @param mediaType 参数类型
+     * @return
+     */
+    public String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
+        if (url == null || url.trim().isEmpty()) {
+            return null;
+        }
+
+        // header
+        HttpHeaders httpHeaders = new HttpHeaders();
+        if (headers != null) {
+            httpHeaders.addAll(headers);
+        }
+
+        HttpEntity<Object> httpEntity;
+        if (headers != null) {
+            // header
+            httpHeaders = new HttpHeaders();
+            httpHeaders.addAll(headers);
+            httpHeaders.setContentType(mediaType);
+            httpEntity = new HttpEntity(params, httpHeaders);
+        } else {
+            httpEntity = new HttpEntity(params, null);
+        }
+        // 提交方式：表单、json
+        ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
+        return response.getBody();
+    }
+
+
+    private final String PHP_API_KEY = "R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V";
+
+    public String postToPhpApi(String url, MultiValueMap<String, String> params) {
+        params.add("sign", processForPhpApi(params).concat("&key=").concat(PHP_API_KEY).toUpperCase());
+        return post(url, params, null);
+    }
+
+    private String processForPhpApi(MultiValueMap<String, String> map) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+            sb.append(entry.getKey()).append("=").append(entry.getValue().get(0)).append("&");
+        }
+        String targetStr = sb.substring(0, sb.length() - 1);
+        try {
+            targetStr = URLDecoder.decode(targetStr, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        targetStr = targetStr.replace("%3D", "=").replace("%26", "&");
+        return targetStr;
+    }
+}

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

 package com.liquidnet.commons.lang.util;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -13,9 +12,6 @@ import java.util.Map;
 
 public class HttpUtil {
 
-    @Autowired
-    private static RestTemplate restTemplate;
-
     /**
      * get请求
      *
@@ -146,16 +142,7 @@ public class HttpUtil {
         }
         HttpEntity<Object> httpEntity = new HttpEntity(params, httpHeaders);
 
-//        HttpEntity<Object> httpEntity;
-//        if (headers != null) {
-//            // header
-//            HttpHeaders httpHeaders = new HttpHeaders();
-//            httpHeaders.addAll(headers);
-//            httpHeaders.setContentType(mediaType);
-//            httpEntity = new HttpEntity(params, httpHeaders);
-//        } else {
-//            httpEntity = new HttpEntity(params, null);
-//        }
+        RestTemplate restTemplate = new RestTemplate();
         // 提交方式：表单、json
         ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
         return response.getBody();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java

 package com.liquidnet.service.order.controller;
 
 
+import com.liquidnet.commons.lang.util.HttpOrderUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.annotation.DecryptAndVerify;
@@ -17,6 +19,7 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import sun.net.www.http.HttpClient;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -78,6 +78,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
+    private HttpOrderUtil httpOrderUtil;
+    @Autowired
     private OrderUtils orderUtils;
     @Autowired
     private RedisLockUtil redisLockUtil;
@@ -552,12 +554,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
 
         currentTime = System.currentTimeMillis();
-        String returnData = HttpUtil.post(payUrl, httpData);
+        String returnData = httpOrderUtil.post(payUrl, httpData);
 //        log.debug("httpData = " + JSON.toJSONString(httpData));
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
-        log.debug("调用 PHP 支付 结果 -> " +JSON.toJSONString(payResultVo));
         payResultVo.getData().setOrderId(orderTicketId);
         payResultVo.getData().setPrice(orderTickets.getPriceActual());
         orderTickets.setPayCode(payResultVo.getData().getCode());