From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
index d662ae9..dfda513 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
@@ -6,7 +6,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
@@ -42,7 +42,7 @@
&& StringUtils.isBlank(baseEntity.getCreateBy())) {
baseEntity.setCreateBy(username);
}
- // 褰撳墠宸茬櫥褰� 涓� 鏇翠俊浠讳负绌� 鍒欏～鍏�
+ // 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
if (StringUtils.isNotBlank(username)
&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
baseEntity.setUpdateBy(username);
@@ -59,16 +59,13 @@
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
Date current = new Date();
- // 鏇存柊鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
- baseEntity.setUpdateTime(current);
- }
- String username = getLoginUsername();
- // 褰撳墠宸茬櫥褰� 涓� 鏇翠俊浠讳负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getUpdateBy())) {
- baseEntity.setUpdateBy(username);
- }
+ // 鏇存柊鏃堕棿濉厖(涓嶇涓轰笉涓虹┖)
+ baseEntity.setUpdateTime(current);
+ String username = getLoginUsername();
+ // 褰撳墠宸茬櫥褰� 鏇存柊浜哄～鍏�(涓嶇涓轰笉涓虹┖)
+ if (StringUtils.isNotBlank(username)) {
+ baseEntity.setUpdateBy(username);
+ }
}
} catch (Exception e) {
throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
@@ -79,14 +76,14 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
private String getLoginUsername() {
- LoginUser loginUser;
+ LoginUser user;
try {
- loginUser = SecurityUtils.getLoginUser();
+ user = LoginUtils.getLoginUser();
} catch (Exception e) {
log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
return null;
}
- return loginUser.getUsername();
+ return user.getUsername();
}
}
--
Gitblit v1.9.3