htt请求修复

pom.xml

@@ -93,6 +93,11 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/scbfkj/uni/api/LogAop.java

@@ -68,15 +68,7 @@ public class LogAop {
 
 		Optional<String> serviceid = Optional.empty();
 		String userId = RequestUtil.getUserId();
-		// Debug模式下的日志打印
-		if ( Config.isDebug() ) {
-			System.out.println("请求参数：" + DataFormatUtil.toString(args));
-			System.out.println("请求路径：" + uri);
-			System.out.println("请求session：" + RequestUtil.getSessionId());
-			System.out.println("请求ip：" + RequestUtil.getIpAddr());
-			System.out.println("请求userToken：" + RequestUtil.getUserToken());
-			System.out.println("请求appToken：" + RequestUtil.getAppToken());
-		}
+		
 
 		try {
 			Map<String, Object> body = null;
@@ -169,11 +161,6 @@ public class LogAop {
 			LoggerService.log(LoggerService.LogType.INTERFACE, logData);
 		}
 
-		// 处理返回数据，过滤和调整
-		if ( Config.isDebug() ) {
-			System.out.println("返回值：" + DataFormatUtil.toString(returnData));
-		}
-
 		Object code = returnData.get("code");
 		// 过滤返回数据
 		if ( ! Config.isDebug() && Objects.nonNull(code) && "0".equals(code.toString()) && Objects.nonNull(userInfo) && ! "0".equals(userInfo.get("usergroupid").toString()) ) {

src/main/java/com/scbfkj/uni/library/DataFormatUtil.java

@@ -14,6 +14,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.oracle.truffle.regex.tregex.util.json.Json;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -129,6 +130,12 @@ public final class DataFormatUtil {
         if (source instanceof LocalDateTime result) {
             return result.format(DATE_TIME_FORMATTER);
         }
+        if(source instanceof JsonNode jsonNode){
+            if(jsonNode.isTextual()){
+                return jsonNode.asText();
+            }
+            return jsonNode.toString();
+        }
         // 尝试使用Jackson ObjectMapper处理其他类型
         try {
             return getObjectMapper().writeValueAsString(source);

src/main/java/com/scbfkj/uni/library/script/HttpScriptUtil.java

@@ -9,6 +9,7 @@ import com.scbfkj.uni.system.Config;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public class HttpScriptUtil {
 
@@ -42,7 +43,11 @@ public class HttpScriptUtil {
             connection.put("method",data.get("method"));
 
             // 执行Web API调用，并返回结果
-            return new Web().execWebApi(connection.get("headers"), connection.getOrDefault("method", "post").toString(), connection.get("body"), DataFormatUtil.toString(connection.get("url")));
+        Map<String, String> headers =
+                (Map<String, String>) Optional.ofNullable(connection.get("headers")).map(DataFormatUtil::toString).map(DataFormatUtil::toMap)
+                        .orElse(Map.of());
+        return new Web().execWebApi(headers, connection.getOrDefault("method", "post").toString(), connection.get(
+                    "body"), DataFormatUtil.toString(connection.get("url")));
         }
     /**
      * 执行Web API调用。
@@ -54,7 +59,7 @@ public class HttpScriptUtil {
      * @return 返回一个包含API响应信息的Map对象。
      * @throws Exception 如果API调用过程中出现错误，则抛出异常。
      */
-    public static Map<String, Object> exec(Object header, String method, Object defaultBody, String url) throws Exception {
+    public static Map<String, Object> exec(Map<String,String> header, String method, Object defaultBody, String url) throws Exception {
         // 创建Web实例并调用其execWebApi方法执行API调用
         return new Web().execWebApi(header, method, defaultBody, url);
     }

src/main/java/com/scbfkj/uni/process/Kafka.java

@@ -157,10 +157,6 @@ public static Map<String, Object> sendMessage(String connection, String topic, L
             // 异步提交消费位点
             consumer.commitAsync();
 
-            // 如果处于调试模式，打印消息列表
-            if (Config.isDebug()) {
-                System.out.println(DataFormatUtil.toString(messageList));
-            }
             // 返回成功结果，包含消息列表
             return UniReturnUtil.success(messageList);
         } finally {

src/main/java/com/scbfkj/uni/process/Web.java

@@ -1,10 +1,23 @@
 package com.scbfkj.uni.process;
 
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.TrustStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -13,7 +26,11 @@ import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.system.Config;
 
+import javax.net.ssl.SSLContext;
 import java.nio.charset.StandardCharsets;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,12 +66,12 @@ public class Web {
      *
      * @throws Exception 抛出异常的情况
      */
-    public Map<String, Object> execWebApiByDataSourceId(
-            String dataSourceId, Object headers, String method, Object defaultBody) throws Exception {
+    public Map<String, Object> execWebApiByDataSourceId(String dataSourceId, Map<String, String> headers, String method,
+                                                        Object defaultBody) throws Exception {
         Map<String, Object> config = queryConnectionStr(dataSourceId); // 查询数据源配置
         String host;
         if (Objects.isNull(headers)) {
-            headers = config.get("headers");
+            headers = (Map<String, String>) DataFormatUtil.toMap(DataFormatUtil.toString(config.get("header")));
         }
         if (Objects.isNull(method)) {
             method = "post";
@@ -76,7 +93,7 @@ public class Web {
      *
      * @return 执行结果
      */
-    public Map<String, Object> execWebApi(Object headers, String method, Object defaultBody, String url) {
+    public Map<String, Object> execWebApi(Map<String, String> headers, String method, Object defaultBody, String url) {
         logger.info("headers: {}", headers);
         logger.info("method: {}", method);
         logger.info("body: {}", defaultBody);
@@ -85,13 +102,6 @@ public class Web {
         if (! "0".equals(restTemplateResult.get("code"))) {
             return UniReturnUtil.fail(restTemplateResult.get("message").toString());
         }
-        if (headers instanceof Map<?, ?> temeMap) {
-            temeMap.putAll((Map) baseHeader);
-            webApiHeader.clear();
-            for (Map.Entry<?, ?> entry : temeMap.entrySet()) {
-                webApiHeader.add((String) entry.getKey(), DataFormatUtil.toString(entry.getValue()));
-            }
-        }
         try {
             Map<String, Object> result = sendWebApiRequest(defaultBody);
             return UniReturnUtil.success(result);
@@ -109,20 +119,39 @@ public class Web {
      */
     private Map<String, Object> sendWebApiRequest(Object defaultBody) {
         try {
-            HttpEntity<Object> request = new HttpEntity<>(defaultBody, webApiHeader);
+            MediaType contentType = webApiHeader.getContentType();
+            if (MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) {
+                String body = DataFormatUtil.toString(defaultBody);
+                if (body != null) {
+                    webApiHeader.setContentLength(body.trim().length());
+                    defaultBody = body.trim();
+                }
+            }
+            HttpHeaders headers = new HttpHeaders();
+            headers.putAll(webApiHeader);
+            HttpEntity<Object> entity = new HttpEntity<>(defaultBody.toString().trim(), headers);
             Object responseEntity = null;
             switch (webapiMethod) {
                 case "get" -> {
-                    HttpHeaders headers = new HttpHeaders();
-                    webApiHeader.forEach((key, value) -> headers.set(key, value.toString()));
-                    HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(headers);
                     ResponseEntity<JsonNode> response =
                             restTemplate.exchange(webapiURL, HttpMethod.GET, entity, JsonNode.class);
                     responseEntity = response.getBody();
                 }
-                case "put" -> restTemplate.put(webapiURL, request);
-                case "delete" -> restTemplate.delete(webapiURL, request);
-                default -> responseEntity = restTemplate.postForObject(webapiURL, request, Object.class);
+                case "put" -> {
+                    ResponseEntity<JsonNode> response =
+                            restTemplate.exchange(webapiURL, HttpMethod.PUT, entity, JsonNode.class);
+                    responseEntity = response.getBody();
+                }
+                case "delete" -> {
+                    ResponseEntity<JsonNode> response =
+                            restTemplate.exchange(webapiURL, HttpMethod.DELETE, entity, JsonNode.class);
+                    responseEntity = response.getBody();
+                }
+                default -> {
+                    ResponseEntity<String> response =
+                            restTemplate.exchange(webapiURL, HttpMethod.POST, entity, String.class);
+                    responseEntity = response.getBody();
+                }
             }
             if (responseEntity == null && (webapiMethod.equals("put") || webapiMethod.equals("delete"))) {
                 return UniReturnUtil.success(null);
@@ -149,24 +178,20 @@ public class Web {
      *
      * @return 初始化结果
      */
-    private Map<String, Object> initWebApiParams(Object headers, String method, String url) {
+    private Map<String, Object> initWebApiParams(Map<String, String> headers, String method, String url) {
         try {
             if (restTemplate == null) {
                 webapiURL = url;
                 if (Objects.isNull(webapiURL)) {
                     return UniReturnUtil.fail("webapi请求地址为空");
                 }
-                Object tempHeaders = headers;
                 webApiHeader = new HttpHeaders();
-                if (Objects.isNull(tempHeaders)) {
+                if (Objects.isNull(headers)) {
                     webApiHeader.setContentType(MediaType.APPLICATION_JSON);
                 }
-                if (tempHeaders instanceof Map<?, ?> temp) {
-                    baseHeader = (Map<String, Object>) temp;
-                    if (! baseHeader.isEmpty()) {
-                        for (Map.Entry<String, Object> entry : baseHeader.entrySet()) {
-                            webApiHeader.add(entry.getKey(), DataFormatUtil.toString(entry.getValue()));
-                        }
+                if (! headers.isEmpty()) {
+                    for (Map.Entry<String, String> entry : headers.entrySet()) {
+                        webApiHeader.add(entry.getKey(), entry.getValue());
                     }
                 }
                 if (Objects.nonNull(method)) {
@@ -174,7 +199,7 @@ public class Web {
                 } else {
                     webapiMethod = "post";
                 }
-                restTemplate = new RestTemplate();
+                restTemplate = restTemplate();
                 restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
             }
         } catch (Exception e) {
@@ -183,6 +208,33 @@ public class Web {
         return UniReturnUtil.success(null);
     }
     
+    public RestTemplate restTemplate() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
+        CloseableHttpClient client =
+                HttpClientBuilder.create().setConnectionManager(getHttpClientConnectionManager()).build();
+        // 使用自定义的CloseableHttpClient创建ClientHttpRequestFactory
+        HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(client);
+        // 使用自定义的ClientHttpRequestFactory创建RestTemplate
+        return new RestTemplate(requestFactory);
+    }
+    
+    private static HttpClientConnectionManager getHttpClientConnectionManager()
+            throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        return PoolingHttpClientConnectionManagerBuilder.create().setSSLSocketFactory(getSslConnectionSocketFactory())
+                                                        .build();
+    }
+    
+    /**
+     * 支持SSL
+     *
+     * @return SSLConnectionSocketFactory
+     */
+    private static LayeredConnectionSocketFactory getSslConnectionSocketFactory()
+            throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        TrustStrategy acceptingTrustStrategy = (x509Certificates, s) -> true;
+        SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+        return new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+    }
+    
     /**
      * 查询数据源连接字符串
      *

src/main/java/com/scbfkj/uni/system/ProcessUtil.java

@@ -271,9 +271,7 @@ public class ProcessUtil {
                         logData.put("endtime", dateTime);
                         logData.put("serviceid", finalServiceId);
                         String string = DataFormatUtil.toString(resource);
-                        if (Config.isDebug()) {
-                            System.out.println("resources:" + string);
-                        }
+                        
                         logData.put("inputdata", string);
                         logData.put("prepesource", DataFormatUtil.toString(preResource));
                         logData.put("returnmessage", finalMessage);

src/main/resources/application.yml

@@ -8,7 +8,6 @@ app:
   singleton:
     enable: false
     file: ./config/config.sqlite
-
 server:
   port: 9500
 spring: