zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-04-04 16:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

配置文件开关，数据库读写分离

Browse Source
This commit is contained in:
橙子
2021-10-26 15:09:07 +08:00
parent b29b6be734
commit 5d5452b531
30 changed files with 397 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Yi.Framework/Yi.Framework.WebCore/Appsettings.cs
View File

@@ -9,7 +9,7 @@ namespace Yi.Framework.WebCore
/// <summary>
/// appsettings.json操作类
/// </summary>
public class Appsettings
public class Appsettings
{
static IConfiguration Configuration { get; set; }
static string contentPath { get; set; }
@@ -26,7 +26,7 @@ namespace Yi.Framework.WebCore
.Add(new JsonConfigurationSource { Path = Path, Optional = false, ReloadOnChange = true })//这样的话，可以直接读目录里的json文件，而不是 bin 文件夹下的，所以不用修改复制属性
.Build();
}
public Appsettings(IConfiguration configuration)
{
Configuration = configuration;
@@ -52,6 +52,23 @@ namespace Yi.Framework.WebCore
return "";
}
public static bool appBool(params string[] sections)
{
return Bool(app(sections));
}
public static bool Bool(object thisValue)
{
bool reval = false;
if (thisValue != null && thisValue != DBNull.Value && bool.TryParse(thisValue.ToString(), out reval))
{
return reval;
}
return reval;
}
/// <summary>
/// 递归获取配置信息数组
/// </summary>

19
Yi.Framework/Yi.Framework.WebCore/BuilderExtend/ApolloExtension.cs
View File

@@ -22,18 +22,21 @@ namespace Yi.Framework.WebCore.BuilderExtend
//阿波罗的日志级别调整
LogManager.UseConsoleLogging(LogLevel.Warn);
var root = builder.Build();
var apolloBuilder = builder.AddApollo(root.GetSection("apollo")).AddDefault();
foreach (var item in NameSpace)
if (Appsettings.Bool(root["Apollo_Enabled"]))
{
apolloBuilder.AddNamespace(item, ConfigFileFormat.Json);
}
//监听apollo配置
Monitor(builder.Build());
var apolloBuilder = builder.AddApollo(root.GetSection("apollo")).AddDefault();
foreach (var item in NameSpace)
{
apolloBuilder.AddNamespace(item, ConfigFileFormat.Json);
}
//监听apollo配置
Monitor(builder.Build());
}
}
#region private
/// <summary>

49
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegiterExtend.cs
View File

@@ -23,36 +23,39 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
/// <param name="app"></param>
/// <param name="healthService"></param>
/// <returns></returns>
public static void UseConsulService(this IApplicationBuilder app)
public static void UseConsulService(this IApplicationBuilder app)
{
var consulRegisterOption= Appsettings.app<ConsulRegisterOption>("ConsulRegisterOption");
var consulClientOption= Appsettings.app<ConsulClientOption>("ConsulRegisterOption");
using (ConsulClient client = new ConsulClient(c =>
{
c.Address = new Uri($"http://{consulClientOption.IP}:{consulClientOption.Port}/");
c.Datacenter = consulClientOption.Datacenter;
}))
if (Appsettings.appBool("Consul_Enabled"))
{
client.Agent.ServiceRegister(new AgentServiceRegistration()
var consulRegisterOption = Appsettings.app<ConsulRegisterOption>("ConsulRegisterOption");
var consulClientOption = Appsettings.app<ConsulClientOption>("ConsulRegisterOption");
using (ConsulClient client = new ConsulClient(c =>
{
c.Address = new Uri($"http://{consulClientOption.IP}:{consulClientOption.Port}/");
c.Datacenter = consulClientOption.Datacenter;
}))
{
ID = $"{consulRegisterOption.IP}-{consulRegisterOption.Port}-{Guid.NewGuid()}",//唯一Id
Name = consulRegisterOption.GroupName,//组名称-Group
Address = consulRegisterOption.IP,
Port = consulRegisterOption.Port,
Tags = new string[] { consulRegisterOption.Tag },
Check = new AgentServiceCheck()
client.Agent.ServiceRegister(new AgentServiceRegistration()
{
Interval = TimeSpan.FromSeconds(consulRegisterOption.Interval),
HTTP = $"http://{consulRegisterOption.IP}:{consulRegisterOption.Port}{consulRegisterOption.HealthCheckUrl}",
Timeout = TimeSpan.FromSeconds(consulRegisterOption.Timeout),
DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(consulRegisterOption.DeregisterCriticalServiceAfter)
}
}).Wait();
Console.WriteLine($"{JsonConvert.SerializeObject(consulRegisterOption)} 完成注册");
ID = $"{consulRegisterOption.IP}-{consulRegisterOption.Port}-{Guid.NewGuid()}",//唯一Id
Name = consulRegisterOption.GroupName,//组名称-Group
Address = consulRegisterOption.IP,
Port = consulRegisterOption.Port,
Tags = new string[] { consulRegisterOption.Tag },
Check = new AgentServiceCheck()
{
Interval = TimeSpan.FromSeconds(consulRegisterOption.Interval),
HTTP = $"http://{consulRegisterOption.IP}:{consulRegisterOption.Port}{consulRegisterOption.HealthCheckUrl}",
Timeout = TimeSpan.FromSeconds(consulRegisterOption.Timeout),
DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(consulRegisterOption.DeregisterCriticalServiceAfter)
}
}).Wait();
Console.WriteLine($"{JsonConvert.SerializeObject(consulRegisterOption)} 完成注册");
}
}
}
}
}

