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

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java

@@ -19,6 +19,8 @@ import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 import static org.springframework.http.HttpStatus.NOT_EXTENDED;
 
@@ -75,6 +77,14 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) {
         response.setStatus(500);
         logger.error(ex.getMessage(),ex);
+        Throwable cause = ex.getCause();
+        if(cause != null && cause.toString().contains("Exception")) {
+            StringWriter stringWriter = new StringWriter();
+            cause.printStackTrace(new PrintWriter(stringWriter));
+            logger.error(cause.getMessage(), ex);
+            HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + stringWriter.toString());
+            return new BaseResponse(5000, "Server exception: " + ex.getMessage());
+        }
         HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + ex);
         return new BaseResponse(CommonConstants.EX_OTHER_CODE, ex.getMessage());
     }

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

@@ -10,6 +10,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 @RestControllerAdvice("com.xxfc.platform")
 @Slf4j
 public class PlatformExceptionHandler {
@@ -26,10 +29,13 @@ public class PlatformExceptionHandler {
     //服务器异常
     @ExceptionHandler(Exception.class)
     public ObjectRestResponse<?> exceptionHandler(Exception e){
+
         Throwable cause = e.getCause();
         if(cause != null && cause.toString().contains("Exception")) {
+            StringWriter stringWriter = new StringWriter();
+            cause.printStackTrace(new PrintWriter(stringWriter));
             log.error(cause.getMessage(), e);
-            HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + e);
+            HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + stringWriter.toString());
             return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
         }
         log.error("Server exception: ", e);

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -378,7 +378,7 @@ public class MsgBiz {
                 }
             } else {
                 if (msgQueryDto.getEndTime() != null) {
-                    query.addCriteria(Criteria.where("body.time").gte(System.currentTimeMillis()).lte(msgQueryDto.getEndTime()));
+                    query.addCriteria(Criteria.where("body.time").gte(57600000).lte(msgQueryDto.getEndTime()));
                 }
             }
             //用户名