From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 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 7cf64c4..87781eb 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;
@@ -22,43 +22,43 @@
@Slf4j
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
- @Override
- public void insertFill(MetaObject metaObject) {
- try {
- if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
- BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
- Date current = new Date();
- // 鍒涘缓鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
- baseEntity.setCreateTime(current);
- }
- // 鏇存柊鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
- baseEntity.setUpdateTime(current);
- }
- String username = getLoginUsername();
- // 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getCreateBy())) {
- baseEntity.setCreateBy(username);
- }
- // 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getUpdateBy())) {
- baseEntity.setUpdateBy(username);
- }
- }
- } catch (Exception e) {
- throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
- }
- }
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ try {
+ if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
+ BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
+ Date current = new Date();
+ // 鍒涘缓鏃堕棿涓虹┖ 鍒欏～鍏�
+ if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
+ baseEntity.setCreateTime(current);
+ }
+ // 鏇存柊鏃堕棿涓虹┖ 鍒欏～鍏�
+ if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
+ baseEntity.setUpdateTime(current);
+ }
+ String username = getLoginUsername();
+ // 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
+ if (StringUtils.isNotBlank(username)
+ && StringUtils.isBlank(baseEntity.getCreateBy())) {
+ baseEntity.setCreateBy(username);
+ }
+ // 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
+ if (StringUtils.isNotBlank(username)
+ && StringUtils.isBlank(baseEntity.getUpdateBy())) {
+ baseEntity.setUpdateBy(username);
+ }
+ }
+ } catch (Exception e) {
+ throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+ }
+ }
- @Override
- public void updateFill(MetaObject metaObject) {
- try {
- if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
- BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
- Date current = new Date();
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ try {
+ if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
+ BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
+ Date current = new Date();
// 鏇存柊鏃堕棿濉厖(涓嶇涓轰笉涓虹┖)
baseEntity.setUpdateTime(current);
String username = getLoginUsername();
@@ -66,11 +66,11 @@
if (StringUtils.isNotBlank(username)) {
baseEntity.setUpdateBy(username);
}
- }
- } catch (Exception e) {
- throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
- }
- }
+ }
+ } catch (Exception e) {
+ throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+ }
+ }
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
@@ -78,7 +78,7 @@
private String getLoginUsername() {
LoginUser loginUser;
try {
- loginUser = SecurityUtils.getLoginUser();
+ loginUser = LoginUtils.getLoginUser();
} catch (Exception e) {
log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
return null;
--
Gitblit v1.9.3