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

升级net10，编译成功

Browse Source
This commit is contained in:
陈益 2025-12-05 23:48:20 +08:00
parent 8bddc3749a
commit 26d4db8f92
14 changed files with 51 additions and 9843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitignore vendored
View File

@ -57,3 +57,19 @@
/test/JiShe.IoT.TestBase/bin/Release/net9.0 /test/JiShe.IoT.TestBase/bin/Release/net9.0
/host/JiShe.IoT.HttpApi.Host/UploadFile/20250729/host/abp-file-management /host/JiShe.IoT.HttpApi.Host/UploadFile/20250729/host/abp-file-management
/host/JiShe.IoT.HttpApi.Host/UploadFile/20250731/host/abp-file-management/3a1b7059-f930-8a33-5a5b-a67f48f2feec /host/JiShe.IoT.HttpApi.Host/UploadFile/20250731/host/abp-file-management/3a1b7059-f930-8a33-5a5b-a67f48f2feec
/gateways/JiShe.IoT.WebGateway/bin/Debug/net10.0
/src/JiShe.IoT.Application/bin/Debug/net10.0
/src/JiShe.IoT.Application.Contracts/bin/Debug/net10.0
/src/JiShe.IoT.DbMigrator/bin/Debug/net10.0
/src/JiShe.IoT.DbMigrator/bin/Debug/net10.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll
/src/JiShe.IoT.Domain/bin/Debug/net10.0
/src/JiShe.IoT.Domain.Shared/bin/Debug/net10.0
/src/JiShe.IoT.EntityFrameworkCore/bin/Debug/net10.0
/src/JiShe.IoT.HttpApi/bin/Debug/net10.0
/src/JiShe.IoT.HttpApi.Client/bin/Debug/net10.0
/test/JiShe.IoT.Application.Tests/bin/Debug/net10.0
/test/JiShe.IoT.Domain.Tests/bin/Debug/net10.0
/test/JiShe.IoT.EntityFrameworkCore.Tests/bin/Debug/net10.0
/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/bin/Debug/net10.0
/test/JiShe.IoT.TestBase/bin/Debug/net10.0
/host/JiShe.IoT.HttpApi.Host/bin/Debug/net10.0

4
Directory.Build.Microsoft.targets
View File

@ -17,8 +17,8 @@
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(DotnetInfoVersion)" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(DotnetInfoVersion)" />
<PackageReference Update="Microsoft.Extensions.Http" Version="$(DotnetInfoVersion)"/> <PackageReference Update="Microsoft.Extensions.Http" Version="$(DotnetInfoVersion)"/>
<PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/> <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0"/>
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/> <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0"/>
<PackageReference Update="Microsoft.CSharp" Version="4.12.0"/> <PackageReference Update="Microsoft.CSharp" Version="4.12.0"/>
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/> <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/> <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>

8
Directory.Build.props
View File

@ -3,13 +3,15 @@
<PropertyGroup> <PropertyGroup>
<!--JiShe.ServicePro版本--> <!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.5.40</ServiceProVersion> <ServiceProVersion>1.0.5.40</ServiceProVersion>
<!--Volo Abp 版本--> <!--Volo Abp 版本-->
<VoloAbpVersion>9.2.1</VoloAbpVersion> <VoloAbpVersion>10.0.1</VoloAbpVersion>
<!--Dotnet 组件 版本--> <!--Dotnet 组件 版本-->
<DotnetInfoVersion>9.0.4</DotnetInfoVersion> <DotnetInfoVersion>10.0.0</DotnetInfoVersion>
<!--Dotnet 框架 版本--> <!--Dotnet 框架 版本-->
<DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion> <DotnetTargetFrameworkVersion>net10.0</DotnetTargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

24
Directory.Build.targets
View File

@ -51,26 +51,26 @@
<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="9.0.0"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="9.0.0"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="10.0.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="9.0.0"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="10.0.1"/>
<!-- Serilog 日志--> <!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="4.3.0"/> <PackageReference Update="Serilog" Version="4.3.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="9.0.2"/> <PackageReference Update="Serilog.Extensions.Logging" Version="10.0.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="2.1.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="2.1.0"/>
<PackageReference Update="Serilog.Sinks.File" Version="7.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.1.1"/>
<PackageReference Update="Serilog.AspNetCore" Version="9.0.0"/> <PackageReference Update="Serilog.AspNetCore" Version="10.0.0"/>
<PackageReference Update="Serilog.Exceptions" Version="8.4.0"/> <PackageReference Update="Serilog.Exceptions" Version="8.4.0"/>
<PackageReference Update="Serilog.Settings.Configuration" Version="9.0.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="10.0.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/> <PackageReference Update="Elastic.Serilog.Sinks" Version="9.0.0"/>
<!-- Magicodes 导入导出Excel--> <!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.5.2"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.8.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.5.2"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.8.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时--> <!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.5.4"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.5.4"/>
@ -88,8 +88,8 @@
<!-- Humanizer 中文格式包--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<!-- NEST ElasticSearch--> <!-- elastic elasticsearch-->
<PackageReference Update="NEST" Version="7.17.5"/> <PackageReference Update="Elastic.Clients.Elasticsearch" Version="9.2.2"/>
<PackageReference Update="WebApiClientCore" Version="2.1.5" /> <PackageReference Update="WebApiClientCore" Version="2.1.5" />

