Former-commit-id: a158fad5a57c7b2842f1f3eb78b9368e9e0e6660
Former-commit-id: 3294da727f58828ca427172ef7623002264485c5
1.0
wanggang 5 years ago
parent 851b303b69
commit 7e0a86cabf

@ -0,0 +1,101 @@
using Microsoft.Extensions.Configuration;
using System;
using System.Globalization;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
namespace TeacherExt
{
public class AesHelper
{
private readonly IConfiguration _config;
public AesHelper(IConfiguration config)
{
this._config = config;
}
public string Decrypt(string input)
{
var data = HexStringToByteArray(input);
return Encoding.UTF8.GetString(AesDecrypt(data)).Trim();
}
public string Encrypt(string input)
{
var data = AesEncrypt(Encoding.UTF8.GetBytes(input));
return BytesToHex(data);
}
private byte[] AesEncrypt(byte[] plainText)
{
using var aes = CreateAes();
using var encryptor = aes.CreateEncryptor();
return encryptor.TransformFinalBlock(plainText, 0, plainText.Length);
}
private byte[] AesDecrypt(byte[] cipherText)
{
using var aes = CreateAes();
using var decryptor = aes.CreateDecryptor();
return decryptor.TransformFinalBlock(cipherText, 0, cipherText.Length);
}
private Aes CreateAes()
{
var password = this._config.GetValue<string>("password");
var key = Encoding.UTF8.GetBytes(password);
//var iv = HexStringToByteArray("DsideaL4r5t6y7u!@#");
var aesAlg = Aes.Create();
aesAlg.KeySize = 128;
aesAlg.Key = AESCreateKey(key, aesAlg.KeySize / 8);
aesAlg.IV = new byte[16];
aesAlg.BlockSize = 128;
aesAlg.Mode = CipherMode.ECB;
aesAlg.Padding = PaddingMode.PKCS7;
return aesAlg;
}
private static byte[] AESCreateKey(byte[] key, int keyLength)
{
// Create the real key with the given key length.
byte[] realkey = new byte[keyLength];
// XOR each byte of the Key given with the real key until there's nothing left.
// This allows for keys longer than our Key Length and pads short keys to the required length.
for (int i = 0; i < key.Length; i++)
{
realkey[i % keyLength] ^= key[i];
}
return realkey;
}
private static byte[] HexStringToByteArray(string hex)
{
return Enumerable.Range(0, hex.Length)
.Where(x => x % 2 == 0)
.Select(x => Convert.ToByte(hex.Substring(x, 2), 16))
.ToArray();
}
public string BytesToHex(byte[] bytes)
{
if (bytes is null)
{
throw new ArgumentNullException(nameof(bytes));
}
var hex = new StringBuilder(bytes.Length * 2);
foreach (byte b in bytes)
{
hex.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}", b);
}
return hex.ToString();
}
}
}

File diff suppressed because it is too large Load Diff

