From 50672a5c91c33f2833f91981b562af3d88b9f1d6 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 30 五月 2024 19:17:45 +0800
Subject: [PATCH] feat: 修复登录bug;token失效bug
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
index 0e17d18..ca03250 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
@@ -37,18 +37,23 @@
public void insertFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName = loginUser.getUsername();
- if (StringUtils.hasLength(userName)) {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("createTime", new Date(), metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- this.setFieldValByName("updateTime", new Date(), metaObject);
- } else {
- this.setFieldValByName("createBy", "", metaObject);
- this.setFieldValByName("updateBy", "", metaObject);
- this.setFieldValByName("createTime", "", metaObject);
- this.setFieldValByName("updateTime", "", metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ if (loginUser != null) {
+ String userName = loginUser.getUsername();
+ if (StringUtils.hasLength(userName)) {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", "", metaObject);
+ this.setFieldValByName("updateTime", "", metaObject);
+ }
}
+
}
/**
@@ -60,7 +65,12 @@
public void updateFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName = loginUser.getUsername();
+ String userName;
+ if (null == loginUser) {
+ userName = tokenService.getLoginUserStudy().getName();
+ } else {
+ userName = loginUser.getUsername();
+ }
if (StringUtils.hasLength(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("createTime", new Date(), metaObject);
--
Gitblit v1.7.1