From 67ef7e3fc1159323bc58e4a48ee1e61d836fdbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 1 Jun 2022 17:36:06 +0800
Subject: [PATCH] update DbProvider.cs

---
 ZR.Admin.WebApi/Extensions/DbExtension.cs |  2 +-
 ZR.CodeGenerator/DbProvider.cs            | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 4183a03..8c1eeaf 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -27,7 +27,7 @@ namespace ZR.Admin.WebApi.Extensions
         public static void AddDb(IConfiguration Configuration)
         {
             string connStr = Configuration.GetConnectionString("conn_db");
-            int dbType = Convert.ToInt32(Configuration["conn_db_dbtype"]);
+            int dbType = Convert.ToInt32(Configuration.GetConnectionString("conn_db_type"));
 
             SugarIocServices.AddSqlSugar(new List<IocConfig>() {
                    new IocConfig() {
diff --git a/ZR.CodeGenerator/DbProvider.cs b/ZR.CodeGenerator/DbProvider.cs
index 24dddb9..27da106 100644
--- a/ZR.CodeGenerator/DbProvider.cs
+++ b/ZR.CodeGenerator/DbProvider.cs
@@ -1,4 +1,5 @@
 using Infrastructure;
+using Infrastructure.Extensions;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -28,8 +29,16 @@ namespace ZR.CodeGenerator
 
             if (!string.IsNullOrEmpty(dbName))
             {
-                string replaceStr = GetValue(connStr, "database=", ";");
-                connStr = connStr.Replace(replaceStr, dbName);
+                string replaceStr = GetValue(connStr, "Database=", ";");
+                string replaceStr2 = GetValue(connStr, "Initial Catalog=", ";");
+                if (replaceStr.IsNotEmpty())
+                {
+                    connStr = connStr.Replace(replaceStr, dbName, StringComparison.OrdinalIgnoreCase);
+                }
+                if (replaceStr2.IsNotEmpty())
+                {
+                    connStr = connStr.Replace(replaceStr2, dbName, StringComparison.OrdinalIgnoreCase);
+                }                
             }
             var db = new SqlSugarClient(new List<ConnectionConfig>()
             {