diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 7b4c6ac9..a0aa002d 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -47,13 +47,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdateUserByHttp(Yi.Framework.Model.Models.UserEntity)">
-            <summary>
-            更新已登录用户的用户信息
-            </summary>
-            <param name="user"></param>
-            <returns></returns>
-        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
             <summary>
             自己更新密码
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
index 17235691..574d6680 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
@@ -159,22 +159,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success().SetData(routers);
         }
 
-        /// <summary>
-        /// 更新已登录用户的用户信息
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        [HttpPut]
-        public async Task<Result> UpdateUserByHttp(UserEntity user)
-        {
-            //当然，密码是不能给他修改的
-            user.Password = null;
-            user.Salt = null;
+        ///// <summary>
+        ///// 更新已登录用户的用户信息
+        ///// </summary>
+        ///// <param name="user"></param>
+        ///// <returns></returns>
+        //[HttpPut]
+        //public async Task<Result> UpdateUserByHttp(UserEntity user)
+        //{
+        //    //当然，密码是不能给他修改的
+        //    user.Password = null;
+        //    user.Salt = null;
 
-            //修改需要赋值上主键哦
-            user.Id = HttpContext.GetUserIdInfo();
-            return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
-        }
+        //    //修改需要赋值上主键哦
+        //    user.Id = HttpContext.GetUserIdInfo();
+        //    return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
+        //}
 
         /// <summary>
         /// 自己更新密码
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index 8b923b7d..8801ce1e 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -119,6 +119,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [Log("用户模块", OperEnum.Update)]
         public async Task<Result> UpdateProfile(UserInfoDto userDto)
         {
+            //修改需要赋值上主键哦
+            userDto.User.Id = HttpContext.GetUserIdInfo();
             return Result.Success().SetStatus(await _iUserService.UpdateProfile(userDto));
         }
 
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580580141183143936 b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580580141183143936
new file mode 100644
index 00000000..53c987dd
Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580580141183143936 differ
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580582304173133824 b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580582304173133824
new file mode 100644
index 00000000..e084ee4d
Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580582304173133824 differ
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580586418466590720 b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580586418466590720
new file mode 100644
index 00000000..c5751514
Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580586418466590720 differ
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587132911751168 b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587132911751168
new file mode 100644
index 00000000..a5908cb2
Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587132911751168 differ
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587228202143744 b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587228202143744
new file mode 100644
index 00000000..374def48
Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580587228202143744 differ
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 8441cc64..73cfa8e1 100644
Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ
diff --git a/Yi.Vue2.x/.browserslistrc b/Yi.Vue2.x.Vuetify/.browserslistrc
similarity index 100%
rename from Yi.Vue2.x/.browserslistrc
rename to Yi.Vue2.x.Vuetify/.browserslistrc
diff --git a/Yi.Vue2.x/.env.development b/Yi.Vue2.x.Vuetify/.env.development
similarity index 100%
rename from Yi.Vue2.x/.env.development
rename to Yi.Vue2.x.Vuetify/.env.development
diff --git a/Yi.Vue2.x/.env.production b/Yi.Vue2.x.Vuetify/.env.production
similarity index 100%
rename from Yi.Vue2.x/.env.production
rename to Yi.Vue2.x.Vuetify/.env.production
diff --git a/Yi.Vue2.x/.gitignore b/Yi.Vue2.x.Vuetify/.gitignore
similarity index 100%
rename from Yi.Vue2.x/.gitignore
rename to Yi.Vue2.x.Vuetify/.gitignore
diff --git a/Yi.Vue2.x/README.md b/Yi.Vue2.x.Vuetify/README.md
similarity index 100%
rename from Yi.Vue2.x/README.md
rename to Yi.Vue2.x.Vuetify/README.md
diff --git a/Yi.Vue2.x/package-lock.json b/Yi.Vue2.x.Vuetify/package-lock.json
similarity index 100%
rename from Yi.Vue2.x/package-lock.json
rename to Yi.Vue2.x.Vuetify/package-lock.json
diff --git a/Yi.Vue2.x/package.json b/Yi.Vue2.x.Vuetify/package.json
similarity index 100%
rename from Yi.Vue2.x/package.json
rename to Yi.Vue2.x.Vuetify/package.json
diff --git a/Yi.Vue2.x/public/favicon.ico b/Yi.Vue2.x.Vuetify/public/favicon.ico
similarity index 100%
rename from Yi.Vue2.x/public/favicon.ico
rename to Yi.Vue2.x.Vuetify/public/favicon.ico
diff --git a/Yi.Vue2.x/public/index.html b/Yi.Vue2.x.Vuetify/public/index.html
similarity index 100%
rename from Yi.Vue2.x/public/index.html
rename to Yi.Vue2.x.Vuetify/public/index.html
diff --git a/Yi.Vue2.x/src/App.vue b/Yi.Vue2.x.Vuetify/src/App.vue
similarity index 100%
rename from Yi.Vue2.x/src/App.vue
rename to Yi.Vue2.x.Vuetify/src/App.vue
diff --git a/Yi.Vue2.x/src/api/accountApi.js b/Yi.Vue2.x.Vuetify/src/api/accountApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/accountApi.js
rename to Yi.Vue2.x.Vuetify/src/api/accountApi.js
diff --git a/Yi.Vue2.x/src/api/fileApi.js b/Yi.Vue2.x.Vuetify/src/api/fileApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/fileApi.js
rename to Yi.Vue2.x.Vuetify/src/api/fileApi.js
diff --git a/Yi.Vue2.x/src/api/menuApi.js b/Yi.Vue2.x.Vuetify/src/api/menuApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/menuApi.js
rename to Yi.Vue2.x.Vuetify/src/api/menuApi.js
diff --git a/Yi.Vue2.x/src/api/mouldApi.js b/Yi.Vue2.x.Vuetify/src/api/mouldApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/mouldApi.js
rename to Yi.Vue2.x.Vuetify/src/api/mouldApi.js
diff --git a/Yi.Vue2.x/src/api/panApi.js b/Yi.Vue2.x.Vuetify/src/api/panApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/panApi.js
rename to Yi.Vue2.x.Vuetify/src/api/panApi.js
diff --git a/Yi.Vue2.x/src/api/roleApi.js b/Yi.Vue2.x.Vuetify/src/api/roleApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/roleApi.js
rename to Yi.Vue2.x.Vuetify/src/api/roleApi.js
diff --git a/Yi.Vue2.x/src/api/userApi.js b/Yi.Vue2.x.Vuetify/src/api/userApi.js
similarity index 100%
rename from Yi.Vue2.x/src/api/userApi.js
rename to Yi.Vue2.x.Vuetify/src/api/userApi.js
diff --git a/Yi.Vue2.x/src/assets/clint-mckoy.jpg b/Yi.Vue2.x.Vuetify/src/assets/clint-mckoy.jpg
similarity index 100%
rename from Yi.Vue2.x/src/assets/clint-mckoy.jpg
rename to Yi.Vue2.x.Vuetify/src/assets/clint-mckoy.jpg
diff --git a/Yi.Vue2.x/src/assets/lock.jpg b/Yi.Vue2.x.Vuetify/src/assets/lock.jpg
similarity index 100%
rename from Yi.Vue2.x/src/assets/lock.jpg
rename to Yi.Vue2.x.Vuetify/src/assets/lock.jpg
diff --git a/Yi.Vue2.x/src/assets/login.jpg b/Yi.Vue2.x.Vuetify/src/assets/login.jpg
similarity index 100%
rename from Yi.Vue2.x/src/assets/login.jpg
rename to Yi.Vue2.x.Vuetify/src/assets/login.jpg
diff --git a/Yi.Vue2.x/src/assets/login.svg b/Yi.Vue2.x.Vuetify/src/assets/login.svg
similarity index 100%
rename from Yi.Vue2.x/src/assets/login.svg
rename to Yi.Vue2.x.Vuetify/src/assets/login.svg
diff --git a/Yi.Vue2.x/src/assets/logo.png b/Yi.Vue2.x.Vuetify/src/assets/logo.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/logo.png
rename to Yi.Vue2.x.Vuetify/src/assets/logo.png
diff --git a/Yi.Vue2.x/src/assets/logo.svg b/Yi.Vue2.x.Vuetify/src/assets/logo.svg
similarity index 100%
rename from Yi.Vue2.x/src/assets/logo.svg
rename to Yi.Vue2.x.Vuetify/src/assets/logo.svg
diff --git a/Yi.Vue2.x/src/assets/mask-dark.png b/Yi.Vue2.x.Vuetify/src/assets/mask-dark.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/mask-dark.png
rename to Yi.Vue2.x.Vuetify/src/assets/mask-dark.png
diff --git a/Yi.Vue2.x/src/assets/mask-light.png b/Yi.Vue2.x.Vuetify/src/assets/mask-light.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/mask-light.png
rename to Yi.Vue2.x.Vuetify/src/assets/mask-light.png
diff --git a/Yi.Vue2.x/src/assets/pricing.jpg b/Yi.Vue2.x.Vuetify/src/assets/pricing.jpg
similarity index 100%
rename from Yi.Vue2.x/src/assets/pricing.jpg
rename to Yi.Vue2.x.Vuetify/src/assets/pricing.jpg
diff --git a/Yi.Vue2.x/src/assets/register.jpg b/Yi.Vue2.x.Vuetify/src/assets/register.jpg
similarity index 100%
rename from Yi.Vue2.x/src/assets/register.jpg
rename to Yi.Vue2.x.Vuetify/src/assets/register.jpg
diff --git a/Yi.Vue2.x/src/assets/tree-3.png b/Yi.Vue2.x.Vuetify/src/assets/tree-3.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/tree-3.png
rename to Yi.Vue2.x.Vuetify/src/assets/tree-3.png
diff --git a/Yi.Vue2.x/src/assets/tree-4.png b/Yi.Vue2.x.Vuetify/src/assets/tree-4.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/tree-4.png
rename to Yi.Vue2.x.Vuetify/src/assets/tree-4.png
diff --git a/Yi.Vue2.x/src/assets/tree.png b/Yi.Vue2.x.Vuetify/src/assets/tree.png
similarity index 100%
rename from Yi.Vue2.x/src/assets/tree.png
rename to Yi.Vue2.x.Vuetify/src/assets/tree.png
diff --git a/Yi.Vue2.x/src/assets/vmd.svg b/Yi.Vue2.x.Vuetify/src/assets/vmd.svg
similarity index 100%
rename from Yi.Vue2.x/src/assets/vmd.svg
rename to Yi.Vue2.x.Vuetify/src/assets/vmd.svg
diff --git a/Yi.Vue2.x/src/assets/vuetify.svg b/Yi.Vue2.x.Vuetify/src/assets/vuetify.svg
similarity index 100%
rename from Yi.Vue2.x/src/assets/vuetify.svg
rename to Yi.Vue2.x.Vuetify/src/assets/vuetify.svg
diff --git a/Yi.Vue2.x/src/components/Links.vue b/Yi.Vue2.x.Vuetify/src/components/Links.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/Links.vue
rename to Yi.Vue2.x.Vuetify/src/components/Links.vue
diff --git a/Yi.Vue2.x/src/components/MaterialAlert.vue b/Yi.Vue2.x.Vuetify/src/components/MaterialAlert.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/MaterialAlert.vue
rename to Yi.Vue2.x.Vuetify/src/components/MaterialAlert.vue
diff --git a/Yi.Vue2.x/src/components/MaterialCard.vue b/Yi.Vue2.x.Vuetify/src/components/MaterialCard.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/MaterialCard.vue
rename to Yi.Vue2.x.Vuetify/src/components/MaterialCard.vue
diff --git a/Yi.Vue2.x/src/components/MaterialChartCard.vue b/Yi.Vue2.x.Vuetify/src/components/MaterialChartCard.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/MaterialChartCard.vue
rename to Yi.Vue2.x.Vuetify/src/components/MaterialChartCard.vue
diff --git a/Yi.Vue2.x/src/components/MaterialSnackbar.vue b/Yi.Vue2.x.Vuetify/src/components/MaterialSnackbar.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/MaterialSnackbar.vue
rename to Yi.Vue2.x.Vuetify/src/components/MaterialSnackbar.vue
diff --git a/Yi.Vue2.x/src/components/MaterialStatsCard.vue b/Yi.Vue2.x.Vuetify/src/components/MaterialStatsCard.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/MaterialStatsCard.vue
rename to Yi.Vue2.x.Vuetify/src/components/MaterialStatsCard.vue
diff --git a/Yi.Vue2.x/src/components/TableApi.js b/Yi.Vue2.x.Vuetify/src/components/TableApi.js
similarity index 100%
rename from Yi.Vue2.x/src/components/TableApi.js
rename to Yi.Vue2.x.Vuetify/src/components/TableApi.js
diff --git a/Yi.Vue2.x/src/components/ViewIntro.vue b/Yi.Vue2.x.Vuetify/src/components/ViewIntro.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/ViewIntro.vue
rename to Yi.Vue2.x.Vuetify/src/components/ViewIntro.vue
diff --git a/Yi.Vue2.x/src/components/app/BarItem.vue b/Yi.Vue2.x.Vuetify/src/components/app/BarItem.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/app/BarItem.vue
rename to Yi.Vue2.x.Vuetify/src/components/app/BarItem.vue
diff --git a/Yi.Vue2.x/src/components/app/Btn.vue b/Yi.Vue2.x.Vuetify/src/components/app/Btn.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/app/Btn.vue
rename to Yi.Vue2.x.Vuetify/src/components/app/Btn.vue
diff --git a/Yi.Vue2.x/src/components/app/Card.vue b/Yi.Vue2.x.Vuetify/src/components/app/Card.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/app/Card.vue
rename to Yi.Vue2.x.Vuetify/src/components/app/Card.vue
diff --git a/Yi.Vue2.x/src/components/app/Tabs.vue b/Yi.Vue2.x.Vuetify/src/components/app/Tabs.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/app/Tabs.vue
rename to Yi.Vue2.x.Vuetify/src/components/app/Tabs.vue
diff --git a/Yi.Vue2.x/src/components/ccAvatar.vue b/Yi.Vue2.x.Vuetify/src/components/ccAvatar.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/ccAvatar.vue
rename to Yi.Vue2.x.Vuetify/src/components/ccAvatar.vue
diff --git a/Yi.Vue2.x/src/components/ccCombobox.vue b/Yi.Vue2.x.Vuetify/src/components/ccCombobox.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/ccCombobox.vue
rename to Yi.Vue2.x.Vuetify/src/components/ccCombobox.vue
diff --git a/Yi.Vue2.x/src/components/ccTable.vue b/Yi.Vue2.x.Vuetify/src/components/ccTable.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/ccTable.vue
rename to Yi.Vue2.x.Vuetify/src/components/ccTable.vue
diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x.Vuetify/src/components/ccTreeview.vue
similarity index 100%
rename from Yi.Vue2.x/src/components/ccTreeview.vue
rename to Yi.Vue2.x.Vuetify/src/components/ccTreeview.vue
diff --git a/Yi.Vue2.x/src/layouts/default/AppBar.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/AppBar.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/AppBar.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/AppBar.vue
diff --git a/Yi.Vue2.x/src/layouts/default/Drawer.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/Drawer.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/Drawer.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/Drawer.vue
diff --git a/Yi.Vue2.x/src/layouts/default/Footer.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/Footer.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/Footer.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/Footer.vue
diff --git a/Yi.Vue2.x/src/layouts/default/Index.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/Index.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/Index.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/Index.vue
diff --git a/Yi.Vue2.x/src/layouts/default/List.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/List.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/List.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/List.vue
diff --git a/Yi.Vue2.x/src/layouts/default/ListGroup.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/ListGroup.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/ListGroup.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/ListGroup.vue
diff --git a/Yi.Vue2.x/src/layouts/default/ListItem.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/ListItem.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/ListItem.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/ListItem.vue
diff --git a/Yi.Vue2.x/src/layouts/default/Settings.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/Settings.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/Settings.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/Settings.vue
diff --git a/Yi.Vue2.x/src/layouts/default/View.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/View.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/View.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/View.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/Account.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Account.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/Account.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Account.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/AccountSettings.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/AccountSettings.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/AccountSettings.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/AccountSettings.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/DrawerHeader.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/DrawerHeader.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/DrawerHeader.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/DrawerHeader.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/DrawerToggle.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/DrawerToggle.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/DrawerToggle.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/DrawerToggle.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/GoHome.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/GoHome.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/GoHome.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/GoHome.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/Notifications.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Notifications.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/Notifications.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Notifications.vue
diff --git a/Yi.Vue2.x/src/layouts/default/widgets/Search.vue b/Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Search.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/default/widgets/Search.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/default/widgets/Search.vue
diff --git a/Yi.Vue2.x/src/layouts/login/Index.vue b/Yi.Vue2.x.Vuetify/src/layouts/login/Index.vue
similarity index 100%
rename from Yi.Vue2.x/src/layouts/login/Index.vue
rename to Yi.Vue2.x.Vuetify/src/layouts/login/Index.vue
diff --git a/Yi.Vue2.x/src/main.js b/Yi.Vue2.x.Vuetify/src/main.js
similarity index 100%
rename from Yi.Vue2.x/src/main.js
rename to Yi.Vue2.x.Vuetify/src/main.js
diff --git a/Yi.Vue2.x/src/permission.js b/Yi.Vue2.x.Vuetify/src/permission.js
similarity index 100%
rename from Yi.Vue2.x/src/permission.js
rename to Yi.Vue2.x.Vuetify/src/permission.js
diff --git a/Yi.Vue2.x/src/plugins/app.js b/Yi.Vue2.x.Vuetify/src/plugins/app.js
similarity index 100%
rename from Yi.Vue2.x/src/plugins/app.js
rename to Yi.Vue2.x.Vuetify/src/plugins/app.js
diff --git a/Yi.Vue2.x/src/plugins/chartist.js b/Yi.Vue2.x.Vuetify/src/plugins/chartist.js
similarity index 100%
rename from Yi.Vue2.x/src/plugins/chartist.js
rename to Yi.Vue2.x.Vuetify/src/plugins/chartist.js
diff --git a/Yi.Vue2.x/src/plugins/index.js b/Yi.Vue2.x.Vuetify/src/plugins/index.js
similarity index 100%
rename from Yi.Vue2.x/src/plugins/index.js
rename to Yi.Vue2.x.Vuetify/src/plugins/index.js
diff --git a/Yi.Vue2.x/src/plugins/vuetify.js b/Yi.Vue2.x.Vuetify/src/plugins/vuetify.js
similarity index 100%
rename from Yi.Vue2.x/src/plugins/vuetify.js
rename to Yi.Vue2.x.Vuetify/src/plugins/vuetify.js
diff --git a/Yi.Vue2.x/src/router/index.js b/Yi.Vue2.x.Vuetify/src/router/index.js
similarity index 100%
rename from Yi.Vue2.x/src/router/index.js
rename to Yi.Vue2.x.Vuetify/src/router/index.js
diff --git a/Yi.Vue2.x/src/store/index.js b/Yi.Vue2.x.Vuetify/src/store/index.js
similarity index 100%
rename from Yi.Vue2.x/src/store/index.js
rename to Yi.Vue2.x.Vuetify/src/store/index.js
diff --git a/Yi.Vue2.x/src/store/modules/home.js b/Yi.Vue2.x.Vuetify/src/store/modules/home.js
similarity index 100%
rename from Yi.Vue2.x/src/store/modules/home.js
rename to Yi.Vue2.x.Vuetify/src/store/modules/home.js
diff --git a/Yi.Vue2.x/src/store/modules/loader.js b/Yi.Vue2.x.Vuetify/src/store/modules/loader.js
similarity index 100%
rename from Yi.Vue2.x/src/store/modules/loader.js
rename to Yi.Vue2.x.Vuetify/src/store/modules/loader.js
diff --git a/Yi.Vue2.x/src/store/modules/pan.js b/Yi.Vue2.x.Vuetify/src/store/modules/pan.js
similarity index 100%
rename from Yi.Vue2.x/src/store/modules/pan.js
rename to Yi.Vue2.x.Vuetify/src/store/modules/pan.js
diff --git a/Yi.Vue2.x/src/store/modules/theme.js b/Yi.Vue2.x.Vuetify/src/store/modules/theme.js
similarity index 100%
rename from Yi.Vue2.x/src/store/modules/theme.js
rename to Yi.Vue2.x.Vuetify/src/store/modules/theme.js
diff --git a/Yi.Vue2.x/src/store/modules/user.js b/Yi.Vue2.x.Vuetify/src/store/modules/user.js
similarity index 100%
rename from Yi.Vue2.x/src/store/modules/user.js
rename to Yi.Vue2.x.Vuetify/src/store/modules/user.js
diff --git a/Yi.Vue2.x/src/styles/auth.scss b/Yi.Vue2.x.Vuetify/src/styles/auth.scss
similarity index 100%
rename from Yi.Vue2.x/src/styles/auth.scss
rename to Yi.Vue2.x.Vuetify/src/styles/auth.scss
diff --git a/Yi.Vue2.x/src/styles/overrides.sass b/Yi.Vue2.x.Vuetify/src/styles/overrides.sass
similarity index 100%
rename from Yi.Vue2.x/src/styles/overrides.sass
rename to Yi.Vue2.x.Vuetify/src/styles/overrides.sass
diff --git a/Yi.Vue2.x/src/styles/variables.scss b/Yi.Vue2.x.Vuetify/src/styles/variables.scss
similarity index 100%
rename from Yi.Vue2.x/src/styles/variables.scss
rename to Yi.Vue2.x.Vuetify/src/styles/variables.scss
diff --git a/Yi.Vue2.x/src/util/btnHandle.js b/Yi.Vue2.x.Vuetify/src/util/btnHandle.js
similarity index 100%
rename from Yi.Vue2.x/src/util/btnHandle.js
rename to Yi.Vue2.x.Vuetify/src/util/btnHandle.js
diff --git a/Yi.Vue2.x/src/util/dialog.js b/Yi.Vue2.x.Vuetify/src/util/dialog.js
similarity index 100%
rename from Yi.Vue2.x/src/util/dialog.js
rename to Yi.Vue2.x.Vuetify/src/util/dialog.js
diff --git a/Yi.Vue2.x/src/util/getMould.js b/Yi.Vue2.x.Vuetify/src/util/getMould.js
similarity index 100%
rename from Yi.Vue2.x/src/util/getMould.js
rename to Yi.Vue2.x.Vuetify/src/util/getMould.js
diff --git a/Yi.Vue2.x/src/util/globals.js b/Yi.Vue2.x.Vuetify/src/util/globals.js
similarity index 100%
rename from Yi.Vue2.x/src/util/globals.js
rename to Yi.Vue2.x.Vuetify/src/util/globals.js
diff --git a/Yi.Vue2.x/src/util/helpers.js b/Yi.Vue2.x.Vuetify/src/util/helpers.js
similarity index 100%
rename from Yi.Vue2.x/src/util/helpers.js
rename to Yi.Vue2.x.Vuetify/src/util/helpers.js
diff --git a/Yi.Vue2.x/src/util/menuHandle.js b/Yi.Vue2.x.Vuetify/src/util/menuHandle.js
similarity index 100%
rename from Yi.Vue2.x/src/util/menuHandle.js
rename to Yi.Vue2.x.Vuetify/src/util/menuHandle.js
diff --git a/Yi.Vue2.x/src/util/myaction.js b/Yi.Vue2.x.Vuetify/src/util/myaction.js
similarity index 100%
rename from Yi.Vue2.x/src/util/myaction.js
rename to Yi.Vue2.x.Vuetify/src/util/myaction.js
diff --git a/Yi.Vue2.x/src/util/myaxios.js b/Yi.Vue2.x.Vuetify/src/util/myaxios.js
similarity index 100%
rename from Yi.Vue2.x/src/util/myaxios.js
rename to Yi.Vue2.x.Vuetify/src/util/myaxios.js
diff --git a/Yi.Vue2.x/src/util/myqq.js b/Yi.Vue2.x.Vuetify/src/util/myqq.js
similarity index 100%
rename from Yi.Vue2.x/src/util/myqq.js
rename to Yi.Vue2.x.Vuetify/src/util/myqq.js
diff --git a/Yi.Vue2.x/src/util/objctHandle.js b/Yi.Vue2.x.Vuetify/src/util/objctHandle.js
similarity index 100%
rename from Yi.Vue2.x/src/util/objctHandle.js
rename to Yi.Vue2.x.Vuetify/src/util/objctHandle.js
diff --git a/Yi.Vue2.x/src/util/routes.js b/Yi.Vue2.x.Vuetify/src/util/routes.js
similarity index 100%
rename from Yi.Vue2.x/src/util/routes.js
rename to Yi.Vue2.x.Vuetify/src/util/routes.js
diff --git a/Yi.Vue2.x/src/util/signalR.js b/Yi.Vue2.x.Vuetify/src/util/signalR.js
similarity index 100%
rename from Yi.Vue2.x/src/util/signalR.js
rename to Yi.Vue2.x.Vuetify/src/util/signalR.js
diff --git a/Yi.Vue2.x/src/util/usertoken.js b/Yi.Vue2.x.Vuetify/src/util/usertoken.js
similarity index 100%
rename from Yi.Vue2.x/src/util/usertoken.js
rename to Yi.Vue2.x.Vuetify/src/util/usertoken.js
diff --git a/Yi.Vue2.x/src/views/AdmMenu.vue b/Yi.Vue2.x.Vuetify/src/views/AdmMenu.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/AdmMenu.vue
rename to Yi.Vue2.x.Vuetify/src/views/AdmMenu.vue
diff --git a/Yi.Vue2.x/src/views/AdmMould.vue b/Yi.Vue2.x.Vuetify/src/views/AdmMould.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/AdmMould.vue
rename to Yi.Vue2.x.Vuetify/src/views/AdmMould.vue
diff --git a/Yi.Vue2.x/src/views/AdmRole.vue b/Yi.Vue2.x.Vuetify/src/views/AdmRole.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/AdmRole.vue
rename to Yi.Vue2.x.Vuetify/src/views/AdmRole.vue
diff --git a/Yi.Vue2.x/src/views/AdmRoleMenu.vue b/Yi.Vue2.x.Vuetify/src/views/AdmRoleMenu.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/AdmRoleMenu.vue
rename to Yi.Vue2.x.Vuetify/src/views/AdmRoleMenu.vue
diff --git a/Yi.Vue2.x/src/views/AdmUser.vue b/Yi.Vue2.x.Vuetify/src/views/AdmUser.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/AdmUser.vue
rename to Yi.Vue2.x.Vuetify/src/views/AdmUser.vue
diff --git a/Yi.Vue2.x/src/views/Index.vue b/Yi.Vue2.x.Vuetify/src/views/Index.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/Index.vue
rename to Yi.Vue2.x.Vuetify/src/views/Index.vue
diff --git a/Yi.Vue2.x/src/views/Pan.vue b/Yi.Vue2.x.Vuetify/src/views/Pan.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/Pan.vue
rename to Yi.Vue2.x.Vuetify/src/views/Pan.vue
diff --git a/Yi.Vue2.x/src/views/PanInfo.vue b/Yi.Vue2.x.Vuetify/src/views/PanInfo.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/PanInfo.vue
rename to Yi.Vue2.x.Vuetify/src/views/PanInfo.vue
diff --git a/Yi.Vue2.x/src/views/login.vue b/Yi.Vue2.x.Vuetify/src/views/login.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/login.vue
rename to Yi.Vue2.x.Vuetify/src/views/login.vue
diff --git a/Yi.Vue2.x/src/views/register.vue b/Yi.Vue2.x.Vuetify/src/views/register.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/register.vue
rename to Yi.Vue2.x.Vuetify/src/views/register.vue
diff --git a/Yi.Vue2.x/src/views/userInfo.vue b/Yi.Vue2.x.Vuetify/src/views/userInfo.vue
similarity index 100%
rename from Yi.Vue2.x/src/views/userInfo.vue
rename to Yi.Vue2.x.Vuetify/src/views/userInfo.vue
diff --git a/Yi.Vue2.x/vue.config.js b/Yi.Vue2.x.Vuetify/vue.config.js
similarity index 100%
rename from Yi.Vue2.x/vue.config.js
rename to Yi.Vue2.x.Vuetify/vue.config.js
diff --git a/Yi.Vue3.X.RuoYi/src/store/modules/user.js b/Yi.Vue3.X.RuoYi/src/store/modules/user.js
index aa839ad9..f036147f 100644
--- a/Yi.Vue3.X.RuoYi/src/store/modules/user.js
+++ b/Yi.Vue3.X.RuoYi/src/store/modules/user.js
@@ -36,7 +36,7 @@ const useUserStore = defineStore(
           getInfo().then(response => {
             const res=response.data;
             const user = res.user
-            const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
+            const avatar = (user.icon == "" || user.icon == null) ? defAva : import.meta.env.VITE_APP_BASE_API + "/file/"+user.icon;
     
             if (res.roleCodes && res.roleCodes.length > 0) { // 验证返回的roles是否是一个非空数组
               this.roles = res.roleCodes
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userAvatar.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userAvatar.vue
index 11d4ee12..7f1c4834 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userAvatar.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userAvatar.vue
@@ -44,7 +44,7 @@
         <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
       </el-col>
       <el-col :lg="{span: 2, offset: 6}" :md="2">
-        <el-button type="primary" @click="uploadImg()">提 交</el-button>
+        <el-button type="primary" @click="uploadImg()">上传</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -53,7 +53,8 @@
 <script setup>
 import "vue-cropper/dist/index.css";
 import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/user";
+import { upload } from "@/api/file";
+import { updateUserProfile } from "@/api/system/user";
 import useUserStore from '@/store/modules/user'
 
 const userStore = useUserStore()
@@ -107,19 +108,32 @@ function beforeUpload(file) {
     reader.onload = () => {
       options.img = reader.result;
     };
+    
   }
 };
 /** 上传图片 */
 function uploadImg() {
   proxy.$refs.cropper.getCropBlob(data => {
     let formData = new FormData();
-    formData.append("avatarfile", data);
-    uploadAvatar(formData).then(response => {
+    formData.append("file", data);
+    upload("image",formData).then(response => {
       open.value = false;
-      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
+      options.img = import.meta.env.VITE_APP_BASE_API +"/file/"+response.data[0];
       userStore.avatar = options.img;
-      proxy.$modal.msgSuccess("修改成功");
+
+
+
+      updateUserProfile({icon:response.data[0]}).then(response2=>{
+        proxy.$modal.msgSuccess("修改成功");
       visible.value = false;
+      })
+
+
+
+
+
+
+
     });
   });
 };
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userInfo.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userInfo.vue
index 52bac135..02775069 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userInfo.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/profile/userInfo.vue
@@ -11,8 +11,8 @@
       </el-form-item>
       <el-form-item label="性别">
          <el-radio-group v-model="user.sex">
-            <el-radio label="0">男</el-radio>
-            <el-radio label="1">女</el-radio>
+            <el-radio :label="0">男</el-radio>
+            <el-radio :label="1">女</el-radio>
          </el-radio-group>
       </el-form-item>
       <el-form-item>
diff --git a/Yi.Vue3.x.RuoYi/src/api/file.js b/Yi.Vue3.x.RuoYi/src/api/file.js
new file mode 100644
index 00000000..2dc681e9
--- /dev/null
+++ b/Yi.Vue3.x.RuoYi/src/api/file.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function
+   upload(type,data){
+    return request({
+        url: `/file/upload/${type}`,
+        headers:{"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"},
+        method: 'POST',
+        data:data
+      });
+}