bugfix

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);

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

@@ -2,7 +2,10 @@ 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 cn.efunbox.manage.common.utils.Constants;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -15,6 +18,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 @Slf4j
 @Aspect
@@ -24,8 +28,12 @@ public class OperationLogAspect {
 
     @Autowired
     AsyncOperationLogHandler asyncOperationLogHandler;
+
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+
     @Autowired
-    RedisTemplate redisTemplate;
+    UserRepository userRepository;
 
     @AfterReturning(value = "execution(* cn.efunbox.manage.base.controller..*.*(..))",returning = "retVal")
     public void doAfter(JoinPoint joinPoint,Object retVal) throws Throwable {
@@ -45,8 +53,8 @@ public class OperationLogAspect {
                     log.error("user token is null !");
                     return;
                 }
-
-                User loginUser = (User) redisTemplate.opsForValue().get(token);
+                User loginUser = (User)JSONObject.toBean(JSONObject.fromObject(redisTemplate.opsForValue().get(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token)), User.class);
+//                User loginUser = (User) ;
 
 
                 request.setAttribute("userInfo",loginUser);

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/assist/async/AsyncOperationLogHandler.java

@@ -35,7 +35,7 @@ public class AsyncOperationLogHandler {
             OperationLog operationLog = new OperationLog();
             try {
                 //设置操作用户 信息
-                operationLog.setUserName(loginUser.getNickName());
+                operationLog.setUserName(loginUser.getUserName());
                 operationLog.setUserId(loginUser.getId()+"");
                 //设置 ip
                 operationLog.setIp(IpUtils.getIp(request));