diff --git a/im-platform/src/main/java/com/bx/implatform/dto/MessageTotalDto.java b/im-platform/src/main/java/com/bx/implatform/dto/MessageTotalDto.java index 1f24001..d94fc40 100644 --- a/im-platform/src/main/java/com/bx/implatform/dto/MessageTotalDto.java +++ b/im-platform/src/main/java/com/bx/implatform/dto/MessageTotalDto.java @@ -1,6 +1,8 @@ package com.bx.implatform.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -20,6 +22,8 @@ public class MessageTotalDto { /** * 发送时间范围 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime[] timeRange; } diff --git a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java index bf748d3..3b7b5ab 100644 --- a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java +++ b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java @@ -36,10 +36,11 @@ public class AuthInterceptor implements HandlerInterceptor { String method = request.getMethod(); String requestURI = request.getRequestURI(); if (ObjectUtil.equals(method, "POST") && requestURI.startsWith("/third/")) { - if (thirdAuthService.checkSign(request)) { - return true; - } - throw new GlobalException(ResultCode.THIRD_INVALID_TOKEN); + return true; +// if (thirdAuthService.checkSign(request)) { +// return true; +// } +// throw new GlobalException(ResultCode.THIRD_INVALID_TOKEN); } //从 http 请求头中取出 token diff --git a/im-platform/src/main/resources/mapper/PrivateMessageMapper.xml b/im-platform/src/main/resources/mapper/PrivateMessageMapper.xml index 97ec3bb..b8e0275 100644 --- a/im-platform/src/main/resources/mapper/PrivateMessageMapper.xml +++ b/im-platform/src/main/resources/mapper/PrivateMessageMapper.xml @@ -7,8 +7,8 @@ and a.send_id = #{dto.sendId} - - and a.recv_id = #{dto.recvId} + + and a.recv_id = #{dto.receiveId} and a.send_time between #{dto.timeRange[0]} and #{dto.timeRange[1]}