edit connection
This commit is contained in:
parent
54d8deec37
commit
394edfd02f
6 changed files with 38 additions and 39 deletions
|
|
@ -1706,8 +1706,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
|
||||||
})
|
})
|
||||||
.FirstOrDefaultAsync();
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
// return Success(new { data, ExamCount = data == null || data.CitizenId == "" ? 0 : GetExamCountTe(data.CitizenId) });
|
return Success(new { data, ExamCount = data == null || data.CitizenId == "" ? 0 : _disableService.GetExamCount(data.CitizenId) });
|
||||||
return Success(data);
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -20,19 +20,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Data
|
||||||
// special "local" folder for your platform.
|
// special "local" folder for your platform.
|
||||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||||
{
|
{
|
||||||
if (!options.IsConfigured)
|
// if (!options.IsConfigured)
|
||||||
{
|
// {
|
||||||
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
|
// var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
|
||||||
var configurationBuilder = new ConfigurationBuilder()
|
// var configurationBuilder = new ConfigurationBuilder()
|
||||||
.AddJsonFile("appsettings.json", optional: true, true)
|
// .AddJsonFile("appsettings.json", optional: true, true)
|
||||||
.AddJsonFile($"appsettings.{environment}.json", true, true)
|
// .AddJsonFile($"appsettings.{environment}.json", true, true)
|
||||||
.AddEnvironmentVariables()
|
// .AddEnvironmentVariables()
|
||||||
.Build();
|
// .Build();
|
||||||
|
|
||||||
var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection");
|
// var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection");
|
||||||
options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection));
|
// options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection));
|
||||||
|
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
// public DbSet<BMA.EHR.Profile.Service.Models.HR.ProfileOrganization> ProfileOrganizations { get; set; }
|
// public DbSet<BMA.EHR.Profile.Service.Models.HR.ProfileOrganization> ProfileOrganizations { get; set; }
|
||||||
// public DbSet<BMA.EHR.Profile.Service.Models.HR.Profile> Profiles { get; set; }
|
// public DbSet<BMA.EHR.Profile.Service.Models.HR.Profile> Profiles { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -20,19 +20,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Data
|
||||||
// special "local" folder for your platform.
|
// special "local" folder for your platform.
|
||||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||||
{
|
{
|
||||||
if (!options.IsConfigured)
|
// if (!options.IsConfigured)
|
||||||
{
|
// {
|
||||||
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
|
// var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
|
||||||
var configurationBuilder = new ConfigurationBuilder()
|
// var configurationBuilder = new ConfigurationBuilder()
|
||||||
.AddJsonFile("appsettings.json", optional: true, true)
|
// .AddJsonFile("appsettings.json", optional: true, true)
|
||||||
.AddJsonFile($"appsettings.{environment}.json", true, true)
|
// .AddJsonFile($"appsettings.{environment}.json", true, true)
|
||||||
.AddEnvironmentVariables()
|
// .AddEnvironmentVariables()
|
||||||
.Build();
|
// .Build();
|
||||||
|
|
||||||
var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection");
|
// var historyConnection = configurationBuilder.GetConnectionString("HistoryConnection");
|
||||||
options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection));
|
// options.UseMySql(historyConnection, ServerVersion.AutoDetect(historyConnection));
|
||||||
|
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
public DbSet<Prefix> prefixe { get; set; }
|
public DbSet<Prefix> prefixe { get; set; }
|
||||||
public DbSet<Religion> religion { get; set; }
|
public DbSet<Religion> religion { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -64,13 +64,13 @@ builder.Host.UseSerilog();
|
||||||
// Register DbContext
|
// Register DbContext
|
||||||
var examConnection = builder.Configuration.GetConnectionString("ExamConnection");
|
var examConnection = builder.Configuration.GetConnectionString("ExamConnection");
|
||||||
builder.Services.AddDbContext<ApplicationDbContext>(options =>
|
builder.Services.AddDbContext<ApplicationDbContext>(options =>
|
||||||
options.UseMySql(examConnection, ServerVersion.AutoDetect(examConnection)));
|
options.UseMySql(examConnection, ServerVersion.AutoDetect(examConnection)), ServiceLifetime.Transient);
|
||||||
var orgConnection = builder.Configuration.GetConnectionString("OrgConnection");
|
var orgConnection = builder.Configuration.GetConnectionString("OrgConnection");
|
||||||
builder.Services.AddDbContext<OrgDbContext>(options =>
|
builder.Services.AddDbContext<OrgDbContext>(options =>
|
||||||
options.UseMySql(orgConnection, ServerVersion.AutoDetect(orgConnection)));
|
options.UseMySql(orgConnection, ServerVersion.AutoDetect(orgConnection)), ServiceLifetime.Transient);
|
||||||
var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
|
var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
|
||||||
builder.Services.AddDbContext<MetadataDbContext>(options =>
|
builder.Services.AddDbContext<MetadataDbContext>(options =>
|
||||||
options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)));
|
options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)), ServiceLifetime.Transient);
|
||||||
|
|
||||||
// Add config CORS
|
// Add config CORS
|
||||||
builder.Services.AddCors(options => options.AddDefaultPolicy(builder =>
|
builder.Services.AddCors(options => options.AddDefaultPolicy(builder =>
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*",
|
"AllowedHosts": "*",
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
"HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
||||||
},
|
},
|
||||||
"Jwt": {
|
"Jwt": {
|
||||||
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*",
|
"AllowedHosts": "*",
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
"OrgConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_organization_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||||
"HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database==bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
"HistoryConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_history_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
||||||
},
|
},
|
||||||
"Jwt": {
|
"Jwt": {
|
||||||
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue