Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!448

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

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

mp-framework/src/main/java/com/qs/mp/framework/web/service/UserDetailsServiceImpl.java

@@ -37,7 +37,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
         if (StringUtils.isNull(user))
         {
             log.info("登录用户：{} 不存在.", username);
-            throw new ServiceException("登录用户：" + username + " 不存在");
+            throw new ServiceException("登录用户不存在：" + username);
         }
         else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {

mp-quartz/src/main/java/com/qs/mp/quartz/task/DayStatTask.java

@@ -115,11 +115,11 @@ public class DayStatTask {
 
     StringBuffer sbDetail = new StringBuffer("");
     LambdaQueryWrapper<TicketBox> queryWrapper = new LambdaQueryWrapper<TicketBox>()
-        .nested(wrapper -> {
-          wrapper.eq(TicketBox::getType, TicketTypeEnum.ONLINE).eq(TicketBox::getStatus,
-              TicketBoxStatusEnum.PUT_ON).or().eq(TicketBox::getType, TicketTypeEnum.OFFLINE);
-        })
-        .notLike(TicketBox::getTitle, "测试票")
+//        .nested(wrapper -> {
+//          wrapper.eq(TicketBox::getType, TicketTypeEnum.ONLINE).eq(TicketBox::getStatus,
+//              TicketBoxStatusEnum.PUT_ON).or().eq(TicketBox::getType, TicketTypeEnum.OFFLINE);
+//        })
+//        .notLike(TicketBox::getTitle, "测试票")
         .eq(TicketBox::getIsDeleted, 0);
 
     int totalSize = ticketBoxService.count(queryWrapper);