wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码生成数据库字符串连接

Browse Source
This commit is contained in:
不做码农 2021-11-27 10:22:28 +08:00
parent 67e1343e24
commit 1375a1f61a
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/appsettings.json
View File

@ -30,7 +30,7 @@
"SECRET": "XX" "SECRET": "XX"
}, },
"gen": { "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 "dbType": 1, //MySql = 0, SqlServer = 1
"autoPre": true, //自动去除表前缀 "autoPre": true, //自动去除表前缀
"author": "zr", "author": "zr",

25
ZR.CodeGenerator/DbProvider.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace ZR.CodeGenerator namespace ZR.CodeGenerator
@ -24,11 +25,14 @@ namespace ZR.CodeGenerator
{ {
string connStr = ConfigUtils.Instance.GetConfig(GenConstants.Gen_conn); string connStr = ConfigUtils.Instance.GetConfig(GenConstants.Gen_conn);
int dbType = ConfigUtils.Instance.GetAppConfig(GenConstants.Gen_conn_dbType, 0); 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); string replaceStr = GetValue(connStr, "database=", ";");
dbType = ConfigUtils.Instance.GetAppConfig<int>(OptionsSetting.ConnDbType);
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>() var db = new SqlSugarScope(new List<ConnectionConfig>()
{ {
@ -43,5 +47,18 @@ namespace ZR.CodeGenerator
CodeDb = db; CodeDb = db;
return 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;
}
} }
} }