wangys 6 år sedan
förälder
incheckning
3d8b47f1b3

+ 2 - 0
efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/UserRepository.java

@@ -16,6 +16,8 @@ public interface UserRepository extends BasicRepository<User> {
 
     User findByIdAndStatus(String id, BaseStatusEnum normal);
 
+    User findById(String id);
+
     @Modifying
     @Query("update User set status=:status where id  in(:ids)")
     int updateStatusByIds(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);

+ 10 - 4
efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/assist/aspect/OperationLogAspect.java

@@ -2,6 +2,7 @@ package cn.efunbox.manage.base.assist.aspect;
 
 import cn.efunbox.manage.base.assist.async.AsyncOperationLogHandler;
 import cn.efunbox.manage.base.entity.User;
+import cn.efunbox.manage.base.repository.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -27,6 +28,9 @@ public class OperationLogAspect {
     @Autowired
     RedisTemplate redisTemplate;
 
+    @Autowired
+    UserRepository userRepository;
+
     @AfterReturning(value = "execution(* cn.efunbox.manage.base.controller..*.*(..))",returning = "retVal")
     public void doAfter(JoinPoint joinPoint,Object retVal) throws Throwable {
         // 接收到请求,记录请求内容
@@ -40,13 +44,15 @@ public class OperationLogAspect {
 
             //如果是 增删改 才记录入库
             if(request.getMethod().equals("POST")|| request.getMethod().equals("PUT")|| request.getMethod().equals("DELETE")|| request.getMethod().equals("TRACE")|| request.getMethod().equals("PATCH")){
-                String token = request.getHeader("X-Token");
-                if (StringUtils.isEmpty(token)) {
-                    log.error("user token is null !");
+//                String token = request.getHeader("X-Token");
+                String uid = request.getHeader("uid");
+                if (StringUtils.isEmpty(uid)) {
+                    log.error("user uid is null !");
                     return;
                 }
 
-                User loginUser = (User) redisTemplate.opsForValue().get(token);
+//                User loginUser = (User) redisTemplate.opsForValue().get(token);
+                User loginUser = userRepository.findById(uid);
 
 
                 request.setAttribute("userInfo",loginUser);