This commit is contained in:
yubaolee 2024-04-17 11:35:05 +08:00
commit fb8f6ebb7e

View File

@ -1,33 +1,29 @@
using System; using System;
using System.Linq; using System.Linq;
using Infrastructure; using Infrastructure;
using Infrastructure.Extensions; using Infrastructure.Extensions;
using Infrastructure.Utilities; using Infrastructure.Utilities;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using OpenAuth.Repository.Domain; using OpenAuth.Repository.Domain;
using OpenAuth.Repository.QueryObj; using OpenAuth.Repository.QueryObj;
namespace OpenAuth.Repository namespace OpenAuth.Repository
{ {
public partial class OpenAuthDBContext : DbContext public partial class OpenAuthDBContext : DbContext
{ {
private ILoggerFactory _LoggerFactory; private ILoggerFactory _LoggerFactory;
private IHttpContextAccessor _httpContextAccessor; private IHttpContextAccessor _httpContextAccessor;
private IConfiguration _configuration; private IConfiguration _configuration;
private IOptions<AppSetting> _appConfiguration; private IOptions<AppSetting> _appConfiguration;
public OpenAuthDBContext(DbContextOptions<OpenAuthDBContext> options, ILoggerFactory loggerFactory, public OpenAuthDBContext(DbContextOptions<OpenAuthDBContext> options, ILoggerFactory loggerFactory,
IHttpContextAccessor httpContextAccessor, IConfiguration configuration, IOptions<AppSetting> appConfiguration) IHttpContextAccessor httpContextAccessor, IConfiguration configuration,
IOptions<AppSetting> appConfiguration)
: base(options) : base(options)
{ {
_LoggerFactory = loggerFactory; _LoggerFactory = loggerFactory;
@ -47,7 +43,6 @@ namespace OpenAuth.Repository
//初始化多租户信息根据租户id调整数据库 //初始化多租户信息根据租户id调整数据库
private void InitTenant(DbContextOptionsBuilder optionsBuilder) private void InitTenant(DbContextOptionsBuilder optionsBuilder)
{ {
var tenantId = _httpContextAccessor.GetTenantId(); var tenantId = _httpContextAccessor.GetTenantId();
string connect = _configuration.GetConnectionString(tenantId); string connect = _configuration.GetConnectionString(tenantId);
if (string.IsNullOrEmpty(connect)) if (string.IsNullOrEmpty(connect))
@ -76,7 +71,6 @@ namespace OpenAuth.Repository
{ {
optionsBuilder.UseOracle(connect, options => options.UseOracleSQLCompatibility("11")); optionsBuilder.UseOracle(connect, options => options.UseOracleSQLCompatibility("11"));
} }
} }
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)
@ -87,7 +81,8 @@ namespace OpenAuth.Repository
modelBuilder.Entity<QueryStringObj>().HasNoKey(); modelBuilder.Entity<QueryStringObj>().HasNoKey();
//converting between PostgreSQL smallint and .NET Boolean types //converting between PostgreSQL smallint and .NET Boolean types
if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL") if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL"
|| Database.ProviderName == "Oracle.EntityFrameworkCore")
{ {
var boolToSmallIntConverter = new ValueConverter<bool, short>( var boolToSmallIntConverter = new ValueConverter<bool, short>(
v => v ? (short) 1 : (short) 0, v => v ? (short) 1 : (short) 0,
@ -103,10 +98,6 @@ namespace OpenAuth.Repository
} }
} }
} }
} }
public virtual DbSet<Application> Applications { get; set; } public virtual DbSet<Application> Applications { get; set; }
@ -135,13 +126,11 @@ namespace OpenAuth.Repository
public virtual DbSet<WmsInboundOrderTbl> WmsInboundOrderTbls { get; set; } public virtual DbSet<WmsInboundOrderTbl> WmsInboundOrderTbls { get; set; }
public virtual DbSet<OpenJob> OpenJobs { get; set; } public virtual DbSet<OpenJob> OpenJobs { get; set; }
public virtual DbSet<BuilderTable> BuilderTables { get; set; } public virtual DbSet<BuilderTable> BuilderTables { get; set; }
public virtual DbSet<BuilderTableColumn> BuilderTableColumns { get; set; } public virtual DbSet<BuilderTableColumn> BuilderTableColumns { get; set; }
//非数据库表格 //非数据库表格
public virtual DbSet<QueryStringObj> QueryStringObjs { get; set; } public virtual DbSet<QueryStringObj> QueryStringObjs { get; set; }
public virtual DbSet<SysTableColumn> SysTableColumns { get; set; } public virtual DbSet<SysTableColumn> SysTableColumns { get; set; }
} }
} }