From 1375a1f61aaf7d1bc1d6693526682818c1f45d57 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: Sat, 27 Nov 2021 10:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/appsettings.json |  2 +-
 ZR.CodeGenerator/DbProvider.cs   | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 8b29429..eaafb97 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -30,7 +30,7 @@
     "SECRET": "XX"
   },
   "gen": {
-    "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database={database};Trusted_Connection=SSPI",
+    "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database=ZrAdmin;Trusted_Connection=SSPI",
     "dbType": 1, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "zr",
diff --git a/ZR.CodeGenerator/DbProvider.cs b/ZR.CodeGenerator/DbProvider.cs
index 71982e1..5523ed9 100644
--- a/ZR.CodeGenerator/DbProvider.cs
+++ b/ZR.CodeGenerator/DbProvider.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ZR.CodeGenerator
@@ -24,11 +25,14 @@ namespace ZR.CodeGenerator
         {
             string connStr = ConfigUtils.Instance.GetConfig(GenConstants.Gen_conn);
             int dbType = ConfigUtils.Instance.GetAppConfig(GenConstants.Gen_conn_dbType, 0);
-            connStr = connStr.Replace("{database}", dbName);
-            if (string.IsNullOrEmpty(dbName))
+
+            if (!string.IsNullOrEmpty(dbName))
             {
-                connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin);
-                dbType = ConfigUtils.Instance.GetAppConfig<int>(OptionsSetting.ConnDbType);
+                string replaceStr = GetValue(connStr, "database=", ";");
+
+                connStr = connStr.Replace(replaceStr, dbName);
+                //connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin);
+                //dbType = ConfigUtils.Instance.GetAppConfig<int>(OptionsSetting.ConnDbType);
             }
             var db = new SqlSugarScope(new List<ConnectionConfig>()
             {
@@ -43,5 +47,18 @@ namespace ZR.CodeGenerator
             CodeDb = db;
             return db;
         }
+
+        /// <summary>
+        /// 鑾峰緱瀛楃涓蹭腑寮�濮嬪拰缁撴潫瀛楃涓蹭腑闂村緱鍊�
+        /// </summary>
+        /// <param name="str">瀛楃涓�</param>
+        /// <param name="s">寮�濮�</param>
+        /// <param name="e">缁撴潫</param>
+        /// <returns></returns> 
+        public static string GetValue(string str, string s, string e)
+        {
+            Regex rg = new Regex("(?<=(" + s + "))[.\\s\\S]*?(?=(" + e + "))", RegexOptions.Multiline | RegexOptions.Singleline);
+            return rg.Match(str).Value;
+        }
     }
 }