gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、缩减所有实体索引长度 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-06-05 19:35:21 +08:00
parent 34930dc6b1
commit 03d438436c
30 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.585" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.600" />
<PackageReference Include="AngleSharp" Version="1.3.0" />
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.5" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1253" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1254" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

2
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
View File

@ -21,7 +21,7 @@ public abstract class EntityBaseId
/// <summary>
/// 框架实体基类
/// </summary>
[SugarIndex("i_{table}_CT", nameof(CreateTime), OrderByType.Asc)]
[SugarIndex("i_{table}_ct", nameof(CreateTime), OrderByType.Asc)]
public abstract class EntityBase : EntityBaseId, IDeletedFilter
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysAlipayAuthInfo.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "支付宝授权记录表")]
[SysTable]
[SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)]
[SugarIndex("index_{table}_T", nameof(OpenId), OrderByType.Asc)]
[SugarIndex("i_{table}_u", nameof(UserId), OrderByType.Asc)]
[SugarIndex("i_{table}_o", nameof(OpenId), OrderByType.Asc)]
public class SysAlipayAuthInfo : EntityBase
{
/// <summary>

6
Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs
View File

@ -11,9 +11,9 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "支付宝交易记录表")]
[SysTable]
[SugarIndex("i_sysalipaytransaction_u", nameof(UserId), OrderByType.Asc)]
[SugarIndex("i_sysalipaytransaction_t", nameof(TradeNo), OrderByType.Asc)]
[SugarIndex("i_sysalipaytransaction_o", nameof(OutTradeNo), OrderByType.Asc)]
[SugarIndex("i_{table}_u", nameof(UserId), OrderByType.Asc)]
[SugarIndex("i_{table}_t", nameof(TradeNo), OrderByType.Asc)]
[SugarIndex("i_{table}_o", nameof(OutTradeNo), OrderByType.Asc)]
public class SysAlipayTransaction : EntityBase
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "代码生成表")]
[SysTable]
[SugarIndex("index_{table}_B", nameof(BusName), OrderByType.Asc)]
[SugarIndex("index_{table}_T", nameof(TableName), OrderByType.Asc)]
[SugarIndex("i_{table}_b", nameof(BusName), OrderByType.Asc)]
[SugarIndex("i_{table}_t", nameof(TableName), OrderByType.Asc)]
public partial class SysCodeGen : EntityBase
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统配置参数表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc, IsUnique = true)]
public partial class SysConfig : EntityBase
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysConfigTenant.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统租户配置参数表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc, IsUnique = true)]
public partial class SysConfigTenant : SysConfig, ITenantIdFilter
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统字典值表")]
[SysTable]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
public partial class SysDictData : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysDictDataTenant.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统租户字典值表")]
[SysTable]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
public partial class SysDictDataTenant : SysDictData, ITenantIdFilter
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统字典类型表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
public partial class SysDictType : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysFile.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统文件表")]
[SysTable]
[SugarIndex("index_{table}_F", nameof(FileName), OrderByType.Asc)]
[SugarIndex("i_{table}_f", nameof(FileName), OrderByType.Asc)]
public partial class SysFile : EntityTenantBaseData
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统作业信息表")]
[SysTable]
[SugarIndex("index_{table}_J", nameof(JobId), OrderByType.Asc)]
[SugarIndex("i_{table}_j", nameof(JobId), OrderByType.Asc)]
public partial class SysJobDetail : EntityBaseId
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysLogDiff.cs
View File

