diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 92295f9c7e..db26d3d75c 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -181,7 +181,13 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol userTokenResultDTO.setToken(token); //7.发送登录事件 - sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId()); + try { + sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId()); + } catch (RenException e) { + log.error(e.getInternalMsg()); + } catch (Exception e) { + log.error("【工作端workLogin登录】发送登录事件失败,程序继续执行。错误信息"); + } return userTokenResultDTO; } @@ -404,6 +410,15 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); + + //6.发送登录事件 + try { + sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId()); + } catch (RenException e) { + log.error(e.getInternalMsg()); + } catch (Exception e) { + log.error("【工作端enterOrg登录】发送登录事件失败,程序继续执行。错误信息"); + } return userTokenResultDTO; } @@ -663,12 +678,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol SystemMsgFormDTO form = new SystemMsgFormDTO(); form.setMessageType(SystemMessageType.LOGIN); form.setContent(loginMQMsg); - Result result = messageOpenFeignClient.sendSystemMsgByMQ(form); - try { - getResultDataOrThrowsException(result, ServiceConstant.EPMET_MESSAGE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用Message服务,发送登录事件到MQ失败"); - } catch (RenException e) { - log.error(e.getInternalMsg()); - } + messageOpenFeignClient.sendSystemMsgByMQ(form); + //getResultDataOrThrowsException(result, ServiceConstant.EPMET_MESSAGE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用Message服务,发送登录事件到MQ失败"); } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2c0cf4bb23..587b92c4a2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1041,6 +1041,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp if(!resiGroupOpenFeignClient.sendEvent(eventParam).success()){ logger.warn("com.epmet.service.impl.IssueServiceImpl.shiftProjectV2,话题被转为项目积分事件发送失败,参数:{}", JSON.toJSONString(formDTO)); } + + //8.记录日志 + //SendMqMsgUtil.build().openFeignClient(messageOpenFeignClient); } /**