XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
hang 2022-09-21 15:08:37 +08:00
parent 88afe4fd3b
commit f584a5927f
8 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.API/IRaCIS.Core.API.csproj
View File

@ -68,12 +68,12 @@
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" /> <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.6.0" /> <PackageReference Include="EasyCaching.InMemory" Version="1.6.1" />
<PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.6.0" /> <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.6.1" />
<PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.1.0" /> <PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.1.0" />
<PackageReference Include="Google.Protobuf" Version="3.21.5" /> <PackageReference Include="Google.Protobuf" Version="3.21.6" />
<PackageReference Include="Grpc.Net.Client" Version="2.47.0" /> <PackageReference Include="Grpc.Net.Client" Version="2.48.0" />
<PackageReference Include="Grpc.Tools" Version="2.47.0"> <PackageReference Include="Grpc.Tools" Version="2.48.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -81,10 +81,10 @@
<PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" /> <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
<PackageReference Include="LogDashboard" Version="1.4.8" /> <PackageReference Include="LogDashboard" Version="1.4.8" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" /> <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.8" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.9" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" /> <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" /> <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" />
<PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" /> <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />

20
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
View File

@ -64,7 +64,7 @@
<PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="8.0.0" /> <PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="BeetleX.BNR" Version="1.0.1" /> <PackageReference Include="BeetleX.BNR" Version="1.0.1" />
<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" /> <PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
<PackageReference Include="EasyCaching.Interceptor.AspectCore" Version="1.6.0" /> <PackageReference Include="EasyCaching.Interceptor.AspectCore" Version="1.6.1" />
<PackageReference Include="ExcelDataReader" Version="3.6.0" /> <PackageReference Include="ExcelDataReader" Version="3.6.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" /> <PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="fo-dicom.Codecs" Version="5.1.0"> <PackageReference Include="fo-dicom.Codecs" Version="5.1.0">
@ -72,7 +72,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="fo-dicom.Drawing" Version="4.0.8" /> <PackageReference Include="fo-dicom.Drawing" Version="4.0.8" />
<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" /> <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" />
<PackageReference Include="Hangfire" Version="1.7.30"> <PackageReference Include="Hangfire" Version="1.7.31">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="Magicodes.IE.Core" Version="2.6.4" /> <PackageReference Include="Magicodes.IE.Core" Version="2.6.4" />
@ -83,24 +83,24 @@
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.6.4" /> <PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.6.4" />
<PackageReference Include="MailKit" Version="3.3.0" /> <PackageReference Include="MailKit" Version="3.4.1" />
<PackageReference Include="MediatR" Version="10.0.1" /> <PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.8" /> <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8"> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="MimeKit" Version="3.3.0" /> <PackageReference Include="MimeKit" Version="3.4.1" />
<PackageReference Include="MiniExcel" Version="1.26.5" /> <PackageReference Include="MiniExcel" Version="1.28.0" />
<PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0"> <PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" /> <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="NPOI" Version="2.5.6" /> <PackageReference Include="NPOI" Version="2.5.6" />
<PackageReference Include="Panda.DynamicWebApi" Version="1.2.0" /> <PackageReference Include="Panda.DynamicWebApi" Version="1.2.0" />
<PackageReference Include="Quartz" Version="3.4.0" /> <PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" /> <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.4" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
<PackageReference Include="WinSCP" Version="5.21.2" /> <PackageReference Include="WinSCP" Version="5.21.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
View File

@ -48,7 +48,7 @@ namespace IRaCIS.Application.Contracts
public DicDataTypeEnum? DataTypeEnum { get; set; } public DicDataTypeEnum DataTypeEnum { get; set; }
//是配置的话，就有值 //是配置的话，就有值
public Guid? ConfigTypeId { get; set; } public Guid? ConfigTypeId { get; set; }

9
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -117,9 +117,16 @@ namespace IRaCIS.Application.Services
// return result; // return result;
// } // }
//} //}
//if (addOrEditBasic.Id != null )
//{
// await _dicRepository.BatchUpdateNoTrackingAsync(t => t.ParentId == addOrEditBasic.Id, c => new Dictionary() { DataTypeEnum = addOrEditBasic.DataTypeEnum });
//}
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1); var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1);
await _dicRepository.BatchUpdateNoTrackingAsync(t => t.ParentId == entity.Id, c => new Dictionary() { DataTypeEnum = entity.DataTypeEnum });
await _dicRepository.SaveChangesAsync(); await _dicRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());

4
IRaCIS.Core.Application/TestService.cs
View File

@ -25,7 +25,9 @@ namespace IRaCIS.Application.Services
[UnitOfWork] [UnitOfWork]
public async Task<string> Get() public async Task<string> Get()
{ {
//var a = ((Decimal)1.00).ToString().TrimEnd(new char[] { '.', '0' });
//var b = ((Decimal)1.01).ToString().TrimEnd(new char[] { '.', '0' });
//var c = ((Decimal)100).ToString().TrimEnd(new char[] { '.', '0' });
//var subject1 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391693"); //var subject1 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391693");
//var subject2 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391694"); //var subject2 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391694");

4
IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
View File

@ -11,8 +11,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EntityFrameworkCore.Projectables" Version="2.3.0" /> <PackageReference Include="EntityFrameworkCore.Projectables" Version="2.3.0" />
<PackageReference Include="EntityFrameworkCore.Projectables.Abstractions" Version="2.3.0" /> <PackageReference Include="EntityFrameworkCore.Projectables.Abstractions" Version="2.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" />
<PackageReference Include="NewId" Version="3.0.3" /> <PackageReference Include="NewId" Version="3.0.3" />
</ItemGroup> </ItemGroup>

2
IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
View File

@ -18,7 +18,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EFCore.BulkExtensions" Version="6.5.6" /> <PackageReference Include="EFCore.BulkExtensions" Version="6.5.6" />
<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="6.0.3" /> <PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="6.0.3.1" />
<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.1.0" /> <PackageReference Include="EntityFrameworkCore.Triggered" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />

8
IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
View File

@ -10,12 +10,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="11.0.1" /> <PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="CSRedisCore" Version="3.8.3" /> <PackageReference Include="CSRedisCore" Version="3.8.669" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
<PackageReference Include="SharpCompress" Version="0.32.2" /> <PackageReference Include="SharpCompress" Version="0.32.2" />
<PackageReference Include="SharpZipLib" Version="1.3.3" /> <PackageReference Include="SharpZipLib" Version="1.4.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.20" />
</ItemGroup> </ItemGroup>