From 32a9c89d6a70f2e53dae9196ab107678a7277506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 17 Oct 2021 19:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MenuController.cs | 7 - .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 65536 bytes .../Yi.Framework.ApiMicroservice.csproj | 7 + .../20211017105828_yi-2.Designer.cs | 221 ++++++++++++++++++ .../Migrations/20211017105828_yi-2.cs | 23 ++ .../Migrations/DataContextModelSnapshot.cs | 5 +- 6 files changed, 255 insertions(+), 8 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.Designer.cs create mode 100644 Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.cs diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 5ce56e65..1c4506ad 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -118,12 +118,5 @@ namespace Yi.Framework.ApiMicroservice.Controllers var menuList =await _userService.GetMenuByUser(_user); return Result.Success().SetData(menuList); } - public async Task GeTopMenuByUser(menu _menu) - { - var _user = this.HttpContext.GetCurrentUserInfo(); - var menu_data= await _userService.GetMenuByUser(_user); - var menuList = await _menuService.GetChildrenMenu(_menu); - return Result.Success().SetData(menuList); - } } } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 85be485f61d53ccb16ea9cdb6e5a46cc55119517..0e47b3b311b93b97bf9e208d1cfade99200fdb98 100644 GIT binary patch delta 862 zcmZ{iO-NKx6vyvby4$Nvm26MMdq}T9o80wDe6x2F(x} zM&w5?qlGPo7?QF=AARXU1zoi$LvRsMS?VaXX=6}S@1wv5yKoO&&hP&}=iGa9IWCvu z`hyBb2=QC{@A3`oN(4DlzkgT~_Yu%FBEP{y>8CW}Tky8iwb9PAw7e_j@l*r?w5QcP zBp#+>q&lrP=`Cl@8x7?F<4*a!sd3;rd}HEfN}Mbc7|akXV#ZYb&#@!Ku!%}7uBmEV z-L1xxjap;Vg>;>ktdG~Ls<9ZZwghtotC+I{v)ER_Cg>(SW3D!=hpA$GJi4`t7bqK` z=k(?dUb2Sa(d`)E1@h>&Y;=US^E?U1gq276mHsPB1GiUh4u2l+U4C+{_;}FFHy!ua zpoS>YJdr!`RvyAFwBr~KU=Koo{7e2IPs>N-YU#T)ZyDZ~vN6R=!hsl}f?sdSy5 zInj~HH0zn=-ojGfUAK}P^ZyUCI#}*`_6Mtljj4nPVu@R^Z)oZI;6~3{*<#x^gXZ0{4F~3*6yq&(bD|Amg2=YaQ87_|(~3!_V$!XcjB=%r(Usj|f7ysJnGMCF zOljU3Omj>$*F+o3aeH?vC=mR>I=6kS_jUjP delta 464 zcmZvYze~eV5XbK|FKv?A_f0`TsnQa05Y$3ioD~s81pfqGL|sJNx;SVCHxZN|ox3?G zQbPyrP#v5c{ITdF)e2$<7neGS`bZHSJh+4J-RJJOa~$qCd^;9Zh{%-wW8s~?R7|0P zvAqc13EU=egM-LtWWVJ$ysQrwSC^QVFvkO)&7ty*{!qvp)hoduLyb`LqRt)MTHKPl zPN+*=g;!5D;!L=YQ>`(sF{O>IWM?yKMDFA$ND9|DM!}1kJMaqAGiJA}2vHBr~N=F8!3+EV^wQa+PvGAS!ykXu>r?2!$2 zoXLiGhri`_sLwa?BZm(q1WJStH1LL3yx>%x{e*km%Ew&b93}rXs;V%iyC;_uia^;7 OU3JNH9$vXRn)n9PynF-z diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj b/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj index 492c6c65..b4833ceb 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj @@ -9,6 +9,13 @@ 1701;1702;CS1591 + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.Designer.cs b/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.Designer.cs new file mode 100644 index 00000000..f21ffc24 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.Designer.cs @@ -0,0 +1,221 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Yi.Framework.Model; + +namespace Yi.Framework.Model.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20211017105828_yi-2")] + partial class yi2 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "5.0.11"); + + modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("icon") + .HasColumnType("TEXT"); + + b.Property("is_delete") + .HasColumnType("INTEGER"); + + b.Property("is_show") + .HasColumnType("INTEGER"); + + b.Property("is_top") + .HasColumnType("INTEGER"); + + b.Property("menu_name") + .HasColumnType("TEXT"); + + b.Property("menuid") + .HasColumnType("INTEGER"); + + b.Property("mouldid") + .HasColumnType("INTEGER"); + + b.Property("router") + .HasColumnType("TEXT"); + + b.Property("sort") + .HasColumnType("INTEGER"); + + b.HasKey("id"); + + b.HasIndex("menuid"); + + b.HasIndex("mouldid"); + + b.ToTable("menu"); + }); + + modelBuilder.Entity("Yi.Framework.Model.Models.mould", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("is_delete") + .HasColumnType("INTEGER"); + + b.Property("mould_name") + .HasColumnType("TEXT"); + + b.Property("url") + .HasColumnType("TEXT"); + + b.HasKey("id"); + + b.ToTable("mould"); + }); + + modelBuilder.Entity("Yi.Framework.Model.Models.role", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("introduce") + .HasColumnType("TEXT"); + + b.Property("is_delete") + .HasColumnType("INTEGER"); + + b.Property("role_name") + .HasColumnType("TEXT"); + + b.HasKey("id"); + + b.ToTable("role"); + }); + + modelBuilder.Entity("Yi.Framework.Model.Models.user", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("age") + .HasColumnType("INTEGER"); + + b.Property("email") + .HasColumnType("TEXT"); + + b.Property("icon") + .HasColumnType("TEXT"); + + b.Property("introduction") + .HasColumnType("TEXT"); + + b.Property("ip") + .HasColumnType("TEXT"); + + b.Property("is_delete") + .HasColumnType("INTEGER"); + + b.Property("nick") + .HasColumnType("TEXT"); + + b.Property("password") + .HasColumnType("TEXT"); + + b.Property("username") + .HasColumnType("TEXT"); + + b.HasKey("id"); + + b.ToTable("user"); + }); + + modelBuilder.Entity("menurole", b => + { + b.Property("menusid") + .HasColumnType("INTEGER"); + + b.Property("rolesid") + .HasColumnType("INTEGER"); + + b.HasKey("menusid", "rolesid"); + + b.HasIndex("rolesid"); + + b.ToTable("menurole"); + }); + + modelBuilder.Entity("roleuser", b => + { + b.Property("rolesid") + .HasColumnType("INTEGER"); + + b.Property("usersid") + .HasColumnType("INTEGER"); + + b.HasKey("rolesid", "usersid"); + + b.HasIndex("usersid"); + + b.ToTable("roleuser"); + }); + + modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => + { + b.HasOne("Yi.Framework.Model.Models.menu", null) + .WithMany("children") + .HasForeignKey("menuid"); + + b.HasOne("Yi.Framework.Model.Models.mould", "mould") + .WithMany() + .HasForeignKey("mouldid"); + + b.Navigation("mould"); + }); + + modelBuilder.Entity("menurole", b => + { + b.HasOne("Yi.Framework.Model.Models.menu", null) + .WithMany() + .HasForeignKey("menusid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yi.Framework.Model.Models.role", null) + .WithMany() + .HasForeignKey("rolesid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("roleuser", b => + { + b.HasOne("Yi.Framework.Model.Models.role", null) + .WithMany() + .HasForeignKey("rolesid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yi.Framework.Model.Models.user", null) + .WithMany() + .HasForeignKey("usersid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => + { + b.Navigation("children"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.cs b/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.cs new file mode 100644 index 00000000..379269ec --- /dev/null +++ b/Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Yi.Framework.Model.Migrations +{ + public partial class yi2 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "is_show", + table: "menu", + type: "INTEGER", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "is_show", + table: "menu"); + } + } +} diff --git a/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs b/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs index 7eb9c22e..d4e8522e 100644 --- a/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs +++ b/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs @@ -14,7 +14,7 @@ namespace Yi.Framework.Model.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "5.0.10"); + .HasAnnotation("ProductVersion", "5.0.11"); modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => { @@ -28,6 +28,9 @@ namespace Yi.Framework.Model.Migrations b.Property("is_delete") .HasColumnType("INTEGER"); + b.Property("is_show") + .HasColumnType("INTEGER"); + b.Property("is_top") .HasColumnType("INTEGER");