25
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/CorsExtension.cs
View File

@@ -12,21 +12,28 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
{
public static IServiceCollection AddCorsService(this IServiceCollection services)
{
services.AddCors(options => options.AddPolicy("CorsPolicy",//解决跨域问题
builder =>
{
builder.AllowAnyMethod()
.SetIsOriginAllowed(_ => true)
.AllowAnyHeader()
.AllowCredentials();
}));
if (Appsettings.appBool("Cors_Enabled"))
{
services.AddCors(options => options.AddPolicy("CorsPolicy",//解决跨域问题
builder =>
{
builder.AllowAnyMethod()
.SetIsOriginAllowed(_ => true)
.AllowAnyHeader()
.AllowCredentials();
}));
}
return services;
}
public static void UseCorsService(this IApplicationBuilder app)
{
app.UseCors("CorsPolicy");
if (Appsettings.appBool("Cors_Enabled"))
{
app.UseCors("CorsPolicy");
}
}
}

23
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/DbExtend.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.IOCOptions;
using Yi.Framework.Model;
using Yi.Framework.Model.ModelFactory;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
public static class DbExtend
{
public static IServiceCollection AddDbService(this IServiceCollection services)
{
DbContextFactory.MutiDB_Enabled = Appsettings.appBool("MutiDB_Enabled");
DataContext.DbSelect = Appsettings.app("DbSelect");
services.Configure<DbConnOptions>(Appsettings.appConfiguration("DbConn"));
return services;
}
}
}

23
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/DbSeedInitExtend.cs
View File

@@ -7,24 +7,29 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.DbInit;
using Yi.Framework.Model.ModelFactory;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
public static class DbSeedInitExtend
{
private static readonly ILog log = LogManager.GetLogger(typeof(DbSeedInitExtend));
public static void UseDbSeedInitService(this IApplicationBuilder app, DbContext _Db)
public static void UseDbSeedInitService(this IApplicationBuilder app, IDbContextFactory _DbFactory)
{
if (app == null) throw new ArgumentNullException(nameof(app));
try
if (Appsettings.appBool("DbSeed_Enabled"))
{
DataSeed.SeedAsync(_Db).Wait();
}
catch (Exception e)
{
log.Error($"Error occured seeding the Database.\n{e.Message}");
throw;
if (app == null) throw new ArgumentNullException(nameof(app));
try
{
DataSeed.SeedAsync(_DbFactory).Wait();
}
catch (Exception e)
{
log.Error($"Error occured seeding the Database.\n{e.Message}");
throw;
}
}
}
}

