Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
+import java.util.Objects;
 
 /**
  * @author libin
@@ -72,7 +73,11 @@ public class TokenAop {
                     args[i]= new AppUserDTO();
                     break;
                 }
-               args[i]= userFeign.userDetailByToken(token).getData();
+               AppUserDTO userDTO = userFeign.userDetailByToken(token).getData();
+                if (Objects.isNull(userDTO)){
+                    userDTO = new AppUserDTO();
+                }
+               args[i]= userDTO;
                break;
            }
            if (UserDTO.class.equals(parameter.getType())){