xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据库迁移

Browse Source
This commit is contained in:
橙子
2021-10-23 02:24:18 +08:00
parent eb15667d21
commit ea5d10d2b1
12 changed files with 177 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs
View File

@@ -68,6 +68,11 @@ namespace Yi.Framework.ApiMicroservice
#endregion #endregion
services.AddSqliteService(); services.AddSqliteService();
#region
//MySql<71><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#endregion
services.AddMysqlService();
#region #region
//Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#endregion #endregion
@@ -78,7 +83,7 @@ namespace Yi.Framework.ApiMicroservice
#endregion #endregion
//services.AddRabbitMQService(); //services.AddRabbitMQService();
} }
#region Autofac<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD> #region Autofac<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD>

2
Yi.Framework/Yi.Framework.ApiMicroservice/appsettings.json
View File

@@ -17,7 +17,7 @@
"Url": "Filename=YIDB.db" "Url": "Filename=YIDB.db"
}, },
"MysqlConn": { "MysqlConn": {
"Url": "server=192.168.2.128;port=3306;database=ECDB;user id=root;password=123456" "Url": "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020."
}, },
"JWTTokenOptions": { "JWTTokenOptions": {

8
Yi.Framework/Yi.Framework.Model/DataContext.cs
View File

@@ -14,10 +14,10 @@ namespace Yi.Framework.Model
//Update-Database yi-1 //Update-Database yi-1
public partial class DataContext : DbContext public partial class DataContext : DbContext
{ {
private readonly IOptionsMonitor<SqliteOptions> _optionsMonitor; private readonly IOptionsMonitor<MySqlConnOptions> _optionsMonitor;
private readonly string _connStr; private readonly string _connStr;
public DataContext(IOptionsMonitor<SqliteOptions> optionsMonitor) public DataContext(IOptionsMonitor<MySqlConnOptions> optionsMonitor)
{ {
_optionsMonitor = optionsMonitor; _optionsMonitor = optionsMonitor;
_connStr = _optionsMonitor.CurrentValue.Url; _connStr = _optionsMonitor.CurrentValue.Url;
@@ -31,7 +31,9 @@ namespace Yi.Framework.Model
{ {
if (!optionsBuilder.IsConfigured) if (!optionsBuilder.IsConfigured)
{ {
optionsBuilder.UseSqlite(_connStr); //optionsBuilder.UseSqlite(_connStr);
var serverVersion = new MySqlServerVersion(new Version(8, 0, 21));
optionsBuilder.UseMySql(_connStr, serverVersion);
} }
} }

218
Yi.Framework/Yi.Framework.Model/Migrations/20211013073148_yi-1.Designer.cs generated
View File

@@ -1,218 +0,0 @@
// <auto-generated />
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("20211013073148_yi-1")]
partial class yi1
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "5.0.10");
modelBuilder.Entity("Yi.Framework.Model.Models.menu", b =>
{
b.Property<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("icon")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<int?>("is_top")
.HasColumnType("INTEGER");
b.Property<string>("menu_name")
.HasColumnType("TEXT");
b.Property<int?>("menuid")
.HasColumnType("INTEGER");
b.Property<int?>("mouldid")
.HasColumnType("INTEGER");
b.Property<string>("router")
.HasColumnType("TEXT");
b.Property<int?>("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<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("mould_name")
.HasColumnType("TEXT");
b.Property<string>("url")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("mould");
});
modelBuilder.Entity("Yi.Framework.Model.Models.role", b =>
{
b.Property<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("introduce")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("role_name")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("role");
});
modelBuilder.Entity("Yi.Framework.Model.Models.user", b =>
{
b.Property<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int?>("age")
.HasColumnType("INTEGER");
b.Property<string>("email")
.HasColumnType("TEXT");
b.Property<string>("icon")
.HasColumnType("TEXT");
b.Property<string>("introduction")
.HasColumnType("TEXT");
b.Property<string>("ip")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("nick")
.HasColumnType("TEXT");
b.Property<string>("password")
.HasColumnType("TEXT");
b.Property<string>("username")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("user");
});
modelBuilder.Entity("menurole", b =>
{
b.Property<int>("menusid")
.HasColumnType("INTEGER");
b.Property<int>("rolesid")
.HasColumnType("INTEGER");
b.HasKey("menusid", "rolesid");
b.HasIndex("rolesid");
b.ToTable("menurole");
});
modelBuilder.Entity("roleuser", b =>
{
b.Property<int>("rolesid")
.HasColumnType("INTEGER");
b.Property<int>("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
}
}
}

221
Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.Designer.cs generated
View File

@@ -1,221 +0,0 @@
// <auto-generated />
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<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("icon")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<int?>("is_show")
.HasColumnType("INTEGER");
b.Property<int?>("is_top")
.HasColumnType("INTEGER");
b.Property<string>("menu_name")
.HasColumnType("TEXT");
b.Property<int?>("menuid")
.HasColumnType("INTEGER");
b.Property<int?>("mouldid")
.HasColumnType("INTEGER");
b.Property<string>("router")
.HasColumnType("TEXT");
b.Property<int?>("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<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("mould_name")
.HasColumnType("TEXT");
b.Property<string>("url")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("mould");
});
modelBuilder.Entity("Yi.Framework.Model.Models.role", b =>
{
b.Property<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("introduce")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("role_name")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("role");
});
modelBuilder.Entity("Yi.Framework.Model.Models.user", b =>
{
b.Property<int>("id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int?>("age")
.HasColumnType("INTEGER");
b.Property<string>("email")
.HasColumnType("TEXT");
b.Property<string>("icon")
.HasColumnType("TEXT");
b.Property<string>("introduction")
.HasColumnType("TEXT");
b.Property<string>("ip")
.HasColumnType("TEXT");
b.Property<int>("is_delete")
.HasColumnType("INTEGER");
b.Property<string>("nick")
.HasColumnType("TEXT");
b.Property<string>("password")
.HasColumnType("TEXT");
b.Property<string>("username")
.HasColumnType("TEXT");
b.HasKey("id");
b.ToTable("user");
});
modelBuilder.Entity("menurole", b =>
{
b.Property<int>("menusid")
.HasColumnType("INTEGER");
b.Property<int>("rolesid")
.HasColumnType("INTEGER");
b.HasKey("menusid", "rolesid");
b.HasIndex("rolesid");
b.ToTable("menurole");
});
modelBuilder.Entity("roleuser", b =>
{
b.Property<int>("rolesid")
.HasColumnType("INTEGER");
b.Property<int>("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
}
}
}

23
Yi.Framework/Yi.Framework.Model/Migrations/20211017105828_yi-2.cs
View File

@@ -1,23 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Yi.Framework.Model.Migrations
{
public partial class yi2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "is_show",
table: "menu",
type: "INTEGER",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "is_show",
table: "menu");
}
}
}

87
Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.cs
View File

@@ -1,87 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Yi.Framework.Model.Migrations
{
public partial class yi3 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "address",
table: "user",
type: "TEXT",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "phone",
table: "user",
type: "INTEGER",
nullable: true);
migrationBuilder.AlterColumn<int>(
name: "sort",
table: "menu",
type: "INTEGER",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "INTEGER",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "is_top",
table: "menu",
type: "INTEGER",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "INTEGER",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
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<int>(
name: "sort",
table: "menu",
type: "INTEGER",
nullable: true,
oldClrType: typeof(int),
oldType: "INTEGER");
migrationBuilder.AlterColumn<int>(
name: "is_top",
table: "menu",
type: "INTEGER",
nullable: true,
oldClrType: typeof(int),
oldType: "INTEGER");
migrationBuilder.AlterColumn<int>(
name: "is_show",
table: "menu",
type: "INTEGER",
nullable: true,
oldClrType: typeof(int),
oldType: "INTEGER");
}
}
}