15
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/HealthCheckExtension.cs
View File

@@ -22,12 +22,17 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
/// <returns></returns>
public static void UseHealthCheckMiddleware(this IApplicationBuilder app, string checkPath = "/Health")
{
app.Map(checkPath, applicationBuilder => applicationBuilder.Run(async context =>
if (Appsettings.appBool("HealthCheck_Enabled"))
{
Console.WriteLine($"This is Health Check");
context.Response.StatusCode = (int)HttpStatusCode.OK;
await context.Response.WriteAsync("OK");
}));
app.Map(checkPath, applicationBuilder => applicationBuilder.Run(async context =>
{
Console.WriteLine($"This is Health Check");
context.Response.StatusCode = (int)HttpStatusCode.OK;
await context.Response.WriteAsync("OK");
}));
}
}
}

6
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/IocExtension.cs
View File

@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using Yi.Framework.Model;
using Yi.Framework.Model.ModelFactory;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
@@ -19,13 +20,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
//配置文件使用配置
#endregion
services.AddSingleton(new Appsettings(configuration));
#region
//数据库配置
#endregion
services.AddScoped<DbContext, DataContext>();
services.AddTransient<DbContext, DataContext>();
return services;
}

20
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/MysqlExtension.cs
View File

@@ -1,20 +0,0 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using Yi.Framework.Common.IOCOptions;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
/// <summary>
/// 数据库扩展
/// </summary>
public static class MysqlExtension
{
public static IServiceCollection AddMysqlService(this IServiceCollection services)
{
services.Configure<MySqlConnOptions>(Appsettings.appConfiguration("MysqlConn"));
return services;
}
}
}

6
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/RabbitMQExtension.cs
View File

@@ -14,8 +14,12 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
{
public static IServiceCollection AddRabbitMQService(this IServiceCollection services)
{
services.Configure<RabbitMQOptions>(Appsettings.appConfiguration("RabbitConn"));
if (Appsettings.appBool("RabbitMQ_Enabled"))
{
services.Configure<RabbitMQOptions>(Appsettings.appConfiguration("RabbitConn"));
}
return services;
}
}
}

5
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/RedisExtension.cs
View File

@@ -14,7 +14,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
{
public static IServiceCollection AddRedisService(this IServiceCollection services)
{
services.Configure<RedisConnOptions>(Appsettings.appConfiguration("RedisConn"));
if (Appsettings.appBool("Redis_Enabled"))
{
services.Configure<RedisConnOptions>(Appsettings.appConfiguration("RedisConn"));
}
return services;
}
}

20
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/SqliteExtension.cs
View File

@@ -1,20 +0,0 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using Yi.Framework.Common.IOCOptions;
namespace Yi.Framework.WebCore.MiddlewareExtend
{
/// <summary>
/// 数据库扩展
/// </summary>
public static class SqliteExtension
{
public static IServiceCollection AddSqliteService(this IServiceCollection services)
{
services.Configure<SqliteOptions>(Appsettings.appConfiguration("SqliteConn"));
return services;
}
}
}

6
Yi.Framework/Yi.Framework.WebCore/Utility/CustomAutofacModule.cs
View File

@@ -10,6 +10,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Yi.Framework.Model.ModelFactory;
using Yi.Framework.WebCore.Utility;
using Module = Autofac.Module;
@@ -19,6 +20,9 @@ namespace Yi.Framework.WebCore.Utility
{
protected override void Load(ContainerBuilder containerBuilder)
{
containerBuilder.RegisterType<DbContextFactory>().As<IDbContextFactory>().InstancePerDependency().EnableInterfaceInterceptors();
var basePath = AppContext.BaseDirectory;
var servicesDllFile = Path.Combine(basePath, "Yi.Framework.Service.dll");
if (!(File.Exists(servicesDllFile)))
@@ -41,7 +45,7 @@ namespace Yi.Framework.WebCore.Utility
//containerBuilder.RegisterGeneric(typeof(BaseService<>)).As(typeof(IBaseService<>)).InstancePerDependency().EnableInterfaceInterceptors();
}