From d252229777797cf859c88476d394dbf980dc1a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 8 May 2022 14:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=A8=E6=80=81=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E8=AE=BE=E7=BD=AE=E8=A7=92=E8=89=B2=E7=AD=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebFirst/database/sqlite.db                   | Bin 143360 -> 143360 bytes
 .../yi-sqlsugar-dev.db                        | Bin 102400 -> 102400 bytes
 .../Yi.Framework.Core/JwtInvoker.cs           |   2 +-
 .../ModelsTemplate/MenuEntity.cs              |  12 +-
 .../ModelsTemplate/RoleEntity.cs              |   5 +
 .../Yi.Framework.Model.csproj                 |   2 +-
 .../Yi.Framework.Service/UserService.cs       |   3 +-
 Yi.Vue2.x/src/api/userApi.js                  |   8 +
 Yi.Vue2.x/src/components/ccAvatar.vue         |   2 +-
 Yi.Vue2.x/src/components/ccCombobox.vue       |   2 +
 Yi.Vue2.x/src/components/ccTreeview.vue       |  28 +--
 Yi.Vue2.x/src/layouts/default/Drawer.vue      | 174 +-----------------
 Yi.Vue2.x/src/layouts/default/ListGroup.vue   |  10 +-
 Yi.Vue2.x/src/layouts/default/ListItem.vue    |  12 +-
 Yi.Vue2.x/src/permission.js                   |   4 +
 Yi.Vue2.x/src/store/modules/user.js           |  11 +-
 Yi.Vue2.x/src/util/menuDic.js                 |   2 +
 Yi.Vue2.x/src/util/menuHandle.js              |  47 +++--
 Yi.Vue2.x/src/util/myaxios.js                 |  12 +-
 Yi.Vue2.x/src/views/AdmRole.vue               |   3 +-
 Yi.Vue2.x/src/views/AdmUser.vue               |  17 +-
 Yi.Vue2.x/src/views/login.vue                 |  57 ++++--
 22 files changed, 150 insertions(+), 263 deletions(-)

diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db
index 1a87a4bac42bb40e291a96a1d21cd775101a5a9a..3dc4e708e430cfce2a73f518fcca8bab7dd4507e 100644
GIT binary patch
delta 372
zcmZp8z|ru4V}i8cS_TFNWgv!ux`{f*jB7V0nCLUU-#k@6X9F8hMvdX>WcCNP0*t22
zos3hNwVBQ`TxE)6{5o-BBVU{&Hv^-nsJyeWF$V|B<OlCW#Eo<fOmz(`6by~63{0$y
z%=OGH&5TS<CMQ1Cm^|e{izr0W#LC3b%GgNH%+%7t+{A41#D{8=gCE|Q-1TTrbLZpj
zosStSY}hz;8I0Jgr?V?C$uqGpny#V1WXHySmD7y9db6VdKf9hvYd$xFtSkoy2d^w6
zLr{KBs&jryDvT~JDay=CH#V~~X!YS{(A1oMK#)n)J|MLyH?z1nGd~Zc7N*8gwKW%J
zlsqGYZ)#qtXL5cXjD{#PG%#@7{#TvJfKi91n}L%-6KJzyYaTa)q$J1*Kz%{^r6s9F
O5E8Cud!#1Qay9@mjA`uv

delta 270
zcmZp8z|ru4V}i8cECvP!Wgv!uiitYLjI%Z-nCLUU**sN0X9F9v8-p6d<jL$0Yy}u5
zGj}q4W_rQY#iY%+oiTXgMEl964_ie|bd5|DjEt=e46KX|^$ZLR%`FVgCkwt7p7c(5
z^4EtqIAa~T85l)H<sB#AdmtkOQEp^qYG7qzqGx7kVluh#wZ`PLkM=kNo#D(VE6eL_
zY|O#I5?Y*E6qKKn3Zsn-jEr;*Omq!R6^sl)+Ko)~EX~Z!4UJ6=3=9l)!Kk_O@%GNg
zj1@L)JlzcX?0=`TD=^73aq3RjP++p#>?kmuefwW^CIiOlI|Z3`ZGW!GB*_K<ZYWIq

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 1ae5c4f1ff9cd04b569656686fc0cf7e36dd23ac..d9f868085b2f5bd08932998a6a62d128bcd5c771 100644
GIT binary patch
delta 4052
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
Q+%|B}bi{-8scFLaADeg>UjP6A

delta 1300
zcmZ`(TWAzl7(Qoqb9QETXU<w(FC@h^WigRDIoFw;v9^gzz^6q-)KIVB<-rFfv3aPj
z8-fTWv}=%bAL@fbgg%rubv5w<A}Q!oL=f~rODUo&KIg3{J(Jmq%Zkh#IGp+Z|NH*`
z`_GJBL1S0Y#m*HY0DyIB8ER>2t)2Xm!;wD^P50><z6J0Le5<~q|2Mp=TT3E@6ha3e
zi}vmAozK85`u5$-whUPHUjFsncm{OCR?N`o(0oSAqM^~<3L9aP0TFHhyoeihc<MR6
zbic2oyO~f+#gGw11d%2l2Qh0A;4S#JwOHSfdues4qrsSg)&X7&bgcaM?*T0X8h5LW
zix)0!J=j$dIVydoUe6|!aY4O77~)lhk(S2vy~fmKMi|>n#AfE?sOt;YC#3DD;B#R+
z!XYk|O129?ajE<!Z7Z7jikFDJcENQBbsVV~Xng=5RGUa{vt6&p?lyjzjH0QNBg7}(
zGQCuyqAG+<9qLgjuOEs(uE)tPTu}<LYaWivZ9#9t{%2Ro8+(-xQA+0JDDx%vCAGQB
zywJKWfp^W&W$Ttgm35yA4IOO>?ain*exThm|H;_v{r_OzR2oai5RAA(m%}f>RE<q0
z7C>SFKeJ}6ia9*@*$((Ks*_9}&MoYL*E;IM<_}u!zk@K@i6($GW$jEi($mHx<ElQa
z51@&}li;au$ecj&@xe8Tx#}@^Ag;mN>gXn{PojOXF4IhbWa=rfR$IsL4BlZrux8WO
z%>C(aQcu-r-AS3plWCMU`ViotsMo%zz=8E)QzAbE_lawJUV#=EKVqa&t#}r0-?%hI
z%NXV}#}<MM$($pJAY*ScW4sK%?rF<Nd?9Vlc|kA-W3V%?EB>PLsWw@L{RXuqA;)#a
zbhr$2wO`9{Q+o#L3u3FmWokrA9g0sk^{|3>W!Te(=C04EEtnL-lO@=SetYI4w4gyP
zTohd9@{-nyp7|d3bhg!^(4H+BqnxtZ>^V48!asq5yq?vUDpHfT_T*@AS%1H(F6--?
z6L0>QI(>BHbj#!g_n_cQ$MziNaO!>)Pou5I=fPh`wWL~sl&D>I-cUJ%BM?pRo9g9P
lKTd_2OR*NEptkx9-1xCnA#Atcx|HzQes~_&&R5~t{{dGPBw+vm

diff --git a/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs b/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
index dbaf0e95..b7ddc280 100644
--- a/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
@@ -42,7 +42,7 @@ namespace Yi.Framework.Core
 
             foreach (var m in menus)
             {
-                claims.Add(new Claim("permission", m.PermissionCode));
+                claims.Add(new Claim("permission", m.PermissionCode.ToString()));
             }
 
             if (isRefresh)
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs
index 062ff186..b32d3177 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs
@@ -32,7 +32,7 @@ namespace Yi.Framework.Model.Models
         /// <summary>
         ///  
         ///</summary>
-         [SugarColumn(ColumnName= "PermissionCode")]
+         [SugarColumn(ColumnName="PermissionCode"    )]
          public string PermissionCode { get; set; }
         /// <summary>
         ///  
