Merge branch 'feature_定时抄读_23_CY' of https://310.jisheyun.com/daizan/JiShe.CollectBus into feature_定时抄读_23_CY
This commit is contained in:
ChenYi
commit
b6d2c7148d
42
Directory.Build.Microsoft.targets
Normal file
42
Directory.Build.Microsoft.targets
Normal file
@ -0,0 +1,42 @@
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
|
||||
<PackageReference Update="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0"/>
|
||||
|
||||
<PackageReference Update="Microsoft.Extensions.Hosting" Version="9.0.0" />
|
||||
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
|
||||
<PackageReference Update="Microsoft.Extensions.Http" Version="9.0.0"/>
|
||||
|
||||
<PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/>
|
||||
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
|
||||
<PackageReference Update="Microsoft.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.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
|
||||
<PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
|
||||
|
||||
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
|
||||
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
|
||||
|
||||
<PackageReference Update="Microsoft.Extensions.Logging" Version="9.0.0"/>
|
||||
|
||||
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
|
||||
|
||||
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="9.0.0"/>
|
||||
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0"/>
|
||||
|
||||
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
102
Directory.Build.Volo.targets
Normal file
102
Directory.Build.Volo.targets
Normal file
@ -0,0 +1,102 @@
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<PackageReference Update="Volo.Abp.Autofac" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Threading" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Json" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Json.Abstractions" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Validation" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AutoMapper" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Settings" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.ObjectMapping" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Caching" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BlobStoring" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BlobStoring.FileSystem" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TestBase" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Account.Web" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Swashbuckle" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Ddd.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Authorization" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Dapper" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Http.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.MongoDB" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs.MongoDB" Version="9.1.1" />
|
||||
<PackageReference Update="Volo.Abp.AuditLogging.MongoDB" Version="9.1.1" />
|
||||
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Account.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.ObjectExtending" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Emailing" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.Domain" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Core" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.EventBus" Version="9.1.1"/>
|
||||
<PackageReference Update="Volo.Abp.Localization" Version="9.1.1" />
|
||||
<PackageReference Update="Volo.Abp.DistributedLocking" Version="9.1.1" />
|
||||
<PackageReference Update="Volo.Abp.Ddd.Domain.Shared" Version="9.1.1" />
|
||||
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
154
Directory.Build.targets
Normal file
154
Directory.Build.targets
Normal file
@ -0,0 +1,154 @@
|
||||
<Project>
|
||||
|
||||
<Import Project="Directory.Build.Microsoft.targets"/>
|
||||
<Import Project="Directory.Build.Volo.targets"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Version>1.0.1</Version>
|
||||
<Description>JiShe Service Pro</Description>
|
||||
<NoWarn>$(NoWarn);CS1591;CS0436;NU1504</NoWarn>
|
||||
<ServiceProjectType>app</ServiceProjectType>
|
||||
<ImplicitUsings>true</ImplicitUsings>
|
||||
<Authors>湖南集社电子技术有限公司</Authors>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<PackageIcon>icon.png</PackageIcon>
|
||||
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath=""/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Ocelot 网关-->
|
||||
<PackageReference Update="Ocelot" Version="18.0.0"/>
|
||||
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
|
||||
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
|
||||
|
||||
<!--FreeRedis-->
|
||||
<PackageReference Update="FreeRedis" Version="1.3.7"/>
|
||||
<PackageReference Update="FreeRedis.DistributedCache" Version="1.3.7"/>
|
||||
|
||||
<!--FreeSql-->
|
||||
<PackageReference Update="FreeSql.Cloud" Version="2.0.1" />
|
||||
<PackageReference Update="FreeSql.Extensions.JsonMap" Version="3.5.206" />
|
||||
<PackageReference Update="FreeSql" Version="3.5.206"/>
|
||||
<PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.5.206"/>
|
||||
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.806"/>
|
||||
<PackageReference Update="FreeSql.Provider.SqlServer" Version="3.5.206" />
|
||||
|
||||
|
||||
<!-- 单元测试包-->
|
||||
<PackageReference Update="xunit" Version="2.9.2"/>
|
||||
<PackageReference Update="xunit.extensibility.execution" Version="2.9.2"/>
|
||||
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2"/>
|
||||
<PackageReference Update="NSubstitute" Version="5.1.0"/>
|
||||
<PackageReference Update="Shouldly" Version="4.2.1"/>
|
||||
<PackageReference Update="coverlet.collector" Version="6.0.0"/>
|
||||
<PackageReference Update="JunitXml.TestLogger" Version="3.0.134"/>
|
||||
<PackageReference Update="AutoFixture.Xunit2" Version="4.18.1"/>
|
||||
|
||||
<!-- Hangfire 后台任务-->
|
||||
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.3"/>
|
||||
|
||||
<!-- CAP 分布式事务-->
|
||||
<PackageReference Update="DotNetCore.CAP" Version="8.3.3"/>
|
||||
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="8.3.3"/>
|
||||
<PackageReference Update="DotNetCore.CAP.Mysql" Version="8.3.3"/>
|
||||
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="8.3.3"/>
|
||||
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="8.3.3"/>
|
||||
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
|
||||
|
||||
<!-- Swagger-->
|
||||
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1"/>
|
||||
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.8.1"/>
|
||||
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/>
|
||||
|
||||
<!-- Serilog 日志-->
|
||||
<PackageReference Update="Serilog" Version="4.0.2"/>
|
||||
<PackageReference Update="Serilog.Extensions.Logging" Version="8.0.0"/>
|
||||
<PackageReference Update="Serilog.Sinks.Async" Version="2.0.0"/>
|
||||
<PackageReference Update="Serilog.Sinks.File" Version="6.0.0"/>
|
||||
<PackageReference Update="Serilog.Sinks.Console" Version="6.0.0"/>
|
||||
<PackageReference Update="Serilog.AspNetCore" Version="8.0.2"/>
|
||||
<PackageReference Update="Serilog.Exceptions" Version="8.4.0"/>
|
||||
<PackageReference Update="Serilog.Settings.Configuration" Version="8.0.2"/>
|
||||
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/>
|
||||
|
||||
|
||||
|
||||
<!-- Magicodes 导入导出Excel-->
|
||||
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.4.5"/>
|
||||
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5"/>
|
||||
|
||||
<!-- MiniProfiler 查看接口耗时,sql耗时-->
|
||||
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.3.8"/>
|
||||
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.3.8"/>
|
||||
<PackageReference Update="MiniProfiler.Shared" Version="4.3.8"/>
|
||||
|
||||
<!-- Polly 重试机制-->
|
||||
<PackageReference Update="Polly" Version="8.5.2"/>
|
||||
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
|
||||
<PackageReference Include="Polly.Core" Version="8.5.2" />
|
||||
|
||||
<!-- Octokit 邮件-->
|
||||
<PackageReference Update="Octokit" Version="14.0.0"/>
|
||||
|
||||
<!-- Humanizer 中文格式包-->
|
||||
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
|
||||
|
||||
<!-- NEST ElasticSearch-->
|
||||
<PackageReference Update="NEST" Version="7.17.5"/>
|
||||
|
||||
<PackageReference Update="WebApiClientCore" Version="2.1.5" />
|
||||
|
||||
<!-- redis分布式锁-->
|
||||
<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" />
|
||||
|
||||
|
||||
<!--Flurl-->
|
||||
<PackageReference Update="Flurl.Http" Version="4.0.2" />
|
||||
<PackageReference Update="Mapster" Version="7.4.0" />
|
||||
|
||||
<!--Apache.IoTDB-->
|
||||
<PackageReference Update="Apache.IoTDB" Version="2.0.2" />
|
||||
|
||||
<!--Kafka-->
|
||||
<PackageReference Update="Confluent.Kafka" Version="2.9.0" />
|
||||
<!--MongoDB-->
|
||||
<PackageReference Update="MongoDB.Bson" Version="2.22.0" />
|
||||
<!--Cassandra-->
|
||||
<PackageReference Update="CassandraCSharpDriver" Version="3.22.0" />
|
||||
|
||||
<!--其他-->
|
||||
<PackageReference Update="BenchmarkDotNet" Version="0.15.0" />
|
||||
<PackageReference Update="System.Linq.Dynamic.Core" Version="1.6.4" />
|
||||
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
|
||||
<PackageReference Update="System.Text.Json" Version="9.0.0" />
|
||||
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Update="Swashbuckle.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="7.0.0" />
|
||||
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.4" />
|
||||
|
||||
<!--HealthChecks-->
|
||||
<PackageReference Update="AspNetCore.HealthChecks.Kafka" Version="9.0.0" />
|
||||
<PackageReference Update="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
|
||||
<PackageReference Update="AspNetCore.HealthChecks.UI" Version="9.0.0" />
|
||||
<PackageReference Update="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
|
||||
<PackageReference Update="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
|
||||
|
||||
<!--TouchSocket-->
|
||||
<PackageReference Update="TouchSocket" Version="3.1.5" />
|
||||
<PackageReference Update="TouchSocket.Hosting" Version="3.1.5" />
|
||||
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -12,8 +12,8 @@
|
||||
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Shared\JiShe.CollectBus.Analyzers.Shared.csproj" />
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CassandraCSharpDriver" Version="3.22.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.3" />
|
||||
<PackageReference Include="CassandraCSharpDriver" />
|
||||
<PackageReference Include="Microsoft.Extensions.Options" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain"/>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FreeRedis" Version="1.3.6" />
|
||||
<PackageReference Include="Volo.Abp" Version="8.3.3" />
|
||||
<PackageReference Include="FreeRedis" />
|
||||
<PackageReference Include="Volo.Abp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FreeSql.Cloud" Version="1.9.1" />
|
||||
<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.5.102" />
|
||||
<PackageReference Include="Volo.Abp" Version="8.3.3" />
|
||||
<PackageReference Include="FreeSql.Cloud" />
|
||||
<PackageReference Include="FreeSql.Provider.SqlServer" />
|
||||
<PackageReference Include="Volo.Abp" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.0.1</AssemblyVersion>
|
||||
@ -9,8 +9,8 @@
|
||||
<Version>1.0.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Apache.IoTDB" Version="2.0.2" />
|
||||
<PackageReference Include="Volo.Abp" Version="8.3.3" />
|
||||
<PackageReference Include="Apache.IoTDB" />
|
||||
<PackageReference Include="Volo.Abp"/>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
@ -16,14 +16,14 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.3.25171.5" />
|
||||
<PackageReference Include="Serilog" Version="4.2.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.1" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="BenchmarkDotNet"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
|
||||
<PackageReference Include="Serilog" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" />
|
||||
<PackageReference Include="Serilog.Sinks.File" />
|
||||
<PackageReference Include="Volo.Abp.Core"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -19,7 +19,7 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace JiShe.CollectBus.Kafka.Test
|
||||
{
|
||||
[SimpleJob(RuntimeMoniker.Net80)]
|
||||
[SimpleJob(RuntimeMoniker.Net90)]
|
||||
//[SimpleJob(RuntimeMoniker.NativeAot80)]
|
||||
[RPlotExporter]
|
||||
public class KafkaProduceBenchmark
|
||||
|
||||
17
modules/JiShe.CollectBus.Kafka.Test/TestService.cs
Normal file
17
modules/JiShe.CollectBus.Kafka.Test/TestService.cs
Normal file
@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace JiShe.CollectBus.Kafka.Test
|
||||
{
|
||||
public class TestService
|
||||
{
|
||||
|
||||
public void Test()
|
||||
{
|
||||
Console.WriteLine("测试动态注入");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.0.1</AssemblyVersion>
|
||||
@ -10,11 +10,11 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Confluent.Kafka" Version="2.9.0" />
|
||||
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
|
||||
<PackageReference Include="Polly.Core" Version="8.5.2" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Confluent.Kafka" />
|
||||
<PackageReference Include="Polly.Contrib.WaitAndRetry" />
|
||||
<PackageReference Include="Polly.Core" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" />
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
</PropertyGroup>
|
||||
@ -12,11 +12,11 @@
|
||||
<None Remove="FodyWeavers.xml" />
|
||||
<None Remove="JiShe.CollectBus.MongoDB.abppkg" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.MongoDB" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundJobs.MongoDB" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.MongoDB" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundJobs.MongoDB" />
|
||||
<PackageReference Include="Volo.Abp.AuditLogging.MongoDB" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
<ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
<PackageReference Include="Volo.Abp.Core"/>
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
<PackageReference Include="Volo.Abp.Core"/>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<BaseOutputPath></BaseOutputPath>
|
||||
@ -10,8 +10,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<BaseOutputPath></BaseOutputPath>
|
||||
@ -10,8 +10,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
using JiShe.CollectBus.Protocol.Interfaces;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System.Reflection;
|
||||
using Volo.Abp;
|
||||
using Volo.Abp.Modularity;
|
||||
|
||||
|
||||
27
protocols/JiShe.CollectBus.Protocol.Test/TestServer.cs
Normal file
27
protocols/JiShe.CollectBus.Protocol.Test/TestServer.cs
Normal file
@ -0,0 +1,27 @@
|
||||
using JiShe.CollectBus.Protocol.Interfaces;
|
||||
using JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace JiShe.CollectBus.Protocol.Test
|
||||
{
|
||||
public class TestServer: IAnalysisStrategy<string>
|
||||
{
|
||||
private readonly ILogger<TestServer> _logger;
|
||||
public TestServer (ILogger<TestServer> logger)
|
||||
{
|
||||
_logger= logger;
|
||||
}
|
||||
|
||||
public Task<bool> ExecuteAsync(string input, Action<dynamic>? result = null)
|
||||
{
|
||||
_logger.LogWarning("测试插件动态加载");
|
||||
return Task.FromResult(true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
@ -18,8 +18,9 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
|
||||
<PackageReference Include="TouchSocket" Version="3.1.2" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions"/>
|
||||
<PackageReference Include="TouchSocket" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -21,8 +21,9 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" />
|
||||
<PackageReference Include="Volo.Abp.Authorization" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj" />
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
|
||||
|
||||
@ -57,6 +57,7 @@ public class CollectBusApplicationModule : AbpModule
|
||||
var any = methods.Any(a => a.GetCustomAttribute<LogInterceptAttribute>() != null);
|
||||
if (any) ctx.Interceptors.TryAdd<LogInterceptor>();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public override async Task OnApplicationInitializationAsync(
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -15,12 +15,13 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.3" />
|
||||
<PackageReference Include="TouchSocket" Version="3.1.2" />
|
||||
<PackageReference Include="TouchSocket.Hosting" Version="3.1.2" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
<PackageReference Include="Volo.Abp.AutoMapper" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" />
|
||||
<PackageReference Include="TouchSocket" />
|
||||
<PackageReference Include="TouchSocket.Hosting" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
|
||||
<ProjectReference Include="..\..\protocols\JiShe.CollectBus.Protocol\JiShe.CollectBus.Protocol.csproj" />
|
||||
|
||||
|
||||
@ -1,17 +1,24 @@
|
||||
using JiShe.CollectBus.Common.Enums;
|
||||
using IdentityModel.Client;
|
||||
using JiShe.CollectBus.Common.Enums;
|
||||
using JiShe.CollectBus.DynamicModule;
|
||||
using JiShe.CollectBus.Interceptors;
|
||||
using JiShe.CollectBus.IotSystems.MessageIssueds;
|
||||
using JiShe.CollectBus.IotSystems.Protocols;
|
||||
using JiShe.CollectBus.Protocol;
|
||||
using JiShe.CollectBus.Protocol.Interfaces;
|
||||
using JiShe.CollectBus.Protocol3761;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Sockets;
|
||||
using Volo.Abp;
|
||||
using Volo.Abp.Modularity;
|
||||
|
||||
namespace JiShe.CollectBus.Samples;
|
||||
@ -25,13 +32,13 @@ public class TestAppService : CollectBusAppService
|
||||
private readonly IProtocolService _protocolService;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
private readonly IDynamicModuleManager _dynamicModuleManager;
|
||||
|
||||
private readonly IServiceCollection _serviceDescriptors;
|
||||
|
||||
public TestAppService(
|
||||
ILogger<TestAppService> logger,
|
||||
//ICassandraRepository<MessageIssued, string> messageReceivedCassandraRepository,
|
||||
//ICassandraProvider cassandraProvider,
|
||||
IProtocolService protocolService,IServiceProvider serviceProvider, IDynamicModuleManager dynamicModuleManager)
|
||||
IProtocolService protocolService,IServiceProvider serviceProvider, IDynamicModuleManager dynamicModuleManager, IServiceCollection serviceDescriptors)
|
||||
{
|
||||
_logger = logger;
|
||||
//_messageReceivedCassandraRepository = messageReceivedCassandraRepository;
|
||||
@ -39,6 +46,7 @@ public class TestAppService : CollectBusAppService
|
||||
_protocolService = protocolService;
|
||||
_serviceProvider = serviceProvider;
|
||||
_dynamicModuleManager = dynamicModuleManager;
|
||||
_serviceDescriptors = serviceDescriptors;
|
||||
}
|
||||
public async Task AddMessageOfCassandra()
|
||||
{
|
||||
@ -135,8 +143,76 @@ public class TestAppService : CollectBusAppService
|
||||
public async Task ReloadPluginsAsync()
|
||||
{
|
||||
var aa = Assembly.LoadFile(
|
||||
@"D:\Codes\CollectBusV5\JiShe.CollectBus\web\JiShe.CollectBus.Host\bin\Debug\net8.0\Plugins\JiShe.CollectBus.Protocol.Test.dll");
|
||||
@"E:\Devlopment\JiShe.CollectBusDev01\web\JiShe.CollectBus.Host\bin\Debug\net8.0\Plugins\JiShe.CollectBus.Protocol.Test.dll");
|
||||
var module = aa.GetTypes().First(a=> typeof(IAbpModule).IsAssignableFrom(a));
|
||||
await _dynamicModuleManager.ReinitializeModuleAsync(module);
|
||||
await _dynamicModuleManager.LoadModuleAsync(module);
|
||||
}
|
||||
|
||||
|
||||
public async Task<bool> TestPlugins()
|
||||
{
|
||||
var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
|
||||
return await executor.ExecuteAsync<string>("TestServer", "TestServer");
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 注册策略
|
||||
/// </summary>
|
||||
public void RegisterProtocolAnalysis()
|
||||
{
|
||||
// 扫描并注册所有策略
|
||||
var strategyMetadata = new Dictionary<(string, Type), Type>();
|
||||
_serviceDescriptors.AddTransient<AnalysisStrategyContext>();
|
||||
|
||||
// 批量注册
|
||||
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
|
||||
if (string.IsNullOrWhiteSpace(assemblyPath))
|
||||
{
|
||||
return;
|
||||
}
|
||||
var dllFiles = Directory.GetFiles(Path.Combine(assemblyPath, "Plugins"), "*.dll");
|
||||
foreach (var file in dllFiles)
|
||||
{
|
||||
// 跳过已加载的程序集
|
||||
var assemblyName = AssemblyName.GetAssemblyName(file);
|
||||
var existingAssembly = AppDomain.CurrentDomain.GetAssemblies()
|
||||
.FirstOrDefault(a => a.GetName().FullName == assemblyName.FullName);
|
||||
var assembly = existingAssembly ?? Assembly.LoadFrom(file);
|
||||
// 实现IAnalysisStrategy接口
|
||||
var analysisStrategyTypes = assembly.GetTypes().Where(t => !t.IsAbstract && !t.IsInterface && t.GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IAnalysisStrategy<>)));
|
||||
if (!analysisStrategyTypes.Any())
|
||||
continue;
|
||||
foreach (var analysisStrategyType in analysisStrategyTypes)
|
||||
{
|
||||
// 通过反射获取静态元数据
|
||||
var strategyType = analysisStrategyType.Name;
|
||||
var genericArgs = analysisStrategyType.GetInterface($"IAnalysisStrategy`1")!.GetGenericArguments();
|
||||
var inputType = genericArgs[0];
|
||||
// 注册策略实现
|
||||
_serviceDescriptors.AddTransient(analysisStrategyType);
|
||||
strategyMetadata[(strategyType, inputType)] = analysisStrategyType;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// 注册元数据字典
|
||||
_serviceDescriptors.AddSingleton(strategyMetadata);
|
||||
|
||||
// 注册策略解析工厂
|
||||
_serviceDescriptors.AddTransient<Func<string, Type, object?>>(provider => (name, inputType) =>
|
||||
{
|
||||
var metadata = provider.GetRequiredService<Dictionary<(string, Type), Type>>();
|
||||
if (metadata.TryGetValue((name, inputType), out var strategyType))
|
||||
{
|
||||
return provider.GetRequiredService(strategyType);
|
||||
}
|
||||
else
|
||||
{
|
||||
var logger = provider.GetRequiredService<ILogger<AnalysisStrategyContext>>();
|
||||
logger.LogWarning($"未能找到解析策略：{name}-{inputType}");
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,20 +4,21 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" />
|
||||
<PackageReference Include="Serilog.Sinks.File" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Autofac"/>
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
</PropertyGroup>
|
||||
@ -30,11 +30,11 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MongoDB.Bson" Version="2.22.0" />
|
||||
<PackageReference Include="Volo.Abp.Emailing" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Caching" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="8.3.3" />
|
||||
<PackageReference Include="MongoDB.Bson" />
|
||||
<PackageReference Include="Volo.Abp.Emailing" />
|
||||
<PackageReference Include="Volo.Abp.Caching" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain"/>
|
||||
<PackageReference Include="Volo.Abp.AuditLogging.Domain" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus.Migration</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -21,8 +21,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts"/>
|
||||
<PackageReference Include="Volo.Abp.Authorization" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus.Migration</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -15,13 +15,14 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.3" />
|
||||
<PackageReference Include="TouchSocket" Version="3.1.2" />
|
||||
<PackageReference Include="TouchSocket.Hosting" Version="3.1.2" />
|
||||
<PackageReference Include="Volo.Abp.EventBus.Kafka" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
<PackageReference Include="Volo.Abp.AutoMapper" />
|
||||
<PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" />
|
||||
<PackageReference Include="TouchSocket"/>
|
||||
<PackageReference Include="TouchSocket.Hosting" />
|
||||
<PackageReference Include="Volo.Abp.EventBus.Kafka" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
<ProjectReference Include="..\..\modules\JiShe.CollectBus.FreeRedis\JiShe.CollectBus.FreeRedis.csproj" />
|
||||
<ProjectReference Include="..\..\modules\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj" />
|
||||
<ProjectReference Include="..\..\modules\JiShe.CollectBus.IoTDB\JiShe.CollectBus.IoTDB.csproj" />
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<RootNamespace>JiShe.CollectBusEPO</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" />
|
||||
<PackageReference Include="Volo.Abp.Authorization" />
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||
<ProjectReference Include="..\..\shared\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj" />
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<RootNamespace>JiShe.CollectBusEPO</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Application" />
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj" />
|
||||
<ProjectReference Include="..\..\modules\JiShe.CollectBus.FreeRedis\JiShe.CollectBus.FreeRedis.csproj" />
|
||||
<ProjectReference Include="..\..\modules\JiShe.CollectBus.Kafka\JiShe.CollectBus.Kafka.csproj" />
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
@ -16,20 +16,20 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
|
||||
<PackageReference Include="Mapster" Version="7.4.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Serilog" Version="4.1.0" />
|
||||
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.4" />
|
||||
<PackageReference Include="System.Text.Json" Version="8.0.5" />
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.3" />
|
||||
<PackageReference Include="JetBrains.Annotations" />
|
||||
<PackageReference Include="Mapster"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" />
|
||||
<PackageReference Include="Newtonsoft.Json"/>
|
||||
<PackageReference Include="Serilog" />
|
||||
<PackageReference Include="System.Linq.Dynamic.Core"/>
|
||||
<PackageReference Include="System.Text.Json" />
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -6,7 +6,9 @@ using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using Volo.Abp;
|
||||
using Volo.Abp.DependencyInjection;
|
||||
using Volo.Abp.Logging;
|
||||
using Volo.Abp.Modularity;
|
||||
using Volo.Abp.Modularity.PlugIns;
|
||||
|
||||
namespace JiShe.CollectBus.DynamicModule
|
||||
{
|
||||
@ -17,13 +19,22 @@ namespace JiShe.CollectBus.DynamicModule
|
||||
{
|
||||
private readonly IModuleContainer _moduleContainer;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
//private readonly IModuleLoader _moduleLoader;
|
||||
//private readonly IAbpApplicationWithInternalServiceProvider _abpApplicationWithInternalServiceProvider;
|
||||
|
||||
//private readonly IServiceCollection _services;
|
||||
public DynamicModuleManager(
|
||||
IModuleContainer moduleContainer,
|
||||
IServiceProvider serviceProvider)
|
||||
IServiceProvider serviceProvider
|
||||
//IModuleLoader moduleLoader,
|
||||
//IServiceCollection services, IAbpApplicationWithInternalServiceProvider abpApplicationWithInternalServiceProvider
|
||||
)
|
||||
{
|
||||
_moduleContainer = moduleContainer;
|
||||
_serviceProvider = serviceProvider;
|
||||
//_moduleLoader = moduleLoader;
|
||||
//_services = services;
|
||||
//_abpApplicationWithInternalServiceProvider= abpApplicationWithInternalServiceProvider;
|
||||
}
|
||||
|
||||
public Type[] GetRegisteredModuleTypes()
|
||||
@ -31,6 +42,21 @@ namespace JiShe.CollectBus.DynamicModule
|
||||
return _moduleContainer.Modules.Select(m => m.Type).ToArray();
|
||||
}
|
||||
|
||||
public async Task LoadModuleAsync(Type moduleType)
|
||||
{
|
||||
if (!typeof(IAbpModule).IsAssignableFrom(moduleType))
|
||||
{
|
||||
throw new ArgumentException($"指定的类型 {moduleType.FullName} 不是有效的ABP模块类型", nameof(moduleType));
|
||||
}
|
||||
//var modules = _moduleLoader.LoadModules(_services, moduleType, new PlugInSourceList());
|
||||
using (var application = AbpApplicationFactory.Create(moduleType))
|
||||
{
|
||||
await application.InitializeAsync();
|
||||
}
|
||||
|
||||
//await _abpApplicationWithInternalServiceProvider.InitializeAsync();
|
||||
}
|
||||
|
||||
public async Task ReinitializeModuleAsync(Type moduleType)
|
||||
{
|
||||
if (!typeof(IAbpModule).IsAssignableFrom(moduleType))
|
||||
|
||||
@ -41,5 +41,7 @@ namespace JiShe.CollectBus.DynamicModule
|
||||
/// <param name="moduleName">模块名称</param>
|
||||
/// <returns>模块类型，如果找不到则为null</returns>
|
||||
Type GetModuleTypeByName(string moduleName);
|
||||
|
||||
Task LoadModuleAsync(Type moduleType);
|
||||
}
|
||||
}
|
||||
@ -1,21 +1,21 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Validation" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
<PackageReference Include="Volo.Abp.Validation"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -31,6 +31,11 @@
|
||||
<None Remove="JiShe.CollectBus.Domain.Shared.abppkg" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -24,31 +24,31 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Kafka" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Redis" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
|
||||
|
||||
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
|
||||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.0.0" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
|
||||
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.3" />
|
||||
<PackageReference Include="Hangfire.Redis.StackExchange" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis"/>
|
||||
<PackageReference Include="Serilog" />
|
||||
<PackageReference Include="Serilog.AspNetCore"/>
|
||||
<PackageReference Include="Serilog.Exceptions" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" />
|
||||
<PackageReference Include="Serilog.Sinks.File" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
<PackageReference Include="Volo.Abp.Ddd.Domain.Shared" />
|
||||
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -15,7 +15,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
<ProjectReference Include="..\..\services\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj" />
|
||||
<ProjectReference Include="..\..\services\JiShe.CollectBus.Application\JiShe.CollectBus.Application.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -20,33 +20,33 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Kafka" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.Redis" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
|
||||
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
|
||||
|
||||
<!--<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />-->
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
|
||||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.0.0" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis"/>
|
||||
<PackageReference Include="Serilog" />
|
||||
<PackageReference Include="Serilog.AspNetCore" />
|
||||
<PackageReference Include="Serilog.Exceptions" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" />
|
||||
<PackageReference Include="Serilog.Sinks.File"/>
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
|
||||
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" />
|
||||
|
||||
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Core" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<Import Project="..\..\common.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>JiShe.CollectBus</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
@ -15,7 +15,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<RootNamespace>JiShe.CollectBusEPO</RootNamespace>
|
||||
<PreserveCompilationReferences>true</PreserveCompilationReferences>
|
||||
<UserSecretsId>JiShe.MicroService-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
|
||||
@ -10,22 +10,22 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
|
||||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
|
||||
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.0.0" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.3" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis"/>
|
||||
<PackageReference Include="Serilog" />
|
||||
<PackageReference Include="Serilog.AspNetCore" />
|
||||
<PackageReference Include="Serilog.Exceptions" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" />
|
||||
<PackageReference Include="Serilog.Sinks.Async"/>
|
||||
<PackageReference Include="Serilog.Sinks.Console" />
|
||||
<PackageReference Include="Serilog.Sinks.File" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer"/>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" />
|
||||
<PackageReference Include="Volo.Abp.Autofac" />
|
||||
<PackageReference Include="Volo.Abp.Swashbuckle" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<RootNamespace>JiShe.CollectBusEPO</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
|
||||
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user