@ -45,9 +45,9 @@ public partial class SysLogDiff : EntityTenant
public string? BusinessData { get; set; }
/// <summary>
/// 差异操作
/// 操作类型（增删改）
/// </summary>
[SugarColumn(ColumnDescription = "差异操作", ColumnDataType = StaticConfig.CodeFirst_BigString)]
[SugarColumn(ColumnDescription = "操作类型", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? DiffType { get; set; }
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
View File

@ -13,8 +13,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统菜单表")]
[SysTable]
[SugarIndex("index_{table}_T", nameof(Title), OrderByType.Asc)]
[SugarIndex("index_{table}_T2", nameof(Type), OrderByType.Asc)]
[SugarIndex("i_{table}_t1", nameof(Title), OrderByType.Asc)]
[SugarIndex("i_{table}_t2", nameof(Type), OrderByType.Asc)]
public partial class SysMenu : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统通知公告表")]
[SysTable]
[SugarIndex("index_{table}_T", nameof(Type), OrderByType.Asc)]
[SugarIndex("i_{table}_t", nameof(Type), OrderByType.Asc)]
public partial class SysNotice : EntityTenant
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysOAuthUser.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统三方用户表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(NickName), OrderByType.Asc)]
[SugarIndex("index_{table}_M", nameof(Mobile), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(NickName), OrderByType.Asc)]
[SugarIndex("i_{table}_m", nameof(Mobile), OrderByType.Asc)]
public partial class SysOAuthUser : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "开放接口身份表")]
[SysTable]
[SugarIndex("index_{table}_A", nameof(AccessKey), OrderByType.Asc)]
[SugarIndex("i_{table}_a", nameof(AccessKey), OrderByType.Asc)]
public partial class SysOpenAccess : EntityBase
{
/// <summary>

6
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs
View File

@ -11,9 +11,9 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统机构表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("index_{table}_T", nameof(Type), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_t", nameof(Type), OrderByType.Asc)]
public partial class SysOrg : EntityTenant
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysPlugin.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统动态插件表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
public partial class SysPlugin : EntityTenant
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysPos.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统职位表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
public partial class SysPos : EntityTenant
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysPrint.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统打印模板表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
public partial class SysPrint : EntityTenant
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysRegion.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统行政地区表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc, IsUnique = true)]
public partial class SysRegion : EntityBaseId
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysRole.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统角色表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("i_{table}_n", nameof(Name), OrderByType.Asc)]
[SugarIndex("i_{table}_c", nameof(Code), OrderByType.Asc)]
public partial class SysRole : EntityTenant
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysUser.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统用户表")]
[SysTable]
[SugarIndex("index_{table}_A", nameof(Account), OrderByType.Asc)]
[SugarIndex("index_{table}_P", nameof(Phone), OrderByType.Asc)]
[SugarIndex("i_{table}_a", nameof(Account), OrderByType.Asc)]
[SugarIndex("i_{table}_p", nameof(Phone), OrderByType.Asc)]
public partial class SysUser : EntityTenant
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysUserLdap.cs
View File

@ -11,8 +11,8 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统用户域配置表")]
[SysTable]
[SugarIndex("index_{table}_A", nameof(Account), OrderByType.Asc)]
[SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)]
[SugarIndex("i_{table}_a", nameof(Account), OrderByType.Asc)]
[SugarIndex("i_{table}_u", nameof(UserId), OrderByType.Asc)]
public class SysUserLdap : EntityTenant
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统微信支付表")]
[SysTable]
[SugarIndex("index_{table}_O", nameof(OrderId), OrderByType.Desc)]
[SugarIndex("i_{table}_o", nameof(OrderId), OrderByType.Desc)]
public partial class SysWechatPay : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
View File

@ -11,7 +11,7 @@ namespace Admin.NET.Core;
/// </summary>
[SugarTable(null, "系统微信退款表")]
[SysTable]
[SugarIndex("index_{table}_O", nameof(OrderId), OrderByType.Desc)]
[SugarIndex("i_{table}_o", nameof(OrderId), OrderByType.Desc)]
public class SysWechatRefund : EntityBase
{
/// <summary>

2
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs
View File

@ -348,7 +348,7 @@ public static class SqlSugarExtension
// 将不存在实体中的字段改为可空
var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
var dbColumnInfos = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? [];
foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => !dbColumnInfo.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName==null || u.DbColumnName.ToLower() != dbColumnInfo.DbColumnName.ToLower())))
foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => !dbColumnInfo.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName == null || u.DbColumnName.ToLower() != dbColumnInfo.DbColumnName.ToLower())))
{
dbColumnInfo.IsNullable = true;
dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo);

2
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
View File

@ -26,7 +26,7 @@
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
<PackageReference Include="Rezero.Api" Version="1.8.21" />
<PackageReference Include="Rezero.Api" Version="1.8.22" />
</ItemGroup>
<ItemGroup>

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.06.04",
"lastBuildTime": "2025.06.05",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -56,14 +56,14 @@
"mqtt": "^5.13.1",
"nprogress": "^0.2.0",
"ol": "^10.5.0",
"pinia": "^3.0.2",
"pinia": "^3.0.3",
"print-js": "^1.6.0",
"push.js": "^1.0.12",
"qrcodejs2-fixes": "^0.0.2",
"qs": "^6.14.0",
"relation-graph": "^2.2.11",
"screenfull": "^6.0.2",
"sm-crypto-v2": "^1.11.0",
"sm-crypto-v2": "^1.12.0",
"sortablejs": "^1.15.6",
"splitpanes": "^4.0.4",
"vcrontab-3": "^3.3.22",
@ -80,8 +80,8 @@
"vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.6.14",
"vxe-table": "^4.13.33",
"vxe-pc-ui": "^4.6.15",
"vxe-table": "^4.13.34",
"xe-utils": "^3.7.4",
"xlsx-js-style": "^1.2.0"
},