From 0271aa5414843f662c74a683cfc36f5f799d2a3c Mon Sep 17 00:00:00 2001
From: guxin0123 <guxin0123@gmail.com>
Date: 星期三, 16 三月 2022 12:52:33 +0800
Subject: [PATCH] update ruoyi-ui/src/store/modules/user.js. 修复数据库用户表 头像列为 null 时不显示默认头像问题
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index a10c8ed..d67b246 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -99,9 +99,8 @@
*
* @param response 渲染对象
* @param string 待渲染的字符串
- * @return null
*/
- public static String renderString(HttpServletResponse response, String string)
+ public static void renderString(HttpServletResponse response, String string)
{
try
{
@@ -114,7 +113,6 @@
{
e.printStackTrace();
}
- return null;
}
/**
@@ -125,13 +123,13 @@
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;
}
@@ -143,10 +141,6 @@
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
- {
- return true;
- }
- return false;
+ return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
}
}
--
Gitblit v1.9.2