diff --git a/OpenAuth.Identity/Startup.cs b/OpenAuth.Identity/Startup.cs index 87c338bf..04fe3323 100644 --- a/OpenAuth.Identity/Startup.cs +++ b/OpenAuth.Identity/Startup.cs @@ -94,47 +94,18 @@ namespace OpenAuth.IdentityServer options.UseOracle(connectionString, o=>o.UseOracleSQLCompatibility("11"))); } - services.AddScoped(s => - { + var sqlsugarTypes = UtilMethods.EnumToDictionary(); + var sugarDbtype = sqlsugarTypes.FirstOrDefault(it => + dbtypes.ToDictionary(u => u.Key, v => v.Value.ToLower()).ContainsValue(it.Key)); - SqlSugarClient sqlSugar; - if(dbtypes.ContainsValue(Define.DBTYPE_SQLSERVER)) + services.AddScoped(s => + { + var sqlSugar = new SqlSugarClient(new ConnectionConfig() { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.SqlServer, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - }); - } - else if(dbtypes.ContainsValue(Define.DBTYPE_MYSQL)) //mysql - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.MySql, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - }); - } - else if(dbtypes.ContainsValue(Define.DBTYPE_PostgreSQL)) //PostgreSQL - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.PostgreSQL, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - }); - } - else - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.Oracle, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - }); - } - + DbType = sugarDbtype.Value, + ConnectionString = connectionString, + IsAutoCloseConnection = true, + }); return sqlSugar; }); diff --git a/OpenAuth.Mvc/Startup.cs b/OpenAuth.Mvc/Startup.cs index 70c55541..29439c83 100644 --- a/OpenAuth.Mvc/Startup.cs +++ b/OpenAuth.Mvc/Startup.cs @@ -101,67 +101,18 @@ namespace OpenAuth.Mvc services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Configuration["DataProtection"])); - services.AddScoped(s => - { + var sqlsugarTypes = UtilMethods.EnumToDictionary(); + var dbType = sqlsugarTypes.FirstOrDefault(it => + dbtypes.ToDictionary(u => u.Key, v => v.Value.ToLower()).ContainsValue(it.Key)); - SqlSugarClient sqlSugar; - if(dbtypes.ContainsValue(Define.DBTYPE_SQLSERVER)) + services.AddScoped(s => + { + var sqlSugar = new SqlSugarClient(new ConnectionConfig() { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.SqlServer, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - },db=>{ - db.Aop.OnLogExecuting = (sql, pars) => - { - logger.LogInformation(sql); - }; - }); - } - else if(dbtypes.ContainsValue(Define.DBTYPE_MYSQL)) //mysql - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.MySql, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - },db=>{ - db.Aop.OnLogExecuting = (sql, pars) => - { - logger.LogInformation(sql); - }; - }); - } - else if(dbtypes.ContainsValue(Define.DBTYPE_PostgreSQL)) //PostgreSQL - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.PostgreSQL, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - },db=>{ - db.Aop.OnLogExecuting = (sql, pars) => - { - logger.LogInformation(sql); - }; - }); - } - else - { - sqlSugar = new SqlSugarClient (new ConnectionConfig() - { - DbType = SqlSugar.DbType.Oracle, - ConnectionString = connectionString, - IsAutoCloseConnection = true, - },db=>{ - db.Aop.OnLogExecuting = (sql, pars) => - { - logger.LogInformation(sql); - }; - }); - } - + DbType = dbType.Value, + ConnectionString = connectionString, + IsAutoCloseConnection = true, + }, db => { db.Aop.OnLogExecuting = (sql, pars) => { logger.LogInformation(sql); }; }); return sqlSugar; });