Merge remote-tracking branch 'origin/dev' into dev

mp-common/src/main/java/com/qs/mp/common/pulsar/PulsarClientService.java

@@ -67,7 +67,7 @@ public class PulsarClientService {
     if (consumerConn) {
       consumer = client.newConsumer()
           .topic(topics.split(","))//topic完整路径，格式为persistent://集群（租户）ID/命名空间/Topic名称
-          .subscriptionName("ygp")//需要现在控制台或者通过控制台API创建好一个订阅，此处填写订阅名
+          .subscriptionName("mp")//需要现在控制台或者通过控制台API创建好一个订阅，此处填写订阅名
           .subscriptionType(SubscriptionType.Exclusive)//声明消费模式为exclusive（独占）模式
           .subscriptionInitialPosition(
               SubscriptionInitialPosition.Earliest)//配置从最早开始消费，否则可能会消费不到历史消息

mp-framework/src/main/java/com/qs/mp/framework/monitor/SendErrorMsgAppender.java

@@ -28,7 +28,8 @@ public class SendErrorMsgAppender extends UnsynchronizedAppenderBase<ILoggingEve
         Throwable throwable = throwableProxy.getThrowable();
         String throwableMsg = throwable.getMessage();
         if (StringUtils.isNotBlank(throwableMsg) && (throwableMsg.startsWith("验证码失效") || throwableMsg.startsWith("重复购买，请稍后再试")
-        || throwableMsg.startsWith("盲票已付款，") || throwableMsg.startsWith("盲票已兑奖") || throwableMsg.startsWith("登录用户不存在："))) {
+        || throwableMsg.startsWith("盲票已付款，") || throwableMsg.startsWith("盲票已兑奖") || throwableMsg.startsWith("登录用户不存在：")
+        || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效"))) {
           return;
         }
         StackTraceElementProxy[] stackTraceElementProxy = iThrowableProxy.getStackTraceElementProxyArray();