😎1、优化获取库表信息接口 2、增加 MongoDB 数据库支持
This commit is contained in:
parent
ce82cab83d
commit
21140b595b
@ -8,12 +8,13 @@
|
|||||||
"ConnectionConfigs": [
|
"ConnectionConfigs": [
|
||||||
{
|
{
|
||||||
//"ConfigId": "1300000000001", // 默认库标识-禁止修改
|
//"ConfigId": "1300000000001", // 默认库标识-禁止修改
|
||||||
"DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
|
"DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、MongoDB、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
|
||||||
"ConnectionString": "DataSource=./Admin.NET.db", // Sqlite
|
"ConnectionString": "DataSource=./Admin.NET.db", // Sqlite
|
||||||
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL
|
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL(Kdbndp、OpenGauss通用)
|
||||||
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;AllowLoadLocalInfile=true;AllowUserVariables=true;", // MySql,
|
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;AllowLoadLocalInfile=true;AllowUserVariables=true;", // MySql,
|
||||||
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle
|
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle
|
||||||
//"ConnectionString": "Server=localhost;Database=xxx;User Id=xxx;Password=xxx;Encrypt=True;TrustServerCertificate=True;", // SqlServer
|
//"ConnectionString": "Server=localhost;Database=xxx;User Id=xxx;Password=xxx;Encrypt=True;TrustServerCertificate=True;", // SqlServer
|
||||||
|
//"ConnectionString": "host=222.71.212.3;Port=27017;Database=testDB;Username= root;Password=123456;authSource=admin;replicaSet=", // MongoDB
|
||||||
|
|
||||||
//"SlaveConnectionConfigs": [ // 读写分离/主从
|
//"SlaveConnectionConfigs": [ // 读写分离/主从
|
||||||
// {
|
// {
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"ConnectionConfigs": [
|
"ConnectionConfigs": [
|
||||||
{
|
{
|
||||||
//"ConfigId": "1300000000001", // 默认库标识-禁止修改
|
//"ConfigId": "1300000000001", // 默认库标识-禁止修改
|
||||||
"DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
|
"DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、MongoDB、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
|
||||||
"ConnectionString": "DataSource=./Admin.NET.db", // Sqlite
|
"ConnectionString": "DataSource=./Admin.NET.db", // Sqlite
|
||||||
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL
|
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL(Kdbndp、OpenGauss通用)
|
||||||
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;AllowLoadLocalInfile=true;AllowUserVariables=true;", // MySql,
|
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;AllowLoadLocalInfile=true;AllowUserVariables=true;", // MySql,
|
||||||
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle
|
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle
|
||||||
//"ConnectionString": "Server=localhost;Database=xxx;User Id=xxx;Password=xxx;Encrypt=True;TrustServerCertificate=True;", // SqlServer
|
//"ConnectionString": "Server=localhost;Database=xxx;User Id=xxx;Password=xxx;Encrypt=True;TrustServerCertificate=True;", // SqlServer
|
||||||
|
//"ConnectionString": "host=222.71.212.3;Port=27017;Database=testDB;Username= root;Password=123456;authSource=admin;replicaSet=", // MongoDB
|
||||||
|
|
||||||
//"SlaveConnectionConfigs": [ // 读写分离/主从
|
//"SlaveConnectionConfigs": [ // 读写分离/主从
|
||||||
// {
|
// {
|
||||||
@ -26,18 +27,18 @@
|
|||||||
// }
|
// }
|
||||||
//],
|
//],
|
||||||
"DbSettings": {
|
"DbSettings": {
|
||||||
"EnableInitDb": true, // 启用库初始化(若实体没有变化建议关闭)
|
"EnableInitDb": false, // 启用库初始化(若实体没有变化建议关闭)
|
||||||
"EnableInitView": true, // 启用视图初始化(若实体和视图没有变化建议关闭)
|
"EnableInitView": false, // 启用视图初始化(若实体和视图没有变化建议关闭)
|
||||||
"EnableDiffLog": false, // 启用库表差异日志
|
"EnableDiffLog": false, // 启用库表差异日志
|
||||||
"EnableUnderLine": false, // 启用驼峰转下划线
|
"EnableUnderLine": false, // 启用驼峰转下划线
|
||||||
"EnableConnEncrypt": false // 启用数据库连接串加密(国密SM2加解密)
|
"EnableConnEncrypt": false // 启用数据库连接串加密(国密SM2加解密)
|
||||||
},
|
},
|
||||||
"TableSettings": {
|
"TableSettings": {
|
||||||
"EnableInitTable": true, // 启用表初始化(若实体没有变化建议关闭)
|
"EnableInitTable": false, // 启用表初始化(若实体没有变化建议关闭)
|
||||||
"EnableIncreTable": false // 启用表增量更新(只更新贴了特性[IncreTable]的实体表)
|
"EnableIncreTable": false // 启用表增量更新(只更新贴了特性[IncreTable]的实体表)
|
||||||
},
|
},
|
||||||
"SeedSettings": {
|
"SeedSettings": {
|
||||||
"EnableInitSeed": true, // 启用种子初始化(若种子没有变化建议关闭)
|
"EnableInitSeed": false, // 启用种子初始化(若种子没有变化建议关闭)
|
||||||
"EnableIncreSeed": false // 启用种子增量更新(只更新贴了特性[IncreSeed]的种子表)
|
"EnableIncreSeed": false // 启用种子增量更新(只更新贴了特性[IncreSeed]的种子表)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -52,6 +52,7 @@
|
|||||||
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
|
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
|
||||||
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
|
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
|
||||||
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
|
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
|
||||||
|
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.227" />
|
||||||
<PackageReference Include="SqlSugarCore" Version="5.1.4.198" />
|
<PackageReference Include="SqlSugarCore" Version="5.1.4.198" />
|
||||||
<PackageReference Include="SSH.NET" Version="2025.0.0" />
|
<PackageReference Include="SSH.NET" Version="2025.0.0" />
|
||||||
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.6" />
|
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.6" />
|
||||||
|
|||||||
@ -113,16 +113,8 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
|
|||||||
var types = new List<Type>();
|
var types = new List<Type>();
|
||||||
if (_codeGenOptions.EntityAssemblyNames != null)
|
if (_codeGenOptions.EntityAssemblyNames != null)
|
||||||
{
|
{
|
||||||
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
|
types = App.EffectiveTypes.Where(u => u.IsClass).Where(u => _codeGenOptions.EntityAssemblyNames.Contains(u.Assembly.GetName().Name)
|
||||||
foreach (var assembly in assemblies)
|
|| _codeGenOptions.EntityAssemblyNames.Any(name => u.Assembly.GetName().Name!.Contains(name))).ToList();
|
||||||
{
|
|
||||||
var assemblyName = assembly.GetName().Name!;
|
|
||||||
if (_codeGenOptions.EntityAssemblyNames.Contains(assemblyName) || _codeGenOptions.EntityAssemblyNames.Any(name => assemblyName.Contains(name)))
|
|
||||||
{
|
|
||||||
Assembly asm = Assembly.Load(assemblyName);
|
|
||||||
types.AddRange(asm.GetExportedTypes().ToList());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Type[] cosType = types.Where(u => u.IsDefined(typeof(SugarTable), false) && !u.GetCustomAttributes<IgnoreTableAttribute>().Any()).ToArray();
|
Type[] cosType = types.Where(u => u.IsDefined(typeof(SugarTable), false) && !u.GetCustomAttributes<IgnoreTableAttribute>().Any()).ToArray();
|
||||||
|
|||||||
@ -23,6 +23,8 @@ public static class SqlSugarSetup
|
|||||||
|
|
||||||
// 自定义雪花Id算法
|
// 自定义雪花Id算法
|
||||||
StaticConfig.CustomSnowFlakeFunc = YitIdHelper.NextId;
|
StaticConfig.CustomSnowFlakeFunc = YitIdHelper.NextId;
|
||||||
|
// 注册 MongoDb
|
||||||
|
InstanceFactory.CustomAssemblies = [typeof(SqlSugar.MongoDb.MongoDbProvider).Assembly];
|
||||||
// 配置字符串表达式
|
// 配置字符串表达式
|
||||||
StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser);
|
StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser);
|
||||||
StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig
|
StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user