liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
修改事务时间

See merge request eshop/biz_service_ebtp_project!28
This commit is contained in:
代兴成
2021-03-27 15:17:42 +08:00
parent 13b2cb3f2e a4f33281f9
commit ddccf9a14d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
View File

@ -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())){

6
src/main/resources/application-uat.yml
View File

@ -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