lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 17:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

去除pgSql驼峰

Browse Source
This commit is contained in:
wintel 2025-02-23 08:28:24 +08:00
parent e244246028
commit 1db14b7973
8 changed files with 30 additions and 44 deletions
OpenAuth.App
Resources
ResourceApp.cs
SysPrinterPlanApp
SysPrinterPlanApp.cs
Test
TestBase.cs
OpenAuth.Mvc
Startup.cs
Views/Home
Main.cshtml
OpenAuth.Repository
OpenAuthDBContext.cs
Test
TestBase.cs
OpenAuth.WebApi
Startup.cs

5
OpenAuth.App/Resources/ResourceApp.cs
View File

@ -85,10 +85,7 @@ namespace OpenAuth.App
}
var columnnames = columnFields.Select(u => u.ColumnName);
if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\"");
}
var propertyStr = string.Join(',', columnnames);
result.columnFields = columnFields;
result.data = resources.OrderBy(u => u.TypeId)

6
OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Nodes;
using System.Threading.Tasks;
using Infrastructure;
using OpenAuth.App.Interface;
@ -41,10 +40,7 @@ namespace OpenAuth.App
}
var columnnames = columnFields.Select(u => u.ColumnName);
if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\"");
}
var propertyStr = string.Join(',', columnnames);
result.columnFields = columnFields;
result.data = objs.OrderByDescending(u => u.CreateTime)

7
OpenAuth.App/Test/TestBase.cs
View File

@ -77,12 +77,7 @@ namespace OpenAuth.App.Test
{
DbType = dbType.Value,
ConnectionString = connectionString,
IsAutoCloseConnection = true,
MoreSettings=new ConnMoreSettings() {
PgSqlIsAutoToLower = false,//增删查改支持驼峰表
PgSqlIsAutoToLowerCodeFirst = false, // 建表建驼峰表。5.1.3.30
IsAutoToUpper=false //禁用自动转成大写表
}
IsAutoCloseConnection = true
});
return sqlSugar;
});

6
OpenAuth.Mvc/Startup.cs
View File

@ -109,11 +109,7 @@ namespace OpenAuth.Mvc
{
DbType = dbType.Value,
ConnectionString = connectionString,
IsAutoCloseConnection = true,
MoreSettings=new ConnMoreSettings() {
PgSqlIsAutoToLower = false,//增删查改支持驼峰表
PgSqlIsAutoToLowerCodeFirst = false // 建表建驼峰表。5.1.3.30
}
IsAutoCloseConnection = true
}, db => { db.Aop.OnLogExecuting = (sql, pars) => { logger.LogInformation(sql); }; });
return sqlSugar;
});

8
OpenAuth.Mvc/Views/Home/Main.cshtml
View File

@ -18,7 +18,7 @@
<div class="panel col">
<a href="javascript:;" data-url="/Rolemanager/index">
<div class="panel_icon" style="background-color:#FF5722;">
<i class="layui-icon layui-icon-vercode" ></i>
<i class="layui-icon layui-icon-vercode" ></i>
</div>
<div class="panel_word roles">
<span></span>
@ -75,14 +75,14 @@
<p>官方博客：<a href="http://www.cnblogs.com/yubaolee/">http://www.cnblogs.com/yubaolee/</a> </p>
<p>
系统默认System账号登录，可以查看所有权限，如果用其他账号（如：admin/test）可以查看相应的授权/可见字段情况。
数据库密码明文存储，不要问为什么不加密，因为你要问这些账号的密码我也记不住啊O(∩_∩)O
</p>
<p>
<a href="https://gitee.com/dotnetchina/OpenAuth.Net" target="_blank" class="layui-btn layui-btn-xs layui-btn-danger">项目地址</a>
<a class="layui-btn layui-btn-xs" target="_blank" href="http://doc.openauth.net.cn">在线文档</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1803">企业版/高级版入口</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1803">企业Vue2演示</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1805">企业Vue3演示</a>
<a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1804">企业版H5入口（请使用移动模式或者直接手机查看）</a>
<span style="color: #f00;">注：【本框架遵循LGPL开源协议，企业单位如商用请联系作者授权，谢谢】</span>
<span style="color: #f00;">注：【本框架遵循Apache开源协议，可以免费商用】</span>
</p>
<p>技术交流QQ群：484498493【已满】 &nbsp; &nbsp; 626433139【已满】 &nbsp;&nbsp; 566344079</p>
</blockquote>

29
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@ -77,7 +77,7 @@ namespace OpenAuth.Repository
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<DataPrivilegeRule>()
.HasKey(c => new {c.Id});
.HasKey(c => new { c.Id });
modelBuilder.Entity<SysTableColumn>().HasNoKey();
modelBuilder.Entity<QueryStringObj>().HasNoKey();
@ -86,7 +86,7 @@ namespace OpenAuth.Repository
|| Database.ProviderName == "Oracle.EntityFrameworkCore")
{
var boolToSmallIntConverter = new ValueConverter<bool, short>(
v => v ? (short) 1 : (short) 0,
v => v ? (short)1 : (short)0,
v => v != 0);
foreach (var entityType in modelBuilder.Model.GetEntityTypes())
{
@ -106,21 +106,32 @@ namespace OpenAuth.Repository
}
}
}
}
//如果数据库是Oracle，则将所有表名和字段名转换为大写
if (Database.ProviderName == "Oracle.EntityFrameworkCore")
{
// Oracle和PostgreSQL将所有属性映射到大写/小写列名
foreach (var entity in modelBuilder.Model.GetEntityTypes())
{
entity.SetTableName(entity.GetTableName().ToUpper());
// 将所有属性映射到大写列名
if (Database.ProviderName == "Oracle.EntityFrameworkCore")
{
entity.SetTableName(entity.GetTableName().ToUpper());
}
else if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL")
{
entity.SetTableName(entity.GetTableName().ToLower());
}
foreach (var property in entity.GetProperties())
{
var storeObject = StoreObjectIdentifier.Create(entity, StoreObjectType.Table);
if (storeObject.HasValue)
{
property.SetColumnName(property.GetColumnName(storeObject.Value).ToUpper());
if (Database.ProviderName == "Oracle.EntityFrameworkCore")
{
property.SetColumnName(property.GetColumnName(storeObject.Value).ToUpper());
}
else if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL")
{
property.SetColumnName(property.GetColumnName(storeObject.Value).ToLower());
}
}
}
}

7
OpenAuth.Repository/Test/TestBase.cs
View File

@ -83,12 +83,7 @@ namespace OpenAuth.Repository.Test
{
DbType = dbType.Value,
ConnectionString = connectionString,
IsAutoCloseConnection = true,
MoreSettings=new ConnMoreSettings() {
PgSqlIsAutoToLower = false,//增删查改支持驼峰表
PgSqlIsAutoToLowerCodeFirst = false, // 建表建驼峰表。5.1.3.30
IsAutoToUpper=false //禁用自动转成大写表
}
IsAutoCloseConnection = true
});
return sqlSugar;
});

6
OpenAuth.WebApi/Startup.cs
View File

@ -184,11 +184,7 @@ namespace OpenAuth.WebApi
{
DbType = dbType.Value,
ConnectionString = connectionString,
IsAutoCloseConnection = true,
MoreSettings=new ConnMoreSettings() {
PgSqlIsAutoToLower = false,//增删查改支持驼峰表
PgSqlIsAutoToLowerCodeFirst = false// 建表建驼峰表。5.1.3.30
}
IsAutoCloseConnection = true
}, db => { db.Aop.OnLogExecuting = (sql, pars) => { logger.LogInformation(sql); }; });
return sqlSugar;
});