diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java index a975dc6a27..c5f0753f47 100644 --- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java +++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java @@ -11,6 +11,8 @@ import com.epmet.commons.thirdplat.properties.JcetThirdplatProps; import com.epmet.commons.thirdplat.properties.ThirdplatProps; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.UnsupportedEncodingException; import java.util.HashMap; @@ -18,6 +20,8 @@ import java.util.Map; public class JcetApiService extends AbstractApiService { + Logger logger = LoggerFactory.getLogger(getClass()); + private JcetThirdplatProps jcetThirdplatProps; public JcetApiService(ThirdplatProps props) { @@ -32,6 +36,10 @@ public class JcetApiService extends AbstractApiService { * @date 2021.01.19 10:26 */ public ThirdPlatUserInfo getUserInfoByTicket(String ticket) throws UnsupportedEncodingException { + + logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>"); + logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口入参 ticket:{}", ticket); + SsoTicketFormDTO ssoTicket = new SsoTicketFormDTO(); ssoTicket.setSsoTicket(ticket); @@ -42,6 +50,13 @@ public class JcetApiService extends AbstractApiService { JSON.toJSONString(ssoTicket), getHeaders(ssoTicket)); + try { + logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口返回:{}", result.getData()); + } catch (Exception e) { + //e.printStackTrace(); + } + logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<"); + JcetUserInfoResultDTO resultDTO = parseResult(result, JcetUserInfoResultDTO.class); ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo(); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java index abb6684cd5..7d9889d77b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java @@ -28,85 +28,91 @@ import java.util.Map; @Slf4j @Component public class SendMqMsgUtils { - private static MqConfig mqConfig; + private static MqConfig mqConfig; - /** - * desc:发送mq消息 - * - * @return - */ - public static Result sendMsg(MqBaseMsgDTO msg) { - if (mqConfig == null) { - mqConfig = SpringContextUtils.getBean(MqConfig.class); - } - log.info("sendMsg param:{}", JSON.toJSONString(msg)); - try { - // TODO - ValidatorUtils.validateEntity(msg, DefaultGroup.class); - } catch (ValidateException e) { - return new Result().error(e.getMsg()); - } - msg.setAppId(mqConfig.getAppId()); - msg.setRequestUrl(mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode())); - msg.setToken(mqConfig.getToken()); - try { - Result result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg)); - log.info("sendMsg result:{}", JSON.toJSONString(result)); - if (result.success()) { - MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); - if (resultResult.getErrCode().equals(NumConstant.ZERO)) { - JSONObject jsonObject = JSON.parseObject(resultResult.getData()); - return new Result().ok(jsonObject.getString("msgId")); - } else { - log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult)); - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg()); - } - } - Result resultResult = new Result<>(); - resultResult.error(result.getCode(), result.getMsg()); - resultResult.setInternalMsg(result.getInternalMsg()); - return resultResult; - } catch (Exception e) { - log.error("sendMsg exception", e); - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); - } - } + /** + * desc:发送mq消息(如果失败重试1次) + * + * @return + */ + public static Result sendMsg(MqBaseMsgDTO msg) { + if (mqConfig == null) { + mqConfig = SpringContextUtils.getBean(MqConfig.class); + } + log.info("sendMsg param:{}", JSON.toJSONString(msg)); + try { + // TODO + ValidatorUtils.validateEntity(msg, DefaultGroup.class); + } catch (ValidateException e) { + return new Result().error(e.getMsg()); + } + msg.setAppId(mqConfig.getAppId()); + msg.setRequestUrl(mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode())); + msg.setToken(mqConfig.getToken()); + try { + int retryTime = 0; + Result result = null; + do { + retryTime++; + result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg)); + log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result)); + } while ((!result.success()) && retryTime < 2); + if (result.success()) { + MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); + if (resultResult.getErrCode().equals(NumConstant.ZERO)) { + JSONObject jsonObject = JSON.parseObject(resultResult.getData()); + return new Result().ok(jsonObject.getString("msgId")); + } else { + log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult)); + return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg()); + } + } + Result resultResult = new Result<>(); + resultResult.error(result.getCode(), result.getMsg()); + resultResult.setInternalMsg(result.getInternalMsg()); + return resultResult; + } catch (Exception e) { + log.error("sendMsg exception", e); + return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + } + } - /** - * desc:发送mq消息 - * - * @return - */ - public static Result> getEventClassList() { - if (mqConfig == null) { - mqConfig = SpringContextUtils.getBean(MqConfig.class); - } - Map param = new HashMap<>(); - param.put("appId", mqConfig.getAppId()); - param.put("token", mqConfig.getToken()); - String requestUrl = mqConfig.getHost().concat(MqMethodPathEnum.GET_EVENT_LIST.getCode()); - try { - Result result = HttpClientManager.getInstance().sendPostByHttps(requestUrl, JSON.toJSONString(param)); - log.info("getEventClassList result:{}", JSON.toJSONString(result)); - if (result.success()) { - MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); - if (resultResult.getErrCode().equals(NumConstant.ZERO)) { - List eventClassDto = JSON.parseArray(resultResult.getData(), EventClassDto.class); - return new Result>().ok(eventClassDto); - } else { - log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult)); - return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg()); - } - } - Result> resultResult = new Result<>(); - resultResult.error(result.getCode(), result.getMsg()); - resultResult.setInternalMsg(result.getInternalMsg()); - return resultResult; - } catch (Exception e) { - log.error("sendMsg exception", e); - return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); - } - } + /** + * desc:发送mq消息 + * + * @return + */ + public static Result> getEventClassList() { + if (mqConfig == null) { + mqConfig = SpringContextUtils.getBean(MqConfig.class); + } + Map param = new HashMap<>(); + param.put("appId", mqConfig.getAppId()); + param.put("token", mqConfig.getToken()); + String requestUrl = mqConfig.getHost().concat(MqMethodPathEnum.GET_EVENT_LIST.getCode()); + + try { + Result result = HttpClientManager.getInstance().sendPostByHttps(requestUrl, JSON.toJSONString(param)); + log.info("getEventClassList result:{}", JSON.toJSONString(result)); + if (result.success()) { + MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); + if (resultResult.getErrCode().equals(NumConstant.ZERO)) { + List eventClassDto = JSON.parseArray(resultResult.getData(), EventClassDto.class); + return new Result>().ok(eventClassDto); + } else { + log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult)); + return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg()); + } + } + Result> resultResult = new Result<>(); + resultResult.error(result.getCode(), result.getMsg()); + resultResult.setInternalMsg(result.getInternalMsg()); + return resultResult; + } catch (Exception e) { + log.error("sendMsg exception", e); + return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + } + } }