From 15b6f985987a5006039d7b13af20073fba2ed041 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Thu, 5 Dec 2024 17:56:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(web):=20=E7=A7=BB=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E7=9A=84=E5=86=97=E4=BD=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 DataFileService 中设置创建和修改用户的代码- 更新了 UserService 中的当前登录用户获取方式，增加了 Optional 类型的方法 - 移除了 EntityHelper 中填充创建者和修改者的代码 --- .../domain/upload/service/DataFileService.java | 3 --- .../web/domain/user/service/UserService.java | 16 ++++++++++------ .../gringotts/web/helper/EntityHelper.java | 12 ------------ 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java index b966406..ddba322 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java @@ -36,9 +36,6 @@ public class DataFileService extends SimpleServiceSupport { public Long initialDataFile(String filename) { DataFile dataFile = new DataFile(); dataFile.setFilename(filename); - User loginUser = userService.currentLoginUser(); - dataFile.setCreatedUser(loginUser); - dataFile.setModifiedUser(loginUser); return dataFileRepository.save(dataFile).getId(); } diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java index 28de0c1..640e344 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java @@ -3,13 +3,12 @@ package com.eshore.gringotts.web.domain.user.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.SaTokenInfo; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.eshore.gringotts.web.domain.user.entity.User; import com.eshore.gringotts.web.domain.user.repository.UserRepository; import java.time.LocalDateTime; -import java.util.List; +import java.util.Optional; import lombok.Data; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; @@ -73,7 +72,15 @@ public class UserService { } public User currentLoginUser() { - return userRepository.findById(StpUtil.getLoginIdAsLong()).orElseThrow(LoginNotFoundException::new); + return currentLoginUserOptional().orElseThrow(LoginNotFoundException::new); + } + + public Optional currentLoginUserOptional() { + try { + return userRepository.findById(StpUtil.getLoginIdAsLong()); + } catch (Throwable throwable) { + return Optional.empty(); + } } private User findUserByUsername(String username) { @@ -129,7 +136,6 @@ public class UserService { */ public void registerFromAdministrator(String username, String password, User.Role role) { User loginUser = currentLoginUser(); - User user = new User(); user.setUsername(username); user.setPassword(encryptPassword(password)); @@ -137,8 +143,6 @@ public class UserService { user.setState(User.State.NORMAL); user.setCheckedUser(loginUser); user.setCheckedTime(LocalDateTime.now()); - user.setCreatedUser(loginUser); - user.setModifiedUser(loginUser); userRepository.save(user); } diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java index 9234f4e..912ab70 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java @@ -1,9 +1,6 @@ package com.eshore.gringotts.web.helper; import cn.hutool.core.util.ObjectUtil; -import com.eshore.gringotts.web.domain.base.entity.SimpleEntity; -import com.eshore.gringotts.web.domain.user.entity.User; -import com.eshore.gringotts.web.domain.user.service.UserService; import java.util.function.Supplier; import org.springframework.data.jpa.repository.JpaRepository; @@ -20,13 +17,4 @@ public class EntityHelper { repository.delete(old); } } - - public static E fillCreatorAndModifier(E entity, UserService service) { - User user = service.currentLoginUser(); - if (ObjectUtil.isNull(entity.getCreatedUser())) { - entity.setCreatedUser(user); - } - entity.setModifiedUser(user); - return entity; - } }