From 571b610417fe8419a9afb00614137d216b6502ff Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 6 Oct 2024 03:32:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20PostgreSQL=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A9=BC=E5=B3=B0=E8=BD=AC=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DbConnOptions.cs | 5 ++- .../SqlSugarDbConnectionCreator.cs | 9 +++++ .../Acme.BookStore.Web/appsettings.json | 32 ++++++++-------- .../sample/Acme.BookStore.Web/yi-abp-dev.db | Bin 372736 -> 0 bytes Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json | 36 +++++++++--------- Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.json | 32 ++++++++-------- .../Yi.Framework.Rbac.Test/appsettings.json | 32 ++++++++-------- 7 files changed, 83 insertions(+), 63 deletions(-) delete mode 100644 Yi.Abp.Net8/sample/Acme.BookStore.Web/yi-abp-dev.db diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs index 0d2e1345..db6be5b3 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs @@ -19,7 +19,10 @@ namespace Yi.Framework.SqlSugarCore.Abstractions /// public bool EnabledDbSeed { get; set; } = false; - + /// + /// 开启驼峰转下划线 + /// + public bool EnableUnderLine { get; set; } = false; /// /// 开启codefirst diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs index 1dd4a823..d62172df 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs @@ -64,6 +64,12 @@ namespace Yi.Framework.SqlSugarCore //设置codefirst非空值判断 ConfigureExternalServices = new ConfigureExternalServices { + // 处理表 + EntityNameService = (type, entity) => + { + if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_')) + entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName);// 驼峰转下划线 + }, EntityService = (c, p) => { if (new NullabilityInfoContext() @@ -72,6 +78,9 @@ namespace Yi.Framework.SqlSugarCore p.IsNullable = true; } + if (dbConnOptions.EnableUnderLine && !p.IsIgnore && !p.DbColumnName.Contains('_')) + p.DbColumnName = UtilMethods.ToUnderLine(p.DbColumnName);// 驼峰转下划线 + EntityService(c, p); } }, diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Web/appsettings.json b/Yi.Abp.Net8/sample/Acme.BookStore.Web/appsettings.json index 5ee98247..fd1c336b 100644 --- a/Yi.Abp.Net8/sample/Acme.BookStore.Web/appsettings.json +++ b/Yi.Abp.Net8/sample/Acme.BookStore.Web/appsettings.json @@ -13,22 +13,24 @@ }, //数据库类型列表 - "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], + "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle", "PostgreSQL" ], - "DbConnOptions": { - "Url": "DataSource=yi-abp-dev.db", - "DbType": "Sqlite", - "EnabledReadWrite": false, - "EnabledCodeFirst": true, - "EnabledSqlLog": true, - "EnabledDbSeed": true - //读写分离地址 - //"ReadUrl": [ - // "DataSource=[xxxx]", //Sqlite - // "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql - // "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver - //] - }, + "DbConnOptions": { + "Url": "DataSource=yi-abp-dev.db", + "DbType": "Sqlite", + "EnabledReadWrite": false, + "EnabledCodeFirst": true, + "EnabledSqlLog": true, + "EnabledDbSeed": true, + "EnableUnderLine": false // 启用驼峰转下划线 + //读写分离地址 + //"ReadUrl": [ + // "DataSource=[xxxx]", //Sqlite + // "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql + // "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver + // "HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]" //PostgreSQL + //] + }, //鉴权 "JwtOptions": { diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Web/yi-abp-dev.db b/Yi.Abp.Net8/sample/Acme.BookStore.Web/yi-abp-dev.db deleted file mode 100644 index a74693eb7e606f779e16e4e254ca92aec87d6d67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372736 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 z Date: Sat, 5 Oct 2024 19:40:41 +0000 Subject: [PATCH 2/2] update Yi.RuoYi.Vue3/src/views/system/tenant/index.vue. --- Yi.RuoYi.Vue3/src/views/system/tenant/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue b/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue index 23edd65e..e462bd33 100644 --- a/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue @@ -127,7 +127,7 @@ system/tenant : api文件路径,例如：codeGen/tableApi {{ dict }}Sqlite: DataSource=[xxxx]

Mysql: server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]

Sqlserver: Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]

+

PostgreSQL: HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]