@@ -23,17 +23,17 @@ namespace DotNetCore.CAP | |||
services.AddScoped<ICapPublisher, CapPublisher>(); | |||
services.AddTransient<IAdditionalProcessor, DefaultAdditionalProcessor>(); | |||
var sqlServerOptions = new MySqlOptions(); | |||
_configure(sqlServerOptions); | |||
var mysqlOptions = new MySqlOptions(); | |||
_configure(mysqlOptions); | |||
if (sqlServerOptions.DbContextType != null) | |||
if (mysqlOptions.DbContextType != null) | |||
{ | |||
var provider = TempBuildService(services); | |||
var dbContextObj = provider.GetService(sqlServerOptions.DbContextType); | |||
var dbContextObj = provider.GetService(mysqlOptions.DbContextType); | |||
var dbContext = (DbContext)dbContextObj; | |||
sqlServerOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString; | |||
mysqlOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString; | |||
} | |||
services.AddSingleton(sqlServerOptions); | |||
services.AddSingleton(mysqlOptions); | |||
} | |||
private IServiceProvider TempBuildService(IServiceCollection services) | |||
@@ -74,7 +74,7 @@ namespace DotNetCore.CAP.MySql | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
PublishWithTrans(name, content, dbConnection, dbTransaction); | |||
} | |||
@@ -83,7 +83,7 @@ namespace DotNetCore.CAP.MySql | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
return PublishWithTransAsync(name, content, dbConnection, dbTransaction); | |||
} | |||
@@ -92,7 +92,7 @@ namespace DotNetCore.CAP.MySql | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
var content = Helper.ToJson(contentObj); | |||
@@ -103,7 +103,7 @@ namespace DotNetCore.CAP.MySql | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
var content = Helper.ToJson(contentObj); | |||
@@ -112,7 +112,7 @@ namespace DotNetCore.CAP.MySql | |||
#region private methods | |||
private void PrePareConnection(IDbConnection dbConnection, ref IDbTransaction dbTransaction) | |||
private void PrepareConnection(IDbConnection dbConnection, ref IDbTransaction dbTransaction) | |||
{ | |||
if (dbConnection == null) | |||
throw new ArgumentNullException(nameof(dbConnection)); | |||
@@ -21,11 +21,11 @@ namespace DotNetCore.CAP.MySql | |||
public DefaultAdditionalProcessor( | |||
IServiceProvider provider, | |||
ILogger<DefaultAdditionalProcessor> logger, | |||
MySqlOptions sqlServerOptions) | |||
MySqlOptions mysqlOptions) | |||
{ | |||
_logger = logger; | |||
_provider = provider; | |||
_options = sqlServerOptions; | |||
_options = mysqlOptions; | |||
} | |||
public async Task ProcessAsync(ProcessingContext context) | |||
@@ -73,7 +73,7 @@ namespace DotNetCore.CAP.SqlServer | |||
public void Publish(string name, string content, IDbConnection dbConnection, IDbTransaction dbTransaction = null) | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
PublishWithTrans(name, content, dbConnection, dbTransaction); | |||
} | |||
@@ -81,7 +81,7 @@ namespace DotNetCore.CAP.SqlServer | |||
public Task PublishAsync(string name, string content, IDbConnection dbConnection, IDbTransaction dbTransaction = null) | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
return PublishWithTransAsync(name, content, dbConnection, dbTransaction); | |||
} | |||
@@ -89,7 +89,7 @@ namespace DotNetCore.CAP.SqlServer | |||
public void Publish<T>(string name, T contentObj, IDbConnection dbConnection, IDbTransaction dbTransaction = null) | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
var content = Helper.ToJson(contentObj); | |||
@@ -99,7 +99,7 @@ namespace DotNetCore.CAP.SqlServer | |||
public Task PublishAsync<T>(string name, T contentObj, IDbConnection dbConnection, IDbTransaction dbTransaction = null) | |||
{ | |||
CheckIsAdoNet(name); | |||
PrePareConnection(dbConnection, ref dbTransaction); | |||
PrepareConnection(dbConnection, ref dbTransaction); | |||
var content = Helper.ToJson(contentObj); | |||
@@ -108,7 +108,7 @@ namespace DotNetCore.CAP.SqlServer | |||
#region private methods | |||
private void PrePareConnection(IDbConnection dbConnection, ref IDbTransaction dbTransaction) | |||
private void PrepareConnection(IDbConnection dbConnection, ref IDbTransaction dbTransaction) | |||
{ | |||
if (dbConnection == null) | |||
throw new ArgumentNullException(nameof(dbConnection)); | |||