diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index 375ad1f8..fc4438b9 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -39,8 +39,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers if( user_data!=null) { - var toke = MakeJwt.app(user_data); - return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke }); + var token = MakeJwt.app(user_data); + return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, token }); } return Result.Error(); } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 24e258e3..819a767c 100644 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db and b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db differ diff --git a/Yi.Vue/src/layouts/default/AppBar.vue b/Yi.Vue/src/layouts/default/AppBar.vue index b6d3651d..26aa754c 100644 --- a/Yi.Vue/src/layouts/default/AppBar.vue +++ b/Yi.Vue/src/layouts/default/AppBar.vue @@ -10,17 +10,11 @@ height="70" flat > - + - + @@ -35,45 +29,50 @@ diff --git a/Yi.Vue/src/layouts/default/Drawer.vue b/Yi.Vue/src/layouts/default/Drawer.vue index 688a0f6b..206bbbc5 100644 --- a/Yi.Vue/src/layouts/default/Drawer.vue +++ b/Yi.Vue/src/layouts/default/Drawer.vue @@ -1,24 +1,17 @@ - - + + @@ -41,15 +34,8 @@ Documentation - - - mdi-package-up - + + mdi-package-up 退出 @@ -61,102 +47,109 @@