From bb3e626ef4e3969c023119e729ab1b3ff749384d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 21:50:58 +0800 Subject: [PATCH 1/3] 1111 --- .../main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e71f69be0..57cd0be2d3 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 @@ -1087,7 +1087,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol GovWebLoginFormDTO loginGovParam = new GovWebLoginFormDTO(); loginGovParam.setCustomerId("1535072605621841922"); - loginGovParam.setPhone(ssoUserInfo.getClientId()); + loginGovParam.setPhone(ssoUserInfo.getMobile()); return govWebService.loginByThirdPlatform(loginGovParam); } From 721e3a2b2308290fdf3ab2205aaa5af269af28cc Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 22:23:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"Revert=20"=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E8=8E=B7=E5=8F=96traceId""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 902663e3 --- .../java/com/epmet/commons/tools/filter/LogMsgSendFilter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 7c10e7a661..926a1ccd1e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -6,6 +6,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.StackTraceElementProxy; import ch.qos.logback.core.spi.FilterReply; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ThreadLocalConstant; import com.epmet.commons.tools.dto.form.DingTalkTextMsg; import com.epmet.commons.tools.enums.EnvEnum; @@ -15,6 +16,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.MDC; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; @@ -77,7 +79,7 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()), DateUtils.DATE_TIME_PATTERN)); stringBuilder.append("\n"); - stringBuilder.append("TraceId：").append(Thread.currentThread().getName()); + stringBuilder.append("TraceId：").append(MDC.get(AppClientConstant.TRANSACTION_SERIAL_KEY)); stringBuilder.append("\n"); HttpServletRequest request = getRequest(); From 22b602d44d4ad4b69c095bd12c7e48d07b7eef31 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 22:25:55 +0800 Subject: [PATCH 3/3] aaaa --- .../commons/tools/aspect/ApplicationReadyEventListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java index 31d50f5dd0..4663717988 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java @@ -78,7 +78,7 @@ public class ApplicationReadyEventListener implements ApplicationListener" + JSON.toJSONString(execute)); } catch (ApiException e) { - logger.error("sendDingMarkDownMsg exception", e); + logger.warn("sendDingMarkDownMsg exception", e); } }