@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using System;
using TeacherExt.Entities;
namespace TeacherExt.Data
@ -9,35 +10,107 @@ namespace TeacherExt.Data
{
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.LogTo(message => Console.WriteLine(message))
.EnableDetailedErrors()
.EnableSensitiveDataLogging();
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.Entity<Organ>().HasKey(o => o.Id);
modelBuilder.Entity<Organ>().Property(o => o.Name).IsRequired();
modelBuilder.Entity<Organ>().Property(o => o.Number).IsRequired();
modelBuilder.Entity<Organ>().HasIndex(o => o.Number).IsUnique();
modelBuilder.Entity<Organ>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o=>o.ParentId).OnDelete(DeleteBehavior.SetNull);
modelBuilder.Entity<User>().HasKey(o => o.Id);
modelBuilder.Entity<User>().Property(o => o.UserName).IsRequired();
modelBuilder.Entity<User>().HasIndex(o => o.UserName).IsUnique();
modelBuilder.Entity<User>().HasOne(o => o.Organ).WithMany(o => o.Users).HasForeignKey(o => o.OrganId).OnDelete(DeleteBehavior.Cascade);
modelBuilder.Entity<Role>().HasKey(o => o.Id);
modelBuilder.Entity<Role>().Property(o => o.Name).IsRequired();
modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId).OnDelete(DeleteBehavior.Cascade);
modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId).OnDelete(DeleteBehavior.Cascade);
modelBuilder.Entity<UserRole>().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique();
modelBuilder.Entity<CheckLog>().HasKey(o => o.Id);
modelBuilder.Entity<Teacher>().HasKey(o => o.Id);
modelBuilder.Entity<Teacher>().Property(o => o.Id).ValueGeneratedNever();
modelBuilder.Entity<TeacherInfo>().HasIndex(o => o.Id);
modelBuilder.Entity<TeacherInfo>().Property(o => o.Id).ValueGeneratedNever();
modelBuilder.Entity<TeacherInfo>().HasOne(o => o.Teacher).WithOne(o => o.Info).HasForeignKey<TeacherInfo>(o=>o.TeacherId).OnDelete(DeleteBehavior.Cascade);
modelBuilder.Entity<TeacherProp>().HasKey(o => o.Id);
modelBuilder.Entity<TeacherProp>().Property(o => o.Id).ValueGeneratedNever();
modelBuilder.Entity<TeacherProp>().HasOne(o => o.Teacher).WithOne(o => o.Prop).HasForeignKey<TeacherProp>(o => o.TeacherId).OnDelete(DeleteBehavior.Cascade);
//
modelBuilder.Entity<Teacher>().HasOne(o => o.User).WithOne(o => o.Teacher).HasForeignKey<Teacher>(o => o.UserId).OnDelete(DeleteBehavior.Cascade);
//t_sys_dic_item
modelBuilder.Entity<DictionaryItem>().ToTable("t_sys_dic_item");
modelBuilder.Entity<DictionaryItem>().HasKey(o => o.Id);
modelBuilder.Entity<DictionaryItem>().Property(o => o.Id).HasColumnName("DIC_ITEM_ID").ValueGeneratedOnAdd();
modelBuilder.Entity<DictionaryItem>().Property(o => o.Code).HasColumnName("CODE");
modelBuilder.Entity<DictionaryItem>().Property(o => o.Detail).HasColumnName("DETAIL");
modelBuilder.Entity<DictionaryItem>().Property(o => o.Remark).HasColumnName("REMARK");
modelBuilder.Entity<DictionaryItem>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
modelBuilder.Entity<DictionaryItem>().Property(o => o.Category).HasColumnName("KIND");
modelBuilder.Entity<DictionaryItem>().Property(o => o.Order).HasColumnName("SORT");
//t_base_organization
modelBuilder.Entity<Organization>().ToTable("t_base_organization");
modelBuilder.Entity<Organization>().HasKey(o => o.Id);
modelBuilder.Entity<Organization>().Property(o => o.Id).HasColumnName("ORG_ID").ValueGeneratedOnAdd();
modelBuilder.Entity<Organization>().Property(o => o.Name).HasColumnName("ORG_NAME");
modelBuilder.Entity<Organization>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
//t_base_person
modelBuilder.Entity<Person>().ToTable("t_base_person");
modelBuilder.Entity<Person>().HasKey(o => o.Id);
modelBuilder.Entity<Person>().Property(o => o.Id).HasColumnName("PERSON_ID").ValueGeneratedOnAdd();
modelBuilder.Entity<Person>().Property(o => o.RealName).HasColumnName("PERSON_NAME").IsRequired();
modelBuilder.Entity<Person>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
modelBuilder.Entity<Person>().Property(o => o.BureauId).HasColumnName("BUREAU_ID");
modelBuilder.Entity<Person>().Property(o => o.OrganId).HasColumnName("ORG_ID");
modelBuilder.Entity<Person>().Property(o => o.Sex).HasColumnName("XB_NAME");
modelBuilder.Entity<Person>().Property(o => o.IdentityId).HasColumnName("IDENTITY_ID");
modelBuilder.Entity<Person>().Property(o => o.IdentityNumber).HasColumnName("IDENTITY_NUM");
modelBuilder.Entity<Person>().Property(o => o.PhoneNumber).HasColumnName("TEL");
modelBuilder.Entity<Person>().Property(o => o.Politics).HasColumnName("political_status");
modelBuilder.Entity<Person>().Property(o => o.AreaId).HasColumnName("DISTRICT_ID");
modelBuilder.Entity<Person>().Property(o => o.CreateAt).HasColumnName("create_time");
modelBuilder.Entity<Person>().Property(o => o.Nation).HasColumnName("NATION");
modelBuilder.Entity<Person>().Property(o => o.NativePlace).HasColumnName("placeofbirth");
//t_base_person_title
modelBuilder.Entity<PersonTitle>().ToTable("t_base_person_title");
modelBuilder.Entity<PersonTitle>().HasKey(o => o.Id);
modelBuilder.Entity<PersonTitle>().Property(o => o.Id).HasColumnName("title_id").ValueGeneratedOnAdd();
modelBuilder.Entity<PersonTitle>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
//t_base_person_record
modelBuilder.Entity<PersonRecord>().ToTable("t_base_person_record");
modelBuilder.Entity<PersonRecord>().HasKey(o => o.Id);
modelBuilder.Entity<PersonRecord>().Property(o => o.Id).HasColumnName("record_id").ValueGeneratedOnAdd();
modelBuilder.Entity<PersonRecord>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
modelBuilder.Entity<PersonRecord>().Property(o => o.PersonId).HasColumnName("person_id");
modelBuilder.Entity<PersonRecord>().Property(o => o.Type).HasColumnName("record_type");
//t_base_person_rewards
modelBuilder.Entity<PersonRewards>().ToTable("t_base_person_rewards");
modelBuilder.Entity<PersonRewards>().HasKey(o => o.Id);
modelBuilder.Entity<PersonRewards>().Property(o => o.Id).HasColumnName("rewards_id").ValueGeneratedOnAdd();
modelBuilder.Entity<PersonRewards>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
modelBuilder.Entity<PersonRewards>().Property(o => o.PersonId).HasColumnName("person_id");
modelBuilder.Entity<PersonRewards>().Property(o => o.Type).HasColumnName("rewards_type");
//t_sys_person_role
modelBuilder.Entity<PersonRole>().ToTable("t_sys_person_role");
modelBuilder.Entity<PersonRole>().HasKey(o => o.Id);
modelBuilder.Entity<PersonRole>().Property(o => o.Id).HasColumnName("ID").ValueGeneratedOnAdd();
modelBuilder.Entity<PersonRole>().Property(o => o.RoleId).HasColumnName("ROLE_ID");
modelBuilder.Entity<PersonRole>().Property(o => o.PersonId).HasColumnName("person_id");
modelBuilder.Entity<PersonRole>().Property(o => o.IdentityId).HasColumnName("IDENTITY_ID");
//modelBuilder.Entity<Organ>().HasKey(o => o.Id);
//modelBuilder.Entity<Organ>().Property(o => o.Name).IsRequired();
//modelBuilder.Entity<Organ>().Property(o => o.Number).IsRequired();
//modelBuilder.Entity<Organ>().HasIndex(o => o.Number).IsUnique();
//modelBuilder.Entity<Organ>().HasOne(o => o.Parent).WithMany(o => o.Children).HasForeignKey(o=>o.ParentId).OnDelete(DeleteBehavior.SetNull);
//modelBuilder.Entity<User>().HasKey(o => o.Id);
//modelBuilder.Entity<User>().Property(o => o.UserName).IsRequired();
//modelBuilder.Entity<User>().HasIndex(o => o.UserName).IsUnique();
//modelBuilder.Entity<User>().HasOne(o => o.Organ).WithMany(o => o.Users).HasForeignKey(o => o.OrganId).OnDelete(DeleteBehavior.Cascade);
//modelBuilder.Entity<Role>().HasKey(o => o.Id);
//modelBuilder.Entity<Role>().Property(o => o.Name).IsRequired();
//modelBuilder.Entity<Role>().HasIndex(o => o.Name).IsUnique();
//modelBuilder.Entity<UserRole>().HasOne(o => o.User).WithMany(o => o.UserRoles).HasForeignKey(o => o.UserId).OnDelete(DeleteBehavior.Cascade);
//modelBuilder.Entity<UserRole>().HasOne(o => o.Role).WithMany(o => o.UserRoles).HasForeignKey(o => o.RoleId).OnDelete(DeleteBehavior.Cascade);
//modelBuilder.Entity<UserRole>().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique();
//modelBuilder.Entity<CheckLog>().HasKey(o => o.Id);
//modelBuilder.Entity<Teacher>().HasKey(o => o.Id);
//modelBuilder.Entity<Teacher>().Property(o => o.Id).ValueGeneratedNever();
//modelBuilder.Entity<TeacherInfo>().HasIndex(o => o.Id);
//modelBuilder.Entity<TeacherInfo>().Property(o => o.Id).ValueGeneratedNever();
//modelBuilder.Entity<TeacherInfo>().HasOne(o => o.Teacher).WithOne(o => o.Info).HasForeignKey<TeacherInfo>(o=>o.TeacherId).OnDelete(DeleteBehavior.Cascade);
//modelBuilder.Entity<TeacherProp>().HasKey(o => o.Id);
//modelBuilder.Entity<TeacherProp>().Property(o => o.Id).ValueGeneratedNever();
//modelBuilder.Entity<TeacherProp>().HasOne(o => o.Teacher).WithOne(o => o.Prop).HasForeignKey<TeacherProp>(o => o.TeacherId).OnDelete(DeleteBehavior.Cascade);
////
//modelBuilder.Entity<Teacher>().HasOne(o => o.User).WithOne(o => o.Teacher).HasForeignKey<Teacher>(o => o.UserId).OnDelete(DeleteBehavior.Cascade);
}
}
}
}

