Merge branch 'dev' into base-modify

dddc4908 · libin · 0874c398 · 5ed6b830 · dddc4908
Commit dddc4908 authored Aug 14, 2019 by libin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

TokenAop.java ...m/github/wxiaoqi/security/admin/support/aop/TokenAop.java +1 -0

No files found.
--- a/ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java
+++ b/ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java
@@ -70,6 +70,7 @@ public class TokenAop {
                if (StringUtils.isEmpty(token)){
 //                   return ObjectRestResponse.createFailedResult(4004,"token不能为空");
                    args[i]= new AppUserDTO();
+                    break;
                }
               args[i]= userFeign.userDetailByToken(token).getData();
               break;