Merge branches 'master' and 'test' of http://gogs.efunbox.cn:/wangys/efunbox-manage into test

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

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

@@ -2,10 +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 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;
@@ -18,7 +15,6 @@ 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
@@ -28,9 +24,8 @@ public class OperationLogAspect {
 
     @Autowired
     AsyncOperationLogHandler asyncOperationLogHandler;
-
     @Autowired
-    private RedisTemplate<String,String> redisTemplate;
+    RedisTemplate redisTemplate;
 
     @Autowired
     UserRepository userRepository;
@@ -48,13 +43,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)JSONObject.toBean(JSONObject.fromObject(redisTemplate.opsForValue().get(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token)), User.class);
-//                User loginUser = (User) ;
+
+//                User loginUser = (User) redisTemplate.opsForValue().get(token);
+                User loginUser = userRepository.findById(uid);
 
 
                 request.setAttribute("userInfo",loginUser);