Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java

@@ -133,7 +133,7 @@
                return response.toString();
            }
        } catch (IOException e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }

        return null;
@@ -449,7 +449,7 @@
     * @param httpGet
     * @return
     */
    private String sendHttpsGet(HttpGet httpGet) {
    public String sendHttpsGet(HttpGet httpGet) {
        CloseableHttpClient httpClient = null;
        CloseableHttpResponse response = null;
        HttpEntity entity = null;