From b77b91912b6a7f095c2c0b4fdff5ef20514fda6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sat, 16 Oct 2021 21:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0vuex=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dlogin+token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 4 +- .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 65536 bytes Yi.Vue/src/layouts/default/AppBar.vue | 71 ++++--- Yi.Vue/src/layouts/default/Drawer.vue | 177 ++++++++-------- Yi.Vue/src/layouts/default/Settings.vue | 198 +++++++----------- .../layouts/default/widgets/DrawerToggle.vue | 7 +- Yi.Vue/src/store/modules/home.js | 75 ++++--- Yi.Vue/src/store/modules/user.js | 49 +++-- Yi.Vue/src/util/myaxios.js | 4 +- 9 files changed, 282 insertions(+), 303 deletions(-) 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 24e258e32cf8749d1573395c184c0187a30a8f5e..819a767cf0b14de7625f22adbe4716a57579ebd5 100644 GIT binary patch delta 75 zcmZo@U}4OC3;v`03;ApLqc;l*c=9VLuyQj93(HC}FfcN3 e7#bM^QEp16Zccu3_Oq2UpRS!Cw7E9Fc>)0YI~G0w delta 38 ucmZo@U} - + - + @@ -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 @@