Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelWithdrawMgrController.java

@@ -58,13 +58,16 @@ public class ChannelWithdrawMgrController extends BaseApiController {
     String name = param.getString("name");
     Date startDay = param.getDate("startDay");
     Date endDay = param.getDate("endDay");
+    if (null != endDay) {
+      endDay = DateUtils.addDays(endDay, 1);
+    }
     startPage();
     List<ChannelWithdrawVO> withdrawList = channelWithdrawService.listWithdrawVO(new QueryWrapper<ChannelWithdraw>()
         .eq(null != status && status != 0, "t1.status", status)
         .eq(StringUtils.isNotBlank(name), "t2.name", name)
-        .ge(null != startDay, "t1.created_time", startDay)
-        .lt(null != endDay, "t1.created_time", DateUtils.addDays(endDay, 1))
-        .orderByDesc("t1.created_time"));
+        .ge(null != startDay, "t1.create_time", startDay)
+        .lt(null != endDay, "t1.create_time", endDay)
+        .orderByDesc("t1.create_time"));
     return getDataTable(withdrawList);
   }
 

mp-framework/src/main/java/com/qs/mp/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 认证失败处理类 返回未授权
- * 
+ *
  * @author ygp
  */
 @Component
@@ -31,7 +31,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
     {
         int code = HttpStatus.UNAUTHORIZED;
         String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
-        logger.warn("权限验证失败:"+e.getMessage(),e);
+        logger.warn("权限验证失败:"+e.getMessage());
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
     }
 }