From 7d64a678591a919f2cba6eaa5377dabe77a26d4b Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 3 Aug 2023 17:18:28 +0800
Subject: [PATCH] updates

---
 .../main/java/org/jeecg/common/util/RestUtil.java    | 12 +++++++++++-
 .../jeecg/modules/api/controller/ApiController.java  |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
index c59f93a..c9860d1 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
@@ -63,7 +63,7 @@ public class RestUtil {
     /**
      * RestAPI 调用器
      */
-    private final static RestTemplate RT;
+    private static RestTemplate RT;
 
     static {
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
@@ -232,7 +232,17 @@ public class RestUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
+
         HttpEntity<String> request = new HttpEntity<>(body, headers);
+        //回调接口
+        if (url.contains("callback")) {
+            SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+            requestFactory.setConnectTimeout(30000);
+            requestFactory.setReadTimeout(30000);
+            RT = new RestTemplate(requestFactory);
+        }
+        // 解决乱码问题
+        RT.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         return RT.exchange(url, method, request, responseType);
     }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
index 5d3b805..a8375e4 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
@@ -63,7 +63,7 @@ public class ApiController {
     @RequestMapping("/identify")
     @Transactional
     @ResponseBody
-    public Result<?> pushSemantic(@RequestBody JSONObject requestBody) {
+    public Result<?> pushSemantic(@RequestBody JSONObject requestBody) throws InterruptedException {
         if (requestBody == null) {
             return Result.error("请输入请求参数");
         }
@@ -124,6 +124,7 @@ public class ApiController {
             ocrIdentify.setSourceJson(requestBody.getJSONArray("sourceJson").toJSONString());//校验数据源
             ocrIdentifyService.save(ocrIdentify);
         }
+        Thread.sleep(1000L);
         //3.请求python ocr识别，异步执行
         ocrIdentifyService.postSemantic(ocrIdentify, fileList);
         return Result.OK("请求成功");