From a4f33281f98edccbf4f2a40f303bc552c67508a1 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Sat, 27 Mar 2021 15:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectReEvaluationServiceImpl.java        | 2 +-
 src/main/resources/application-uat.yml                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
index ce41e95..9b4e2c8 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
@@ -213,7 +213,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class,timeoutMills = 60000 * 2)
     public boolean callbackApproval(WasUpdateBizDTO dto) {
         boolean result = false;
         if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_YES,dto.getAuditState())){
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 2a9e6d8..6dca7c4 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -131,12 +131,12 @@ hystrix:
           thread:
             timeoutInMilliseconds: 200000  #熔断超时时间
       circuitBreaker:
-        sleepWindowInMilliseconds: 20000
+        sleepWindowInMilliseconds: 200000
         forceClosed: true
         
 ribbon:
-  ReadTimeout: 20000  #请求处理的超时时间
-  ConnectTimeout: 20000 #请求连接超时时间
+  ReadTimeout: 200000  #请求处理的超时时间
+  ConnectTimeout: 200000 #请求连接超时时间
   MaxAutoRetries: 0 #对当前实例的重试次数
   MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1