Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -1088,7 +1088,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);
     }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java

@@ -78,7 +78,7 @@ public class ApplicationReadyEventListener implements ApplicationListener<Applic
             OapiRobotSendResponse execute = client.execute(request);
             logger.info("=====通知结果===>" + JSON.toJSONString(execute));
         } catch (ApiException e) {
-            logger.error("sendDingMarkDownMsg exception", e);
+            logger.warn("sendDingMarkDownMsg exception", e);
         }
     }
 

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();