@ -0,0 +1,13 @@
namespace TeacherExt.Entities
{
public class DictionaryItem
{
public int Id { get; set; }
public string Code { get; set; }
public string Detail { get; set; }
public string Remark { get; set; }
public bool IsUsed { get; set; }
public string Category { get; set; }
public long Order { get; set; }
}
}

@ -0,0 +1,13 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace TeacherExt.Entities
{
public class Organization
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
public string Name { get; set; }
public bool IsUsed { get; set; }
}
}

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace TeacherExt.Entities
{
public class Person
{
public int Id { get; set; }
public bool IsUsed { get; set; }
public string RealName { get; set; }
public string Sex { get; set; }
/// <summary>
/// 学校/教育局ID
/// </summary>
public int BureauId { get; set; }
public int OrganId { get; set; }
/// <summary>
/// 身份ID对应t_sys_identity表的主键IDENTITY_ID
/// </summary>
public int IdentityId { get; set; }
public string IdentityNumber { get; set; }
public string PhoneNumber { get; set; }
public int Politics { get; set; }
/// <summary>
/// 区ID
/// </summary>
public int AreaId { get; set; }
public DateTime CreateAt { get; set; }
public string Nation { get; set; }
public string NativePlace { get; set; }
}
}

@ -0,0 +1,10 @@
namespace TeacherExt.Entities
{
public class PersonRecord
{
public int Id { get; set; }
public bool IsUsed { get; set; }
public int PersonId { get; set; }
public int Type { get; set; }
}
}

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace TeacherExt.Entities
{
public class PersonRewards
{
public int Id { get; set; }
public bool IsUsed { get; set; }
public int PersonId { get; set; }
public int Type { get; set; }
}
}