@@ -69,5 +69,15 @@ namespace Yi.Framework.Model.Models
         ///</summary>
          [SugarColumn(ColumnName="TenantId"    )]
          public long? TenantId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuIcon"    )]
+         public string MenuIcon { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Router"    )]
+         public string Router { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs
index a85c6d45..99c9da38 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs
@@ -54,5 +54,10 @@ namespace Yi.Framework.Model.Models
         ///</summary>
          [SugarColumn(ColumnName="ModifyUser"    )]
          public long? ModifyUser { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleCode"    )]
+         public string RoleCode { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
index b2e5a54d..31183d3e 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="NEST" Version="7.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.7.5" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.7.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
index a2275c85..16fecb33 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
@@ -1,6 +1,7 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Helper;
@@ -112,7 +113,7 @@ namespace Yi.Framework.Service
             //首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可)
 
             //得到用户
-            var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles, r => r.Menus).InSingleAsync(userId);
+            var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles.Where(r=>r.IsDeleted==false).ToList(), r => r.Menus.Where(m=>m.IsDeleted==false).ToList()).InSingleAsync(userId);
 
             //得到角色集合
             var roleList = user.Roles;
diff --git a/Yi.Vue2.x/src/api/userApi.js b/Yi.Vue2.x/src/api/userApi.js
index 728e97a5..9b9f7851 100644
--- a/Yi.Vue2.x/src/api/userApi.js
+++ b/Yi.Vue2.x/src/api/userApi.js
@@ -19,4 +19,12 @@ export default {
             method: 'get'
         })
     },
+    GiveUserSetRole(UserIds,RoleIds)
+    {
+        return myaxios({
+            url: `/User/GiveUserSetRole`,
+            method: 'put',
+            data:{UserIds,RoleIds}
+        })
+    }
 }
\ No newline at end of file
diff --git a/Yi.Vue2.x/src/components/ccAvatar.vue b/Yi.Vue2.x/src/components/ccAvatar.vue
index a8709e15..4f8a6438 100644
--- a/Yi.Vue2.x/src/components/ccAvatar.vue
+++ b/Yi.Vue2.x/src/components/ccAvatar.vue
@@ -2,7 +2,7 @@
         <v-avatar  :size="size" >
               <!-- <img src="https://z3.ax1x.com/2021/05/09/gJadhD.jpg" /> -->
               <img
-                :src="baseurl +'/image/'+$store.state.user.user.icon"
+                :src="baseurl +'/image/'+$store.state.user.user.user.icon"
               />
             </v-avatar>
 </template>
