😎1、调整基类创建者部门Id可以更新 2、代码优化及升级依赖
This commit is contained in:
parent
38d6c82dcd
commit
4338c38ea6
@ -41,6 +41,7 @@ public class Startup : AppStartup
|
|||||||
{
|
{
|
||||||
// 比较版本号对数据库进行升级结构、种子数据等
|
// 比较版本号对数据库进行升级结构、种子数据等
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 构建 WebApplication 对象过程中装载中间件
|
/// 构建 WebApplication 对象过程中装载中间件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -21,16 +21,16 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.3" />
|
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
|
||||||
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.511" />
|
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.511" />
|
||||||
<PackageReference Include="AngleSharp" Version="1.3.0" />
|
<PackageReference Include="AngleSharp" Version="1.3.0" />
|
||||||
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
|
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
|
||||||
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
|
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
|
||||||
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
|
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
|
||||||
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.0" />
|
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.0" />
|
||||||
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.47" />
|
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.48" />
|
||||||
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.47" />
|
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.48" />
|
||||||
<PackageReference Include="Furion.Pure" Version="4.9.7.47" />
|
<PackageReference Include="Furion.Pure" Version="4.9.7.48" />
|
||||||
<PackageReference Include="Hardware.Info" Version="101.0.1" />
|
<PackageReference Include="Hardware.Info" Version="101.0.1" />
|
||||||
<PackageReference Include="Hashids.net" Version="1.7.0" />
|
<PackageReference Include="Hashids.net" Version="1.7.0" />
|
||||||
<PackageReference Include="IPTools.China" Version="1.6.0" />
|
<PackageReference Include="IPTools.China" Version="1.6.0" />
|
||||||
@ -56,7 +56,7 @@
|
|||||||
<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.0.2" />
|
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1224" />
|
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1225" />
|
||||||
<PackageReference Include="UAParser" Version="3.1.47" />
|
<PackageReference Include="UAParser" Version="3.1.47" />
|
||||||
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
|
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@ -93,7 +93,7 @@ public abstract class EntityBaseData : EntityBase, IOrgIdFilter
|
|||||||
/// 创建者部门Id
|
/// 创建者部门Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[OwnerOrg]
|
[OwnerOrg]
|
||||||
[SugarColumn(ColumnDescription = "创建者部门Id", IsOnlyIgnoreUpdate = true)]
|
[SugarColumn(ColumnDescription = "创建者部门Id")]
|
||||||
public virtual long? CreateOrgId { get; set; }
|
public virtual long? CreateOrgId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -107,7 +107,7 @@ public abstract class EntityBaseData : EntityBase, IOrgIdFilter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建者部门名称
|
/// 创建者部门名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SugarColumn(ColumnDescription = "创建者部门名称", Length = 64, IsOnlyIgnoreUpdate = true)]
|
[SugarColumn(ColumnDescription = "创建者部门名称", Length = 64)]
|
||||||
public virtual string? CreateOrgName { get; set; }
|
public virtual string? CreateOrgName { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
//
|
//
|
||||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Http.Features;
|
|
||||||
using Furion;
|
using Furion;
|
||||||
|
using Microsoft.AspNetCore.Http.Features;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
Serve.Run(RunOptions.Default.AddWebComponent<WebComponent>().UseComponent<ApplicationComponent>());
|
Serve.Run(RunOptions.Default.AddWebComponent<WebComponent>().UseComponent<ApplicationComponent>());
|
||||||
@ -34,6 +34,7 @@ public class WebComponent : IWebComponent
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ApplicationComponent : IApplicationComponent
|
public class ApplicationComponent : IApplicationComponent
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -44,13 +45,13 @@ public class ApplicationComponent : IApplicationComponent
|
|||||||
/// <param name="componentContext"></param>
|
/// <param name="componentContext"></param>
|
||||||
public void Load(IApplicationBuilder app, IWebHostEnvironment env, ComponentContext componentContext)
|
public void Load(IApplicationBuilder app, IWebHostEnvironment env, ComponentContext componentContext)
|
||||||
{
|
{
|
||||||
//WebApplication application = app as WebApplication;
|
|
||||||
// 扫描所有继承 AppStartup 的类(排序执行顺序)
|
// 扫描所有继承 AppStartup 的类(排序执行顺序)
|
||||||
var startups = App.EffectiveTypes
|
var startups = App.EffectiveTypes
|
||||||
.Where(u => typeof(AppStartup).IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType && u.GetMethod("LoadAppComponent") != null)
|
.Where(u => typeof(AppStartup).IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType && u.GetMethod("LoadAppComponent") != null)
|
||||||
.OrderByDescending(u => !u.IsDefined(typeof(AppStartupAttribute), true) ? 0 : u.GetCustomAttribute<AppStartupAttribute>(true).Order);
|
.OrderByDescending(u => !u.IsDefined(typeof(AppStartupAttribute), true) ? 0 : u.GetCustomAttribute<AppStartupAttribute>(true).Order);
|
||||||
if (startups == null || !startups.Any())
|
if (startups == null || !startups.Any())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
foreach (var type in startups)
|
foreach (var type in startups)
|
||||||
@ -60,8 +61,6 @@ public class ApplicationComponent : IApplicationComponent
|
|||||||
initDataMethod?.Invoke(startup, [app, env, componentContext]);
|
initDataMethod?.Invoke(startup, [app, env, componentContext]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch { }
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2,7 +2,7 @@
|
|||||||
"name": "admin.net.pro",
|
"name": "admin.net.pro",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "2.4.33",
|
"version": "2.4.33",
|
||||||
"lastBuildTime": "2025.04.22",
|
"lastBuildTime": "2025.04.23",
|
||||||
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
|
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
|
||||||
"author": "zuohuaijun",
|
"author": "zuohuaijun",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -77,8 +77,8 @@
|
|||||||
"vue-signature-pad": "^3.0.2",
|
"vue-signature-pad": "^3.0.2",
|
||||||
"vue3-flag-icons": "^0.0.3",
|
"vue3-flag-icons": "^0.0.3",
|
||||||
"vue3-tree-org": "^4.2.2",
|
"vue3-tree-org": "^4.2.2",
|
||||||
"vxe-pc-ui": "^4.5.27",
|
"vxe-pc-ui": "^4.5.29",
|
||||||
"vxe-table": "^4.13.7",
|
"vxe-table": "^4.13.8",
|
||||||
"vxe-table-plugin-element": "^4.0.4",
|
"vxe-table-plugin-element": "^4.0.4",
|
||||||
"vxe-table-plugin-export-xlsx": "^4.0.7",
|
"vxe-table-plugin-export-xlsx": "^4.0.7",
|
||||||
"xe-utils": "^3.7.4",
|
"xe-utils": "^3.7.4",
|
||||||
|
|||||||
@ -64,7 +64,7 @@ import { TreeNode } from '/@/api-services/models';
|
|||||||
import { TreeKey } from 'element-plus/es/components/tree/src/tree.type';
|
import { TreeKey } from 'element-plus/es/components/tree/src/tree.type';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
checkStrictly: { type: Boolean, defaul: true },
|
checkStrictly: { type: Boolean, default: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
const filterText = ref('');
|
const filterText = ref('');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user