From 3c92f26684ac009659c8643ad06dcf6582e6778b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 5 May 2019 15:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ServletUtils.renderResult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/common/web/http/ServletUtils.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java index 8f23892a..c068fcb4 100644 --- a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java +++ b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java @@ -190,19 +190,22 @@ public class ServletUtils { } } HttpServletRequest request = getRequest(); - String uri = request.getRequestURI(); - if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils - .equalsIgnoreCase(request.getParameter("__ajax"), "xml")){ - return XmlMapper.toXml(resultMap); - }else{ - String functionName = request.getParameter("__callback"); - if (StringUtils.isNotBlank(functionName)){ - return JsonMapper.toJsonp(functionName, resultMap); + if (request != null){ + String uri = request.getRequestURI(); + if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils + .equalsIgnoreCase(request.getParameter("__ajax"), "xml")){ + return XmlMapper.toXml(resultMap); }else{ - return JsonMapper.toJson(resultMap); + String functionName = request.getParameter("__callback"); + if (StringUtils.isNotBlank(functionName)){ + return JsonMapper.toJsonp(functionName, resultMap); + }else{ + return JsonMapper.toJson(resultMap); + } } + }else{ + return JsonMapper.toJson(resultMap); } - } /**