From dcb51eb2124a2b3c4886e974ad87f39305701e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Wed, 20 Oct 2021 15:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 69632 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-shm | Bin 0 -> 32768 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-wal | 0 .../BaseModels/loopModel.cs | 6 +- .../20211020073819_yi-3.Designer.cs | 227 ++++++++++++++++++ .../Migrations/20211020073819_yi-3.cs | 87 +++++++ .../Migrations/DataContextModelSnapshot.cs | 12 +- .../Yi.Framework.Model/Models/user.cs | 3 + Yi.Vue/src/views/Index2.vue | 25 -- 9 files changed, 329 insertions(+), 31 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal create mode 100644 Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.Designer.cs create mode 100644 Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.cs delete mode 100644 Yi.Vue/src/views/Index2.vue diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 8dd99a73a1ae619992098e33244e5756cb57e622..12c8f14b0eee85ad12854808f127414bb9b7b408 100644 GIT binary patch delta 2536 zcmb7`eQXnD9LMi^z4qREzm{$7%G%!TN*N5g^=;Fc00XUvSs)?PKs4aYs?^AsTQwSu zT@VRico`2QNFbRaF9xGw<;8`>KMecFsDnr}_=ih0jFEsb#6&}k@p+-p&ep{y&o}qn z^SR&e`};l5T{<*m9~!amYw(C1$9eG3@!;{O8D5->id@UeQ!YFMVT#j#gmb#Xbyk~H zSIa|c&^aovaU6Fn6Q-QcIaPl9@bKNGPSrl|Va2D{WfECFHjCqhD?FQCa}BUNP|i^u8^Knw18mDM9pu>_<_$rlX@u zVS!V%WobHK>9#%XcKYh-_?>J{(vsmp>*crqN8qa{VgH7ovtJCM0kIyniy_0~@GY$4 zU&;3MW?o;ljuu2E+e;Ei$Pj&nUE&2nc}I6p3-9I&Z>rDmix!(!PjBx)W^m9lyVL8s z&DBqJb>W-+o3`|2EOXWB?)1v^T6(wey=DnIX}16;IQSVZ!HI&$eF#DUK}h-&u|zx` zOT=OiB_ED=Y>xB7~|k3T!AtC$Z4qe2}!=f6GGui>oT_u#tRSMTivE3 z_k{N`D=Z2;A2g_jhd#wVJ1KRPo}TW=RQUL;~CA`r0&0w<3SiJeHi9P(U*^Kb^2d=fr{qi_fi zid|0O0zTFiyCCykB0BO+ZbOGB!|2P&rEc8B;*V^qRB&JZt#uQ*j45^w_j3$)ZVNmK zOQ01Rp$0_#cm1k$dA_*J;--SJw4}tI6fmrnGVGBWZm%b_N!~usH!P9m2u^mvQ_C(Iu%Q?V{1p`d?2QBh9pTfJXa@e?#)IAb3FsOR4S$C zGK0B5Yo*op_IA2zw6Ilw*|SsU-kbjHAOoTpkR_=)kY79tVJ>1oLxmi1ARet|Mi`Zd zczhvY8W%DqIFrd^tMPafVT=XUtx&*hs$}KHfm2gEE+kmJ^Q(vO(j1W)K%TanwTxC{ z%$q@!0B#y0Tph3o5V05#DX;ay#p}C9m{}UfY$RA-k}7pJ!BUykQ?YW4>Ohcqu|f=} zxHr*wFqg-W8Dvl;BW#O}K=nM#X~S&5+{!?noK+ek)3uH3P-ucv)Mg_a3>v`{2}`gbR=G)3h&9FhFJksO*_Hj_$bHqBW& zQyuqaGJY;Bs+?bzolps)oLJ5;+5bl*xW-2FPh%)~G97ocH delta 2370 zcmb7_eP|nH7{K34E+6;xKG&s5n>ER$Nz*j_PMQ`gi1l*{Ws2gc2+rCTTenub#7&%d zaZKGN>bCQvg5ZV}2c3!wI;DT8Q2&~!mBA31h_bfU^`HLZz)`*Dy>{!;B*nn}^4`6_ z_qpeN@80KfC-_{BKU!146GBw;So_Jxnmd|!(z@-GBHTuRTO{-+_()k%PRkdhacvqS3{0cw8r}7o*V_fyYyIig+ua`SCn(cpl_t5Cj*fV&zjTQR~#*)o%OxS{k z-w`mb@&V&{zTVhxqsDGoGPXNFd8oIyIUE_u?92>5wa@66z4={^lN_fQiYvrXBj>6z z?r?=P*;$qFa^oXogG0~W+qV((LmE+2| za=+51P!9*&nvW&X`m zbBE5Rs8(M-ginhV2>P|a(vcHZvTC>%HNEu8 zrc^Cl{#HIsD=!2iAr#6y8@(kN37QqTFqv{*5ZP>{?@{)T6J;bx=>YK zpqh^fLaA33H1CE8`s!v|OQLdvQ6P9W6Siz3#41oQUk|q7A6~!X=U$(@^u`DCAD^5* z`ZA5F>%H}w^#ZMGjeuIxEMLNn_2Zp!%6arg%DROO-B~Nj!iUEf4xh1Ng*l1%H9sMO zxz{t#~hSnCtDn?|&z(CA=FhvjrYfQVR?h&!a{cz29w*4G<~o8^Y&^8Fx5 z1OUvfWRCCd?#4f??B?PT;)DSrixQq%f>U;{JG03yiRjllZIaXK6flS^tTUZaN6~3@ zvT1c%sdh&BqEebkX-i6n{A&|3?_y54^LjbAjHs<>loX4SvYgbJoTF!eUM6rA{)S~( zf(7^*rr~q=6!yX&a1k!RES!UHVG1VUMTh`TSLhYGOfSPL@F=u`2=BwYV8CmzAD)IM zVG! { - public int? is_top { get; set; } - public int? sort { get; set; } - public int? is_show { get; set; } + public int is_top { get; set; } + public int sort { get; set; } + public int is_show { get; set; } } } diff --git a/Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.Designer.cs b/Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.Designer.cs new file mode 100644 index 00000000..9f3201f1 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.Designer.cs @@ -0,0 +1,227 @@ +// +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("20211020073819_yi-3")] + partial class yi3 + { + 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("address") + .HasColumnType("TEXT"); + + 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("phone") + .HasColumnType("INTEGER"); + + 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/20211020073819_yi-3.cs b/Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.cs new file mode 100644 index 00000000..a55c374d --- /dev/null +++ b/Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.cs @@ -0,0 +1,87 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Yi.Framework.Model.Migrations +{ + public partial class yi3 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "address", + table: "user", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "phone", + table: "user", + type: "INTEGER", + nullable: true); + + migrationBuilder.AlterColumn( + name: "sort", + table: "menu", + type: "INTEGER", + nullable: false, + defaultValue: 0, + oldClrType: typeof(int), + oldType: "INTEGER", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "is_top", + table: "menu", + type: "INTEGER", + nullable: false, + defaultValue: 0, + oldClrType: typeof(int), + oldType: "INTEGER", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "is_show", + table: "menu", + type: "INTEGER", + nullable: false, + defaultValue: 0, + oldClrType: typeof(int), + oldType: "INTEGER", + oldNullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "address", + table: "user"); + + migrationBuilder.DropColumn( + name: "phone", + table: "user"); + + migrationBuilder.AlterColumn( + name: "sort", + table: "menu", + type: "INTEGER", + nullable: true, + oldClrType: typeof(int), + oldType: "INTEGER"); + + migrationBuilder.AlterColumn( + name: "is_top", + table: "menu", + type: "INTEGER", + nullable: true, + oldClrType: typeof(int), + oldType: "INTEGER"); + + migrationBuilder.AlterColumn( + name: "is_show", + table: "menu", + type: "INTEGER", + nullable: true, + oldClrType: typeof(int), + oldType: "INTEGER"); + } + } +} diff --git a/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs b/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs index d4e8522e..33dbad96 100644 --- a/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs +++ b/Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs @@ -28,10 +28,10 @@ namespace Yi.Framework.Model.Migrations b.Property("is_delete") .HasColumnType("INTEGER"); - b.Property("is_show") + b.Property("is_show") .HasColumnType("INTEGER"); - b.Property("is_top") + b.Property("is_top") .HasColumnType("INTEGER"); b.Property("menu_name") @@ -46,7 +46,7 @@ namespace Yi.Framework.Model.Migrations b.Property("router") .HasColumnType("TEXT"); - b.Property("sort") + b.Property("sort") .HasColumnType("INTEGER"); b.HasKey("id"); @@ -104,6 +104,9 @@ namespace Yi.Framework.Model.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("address") + .HasColumnType("TEXT"); + b.Property("age") .HasColumnType("INTEGER"); @@ -128,6 +131,9 @@ namespace Yi.Framework.Model.Migrations b.Property("password") .HasColumnType("TEXT"); + b.Property("phone") + .HasColumnType("INTEGER"); + b.Property("username") .HasColumnType("TEXT"); diff --git a/Yi.Framework/Yi.Framework.Model/Models/user.cs b/Yi.Framework/Yi.Framework.Model/Models/user.cs index 13237cad..3a6cdeb7 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/user.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/user.cs @@ -17,6 +17,9 @@ namespace Yi.Framework.Model.Models public string ip { get; set; } public int? age { get; set; } public string introduction { get; set; } + public string address { get; set; } + public int? phone { get; set; } + public ICollection roles { get; set; } diff --git a/Yi.Vue/src/views/Index2.vue b/Yi.Vue/src/views/Index2.vue deleted file mode 100644 index cadecbbd..00000000 --- a/Yi.Vue/src/views/Index2.vue +++ /dev/null @@ -1,25 +0,0 @@ - - \ No newline at end of file