From baad2fa7d5c2bdb30769a42375ad421888be8621 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 29 Apr 2020 16:41:47 +0800 Subject: [PATCH] 1.0.0.4292 Former-commit-id: 88d94422031fef163b2527d4d048a8c08d1a3316 --- projects/IoT.Shared/IoTSharedDbConfig.cs | 15 +++++++++------ projects/IoTCenter/db.sql | 4 ++-- projects/StudyCenter/DbConfig.cs | 13 +++++++------ .../Application/Models/EditUserModel.cs | 2 +- projects/UserCenter/DbConfig.cs | 14 ++++++++++---- projects/UserCenter/db.sql | 8 ++++++-- projects/Version.cs | 2 +- 7 files changed, 36 insertions(+), 22 deletions(-) diff --git a/projects/IoT.Shared/IoTSharedDbConfig.cs b/projects/IoT.Shared/IoTSharedDbConfig.cs index 446c0137..09a6e2dd 100644 --- a/projects/IoT.Shared/IoTSharedDbConfig.cs +++ b/projects/IoT.Shared/IoTSharedDbConfig.cs @@ -10,18 +10,21 @@ namespace IoT.Shared public static void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity(); - modelBuilder.Entity().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull); - modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); - modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); - modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId); - modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId); - modelBuilder.Entity().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId); + // + modelBuilder.Entity().Property(o => o.UserName).IsRequired(); modelBuilder.Entity().HasIndex(o => o.UserName).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Email).IsUnique(); + modelBuilder.Entity().Property(o => o.Name).IsRequired(); modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); + modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); + modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId); modelBuilder.Entity().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId); + modelBuilder.Entity().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId); modelBuilder.Entity().HasIndex(o => new { o.RoleId, o.PermissionId }).IsUnique(); ////// modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); diff --git a/projects/IoTCenter/db.sql b/projects/IoTCenter/db.sql index f2051503..4845fca9 100644 --- a/projects/IoTCenter/db.sql +++ b/projects/IoTCenter/db.sql @@ -57,7 +57,7 @@ CREATE TABLE "iot_PermissionCategory" ( CREATE TABLE "iot_Role" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_Role" PRIMARY KEY, "IsDeleted" TEXT NULL, - "Name" TEXT NULL, + "Name" TEXT NOT NULL, "IsReadOnly" INTEGER NOT NULL ); @@ -72,7 +72,7 @@ CREATE TABLE "iot_Setting" ( CREATE TABLE "iot_User" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_User" PRIMARY KEY, "IsDeleted" TEXT NULL, - "UserName" TEXT NULL, + "UserName" TEXT NOT NULL, "NickName" TEXT NULL, "Avatar" TEXT NULL, "SecurityStamp" TEXT NULL, diff --git a/projects/StudyCenter/DbConfig.cs b/projects/StudyCenter/DbConfig.cs index 1cfb1792..c249955c 100644 --- a/projects/StudyCenter/DbConfig.cs +++ b/projects/StudyCenter/DbConfig.cs @@ -26,17 +26,18 @@ namespace StudyCenter public void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity(); - modelBuilder.Entity().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId); - modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId); - modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); - modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId); - modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId); - modelBuilder.Entity().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId); + modelBuilder.Entity().Property(o => o.UserName).IsRequired(); modelBuilder.Entity().HasIndex(o => o.UserName).IsUnique(); + modelBuilder.Entity().Property(o => o.Name).IsRequired(); modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); + modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId); modelBuilder.Entity().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId); + modelBuilder.Entity().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId); modelBuilder.Entity().HasIndex(o => new { o.RoleId, o.PermissionId }).IsUnique(); //学校课程 //专业分类用来组织学校、学院、系等 diff --git a/projects/UserCenter/Application/Models/EditUserModel.cs b/projects/UserCenter/Application/Models/EditUserModel.cs index ea9c7af7..4b80328f 100644 --- a/projects/UserCenter/Application/Models/EditUserModel.cs +++ b/projects/UserCenter/Application/Models/EditUserModel.cs @@ -2,7 +2,6 @@ using Application.Domain.Entities; using Infrastructure.Application; using System; using System.Collections.Generic; -using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace Application.Models @@ -27,6 +26,7 @@ namespace Application.Models [DataType(DataType.EmailAddress)] [RegularExpression(@"^\w+@\w+\.\w+$", ErrorMessage = "邮箱格式错误")] [Display(Name = "邮箱")] + [Required(ErrorMessage = nameof(RequiredAttribute))] public string Email { get; set; } [Display(Name = "邮箱认证")] diff --git a/projects/UserCenter/DbConfig.cs b/projects/UserCenter/DbConfig.cs index a4e8576d..c067b7eb 100644 --- a/projects/UserCenter/DbConfig.cs +++ b/projects/UserCenter/DbConfig.cs @@ -25,14 +25,20 @@ namespace UserCenter public void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity(); + modelBuilder.Entity().Property(o => o.UserName).IsRequired(); + modelBuilder.Entity().HasIndex(o => o.UserName).IsUnique(); + modelBuilder.Entity().Property(o => o.Email).IsRequired(); + modelBuilder.Entity().HasIndex(o => o.Email).IsUnique(); + modelBuilder.Entity().HasIndex(o => o.PhoneNumber).IsUnique(); + modelBuilder.Entity().HasIndex(o => o.NickName).IsUnique(); + modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); modelBuilder.Entity().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull); - modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); - modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); + modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId); modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId); modelBuilder.Entity().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId); modelBuilder.Entity().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId); - modelBuilder.Entity().HasIndex(o => o.PhoneNumber).IsUnique(); - modelBuilder.Entity().HasIndex(o => o.NickName).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique(); diff --git a/projects/UserCenter/db.sql b/projects/UserCenter/db.sql index 91f73bf8..5ca16cd9 100644 --- a/projects/UserCenter/db.sql +++ b/projects/UserCenter/db.sql @@ -48,11 +48,11 @@ CREATE TABLE "uc_Site" ( CREATE TABLE "uc_User" ( "Id" TEXT NOT NULL CONSTRAINT "PK_uc_User" PRIMARY KEY, "IsDeleted" TEXT NULL, - "UserName" TEXT NULL, + "UserName" TEXT NOT NULL, "SecurityStamp" TEXT NULL, "PasswordHash" TEXT NULL, "PasswordConfirmed" INTEGER NOT NULL, - "Email" TEXT NULL, + "Email" TEXT NOT NULL, "EmailConfirmed" INTEGER NOT NULL, "PhoneNumber" TEXT NULL, "PhoneNumberConfirmed" INTEGER NOT NULL, @@ -132,10 +132,14 @@ CREATE UNIQUE INDEX "IX_uc_RolePermission_RoleId_PermissionId" ON "uc_RolePermis CREATE UNIQUE INDEX "IX_uc_Site_Name" ON "uc_Site" ("Name"); +CREATE UNIQUE INDEX "IX_uc_User_Email" ON "uc_User" ("Email"); + CREATE UNIQUE INDEX "IX_uc_User_NickName" ON "uc_User" ("NickName"); CREATE UNIQUE INDEX "IX_uc_User_PhoneNumber" ON "uc_User" ("PhoneNumber"); +CREATE UNIQUE INDEX "IX_uc_User_UserName" ON "uc_User" ("UserName"); + CREATE INDEX "IX_uc_UserDepartment_DepartmentId" ON "uc_UserDepartment" ("DepartmentId"); CREATE UNIQUE INDEX "IX_uc_UserDepartment_UserId_DepartmentId" ON "uc_UserDepartment" ("UserId", "DepartmentId"); diff --git a/projects/Version.cs b/projects/Version.cs index a5a0b279..bd4ffb31 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.*")] -[assembly: AssemblyInformationalVersion("1.0.0.4291")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.4292")] \ No newline at end of file