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(OptionsSetting.ConnDbType); + string replaceStr = GetValue(connStr, "database=", ";"); + + connStr = connStr.Replace(replaceStr, dbName); + //connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin); + //dbType = ConfigUtils.Instance.GetAppConfig(OptionsSetting.ConnDbType); } var db = new SqlSugarScope(new List() { @@ -43,5 +47,18 @@ namespace ZR.CodeGenerator CodeDb = db; return db; } + + /// + /// 鑾峰緱瀛楃涓蹭腑寮濮嬪拰缁撴潫瀛楃涓蹭腑闂村緱鍊 + /// + /// 瀛楃涓 + /// 寮濮 + /// 缁撴潫 + /// + 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; + } } }