73
Yi.Framework/Yi.Framework.Model/Migrations/20211020073819_yi-3.Designer.cs → Yi.Framework/Yi.Framework.Model/Migrations/20211022181627_yi-1.Designer.cs generated
View File

@@ -9,47 +9,48 @@ using Yi.Framework.Model;
namespace Yi.Framework.Model.Migrations namespace Yi.Framework.Model.Migrations
{ {
[DbContext(typeof(DataContext))] [DbContext(typeof(DataContext))]
[Migration("20211020073819_yi-3")] [Migration("20211022181627_yi-1")]
partial class yi3 partial class yi1
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("Relational:MaxIdentifierLength", 64)
.HasAnnotation("ProductVersion", "5.0.11"); .HasAnnotation("ProductVersion", "5.0.11");
modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => modelBuilder.Entity("Yi.Framework.Model.Models.menu", b =>
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("icon") b.Property<string>("icon")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_show") b.Property<int>("is_show")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_top") b.Property<int>("is_top")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("menu_name") b.Property<string>("menu_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("menuid") b.Property<int?>("menuid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int?>("mouldid") b.Property<int?>("mouldid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("router") b.Property<string>("router")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("sort") b.Property<int>("sort")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("id"); b.HasKey("id");
@@ -64,16 +65,16 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("mould_name") b.Property<string>("mould_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("url") b.Property<string>("url")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -84,16 +85,16 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("introduce") b.Property<string>("introduce")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("role_name") b.Property<string>("role_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -104,40 +105,40 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("address") b.Property<string>("address")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("age") b.Property<int?>("age")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("email") b.Property<string>("email")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("icon") b.Property<string>("icon")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("introduction") b.Property<string>("introduction")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("ip") b.Property<string>("ip")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("nick") b.Property<string>("nick")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("password") b.Property<string>("password")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("phone") b.Property<int?>("phone")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("username") b.Property<string>("username")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -147,10 +148,10 @@ namespace Yi.Framework.Model.Migrations
modelBuilder.Entity("menurole", b => modelBuilder.Entity("menurole", b =>
{ {
b.Property<int>("menusid") b.Property<int>("menusid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("rolesid") b.Property<int>("rolesid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("menusid", "rolesid"); b.HasKey("menusid", "rolesid");
@@ -162,10 +163,10 @@ namespace Yi.Framework.Model.Migrations
modelBuilder.Entity("roleuser", b => modelBuilder.Entity("roleuser", b =>
{ {
b.Property<int>("rolesid") b.Property<int>("rolesid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("usersid") b.Property<int>("usersid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("rolesid", "usersid"); b.HasKey("rolesid", "usersid");

112
Yi.Framework/Yi.Framework.Model/Migrations/20211013073148_yi-1.cs → Yi.Framework/Yi.Framework.Model/Migrations/20211022181627_yi-1.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Yi.Framework.Model.Migrations namespace Yi.Framework.Model.Migrations
{ {
@@ -6,71 +7,95 @@ namespace Yi.Framework.Model.Migrations
{ {
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
{ {
migrationBuilder.AlterDatabase()
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "mould", name: "mould",
columns: table => new columns: table => new
{ {
id = table.Column<int>(type: "INTEGER", nullable: false) id = table.Column<int>(type: "int", nullable: false)
.Annotation("Sqlite:Autoincrement", true), .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
mould_name = table.Column<string>(type: "TEXT", nullable: true), mould_name = table.Column<string>(type: "longtext", nullable: true)
url = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
is_delete = table.Column<int>(type: "INTEGER", nullable: false) url = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
is_delete = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_mould", x => x.id); table.PrimaryKey("PK_mould", x => x.id);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "role", name: "role",
columns: table => new columns: table => new
{ {
id = table.Column<int>(type: "INTEGER", nullable: false) id = table.Column<int>(type: "int", nullable: false)
.Annotation("Sqlite:Autoincrement", true), .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
role_name = table.Column<string>(type: "TEXT", nullable: true), role_name = table.Column<string>(type: "longtext", nullable: true)
introduce = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
is_delete = table.Column<int>(type: "INTEGER", nullable: false) introduce = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
is_delete = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_role", x => x.id); table.PrimaryKey("PK_role", x => x.id);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "user", name: "user",
columns: table => new columns: table => new
{ {
id = table.Column<int>(type: "INTEGER", nullable: false) id = table.Column<int>(type: "int", nullable: false)
.Annotation("Sqlite:Autoincrement", true), .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
username = table.Column<string>(type: "TEXT", nullable: true), username = table.Column<string>(type: "longtext", nullable: true)
password = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
icon = table.Column<string>(type: "TEXT", nullable: true), password = table.Column<string>(type: "longtext", nullable: true)
nick = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
email = table.Column<string>(type: "TEXT", nullable: true), icon = table.Column<string>(type: "longtext", nullable: true)
ip = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
age = table.Column<int>(type: "INTEGER", nullable: true), nick = table.Column<string>(type: "longtext", nullable: true)
introduction = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
is_delete = table.Column<int>(type: "INTEGER", nullable: false) email = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ip = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
age = table.Column<int>(type: "int", nullable: true),
introduction = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
address = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
phone = table.Column<int>(type: "int", nullable: true),
is_delete = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_user", x => x.id); table.PrimaryKey("PK_user", x => x.id);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "menu", name: "menu",
columns: table => new columns: table => new
{ {
id = table.Column<int>(type: "INTEGER", nullable: false) id = table.Column<int>(type: "int", nullable: false)
.Annotation("Sqlite:Autoincrement", true), .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
icon = table.Column<string>(type: "TEXT", nullable: true), icon = table.Column<string>(type: "longtext", nullable: true)
router = table.Column<string>(type: "TEXT", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
menu_name = table.Column<string>(type: "TEXT", nullable: true), router = table.Column<string>(type: "longtext", nullable: true)
mouldid = table.Column<int>(type: "INTEGER", nullable: true), .Annotation("MySql:CharSet", "utf8mb4"),
menuid = table.Column<int>(type: "INTEGER", nullable: true), menu_name = table.Column<string>(type: "longtext", nullable: true)
is_delete = table.Column<int>(type: "INTEGER", nullable: false), .Annotation("MySql:CharSet", "utf8mb4"),
is_top = table.Column<int>(type: "INTEGER", nullable: true), mouldid = table.Column<int>(type: "int", nullable: true),
sort = table.Column<int>(type: "INTEGER", nullable: true) menuid = table.Column<int>(type: "int", nullable: true),
is_delete = table.Column<int>(type: "int", nullable: false),
is_top = table.Column<int>(type: "int", nullable: false),
sort = table.Column<int>(type: "int", nullable: false),
is_show = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
@@ -87,14 +112,15 @@ namespace Yi.Framework.Model.Migrations
principalTable: "mould", principalTable: "mould",
principalColumn: "id", principalColumn: "id",
onDelete: ReferentialAction.Restrict); onDelete: ReferentialAction.Restrict);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "roleuser", name: "roleuser",
columns: table => new columns: table => new
{ {
rolesid = table.Column<int>(type: "INTEGER", nullable: false), rolesid = table.Column<int>(type: "int", nullable: false),
usersid = table.Column<int>(type: "INTEGER", nullable: false) usersid = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
@@ -111,14 +137,15 @@ namespace Yi.Framework.Model.Migrations
principalTable: "user", principalTable: "user",
principalColumn: "id", principalColumn: "id",
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Cascade);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "menurole", name: "menurole",
columns: table => new columns: table => new
{ {
menusid = table.Column<int>(type: "INTEGER", nullable: false), menusid = table.Column<int>(type: "int", nullable: false),
rolesid = table.Column<int>(type: "INTEGER", nullable: false) rolesid = table.Column<int>(type: "int", nullable: false)
}, },
constraints: table => constraints: table =>
{ {
@@ -135,7 +162,8 @@ namespace Yi.Framework.Model.Migrations
principalTable: "role", principalTable: "role",
principalColumn: "id", principalColumn: "id",
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Cascade);
}); })
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_menu_menuid", name: "IX_menu_menuid",

69
Yi.Framework/Yi.Framework.Model/Migrations/DataContextModelSnapshot.cs
View File

@@ -14,40 +14,41 @@ namespace Yi.Framework.Model.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("Relational:MaxIdentifierLength", 64)
.HasAnnotation("ProductVersion", "5.0.11"); .HasAnnotation("ProductVersion", "5.0.11");
modelBuilder.Entity("Yi.Framework.Model.Models.menu", b => modelBuilder.Entity("Yi.Framework.Model.Models.menu", b =>
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("icon") b.Property<string>("icon")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_show") b.Property<int>("is_show")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_top") b.Property<int>("is_top")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("menu_name") b.Property<string>("menu_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("menuid") b.Property<int?>("menuid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int?>("mouldid") b.Property<int?>("mouldid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("router") b.Property<string>("router")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("sort") b.Property<int>("sort")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("id"); b.HasKey("id");
@@ -62,16 +63,16 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("mould_name") b.Property<string>("mould_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("url") b.Property<string>("url")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -82,16 +83,16 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("introduce") b.Property<string>("introduce")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("role_name") b.Property<string>("role_name")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -102,40 +103,40 @@ namespace Yi.Framework.Model.Migrations
{ {
b.Property<int>("id") b.Property<int>("id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("address") b.Property<string>("address")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("age") b.Property<int?>("age")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("email") b.Property<string>("email")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("icon") b.Property<string>("icon")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("introduction") b.Property<string>("introduction")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("ip") b.Property<string>("ip")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int>("is_delete") b.Property<int>("is_delete")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("nick") b.Property<string>("nick")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<string>("password") b.Property<string>("password")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.Property<int?>("phone") b.Property<int?>("phone")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<string>("username") b.Property<string>("username")
.HasColumnType("TEXT"); .HasColumnType("longtext");
b.HasKey("id"); b.HasKey("id");
@@ -145,10 +146,10 @@ namespace Yi.Framework.Model.Migrations
modelBuilder.Entity("menurole", b => modelBuilder.Entity("menurole", b =>
{ {
b.Property<int>("menusid") b.Property<int>("menusid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("rolesid") b.Property<int>("rolesid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("menusid", "rolesid"); b.HasKey("menusid", "rolesid");
@@ -160,10 +161,10 @@ namespace Yi.Framework.Model.Migrations
modelBuilder.Entity("roleuser", b => modelBuilder.Entity("roleuser", b =>
{ {
b.Property<int>("rolesid") b.Property<int>("rolesid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.Property<int>("usersid") b.Property<int>("usersid")
.HasColumnType("INTEGER"); .HasColumnType("int");
b.HasKey("rolesid", "usersid"); b.HasKey("rolesid", "usersid");

20
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/MysqlExtension.cs Normal file
View File

@@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using Yi.Framework.Common.IOCOptions;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
/// <summary>
/// 数据库扩展
/// </summary>
public static class MysqlExtension
{
public static IServiceCollection AddMysqlService(this IServiceCollection services)
{
services.Configure<MySqlConnOptions>(Appsettings.appConfiguration("MysqlConn"));
return services;
}
}
}

99
Yi.Vue/src/views/AdmRole.vue
View File

@@ -12,106 +12,13 @@
</material-card> </material-card>
</template> </template>
<script> <script>
import {handUrl} from '../util/getMould'
export default { export default {
created() { created() {
this.init(); this.init();
}, },
methods: { methods: {
recursiveFun(menuList, menuStr) {
if (this.start) {
this.getUrlFun(menuList, menuStr);
}
},
getUrlFun(menuList, menuStr) {
for (var i = 0; i < menuList.length; i++) {
if (menuList[i].menu_name == menuStr) {
this.start = false;
this.axiosUrls= handUrl(menuList[i]);
} else {
if (menuList[i].children != undefined && this.start) {
this.recursiveFun(menuList[i].children, menuStr);
}
}
}
},
init() { init() {
const resp = [ }
{
menu_name: "首页",
icon: "mdi-view-dashboard",
to: "/",
},
{
menu_name: "用户角色管理",
icon: "mdi-account",
to: "",
children: [
{
menu_name: "用户管理",
icon: "mdi-account",
to: "/admuser/",
children: [
{
menu_name: "",
icon: "mdi-account",
to: "/admrole/",
mould: {
mould_name: "get",
url: "/role/getrole",
},
},
],
},
{
menu_name: "角色管理",
icon: "mdi-account-tie",
to: "/admrole/",
children: [],
},
],
},
{
menu_name: "菜单接口管理",
icon: "mdi-clipboard-outline",
to: "",
children: [
{
menu_name: "菜单管理",
icon: "mdi-account",
to: "/admMenu/",
children: [],
},
{
menu_name: "接口管理",
icon: "mdi-account",
to: "/admMould/",
children: [],
},
{
menu_name: "角色菜单分配管理",
icon: "mdi-account",
to: "/admRoleMenu/",
children: [],
},
],
},
{
menu_name: "测试路由",
icon: "mdi-clipboard-outline",
to: "",
children: [
{
menu_name: "用户信息",
icon: "mdi-account",
to: "/userinfo/",
children: [],
},
],
},
];
this.recursiveFun(resp, "用户管理");
},
}, },
data: () => ({ data: () => ({
start: true, start: true,
@@ -128,8 +35,8 @@ export default {
{ text: "操作", value: "actions", sortable: false }, { text: "操作", value: "actions", sortable: false },
], ],
defaultItem: { defaultItem: {
role_name: "test", role_name: "",
introduce: "用于测试", introduce: "",
}, },
}), }),
}; };