diff --git a/Yi.Vue2.x/src/components/ccCombobox.vue b/Yi.Vue2.x/src/components/ccCombobox.vue
index 78f07eb1..527a52f6 100644
--- a/Yi.Vue2.x/src/components/ccCombobox.vue
+++ b/Yi.Vue2.x/src/components/ccCombobox.vue
@@ -58,6 +58,8 @@ export default {
   watch:{
      select:{//深度监听，可监听到对象、数组的变化
          handler(val, oldVal){
+             console.log(oldVal)
+           console.log(val)
               this.$emit("select",val);
          },
          deep:true
diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x/src/components/ccTreeview.vue
index c1e4acaf..4fe46133 100644
--- a/Yi.Vue2.x/src/components/ccTreeview.vue
+++ b/Yi.Vue2.x/src/components/ccTreeview.vue
@@ -52,10 +52,15 @@
       hoverable
       item-text="menuName"
     >
+        <template v-slot:prepend="{ item }">
+      <v-icon>
+        {{ item.menuIcon }}
+      </v-icon>
+    </template>
       <template v-slot:append="{ item }">
         <v-btn v-show="item.menuType==1" class="mr-2">权限:{{ item.permissionCode }}</v-btn>
         <!-- <v-btn class="mr-2">图标:{{ item.icon }}</v-btn> -->
-        <!-- <v-btn class="mr-2">路由:{{ item.router }}</v-btn> -->
+        <v-btn v-show="item.menuType!=1" class="mr-2">路由:{{ item.router }}</v-btn>
         <!-- <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
         <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn> -->
         <!-- <ccCombobox
@@ -101,9 +106,10 @@ export default {
     editedItem: {},
     editedIndex: -1,
     defaultItem: {
-      // icon: "mdi-start",
+      menuIcon: "mdi-view-dashboard",
       permissionCode: "test",
       menuName: "管理",
+      router:"/",
       parentId: 0,
       MenuType:0
     },
@@ -121,21 +127,16 @@ export default {
       this.$refs.tree.updateAll(true);
     },
 
-    // setMould(item) {
-    //   menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
-    //     this.$dialog.notify.info(resp.msg, {
-    //       position: "top-right",
-    //       timeout: 5000,
-    //     });
-    //     this.init();
-    //   });
-    // },
 
     getSelect(data) {
       this.mouldSelect = data;
     },
     async deleteItem(item) {
-      this.editedIndex = 1;
+      if(item!=null)
+      {
+   this.editedIndex = 1;
+      }
+   
       this.editedItem = Object.assign({}, item);
       var p = await this.$dialog.warning({
         text: "你确定要删除此条记录吗？?",
@@ -154,7 +155,7 @@ export default {
       if (this.editedIndex > -1) {
         Ids.push(this.editedItem.id);
       } else {
-        this.selection.forEach(function (item) {
+        this.selection.forEach( (item) =>{
           Ids.push(item.id);
         });
       }
@@ -200,6 +201,7 @@ export default {
     selection: {
       //深度监听，可监听到对象、数组的变化
       handler(val, oldVal) {
+
         this.$emit("selection", val);
       },
       deep: true,
diff --git a/Yi.Vue2.x/src/layouts/default/Drawer.vue b/Yi.Vue2.x/src/layouts/default/Drawer.vue
index 047625cb..bbaf372e 100644
--- a/Yi.Vue2.x/src/layouts/default/Drawer.vue
+++ b/Yi.Vue2.x/src/layouts/default/Drawer.vue
@@ -49,180 +49,16 @@
 <script>
 // Utilities
 // import { get, sync } from 'vuex-pathify'
-import userApi from "@/api/userApi";
+import store from "@/store/index.js";
+import { toTree } from "@/util/menuHandle";
 export default {
   methods: {
     init() {
-      //这里动态获取菜单，暂时写死
-      // userApi.GetMenuByHttpUser().then((resp) => {
-      //   this.items = resp.data.children;
-      // });
-      this.items = 
-      
-       [
-          {
-            icon: "mdi-view-dashboard",
-            router: "/",
-            menu_name: "首页",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: null,
-            id: 2,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-account-box-multiple",
-            router: null,
-            menu_name: "用户角色管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-account-box",
-                router: "/AdmUser/",
-                menu_name: "用户管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 3,
-                children: null,
-                id: 4,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-account-circle",
-                router: "/admrole/",
-                menu_name: "角色管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 3,
-                children: null,
-                id: 9,
-                is_delete: 0,
-              },
-            ],
-            id: 3,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-account-cash",
-            router: null,
-            menu_name: "角色接口管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-clipboard-check-multiple",
-                router: "/AdmMenu/",
-                menu_name: "菜单管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 15,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-circle-slice-8",
-                router: "/admMould/",
-                menu_name: "接口管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 20,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-clipboard-account",
-                router: "/admRoleMenu/",
-                menu_name: "角色菜单分配管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 25,
-                is_delete: 0,
-              },
-            ],
-            id: 14,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-clipboard-flow-outline",
-            router: null,
-            menu_name: "路由管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-account-eye",
-                router: "/userinfo/",
-                menu_name: "用户信息",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 26,
-                children: null,
-                id: 27,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-account-eye",
-                router: "/pan",
-                menu_name: "云盘管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 26,
-                children: null,
-                id: 28,
-                is_delete: 0,
-              },
-            ],
-            id: 26,
-            is_delete: 0,
-          },
-        ]
-
+      this.items=toTree( store.state.user.user.menus);
     },
     logout() {
-      this.$store.dispatch("Logout");
-      this.$router.push({ path: "/login" });
+      this.$store.dispatch("Logout")
+   this.$router.push({ path: "/login/" });
     },
   },
   created() {
diff --git a/Yi.Vue2.x/src/layouts/default/ListGroup.vue b/Yi.Vue2.x/src/layouts/default/ListGroup.vue
index d4cec40f..eeff04e6 100644
--- a/Yi.Vue2.x/src/layouts/default/ListGroup.vue
+++ b/Yi.Vue2.x/src/layouts/default/ListGroup.vue
@@ -1,8 +1,8 @@
 <template>
-  <v-list-group :group="group" :prepend-icon="item.icon" eager v-bind="$attrs">
+  <v-list-group :group="group" :prepend-icon="item.menuIcon" eager v-bind="$attrs">
     <template v-slot:activator>
       <v-list-item-icon
-        v-if="!item.icon && !item.avatar"
+        v-if="!item.menuIcon && !item.avatar"
         class="text-caption text-uppercase text-center my-2 align-self-center"
         style="margin-top: 14px"
       >
@@ -13,8 +13,8 @@
         <v-img :src="item.avatar" />
       </v-list-item-avatar>
 
-      <v-list-item-content v-if="item.menu_name">
-        <v-list-item-title v-text="item.menu_name" />
+      <v-list-item-content v-if="item.menuName">
+        <v-list-item-title v-text="item.menuName" />
       </v-list-item-content>
     </template>
 
@@ -57,7 +57,7 @@ export default {
       return this.genGroup(this.item.children);
     },
     title() {
-      const matches = this.item.menu_name.match(/\b(\w)/g);
+      const matches = this.item.menuName.match(/\b(\w)/g);
       if (matches != null) {
         return matches.join("");
       }
diff --git a/Yi.Vue2.x/src/layouts/default/ListItem.vue b/Yi.Vue2.x/src/layouts/default/ListItem.vue
index 47b1ee83..8404f185 100644
--- a/Yi.Vue2.x/src/layouts/default/ListItem.vue
+++ b/Yi.Vue2.x/src/layouts/default/ListItem.vue
@@ -11,7 +11,7 @@
     v-on="$listeners"
   >
     <v-list-item-icon
-      v-if="!item.icon"
+      v-if="!item.menuIcon"
       class="text-caption text-uppercase justify-center ml-1 my-2 align-self-center"
     >
       {{ title }}
@@ -22,14 +22,14 @@
     </v-list-item-avatar>
 
     <v-list-item-icon
-      v-if="item.icon"
+      v-if="item.menuIcon"
       class="my-2 align-self-center"
     >
-      <v-icon v-text="item.icon" />
+      <v-icon v-text="item.menuIcon" />
     </v-list-item-icon>
 
-    <v-list-item-content v-if="item.menu_name">
-      <v-list-item-title v-text="item.menu_name" />
+    <v-list-item-content v-if="item.menuName">
+      <v-list-item-title v-text="item.menuName" />
     </v-list-item-content>
   </v-list-item>
 </template>
@@ -47,7 +47,7 @@
 
     computed: {
       title () {
-        const matches = this.item.menu_name.match(/\b(\w)/g)
+        const matches = this.item.menuName.match(/\b(\w)/g)
 if(matches!=null)
 {
         return matches.join('')
diff --git a/Yi.Vue2.x/src/permission.js b/Yi.Vue2.x/src/permission.js
index 54c597df..c12c8181 100644
--- a/Yi.Vue2.x/src/permission.js
+++ b/Yi.Vue2.x/src/permission.js
@@ -4,6 +4,10 @@ import store from './store/index'
 
 
 router.beforeEach((to, from, next) => {
+
+    // console.log(to)
+    // console.log(from)
+    // console.log(next)
     const user = store.state.user.user; //获取是有user
     if (!user) { //如果没有登入
         if (to.path == '/login/' || to.path == '/register/' || to.path == '/reset_password/' || to.path == '/qq/') {
diff --git a/Yi.Vue2.x/src/store/modules/user.js b/Yi.Vue2.x/src/store/modules/user.js
index 932d94de..fc1b4a3c 100644
--- a/Yi.Vue2.x/src/store/modules/user.js
+++ b/Yi.Vue2.x/src/store/modules/user.js
@@ -38,7 +38,6 @@ const mutations = { //变化//载荷
     },
     SET_USER(state, user) {
         state.user = user
-        console.log(user)
         setUser(user)
     },
     SetGradient(state, gradient) {
@@ -87,19 +86,21 @@ const actions = { //动作
      
 
                     accountApi.getUserAllInfo().then(resp2=>{
-                        commit('SET_USER', resp2.data.user)
+                        commit('SET_USER', resp2.data)
 
                         var code=[];
                         resp2.data.menus.forEach(element => {
                             code.push(element.permissionCode)
                         });
                         commit('SET_PER', code)
+
                         resolv(resp)
                     })
-
-
                 }
-           
+                else
+                {
+                    resolv(resp)
+                }
             }).catch(error => {
                 reject(error)
             })
diff --git a/Yi.Vue2.x/src/util/menuDic.js b/Yi.Vue2.x/src/util/menuDic.js
index 34f194e3..af4ab138 100644
--- a/Yi.Vue2.x/src/util/menuDic.js
+++ b/Yi.Vue2.x/src/util/menuDic.js
@@ -27,3 +27,5 @@ export default {menuDic,btnDic};
 
 
 //如果查询找到的是user:*，可以先把*全部替换成get:list再进行比对即可
+
+//等待持续更新中
\ No newline at end of file
diff --git a/Yi.Vue2.x/src/util/menuHandle.js b/Yi.Vue2.x/src/util/menuHandle.js
index 255518d1..4428b571 100644
--- a/Yi.Vue2.x/src/util/menuHandle.js
+++ b/Yi.Vue2.x/src/util/menuHandle.js
@@ -1,29 +1,26 @@
-export function setTreeMenu(menuList) {
-    if (menuList != null && menuList.length > 0) {
+export function toTree(data) {
+    // 删除 所有 children,以防止多次调用
+    data.forEach(function (item) {
+        delete item.children;
+    });
 
-        //结果
-        var res;
-        //获取最小的parentId
-        var minParentId = 0;
-        //获取id=最小的parentId的菜单列表
-        var menuList1=menuList.filter((item)=>{item.parentId==minParentId}) ;
-
-        menuList1.forEach(element=>{
-            res.push(element)
-            var children=menuList.filter((item)=>{item.parentId==element.id}) ;
-            if (children.length > 0) {
-                setTreeChildren(menuList, children,element)
-            }
-        })
-    }
-}
-
-function setTreeChildren(menuList, childrenList,model) {
-    childrenList.forEach(element => {
-        model.Childs.push(element);
-        var childrenList2=menuList.filter((item)=>{item.parentId==element.id}) ;
-        if (childrenList2.length > 0) {
-            setTreeChildren(menuList, childrenList2,element)
+    // 将数据存储为 以 id 为 KEY 的 map 索引数据列
+    var map = {};
+    data.forEach(function (item) {
+        map[item.id] = item;
+    });
+//        console.log(map);
+    var val = [];
+    data.forEach(function (item) {
+        // 以当前遍历项，的pid,去map对象中找到索引的id
+        var parent = map[item.parentId];
+        // 好绕啊，如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
+        if (parent) {
+            (parent.children || ( parent.children = [] )).push(item);
+        } else {
+            //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
+            val.push(item);
         }
     });
+    return val;
 }
\ No newline at end of file
diff --git a/Yi.Vue2.x/src/util/myaxios.js b/Yi.Vue2.x/src/util/myaxios.js
index f7034049..fc890dbf 100644
--- a/Yi.Vue2.x/src/util/myaxios.js
+++ b/Yi.Vue2.x/src/util/myaxios.js
@@ -31,14 +31,14 @@ myaxios.interceptors.request.use(function(config) {
 // 响应拦截器
 myaxios.interceptors.response.use(async function(response) {
     const resp = response.data
-    if (resp.code == undefined && resp.msg == undefined) {
+    if (resp.code == undefined && resp.message == undefined) {
         vm.$dialog.notify.error("错误代码：无，原因：与服务器失去连接", {
             position: "top-right",
             timeout: 5000,
         });
     } else if (resp.code == 401) {
         const res = await vm.$dialog.error({
-            text: `错误代码：${resp.code}，原因：${resp.msg}<br>是否重新进行登录？`,
+            text: `错误代码：${resp.code}，原因：${resp.message}<br>是否重新进行登录？`,
             title: '错误',
             actions: {
                 'false': '取消',
@@ -50,7 +50,7 @@ myaxios.interceptors.response.use(async function(response) {
         }
 
     } else if (resp.code !== 200) {
-        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.msg}`, {
+        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.message}`, {
             position: "top-right",
             timeout: 5000,
         });
@@ -60,14 +60,14 @@ myaxios.interceptors.response.use(async function(response) {
     return resp;
 }, async function(error) {
     const resp = error.response.data
-    if (resp.code == undefined && resp.msg == undefined) {
+    if (resp.code == undefined && resp.message == undefined) {
         vm.$dialog.notify.error("错误代码：无，原因：与服务器失去连接", {
             position: "top-right",
             timeout: 5000,
         });
     } else if (resp.code == 401) {
         const res = await vm.$dialog.error({
-            text: `错误代码：${resp.code}，原因：${resp.msg}<br>是否重新进行登录？`,
+            text: `错误代码：${resp.code}，原因：${resp.message}<br>是否重新进行登录？`,
             title: '错误',
             actions: {
                 'false': '取消',
@@ -81,7 +81,7 @@ myaxios.interceptors.response.use(async function(response) {
         }
 
     } else if (resp.code !== 200) {
-        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.msg}`, {
+        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.message}`, {
             position: "top-right",
             timeout: 5000,
         });
diff --git a/Yi.Vue2.x/src/views/AdmRole.vue b/Yi.Vue2.x/src/views/AdmRole.vue
index 9bd1e9a0..9af21e41 100644
--- a/Yi.Vue2.x/src/views/AdmRole.vue
+++ b/Yi.Vue2.x/src/views/AdmRole.vue
@@ -31,7 +31,8 @@ export default {
     axiosUrls: {
     },
     headers: [
-      { text: "编号", align: "start", value: "id" },
+      // { text: "编号", align: "start", value: "id" },
+           { text: "角色编号", value: "roleCode", sortable: false },
       { text: "角色名", value: "roleName", sortable: false },
       // { text: "云盘地址", value: "file_path", sortable: false },
       // { text: "简介", value: "introduce", sortable: false },
diff --git a/Yi.Vue2.x/src/views/AdmUser.vue b/Yi.Vue2.x/src/views/AdmUser.vue
index 3a55f1d1..9544f223 100644
--- a/Yi.Vue2.x/src/views/AdmUser.vue
+++ b/Yi.Vue2.x/src/views/AdmUser.vue
@@ -7,7 +7,7 @@
       headers="设置角色"
       :items="roleItems"
       @select="getSelect"
-      itemText="role_name"
+      itemText="roleName"
     >
       <template v-slot:save>
         <v-btn @click="setRole" color="blue darken-1" text> 保存</v-btn>
@@ -27,6 +27,7 @@
 </template>
 <script>
 import userApi from "../api/userApi";
+import roleApi from "../api/roleApi";
 export default {
   created() {
     this.init();
@@ -59,8 +60,7 @@ export default {
       });
     },
     init() {
-
-//这里可以遍历后台的菜单code，根据对应的菜单code来给axiosUrls的增删改查赋值即可
+      //这里可以遍历后台的菜单code，根据对应的菜单code来给axiosUrls的增删改查赋值即可
 
       this.axiosUrls = {
         get: "/user/GetList",
@@ -69,9 +69,10 @@ export default {
         add: "/user/Add",
       };
 
-      // roleApi.getRole().then((resp) => {
-      //   this.roleItems = resp.data;
-      // });
+      roleApi.getList().then((resp) => {
+        console.log(resp.data)
+        this.roleItems=JSON.parse(JSON.stringify(resp.data));
+      });
     },
     setRole() {
       var userIds = [];
@@ -82,8 +83,8 @@ export default {
       this.select.forEach((item) => {
         roleIds.push(item.id);
       });
-      userApi.SetRoleByUser(userIds, roleIds).then((resp) => {
-        this.$dialog.notify.success(resp.msg, {
+      userApi.GiveUserSetRole(userIds, roleIds).then((resp) => {
+        this.$dialog.notify.success(resp.message, {
           position: "top-right",
           timeout: 5000,
         });
diff --git a/Yi.Vue2.x/src/views/login.vue b/Yi.Vue2.x/src/views/login.vue
index 4602e343..a90b6c9c 100644
--- a/Yi.Vue2.x/src/views/login.vue
+++ b/Yi.Vue2.x/src/views/login.vue
@@ -52,7 +52,16 @@
           <a href="javascript:void(0)" class="mt-1"> 忘记密码? </a>
         </div>
 
-        <v-btn block color="primary" @click="login" class="mt-6" :loading="loader" :disabled="btn_dis"> 登录 </v-btn>
+        <v-btn
+          block
+          color="primary"
+          @click="login"
+          class="mt-6"
+          :loading="loader"
+          :disabled="btn_dis"
+        >
+          登录
+        </v-btn>
       </v-form>
     </v-card-text>
 
@@ -70,7 +79,7 @@
     </v-card-text>
 
     <!-- social links -->
-    <v-card-actions class="d-flex justify-center ">
+    <v-card-actions class="d-flex justify-center">
       <v-btn v-for="link in socialLink" :key="link.icon" icon class="ms-1">
         <v-icon :color="$vuetify.theme.dark ? link.colorInDark : link.color">
           {{ link.icon }}
@@ -81,11 +90,11 @@
 </template>
 <script>
 export default {
-  created(){
+  created() {
     this.enterSearch();
   },
   data: () => ({
-        btn_dis:false,
+    btn_dis: false,
     loader: null,
     socialLink: [
       {
@@ -122,8 +131,7 @@ export default {
     },
   }),
   methods: {
-      enterSearch() {
-     
+    enterSearch() {
       document.onkeydown = (e) => {
         //13表示回车键，baseURI是当前页面的地址，为了更严谨，也可以加别的，可以打印e看一下
         if (e.keyCode === 13 && e.target.baseURI.match("/")) {
@@ -133,20 +141,29 @@ export default {
       };
     },
     login() {
-         this.loader = true;
-      this.btn_dis=true;
-      this.$store.dispatch("Login", this.form).then((resp) => {
-        if (resp.status) {
-          this.$router.push("/");
-        } else {
-                  this.loader=null;
-             this.btn_dis=false;
-          this.$dialog.notify.error(resp.msg, {
-            position: "top-right",
-            timeout: 5000,
-          });
-        }
-      });
+      this.loader = true;
+      this.btn_dis = true;
+      this.$store
+        .dispatch("Login", this.form)
+        .then((resp) => {
+          if (resp.status) {
+           
+            this.$router.push("/");
+          } else {
+
+            this.loader = null;
+            this.btn_dis = false;
+            this.$dialog.notify.error(resp.message, {
+              position: "top-right",
+              timeout: 5000,
+            });
+          }
+        })
+        .catch((error) => {
+                
+          this.loader = false;
+          this.btn_dis = false;
+        });
     },
   },
 };