From 22864c692d11aff4a5996a3ab290cb5b30872d85 Mon Sep 17 00:00:00 2001 From: malcolmshen Date: Fri, 27 Jul 2018 16:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BA=BA/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA/=E5=88=9B=E5=BB=BA=E4=BA=BAID/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BAID=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/common/util/EntityUtils.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/ace-common/src/main/java/com/github/wxiaoqi/security/common/util/EntityUtils.java b/ace-common/src/main/java/com/github/wxiaoqi/security/common/util/EntityUtils.java index e1ad5a8c..20e15540 100644 --- a/ace-common/src/main/java/com/github/wxiaoqi/security/common/util/EntityUtils.java +++ b/ace-common/src/main/java/com/github/wxiaoqi/security/common/util/EntityUtils.java @@ -1,5 +1,7 @@ package com.github.wxiaoqi.security.common.util; +import com.github.wxiaoqi.security.common.context.BaseContextHandler; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -43,11 +45,19 @@ public class EntityUtils { String name = ""; String id = ""; if(request!=null) { - hostIp = String.valueOf(request.getHeader("userHost")); - name = String.valueOf(request.getHeader("userName")); + hostIp = StringUtils.trimToEmpty(request.getHeader("userHost")); + name = StringUtils.trimToEmpty(request.getHeader("userName")); name = URLDecoder.decode(name); - id = String.valueOf(request.getHeader("userId")); + id = StringUtils.trimToEmpty(request.getHeader("userId")); } + + if (StringUtils.isBlank(name)) { + name = BaseContextHandler.getUsername(); + } + if (StringUtils.isBlank(id)) { + id = BaseContextHandler.getUserID(); + } + // 默认属性 String[] fields = {"crtName","crtUser","crtHost","crtTime"}; Field field = ReflectionUtils.getAccessibleField(entity, "crtTime"); @@ -72,11 +82,19 @@ public class EntityUtils { String name = ""; String id = ""; if(request!=null) { - hostIp = String.valueOf(request.getHeader("userHost")); - name = String.valueOf(request.getHeader("userName")); + hostIp = StringUtils.trimToEmpty(request.getHeader("userHost")); + name = StringUtils.trimToEmpty(request.getHeader("userName")); name = URLDecoder.decode(name); - id = String.valueOf(request.getHeader("userId")); + id = StringUtils.trimToEmpty(request.getHeader("userId")); } + + if (StringUtils.isBlank(name)) { + name = BaseContextHandler.getUsername(); + } + if (StringUtils.isBlank(id)) { + id = BaseContextHandler.getUserID(); + } + // 默认属性 String[] fields = {"updName","updUser","updHost","updTime"}; Field field = ReflectionUtils.getAccessibleField(entity, "updTime"); -- Gitee