lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-12-27 06:35:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

同步openauth.Core：

Browse Source 
采用代码生成器的表结构控制前端显示，删除以前按照dbset获取数据库结构
优化注释
升级EF及所有三方的版本
This commit is contained in:
yubaolee
2021-10-18 00:42:29 +08:00
parent 3a70bf8e43
commit 9fd0405721
60 changed files with 371 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenAuth.Repository/BaseRepository.cs
View File

@@ -177,7 +177,6 @@ namespace OpenAuth.Repository
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为数据库实体</typeparam>
/// <returns></returns>
public IQueryable<T> FromSql(string sql, params object[] parameters)
{
@@ -187,11 +186,11 @@ namespace OpenAuth.Repository
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为非数据库实体，需要在DbContext中增加对应的DbQuery</typeparam>
/// <returns></returns>
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
public IQueryable<T> Query(string sql, params object[] parameters)
{
return _context.Query<T>().FromSqlRaw(sql, parameters);
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
#region 异步实现

3
OpenAuth.Repository/Interface/IRepository.cs
View File

@@ -63,15 +63,14 @@ namespace OpenAuth.Repository.Interface
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为数据库实体</typeparam>
/// <returns></returns>
IQueryable<T> FromSql(string sql, params object[] parameters);
/// <summary>
/// 使用SQL脚本查询
/// </summary>
/// <typeparam name="T"> T为非数据库实体，需要在DbContext中增加对应的DbQuery</typeparam>
/// <returns></returns>
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
IQueryable<T> Query(string sql, params object[] parameters);

16
OpenAuth.Repository/OpenAuth.Repository.csproj
View File

@@ -6,24 +6,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net5.0\OpenAuth.Repository.xml</DocumentationFile>
<NoWarn>1701;1702;1591;1573;1572;1570</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="5.1.2" />
<PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="MySql.Data" Version="8.0.13" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="3.19.110" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.40" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.1" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.1" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="5.2.13" />
</ItemGroup>
<ItemGroup>

5
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@@ -63,7 +63,7 @@ namespace OpenAuth.Repository
}
else if(dbType == Define.DBTYPE_MYSQL) //mysql
{
optionsBuilder.UseMySql(connect);
optionsBuilder.UseMySql(connect, new MySqlServerVersion(new Version(8, 0, 11)));
}
else
{
@@ -76,6 +76,7 @@ namespace OpenAuth.Repository
{
modelBuilder.Entity<DataPrivilegeRule>()
.HasKey(c => new { c.Id });
modelBuilder.Entity<SysTableColumn>().HasNoKey();
}
public virtual DbSet<Application> Applications { get; set; }
@@ -109,7 +110,7 @@ namespace OpenAuth.Repository
public virtual DbSet<BuilderTable> BuilderTables { get; set; }
public virtual DbSet<BuilderTableColumn> BuilderTableColumns { get; set; }
//非数据库表格
public virtual DbQuery<SysTableColumn> SysTableColumns { get; set; }
public virtual DbSet<SysTableColumn> SysTableColumns { get; set; }
}
}

14
OpenAuth.Repository/QueryObj/SysTableColumn.cs
View File

@@ -7,31 +7,31 @@
{
/// <summary>
/// 列名
/// <summary>
/// </summary>
public string ColumnName { get; set; }
/// <summary>
/// 列注释
/// <summary>
/// </summary>
public string Comment { get; set; }
/// <summary>
/// 类型，已转为.net类型
/// <summary>
/// </summary>
public string ColumnType { get; set; }
/// <summary>
/// 最大长度
/// <summary>
/// </summary>
public int? MaxLength { get; set; }
/// <summary>
/// 是否可空
/// <summary>
/// </summary>
public int? IsNull { get; set; }
/// <summary>
/// 是否显示
/// <summary>
/// </summary>
public int? IsDisplay { get; set; }
/// <summary>
/// 是否主键
/// <summary>
/// </summary>
public int? IsKey { get; set; }
public string EntityType { get; set; }
}

5
OpenAuth.Repository/UnitWork.cs
View File

@@ -211,10 +211,11 @@ namespace OpenAuth.Repository
{
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
[Obsolete("最新版同FromSql，需要在DbContext中设置modelBuilder.Entity<XX>().HasNoKey();")]
public IQueryable<T> Query<T>(string sql, params object[] parameters) where T : class
{
return _context.Query<T>().FromSqlRaw(sql, parameters);
return _context.Set<T>().FromSqlRaw(sql, parameters);
}
/// <summary>