9
JiShe.IoT.Admin.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18 # Visual Studio Version 18
VisualStudioVersion = 18.0.11217.181 d18.0 VisualStudioVersion = 18.0.11217.181
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Domain", "src\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Domain", "src\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
EndProject EndProject
@ -236,8 +236,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.CAP.Entity
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.CTWingAep.Provider", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.CTWingAep.Provider\JiShe.ServicePro.CTWingAep.Provider.csproj", "{4280ED21-7498-85F9-315F-BC1CB3458900}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.CTWingAep.Provider", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.CTWingAep.Provider\JiShe.ServicePro.CTWingAep.Provider.csproj", "{4280ED21-7498-85F9-315F-BC1CB3458900}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.ElasticSearch", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.ElasticSearch\JiShe.ServicePro.ElasticSearch.csproj", "{9CB012D4-9905-6623-E78D-A6649660EDB1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.HttpClient", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.HttpClient\JiShe.ServicePro.HttpClient.csproj", "{FCA448BF-8B4C-4932-654A-B942A3777E5C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.HttpClient", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.HttpClient\JiShe.ServicePro.HttpClient.csproj", "{FCA448BF-8B4C-4932-654A-B942A3777E5C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.Localization", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.Localization\JiShe.ServicePro.Localization.csproj", "{08FCE8E5-2F1D-F04F-FD45-9693709C262A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.ServicePro.Localization", "JiShe.ServicePro\frameworks\src\JiShe.ServicePro.Localization\JiShe.ServicePro.Localization.csproj", "{08FCE8E5-2F1D-F04F-FD45-9693709C262A}"
@ -681,10 +679,6 @@ Global
{4280ED21-7498-85F9-315F-BC1CB3458900}.Debug|Any CPU.Build.0 = Debug|Any CPU {4280ED21-7498-85F9-315F-BC1CB3458900}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4280ED21-7498-85F9-315F-BC1CB3458900}.Release|Any CPU.ActiveCfg = Release|Any CPU {4280ED21-7498-85F9-315F-BC1CB3458900}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4280ED21-7498-85F9-315F-BC1CB3458900}.Release|Any CPU.Build.0 = Release|Any CPU {4280ED21-7498-85F9-315F-BC1CB3458900}.Release|Any CPU.Build.0 = Release|Any CPU
{9CB012D4-9905-6623-E78D-A6649660EDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CB012D4-9905-6623-E78D-A6649660EDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CB012D4-9905-6623-E78D-A6649660EDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CB012D4-9905-6623-E78D-A6649660EDB1}.Release|Any CPU.Build.0 = Release|Any CPU
{FCA448BF-8B4C-4932-654A-B942A3777E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCA448BF-8B4C-4932-654A-B942A3777E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCA448BF-8B4C-4932-654A-B942A3777E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCA448BF-8B4C-4932-654A-B942A3777E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCA448BF-8B4C-4932-654A-B942A3777E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCA448BF-8B4C-4932-654A-B942A3777E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -863,7 +857,6 @@ Global
{DFC637A5-87AC-1C38-37B3-4077866E8258} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {DFC637A5-87AC-1C38-37B3-4077866E8258} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{2267BD37-7F07-0AF0-CA18-7CE4D2D43A71} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {2267BD37-7F07-0AF0-CA18-7CE4D2D43A71} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{4280ED21-7498-85F9-315F-BC1CB3458900} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {4280ED21-7498-85F9-315F-BC1CB3458900} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{9CB012D4-9905-6623-E78D-A6649660EDB1} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{FCA448BF-8B4C-4932-654A-B942A3777E5C} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {FCA448BF-8B4C-4932-654A-B942A3777E5C} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{08FCE8E5-2F1D-F04F-FD45-9693709C262A} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {08FCE8E5-2F1D-F04F-FD45-9693709C262A} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}
{29859269-BBC5-66F7-B18F-71FDA7A4493D} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E} {29859269-BBC5-66F7-B18F-71FDA7A4493D} = {72493AF2-CDAA-40A7-98AB-B8AA2B05965E}

2
host/JiShe.IoT.HttpApi.Host/GlobalUsings.cs
View File

@ -36,7 +36,7 @@ global using Microsoft.Extensions.Logging;
global using Microsoft.Extensions.Logging.Abstractions; global using Microsoft.Extensions.Logging.Abstractions;
global using Microsoft.Extensions.Options; global using Microsoft.Extensions.Options;
global using Microsoft.IdentityModel.Tokens; global using Microsoft.IdentityModel.Tokens;
global using Microsoft.OpenApi.Models; global using Microsoft.OpenApi;
global using JiShe.IoT; global using JiShe.IoT;
global using Serilog; global using Serilog;
global using StackExchange.Redis; global using StackExchange.Redis;

24
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
View File

@ -149,12 +149,12 @@ public partial class IoTHttpApiHostModule
options => options =>
{ {
// 文件下载类型 // 文件下载类型
options.MapType<FileContentResult>(() => new OpenApiSchema() { Type = "file" }); options.MapType<FileContentResult>(() => new OpenApiSchema() { Type = JsonSchemaType.String, Format = "binary" });
options.SwaggerDoc("AbpPro", new OpenApiInfo { Title = "AbpPro API", Version = "v1" }); options.SwaggerDoc("AbpPro", new OpenApiInfo { Title = "AbpPro API", Version = "v1" });
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
var groupNames = EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>(); var groupNames = System.EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>();
var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>(); var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>();
groupNames.ForEach(group => groupNames.ForEach(group =>
@ -207,16 +207,10 @@ public partial class IoTHttpApiHostModule
Scheme = JwtBearerDefaults.AuthenticationScheme, Scheme = JwtBearerDefaults.AuthenticationScheme,
BearerFormat = "JWT" BearerFormat = "JWT"
}); });
options.AddSecurityRequirement(new OpenApiSecurityRequirement options.AddSecurityRequirement(document => new OpenApiSecurityRequirement
{ {
{ {
new OpenApiSecurityScheme new OpenApiSecuritySchemeReference(JwtBearerDefaults.AuthenticationScheme, document),
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme, Id = "Bearer"
}
},
new List<string>() new List<string>()
} }
}); });
@ -229,15 +223,11 @@ public partial class IoTHttpApiHostModule
Description = "多语言设置，系统预设语言有zh-Hans、en，默认为zh-Hans", Description = "多语言设置，系统预设语言有zh-Hans、en，默认为zh-Hans",
}); });
options.AddSecurityRequirement(new OpenApiSecurityRequirement options.AddSecurityRequirement(document => new OpenApiSecurityRequirement
{ {
{ {
new OpenApiSecurityScheme new OpenApiSecuritySchemeReference("ApiKey", document),
{ new List<string>()
Reference = new OpenApiReference
{ Type = ReferenceType.SecurityScheme, Id = "ApiKey" }
},
Array.Empty<string>()
} }
}); });
}); });

2
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
View File

@ -88,7 +88,7 @@ namespace JiShe.IoT
app.UseSwagger(); app.UseSwagger();
app.UseAbpSwaggerUI(options => app.UseAbpSwaggerUI(options =>
{ {
var groupNames = EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>(); var groupNames = System.EnumExtensions.GetEnumTypeValueNameList<SwaggerGroupEnum>();
var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>(); var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get<List<string>>() ?? new List<string>();
groupNames.ForEach(attr => groupNames.ForEach(attr =>
{ {

2
host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
View File

@ -29,7 +29,7 @@
<PackageReference Include="Serilog.Extensions.Logging" /> <PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Serilog.Settings.Configuration" /> <PackageReference Include="Serilog.Settings.Configuration" />
<PackageReference Include="Serilog.Sinks.Console" /> <PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" /> <PackageReference Include="Elastic.Serilog.Sinks" />
<PackageReference Include="Serilog.Sinks.File" /> <PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog.Sinks.Async" /> <PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Hangfire.Redis.StackExchange" /> <PackageReference Include="Hangfire.Redis.StackExchange" />

2
src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs
View File

@ -86,7 +86,7 @@ namespace JiShe.IoT.EntityFrameworkCore
public DbSet<OneNETAccountInfos> OneNETAccountInfo { get; set; } public DbSet<OneNETAccountInfos> OneNETAccountInfo { get; set; }
public DbSet<OneNETProductInfos> OneNETProductInfo { get; set; } public DbSet<OneNETProductInfos> OneNETProductInfo { get; set; }
public DbSet<AuditLogExcelFile> AuditLogExcelFiles { get; set; }
public IoTDbContext(DbContextOptions<IoTDbContext> options) public IoTDbContext(DbContextOptions<IoTDbContext> options)
: base(options) : base(options)

2
src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTMigrationsDbContextFactory.cs
View File

@ -11,7 +11,7 @@ namespace JiShe.IoT.EntityFrameworkCore
var configuration = BuildConfiguration(); var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<IoTDbContext>() var builder = new DbContextOptionsBuilder<IoTDbContext>()
.UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion); .UseMySQL(configuration.GetConnectionString("Default"));
return new IoTDbContext(builder.Options); return new IoTDbContext(builder.Options);
} }

3804
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251205064351_InitialCreate.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2188
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251205064351_InitialCreate.cs
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff