From 115c79bd9cf1b36095b2176e52c22699018614ac Mon Sep 17 00:00:00 2001
From: yubaolee <yubaoee@163.com>
Date: Sat, 2 Sep 2023 11:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96sqlsugar=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Identity/Startup.cs | 49 ++++++-------------------
 OpenAuth.Mvc/Startup.cs      | 69 ++++++------------------------------
 2 files changed, 20 insertions(+), 98 deletions(-)

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<ISqlSugarClient>(s =>
-            {
+            var sqlsugarTypes = UtilMethods.EnumToDictionary<SqlSugar.DbType>();
+            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<ISqlSugarClient>(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<ISqlSugarClient>(s =>
-            {
+            var sqlsugarTypes = UtilMethods.EnumToDictionary<SqlSugar.DbType>();
+            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<ISqlSugarClient>(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;
             });