admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化菜单，升级Abp版本

Browse Source
This commit is contained in:
ChenYi 2025-07-25 11:54:19 +08:00
parent ce3cb539c3
commit 5c3a5136b6
6 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Build.props
View File

@ -4,10 +4,10 @@
<!--JiShe.ServicePro版本--> <!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.5.40</ServiceProVersion> <ServiceProVersion>1.0.5.40</ServiceProVersion>
<!--Volo Abp 版本--> <!--Volo Abp 版本-->
<VoloAbpVersion>9.1.1</VoloAbpVersion> <VoloAbpVersion>9.2.1</VoloAbpVersion>
<!--Dotnet 组件 版本--> <!--Dotnet 组件 版本-->
<DotnetInfoVersion>9.0.0</DotnetInfoVersion> <DotnetInfoVersion>9.0.4</DotnetInfoVersion>
<!--Dotnet 框架 版本--> <!--Dotnet 框架 版本-->
<DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion> <DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion>

68
Directory.Build.targets
View File

@ -30,58 +30,60 @@
<!-- 单元测试包--> <!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.9.2"/> <PackageReference Update="xunit" Version="2.9.3"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.9.2"/> <PackageReference Update="xunit.extensibility.execution" Version="2.9.3"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2"/> <PackageReference Update="xunit.runner.visualstudio" Version="3.1.1"/>
<PackageReference Update="NSubstitute" Version="5.1.0"/> <PackageReference Update="NSubstitute" Version="5.3.0"/>
<PackageReference Update="Shouldly" Version="4.2.1"/> <PackageReference Update="Shouldly" Version="4.3.0"/>
<PackageReference Update="coverlet.collector" Version="6.0.0"/> <PackageReference Update="coverlet.collector" Version="6.0.4"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.134"/> <PackageReference Update="JunitXml.TestLogger" Version="6.1.0"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.18.1"/> <PackageReference Update="AutoFixture.Xunit2" Version="4.18.1"/>
<!-- Hangfire 后台任务--> <!-- Hangfire 后台任务-->
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.3"/> <PackageReference Update="Hangfire.Redis.StackExchange" Version="1.12.0"/>
<!-- CAP 分布式事务--> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP" Version="8.3.5"/>
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="8.3.5"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="8.3.5"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="8.3.5"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="8.3.5"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
<!-- Swagger--> <!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.0"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.8.1"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="9.0.0"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="9.0.0"/>
<!-- Serilog 日志--> <!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="4.0.2"/> <PackageReference Update="Serilog" Version="4.3.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="8.0.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="9.0.2"/>
<PackageReference Update="Serilog.Sinks.Async" Version="2.0.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="2.1.0"/>
<PackageReference Update="Serilog.Sinks.File" Version="6.0.0"/> <PackageReference Update="Serilog.Sinks.File" Version="7.0.0"/>
<PackageReference Update="Serilog.Sinks.Console" Version="6.0.0"/> <PackageReference Update="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Update="Serilog.AspNetCore" Version="8.0.2"/> <PackageReference Update="Serilog.AspNetCore" Version="9.0.0"/>
<PackageReference Update="Serilog.Exceptions" Version="8.4.0"/> <PackageReference Update="Serilog.Exceptions" Version="8.4.0"/>
<PackageReference Update="Serilog.Settings.Configuration" Version="8.0.2"/> <PackageReference Update="Serilog.Settings.Configuration" Version="9.0.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/>
<!-- Magicodes 导入导出Excel--> <!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.4.5"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.5.2"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.5.2"/>
<!-- MiniProfiler 查看接口耗时,sql耗时--> <!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.3.8"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.5.4"/>
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.3.8"/> <PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.5.4"/>
<PackageReference Update="MiniProfiler.Shared" Version="4.3.8"/> <PackageReference Update="MiniProfiler.Shared" Version="4.5.4"/>
<!-- Polly 重试机制--> <!-- Polly 重试机制-->
<PackageReference Update="Polly" Version="8.5.0"/> <PackageReference Update="Polly" Version="8.6.1"/>
<PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Update="Polly.Core" Version="8.6.1" />
<!-- Octokit 邮件--> <!-- Octokit 邮件-->
<PackageReference Update="Octokit" Version="9.0.0"/> <PackageReference Update="Octokit" Version="14.0.0"/>
<!-- Humanizer 中文格式包--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
@ -94,6 +96,14 @@
<!-- redis分布式锁--> <!-- redis分布式锁-->
<PackageReference Update="DistributedLock.Redis" Version="1.0.3" /> <PackageReference Update="DistributedLock.Redis" Version="1.0.3" />
<!-- Humanizer 中文格式包-->
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<PackageReference Update="Scriban" Version="5.4.4" />
<PackageReference Update="Otp.NET" Version="1.4.0" />
<PackageReference Update="QRCoder" Version="1.6.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
View File

@ -30,7 +30,7 @@ namespace JiShe.IoT.DeviceAggregation
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[Authorize(DeviceManagementPermissions.MeterManagement.Create)] [Authorize(DeviceManagementPermissions.DeviceInfoManagement.Create)]
public async Task<bool> CreateAsync(CreateDeviceAggregationInput input) public async Task<bool> CreateAsync(CreateDeviceAggregationInput input)
{ {
@ -85,7 +85,7 @@ namespace JiShe.IoT.DeviceAggregation
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
[Authorize(DeviceManagementPermissions.MeterManagement.Delete)] [Authorize(DeviceManagementPermissions.DeviceInfoManagement.Delete)]
public async Task<bool> DeleteAsync(IdInput input) public async Task<bool> DeleteAsync(IdInput input)
{ {
return await deviceAppService.DeleteAsync(input); return await deviceAppService.DeleteAsync(input);

8
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs generated
View File

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations namespace JiShe.IoT.Migrations
{ {
[DbContext(typeof(IoTDbContext))] [DbContext(typeof(IoTDbContext))]
[Migration("20250724092610_InitialCreate")] [Migration("20250725034846_InitialCreate")]
partial class InitialCreate partial class InitialCreate
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -22,7 +22,7 @@ namespace JiShe.IoT.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "9.0.0") .HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@ -1821,6 +1821,10 @@ namespace JiShe.IoT.Migrations
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<string>("ApplicationName")
.HasMaxLength(96)
.HasColumnType("varchar(96)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.IsRequired() .IsRequired()

2
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs
View File

@ -70,6 +70,8 @@ namespace JiShe.IoT.Migrations
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"), Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
ApplicationName = table.Column<string>(type: "varchar(96)", maxLength: 96, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
JobName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false) JobName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"), .Annotation("MySql:CharSet", "utf8mb4"),
JobArgs = table.Column<string>(type: "longtext", maxLength: 1048576, nullable: false) JobArgs = table.Column<string>(type: "longtext", maxLength: 1048576, nullable: false)

6
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
View File

@ -19,7 +19,7 @@ namespace JiShe.IoT.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "9.0.0") .HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@ -1818,6 +1818,10 @@ namespace JiShe.IoT.Migrations
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<string>("ApplicationName")
.HasMaxLength(96)
.HasColumnType("varchar(96)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.IsRequired() .IsRequired()