From 0755a4026ad403caffcdcce36f89285f9a8ff036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Wed, 19 Oct 2022 19:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcodefirst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.ApiMicroservice/Program.cs | 3 --- .../yi-sqlsugar-dev.db | Bin 221184 -> 221184 bytes .../Yi.Framework.Model/ArticleEntity.cs | 2 +- .../Yi.Framework.Model/CategoryEntity.cs | 4 ++-- .../Yi.Framework.Model/MenuEntity.cs | 12 ++++++------ .../ModelsTemplate/ArticleEntity.cs | 2 +- .../Yi.Framework.Model/RoleEntity.cs | 4 ++-- .../Yi.Framework.Model/SkuEntity.cs | 4 ++-- .../Yi.Framework.Model/SpecsGroupEntity.cs | 2 +- .../Yi.Framework.Model/SpuEntity.cs | 6 +++--- .../Yi.Framework.Model/UserEntity.cs | 6 +++--- Yi.Vue3.x.Vant/components.d.ts | 2 -- Yi.Vue3.x.Vant/src/api/articleApi.ts | 1 - Yi.Vue3.x.Vant/src/layout/bottom/index.vue | 8 ++++---- Yi.Vue3.x.Vant/src/utils/myaxios.ts | 10 +++++++++- 15 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs index d3e88145..45a105fc 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs @@ -159,9 +159,6 @@ ServiceLocator.Instance = app.Services; //测试页面注入 #endregion app.UseDeveloperExceptionPage(); - #region - //Swagger服务注入 - #endregion app.UseSwaggerService(); } #region 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 326eb9ab35c5c9682b78a1f1e908f533fd4542f7..8600b9436a61e0febe1437d3fc235c188850cc35 100644 GIT binary patch literal 221184 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 literal 221184 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 F{QpCM`MLlA diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs index fc9ad6b0..0f9cb8ca 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs @@ -8,6 +8,6 @@ namespace Yi.Framework.Model.Models public partial class ArticleEntity:IBaseModelEntity { [Navigate(NavigateType.OneToOne,nameof(UserId))] - public UserEntity User { get; set; } + public UserEntity? User { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs index b5f24ae3..565f195e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs @@ -11,10 +11,10 @@ namespace Yi.Framework.Model.Models public partial class CategoryEntity:IBaseModelEntity { [SugarColumn(IsIgnore = true)] - public List Children { get; set; } + public List? Children { get; set; } [Navigate(NavigateType.OneToMany,nameof(SpecsGroupEntity.CategoryId))] - public List SpecsGroups { get; set; } + public List? SpecsGroups { get; set; } } } \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs index e56f69ea..7cc31a48 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs @@ -25,14 +25,14 @@ namespace Yi.Framework.Model.Models var r = new VueRouterModel(); r.OrderNum = m.OrderNum ?? 0; - var routerName = m.Router.Split("/").LastOrDefault(); + var routerName = m.Router?.Split("/").LastOrDefault(); r.Id = m.Id; - r.ParentId = (long)m.ParentId; + r.ParentId = m.ParentId??-1; //寮澶村ぇ鍐 - r.Name = routerName.First().ToString().ToUpper() + routerName.Substring(1); + r.Name = routerName?.First().ToString().ToUpper() + routerName?.Substring(1); r.Path = m.Router; - r.Hidden = (bool)!m.IsShow; + r.Hidden =!m.IsShow??false; if (m.MenuType == MenuTypeEnum.Catalogue.GetHashCode()) @@ -62,9 +62,9 @@ namespace Yi.Framework.Model.Models { Title = m.MenuName, Icon = m.MenuIcon, - NoCache = (bool)!m.IsCache + NoCache = !m.IsCache??true }; - if ((bool)m.IsLink) + if (m.IsLink??false) { r.Meta.link = m.Router; r.AlwaysShow = false; diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs index 3d9d7f17..c1dceebc 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs @@ -77,6 +77,6 @@ namespace Yi.Framework.Model.Models /// 鍥剧墖鍒楄〃 /// [SugarColumn(ColumnName="Images",IsJson = true)] - public List Images { get; set; } + public List? Images { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs index 3aec15c2..6a99237e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Model.Models { [Navigate(typeof(RoleMenuEntity),nameof(RoleMenuEntity.RoleId),nameof(RoleMenuEntity.MenuId))] - public List Menus { get; set; } + public List? Menus { get; set; } [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))] - public List Depts { get; set; } + public List? Depts { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs index b07a6bcf..582c3283 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs @@ -14,12 +14,12 @@ namespace Yi.Framework.Model.Models /// 瑙勬牸sku淇℃伅 /// [SugarColumn(ColumnName = "SpecsSkuInfo", IsJson = true)] - public List SpecsSkuInfo { get; set; } + public List? SpecsSkuInfo { get; set; } /// /// 瑙勬牸sku瀹屾暣淇℃伅 /// [SugarColumn(ColumnName = "SpecsSkuAllInfo", IsJson = true)] - public List SpecsSkuAllInfo { get; set; } + public List? SpecsSkuAllInfo { get; set; } } public class SpecsSkuAllInfoModel diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs index 96793422..3a4df243 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs @@ -11,6 +11,6 @@ namespace Yi.Framework.Model.Models public partial class SpecsGroupEntity:IBaseModelEntity { [Navigate(NavigateType.OneToMany, nameof(SpecsEntity.SpecsGroupId))] - public List Specses { get; set; } + public List? Specses { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs index 6f253f55..cb09b8df 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs @@ -12,15 +12,15 @@ namespace Yi.Framework.Model.Models /// 瑙勬牸Spu瀹屾暣淇℃伅 /// [SugarColumn(ColumnName = "SpecsAllInfo", IsJson = true)] - public List SpecsSpuAllInfo { get; set; } + public List? SpecsSpuAllInfo { get; set; } /// /// 瑙勬牸Spu淇℃伅 /// [SugarColumn(ColumnName = "SpecsInfo", IsJson = true)] - public List SpecsSpuInfo { get; set; } + public List? SpecsSpuInfo { get; set; } [Navigate(NavigateType.OneToMany, nameof(SkuEntity.SpuId))] - public List Spus { get; set; } + public List? Spus { get; set; } } public class SpecsSpuAllInfoModel diff --git a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs index dd3d2275..07d56a5a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs @@ -12,13 +12,13 @@ namespace Yi.Framework.Model.Models /// 鐪嬪ソ鍟︼紒ORM绮鹃珦锛屽鑸睘鎬 /// [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))] - public List Roles { get; set; } + public List? Roles { get; set; } [Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))] - public List Posts { get; set; } + public List? Posts { get; set; } [Navigate( NavigateType.OneToOne,nameof(DeptId))] - public DeptEntity Dept { get; set; } + public DeptEntity? Dept { get; set; } /// /// 鏋勫缓瀵嗙爜锛孧D5鐩愬煎姞瀵 diff --git a/Yi.Vue3.x.Vant/components.d.ts b/Yi.Vue3.x.Vant/components.d.ts index 71bae129..9709bee6 100644 --- a/Yi.Vue3.x.Vant/components.d.ts +++ b/Yi.Vue3.x.Vant/components.d.ts @@ -15,7 +15,6 @@ declare module '@vue/runtime-core' { RouterView: typeof import('vue-router')['RouterView'] VanActionSheet: typeof import('vant/es')['ActionSheet'] VanButton: typeof import('vant/es')['Button'] - VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanCol: typeof import('vant/es')['Col'] VanDivider: typeof import('vant/es')['Divider'] @@ -27,7 +26,6 @@ declare module '@vue/runtime-core' { VanList: typeof import('vant/es')['List'] VanLoading: typeof import('vant/es')['Loading'] VanNavBar: typeof import('vant/es')['NavBar'] - VanPopup: typeof import('vant/es')['Popup'] VanPullRefresh: typeof import('vant/es')['PullRefresh'] VanRow: typeof import('vant/es')['Row'] VanSticky: typeof import('vant/es')['Sticky'] diff --git a/Yi.Vue3.x.Vant/src/api/articleApi.ts b/Yi.Vue3.x.Vant/src/api/articleApi.ts index 24ad276c..c7ad11a1 100644 --- a/Yi.Vue3.x.Vant/src/api/articleApi.ts +++ b/Yi.Vue3.x.Vant/src/api/articleApi.ts @@ -3,7 +3,6 @@ import { ArticleEntity } from '@/type/interface/ArticleEntity' export default { add(data:any) { - console.log(data) return myaxios({ url: `/article/add`, method: 'post', diff --git a/Yi.Vue3.x.Vant/src/layout/bottom/index.vue b/Yi.Vue3.x.Vant/src/layout/bottom/index.vue index a955d1f4..8f9bdbe3 100644 --- a/Yi.Vue3.x.Vant/src/layout/bottom/index.vue +++ b/Yi.Vue3.x.Vant/src/layout/bottom/index.vue @@ -35,8 +35,8 @@ let tabbar=ref([ {icon:"wap-home",to:"/",title:"涓婚〉"}, {icon:"location-o",to:"",title:"鍙戠幇"}, {icon:"",to:"",title:""}, - // {icon:"friends-o",to:"/shopIndex",title:"鍟嗗煄"}, - {icon:"friends-o",to:"",title:"鍟嗗煄"}, + {icon:"friends-o",to:"/shopIndex",title:"鍟嗗煄"}, + // {icon:"friends-o",to:"",title:"鍟嗗煄"}, {icon:"setting-o",to:"/my",title:"鎴戠殑"}, ]) const onChange=(index:number)=>{ @@ -44,8 +44,8 @@ const onChange=(index:number)=>{ {icon:"wap-home-o",to:"/",title:"涓婚〉"}, {icon:"location-o",to:"",title:"鍙戠幇"}, {icon:"",to:"",title:""}, - // {icon:"friends-o",to:"/shopIndex",title:"鍟嗗煄"}, - {icon:"friends-o",to:"",title:"鍟嗗煄"}, + {icon:"friends-o",to:"/shopIndex",title:"鍟嗗煄"}, + // {icon:"friends-o",to:"",title:"鍟嗗煄"}, {icon:"setting-o",to:"/my",title:"鎴戠殑"}, ]; tabbar.value[index].icon=tabbar.value[index].icon.replace("-o","") diff --git a/Yi.Vue3.x.Vant/src/utils/myaxios.ts b/Yi.Vue3.x.Vant/src/utils/myaxios.ts index fbcd51fd..b25bde49 100644 --- a/Yi.Vue3.x.Vant/src/utils/myaxios.ts +++ b/Yi.Vue3.x.Vant/src/utils/myaxios.ts @@ -42,7 +42,15 @@ myaxios.interceptors.request.use(function(config:any) { myaxios.interceptors.response.use(async function(response) { //鎴愬姛 const resp = response.data - + if(resp.code==401) + { + Notify({ type: 'warning', message: '鐧诲綍杩囨湡' }); + //鐧诲嚭 + useUserStore().logOut().then(() => { + location.href = '/'; + }) + isRelogin.show = false; + } // store.dispatch("closeLoad"); return resp; }, async function(error) {