@ -0,0 +1,11 @@
namespace TeacherExt.Entities
{
public class PersonRole
{
public int Id { get; set; }
public bool IsUsed { get; set; }
public int PersonId { get; set; }
public int IdentityId { get; set; }
public int RoleId { get; set; }
}
}

@ -0,0 +1,8 @@
namespace TeacherExt.Entities
{
public class PersonTitle
{
public int Id { get; set; }
public bool IsUsed { get; set; }
}
}

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace TeacherExt.Models
{
public class ListItem
{
public string person_name { get; internal set; }
public string sex { get; internal set; }
public string nation { get; internal set; }
public string nation_name { get; internal set; }
public string placeofbirth { get; internal set; }
public string org_name { get; internal set; }
public int person_id { get; internal set; }
public string bureau_name { get; internal set; }
}
}

@ -52,15 +52,19 @@ namespace TeacherExt
.AllowCredentials();
}));
var database = Configuration.GetValue<string>("database");
if (database=="sqlite")
{
services.AddDbContext<TeacherDbContext>(o => o.UseSqlite(Configuration.GetConnectionString("sqlite")));
}
else
{
var connstr = Configuration.GetConnectionString("mysql");
services.AddDbContext<TeacherDbContext>(o => o.UseMySql(connstr, ServerVersion.AutoDetect(connstr)));
}
//if (database=="sqlite")
//{
// services.AddDbContext<TeacherDbContext2>(o => o.UseSqlite(Configuration.GetConnectionString("sqlite")));
//}
//else
//{
// var connstr = Configuration.GetConnectionString("mysql");
// services.AddDbContext<TeacherDbContext>(o => o.UseMySql(connstr, ServerVersion.AutoDetect(connstr)));
//}
services.AddTransient<AesHelper>();
var connstr = Configuration.GetConnectionString("mariyadb");
services.AddDbContext<TeacherDbContext>(o => o.UseMySql(connstr, ServerVersion.AutoDetect(connstr)));
services.AddDistributedMemoryCache();
services.AddScoped<DbContext, TeacherDbContext>();
services.AddTransient(typeof(IRepository<>), typeof(EfRepository<>));
@ -174,120 +178,120 @@ namespace TeacherExt
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}");
});
using var scope = app.ApplicationServices.CreateScope();
var encryptionService = scope.ServiceProvider.GetRequiredService<IEncryptionService>();
var salt = "111111";
var password = encryptionService.CreatePasswordHash(salt, salt);
using var db = scope.ServiceProvider.GetRequiredService<DbContext>();
if (db.Database.EnsureCreated())
{
db.Set<Role>().Add(new Role { Name = "局管理员" });
db.Set<Role>().Add(new Role { Name = "校管理员" });
db.Set<Role>().Add(new Role { Name = "教职工" });
db.SaveChanges();
//using var scope = app.ApplicationServices.CreateScope();
//var encryptionService = scope.ServiceProvider.GetRequiredService<IEncryptionService>();
//var salt = "111111";
//var password = encryptionService.CreatePasswordHash(salt, salt);
//using var db = scope.ServiceProvider.GetRequiredService<DbContext>();
//if (db.Database.EnsureCreated())
//{
// db.Set<Role>().Add(new Role { Name = "局管理员" });
// db.Set<Role>().Add(new Role { Name = "校管理员" });
// db.Set<Role>().Add(new Role { Name = "教职工" });
// db.SaveChanges();
db.Set<Organ>().Add(new Organ
{
Name = "教育局",
Number = "jiaoyuju",
Children = new List<Organ> {
new Organ
{
Name="学校1",
Number="xuexiao1"
},
new Organ
{
Name="学校2",
Number="xuexiao2"
}
}
});
db.SaveChanges();
// db.Set<Organ>().Add(new Organ
// {
// Name = "教育局",
// Number = "jiaoyuju",
// Children = new List<Organ> {
// new Organ
// {
// Name="学校1",
// Number="xuexiao1"
// },
// new Organ
// {
// Name="学校2",
// Number="xuexiao2"
// }
// }
// });
// db.SaveChanges();
db.Set<User>().Add(new User
{
UserName = "admin",
PasswordSalt = salt,
PasswordHash = password,
RealName = "教育局管理员",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "jiaoyuju").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "局管理员").Id } }
});
db.Set<User>().Add(new User
{
UserName = "admin1",
PasswordSalt = salt,
PasswordHash = password,
RealName = "校管理员1",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "校管理员").Id } }
});
db.Set<User>().Add(new User
{
UserName = "xiaozhang1",
PasswordSalt = salt,
PasswordHash = password,
RealName = "校长1",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.Set<User>().Add(new User
{
UserName = "laoshi1",
PasswordSalt = salt,
PasswordHash = password,
RealName = "老师1",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.Set<User>().Add(new User
{
UserName = "zhigong1",
PasswordSalt = salt,
PasswordHash = password,
RealName = "职工1",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.Set<User>().Add(new User
{
UserName = "admin2",
PasswordSalt = salt,
PasswordHash = password,
RealName = "校管理员2",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "校管理员").Id } }
});
db.Set<User>().Add(new User
{
UserName = "xiaozhang2",
PasswordSalt = salt,
PasswordHash = password,
RealName = "校长2",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.Set<User>().Add(new User
{
UserName = "laoshi2",
PasswordSalt = salt,
PasswordHash = password,
RealName = "老师2",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.Set<User>().Add(new User
{
UserName = "zhigong2",
PasswordSalt = salt,
PasswordHash = password,
RealName = "职工2",
OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
});
db.SaveChanges();
}
// db.Set<User>().Add(new User
// {
// UserName = "admin",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "教育局管理员",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "jiaoyuju").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "局管理员").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "admin1",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "校管理员1",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "校管理员").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "xiaozhang1",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "校长1",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "laoshi1",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "老师1",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "zhigong1",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "职工1",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao1").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "admin2",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "校管理员2",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "校管理员").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "xiaozhang2",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "校长2",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "laoshi2",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "老师2",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.Set<User>().Add(new User
// {
// UserName = "zhigong2",
// PasswordSalt = salt,
// PasswordHash = password,
// RealName = "职工2",
// OrganId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao2").Id,
// UserRoles = new List<UserRole> { new UserRole { RoleId = db.Set<Role>().FirstOrDefault(o => o.Name == "教职工").Id } }
// });
// db.SaveChanges();
//}
}
}
}

@ -9,7 +9,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
<PackageReference Include="NPOI" Version="2.5.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
</ItemGroup>

@ -13,8 +13,10 @@
"issuer": "111111111111111111111111",
"audience": "111111111111111111111111"
},
"password": "DsideaL4r5t6y7u!@#",
"ConnectionStrings": {
"sqlite": "Data Source=data.db",
"mysql": "Server=localhost;Port=3306;Database=teacher;Uid=root;Pwd=aA123456!;"
"mysql": "Server=localhost;Port=3306;Database=teacher;Uid=root;Pwd=aA123456!;",
"mariyadb": "Server=10.10.15.13;Port=22066;Database=dsideal_db;Uid=root;Pwd=DsideaL147258369;CharSet=utf8mb4;"
}
}

@ -7,8 +7,9 @@
vpn下载&服务器地址https://125.72.102.82:44331
用户名:靳发全 密码DSideal!@#1234
Web10.10.15.12 root DsIdeal@123
数据库:
10.10.14.199:22066 root DsideaL147258369
10.10.15.13:22066 root DsideaL147258369
接口getPersonInfoList获取用户列表数据库表t_base_person
接口getEduUnitList获取机构列表数据库表t_base_organizationarea_id 是上级机构id

Loading…
Cancel
Save