Merge branch 'master' into pro

This commit is contained in:
dxc
2021-04-25 17:02:34 +08:00
2 changed files with 3 additions and 2 deletions

View File

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

View File

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