lbqms.git - Gitblit

			@@ -3,6 +3,8 @@
			import cn.hutool.core.convert.Convert;
			import cn.hutool.extra.servlet.ServletUtil;
			import cn.hutool.http.HttpStatus;
			import lombok.AccessLevel;
			import lombok.NoArgsConstructor;
			import org.springframework.http.MediaType;
			import org.springframework.web.context.request.RequestAttributes;
			import org.springframework.web.context.request.RequestContextHolder;
			@@ -19,6 +21,7 @@
			*
			* @author ruoyi
			*/
			@NoArgsConstructor(access = AccessLevel.PRIVATE)
			public class ServletUtils extends ServletUtil {

			/**
			@@ -94,9 +97,8 @@
			*
			* @param response 渲染对象
			* @param string 待渲染的字符串
			* @return null
			*/
			public static String renderString(HttpServletResponse response, String string) {
			public static void renderString(HttpServletResponse response, String string) {
			try {
			response.setStatus(HttpStatus.HTTP_OK);
			response.setContentType(MediaType.APPLICATION_JSON_VALUE);
			@@ -105,7 +107,6 @@
			} catch (IOException e) {
			e.printStackTrace();
			}
			return null;
			}

			/**
			@@ -116,12 +117,12 @@
			public static boolean isAjaxRequest(HttpServletRequest request) {

			String accept = request.getHeader("accept");
			if (accept != null && accept.indexOf("application/json") != -1) {
			if (accept != null && accept.contains("application/json")) {
			return true;
			}

			String xRequestedWith = request.getHeader("X-Requested-With");
			if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
			if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
			return true;
			}

			@@ -131,10 +132,7 @@
			}

			String ajax = request.getParameter("__ajax");
			if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
			return true;
			}
			return false;
			return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
			}

			public static String getClientIP() {