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

Merge branch 'master' into pro

Browse Source
This commit is contained in:
dxc
2021-04-25 17:02:34 +08:00
parent eb37f4284b b3d0f8f896
commit 896a1cd9e8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
View File

@ -397,11 +397,12 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
failRequest.setProjIds(projIds); failRequest.setProjIds(projIds);
failRequest.setFailStatus(EbpProjectCommonUtil.FAIL_STATUS_MAP.get(projectException.getExceptionDesc())); failRequest.setFailStatus(EbpProjectCommonUtil.FAIL_STATUS_MAP.get(projectException.getExceptionDesc()));
failRequest.setFailCause(dictProject.getDicName()); failRequest.setFailCause(dictProject.getDicName());
log.debug("访问失败接口"+ JsonUtils.objectToJson(failRequest)); log.info("访问用友失败接口"+ JsonUtils.objectToJson(failRequest));
//调用接口 //调用接口
String xid = RootContext.getXID(); String xid = RootContext.getXID();
RootContext.unbind(); RootContext.unbind();
BaseResponse baseResponse = mallPurpApi.projInvitationFail(failRequest); BaseResponse baseResponse = mallPurpApi.projInvitationFail(failRequest);
log.info("访问用友失败接口返回结果"+ JsonUtils.objectToJson(baseResponse));
RootContext.bind(xid); RootContext.bind(xid);
if(!baseResponse.isSuccess()){ if(!baseResponse.isSuccess()){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_INVITATION_FAIL_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_INVITATION_FAIL_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());

2
src/main/resources/application-pro.yml
View File

@ -59,7 +59,7 @@ spring:
connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000
props: props:
sql: sql:
show: true show: false
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss