From 16421f9a8bcefedef97f9ce3c31baff86ea716c9 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaoee@163.com>
Date: Fri, 1 Sep 2023 01:44:25 +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.WebApi/Startup.cs | 74 +++++++-------------------------------
 1 file changed, 13 insertions(+), 61 deletions(-)

diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs
index f0e07609..c382bf59 100644
--- a/OpenAuth.WebApi/Startup.cs
+++ b/OpenAuth.WebApi/Startup.cs
@@ -92,7 +92,7 @@ namespace OpenAuth.WebApi
 
                 logger.LogInformation($"api doc basepath:{AppContext.BaseDirectory}");
                 foreach (var name in Directory.GetFiles(AppContext.BaseDirectory, "*.*",
-                    SearchOption.AllDirectories).Where(f => Path.GetExtension(f).ToLower() == ".xml"))
+                             SearchOption.AllDirectories).Where(f => Path.GetExtension(f).ToLower() == ".xml"))
                 {
                     option.IncludeXmlComments(name, includeControllerXmlComments: true);
                     // logger.LogInformation($"find api file{name}");
@@ -173,68 +173,19 @@ namespace OpenAuth.WebApi
             services.AddHttpClient();
 
             services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Configuration["DataProtection"]));
-            
+
+            var sqlsugarTypes = UtilMethods.EnumToDictionary<SqlSugar.DbType>();
+            var dbType = sqlsugarTypes.FirstOrDefault(it =>
+                dbtypes.ToDictionary(u => u.Key, v => v.Value.ToLower()).ContainsValue(it.Key));
+
             services.AddScoped<ISqlSugarClient>(s =>
             {
-
-                SqlSugarClient sqlSugar;
-                if(dbtypes.ContainsValue(Define.DBTYPE_SQLSERVER))
+                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;
             });
 
@@ -297,7 +248,8 @@ namespace OpenAuth.WebApi
             app.UseSwaggerUI(c =>
             {
                 c.IndexStream = () =>
-                    IntrospectionExtensions.GetTypeInfo(GetType()).Assembly.GetManifestResourceStream("OpenAuth.WebApi.index.html");
+                    IntrospectionExtensions.GetTypeInfo(GetType()).Assembly
+                        .GetManifestResourceStream("OpenAuth.WebApi.index.html");
 
                 foreach (var controller in GetControllers())
                 {