Merge branch 'feature' into 'release'

2024/07/04 ai标注接口请求超时时间调整，添加接口耗时打印

See merge request !108

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceAiMark.java

@@ -97,7 +97,7 @@ public class TaskServiceAiMark implements TaskService {
         redissonUtil.putCount(Tools.assembleKey(GenericAttribute.KEY_AI, timeKey, GenericAttribute.KEY_TOTAL), 1);
         if (Objects.isNull(s)) {
             redissonUtil.putCount(Tools.assembleKey(GenericAttribute.KEY_AI, timeKey, GenericAttribute.KEY_RES_ERROR), 1);
-            log.error("ai标注失败，数据id：{}，错误信息：ai接口返回为null" , aiParam.getJson().getString("id"));
+            log.error("ai标注失败，数据id：{}，耗时：{}，错误信息：ai接口返回为null" , aiParam.getJson().getString("id"), System.currentTimeMillis() - now);
             return null;
         }
         long endTime = System.currentTimeMillis() - now;

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/util/OkHttpUtil.java

@@ -11,9 +11,9 @@ import java.util.concurrent.TimeUnit;
  **/
 public class OkHttpUtil {
     public static final OkHttpClient okHttpClient = new OkHttpClient.Builder()
-            .connectTimeout(60, TimeUnit.SECONDS)
-            .readTimeout(60, TimeUnit.SECONDS)
-            .writeTimeout(60, TimeUnit.SECONDS)
+            .connectTimeout(90, TimeUnit.SECONDS)
+            .readTimeout(90, TimeUnit.SECONDS)
+            .writeTimeout(90, TimeUnit.SECONDS)
             .retryOnConnectionFailure(true).build();
 
     public static String httpPut(String url, String info, Map<String, Object> header) {