wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.0.0.4292

Browse Source 
Former-commit-id: 88d94422031fef163b2527d4d048a8c08d1a3316
TangShanKaiPing
wanggang 5 years ago
parent d8683d5703
commit baad2fa7d5
7 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File

15
projects/IoT.Shared/IoTSharedDbConfig.cs
Unescape View File

@ -10,18 +10,21 @@ namespace IoT.Shared
public static void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Setting>();
modelBuilder.Entity<PermissionCategory>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId);
//
modelBuilder.Entity<User>().Property(o => o.UserName).IsRequired();
modelBuilder.Entity<User>().HasIndex(o => o.UserName).IsUnique();
modelBuilder.Entity<User>().HasIndex(o => o.Email).IsUnique();
modelBuilder.Entity<Role>().Property(o => o.Name).IsRequired();
modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
modelBuilder.Entity<PermissionCategory>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<PermissionCategory>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<UserRole>().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique();
modelBuilder.Entity<RolePermission>().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId);
modelBuilder.Entity<RolePermission>().HasIndex(o => new { o.RoleId, o.PermissionId }).IsUnique();
//////
modelBuilder.Entity<Node>().HasIndex(o => o.Number).IsUnique();

4
projects/IoTCenter/db.sql
Unescape View File

@ -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,

13
projects/StudyCenter/DbConfig.cs
Unescape View File

@ -26,17 +26,18 @@ namespace StudyCenter
public void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Setting>();
modelBuilder.Entity<PermissionCategory>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId);
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId);
modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId);
modelBuilder.Entity<User>().Property(o => o.UserName).IsRequired();
modelBuilder.Entity<User>().HasIndex(o => o.UserName).IsUnique();
modelBuilder.Entity<Role>().Property(o => o.Name).IsRequired();
modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
modelBuilder.Entity<PermissionCategory>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<PermissionCategory>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<UserRole>().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique();
modelBuilder.Entity<RolePermission>().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId);
modelBuilder.Entity<RolePermission>().HasIndex(o => new { o.RoleId, o.PermissionId }).IsUnique();
//学校课程
//专业分类用来组织学校、学院、系等

2
projects/UserCenter/Application/Models/EditUserModel.cs
Unescape View File

@ -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 = "邮箱认证")]

14
projects/UserCenter/DbConfig.cs
Unescape View File

@ -25,14 +25,20 @@ namespace UserCenter
public void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Setting>();
modelBuilder.Entity<User>().Property(o => o.UserName).IsRequired();
modelBuilder.Entity<User>().HasIndex(o => o.UserName).IsUnique();
modelBuilder.Entity<User>().Property(o => o.Email).IsRequired();
modelBuilder.Entity<User>().HasIndex(o => o.Email).IsUnique();
modelBuilder.Entity<User>().HasIndex(o => o.PhoneNumber).IsUnique();
modelBuilder.Entity<User>().HasIndex(o => o.NickName).IsUnique();
modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
modelBuilder.Entity<PermissionCategory>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o => o.ParentId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<PermissionCategory>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasOne(o => o.Category).WithMany(o => o.Permissions).HasForeignKey(o => o.CategoryId).OnDelete(DeleteBehavior.SetNull); modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Role).WithMany(o => o.RolePermissions).HasForeignKey(o => o.RoleId);
modelBuilder.Entity<RolePermission>().HasOne(o => o.Permission).WithMany(o => o.RolePermissions).HasForeignKey(o => o.PermissionId);
modelBuilder.Entity<User>().HasIndex(o => o.PhoneNumber).IsUnique();
modelBuilder.Entity<User>().HasIndex(o => o.NickName).IsUnique(); modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
modelBuilder.Entity<PermissionCategory>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Permission>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<UserRole>().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique();

8
projects/UserCenter/db.sql
Unescape View File

@ -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");

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyInformationalVersion("1.0.0.4291")]
[assembly: AssemblyInformationalVersion("1.0.0.4292")]
Write Preview
Loading…
Cancel
Save