Merge remote-tracking branch 'origin/fw-nifi' into fw-nifi

fw-nifi/src/main/java/com/hzya/frame/nifiapi/config/HttpClientConfig.java

@@ -27,6 +27,7 @@ public class HttpClientConfig {
 
     @Bean
     public OkHttpClient okHttpClient() throws Exception {
+
         //调用nifi接口正常情况不会超过60秒的，目前遇到的接口1秒以内调用完毕
         return new OkHttpClient.Builder().sslSocketFactory(createTrustAllSslSocketFactory(), createTrustAllTrustManager()).hostnameVerifier((hostname, session) -> true).connectTimeout(60, TimeUnit.SECONDS) // 连接超时时间
                 .readTimeout(60, TimeUnit.SECONDS)   // 读取超时时间