ideship/itfx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master'

Browse Source 
# Conflicts:
#	src/InterfaceForward.Api/InterfaceForward.Api.csproj
#	src/InterfaceForward.Application/InterfaceForward.Application.csproj
#	src/InterfaceForward.Domain.Shared/InterfaceForward.Domain.Shared.csproj
#	src/InterfaceForward.Repositories/InterfaceForward.Repositories.csproj
This commit is contained in:
xiaolipro 2025-07-17 11:09:05 +08:00
commit 37f70a7ef0
14 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/InterfaceForward.Api/InterfaceForward.Api.csproj
View File

@ -10,7 +10,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\InterfaceForward.Application\InterfaceForward.Application.csproj" /> <ProjectReference Include="..\InterfaceForward.Application\InterfaceForward.Application.csproj" />
<ProjectReference Include="..\InterfaceForward.ServiceDefaults\InterfaceForward.ServiceDefaults.csproj"/> <ProjectReference Include="..\InterfaceForward.ServiceDefaults\InterfaceForward.ServiceDefaults.csproj"/>
<PackageReference Include="Fake.Autofac" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.Autofac" Version="8.0.0-preview10" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" /> <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" /> <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />

3
src/InterfaceForward.Api/appsettings.json
View File

@ -48,7 +48,8 @@
"HostName": "129.204.22.146", "HostName": "129.204.22.146",
"Port": 5672, "Port": 5672,
"UserName": "rabbit", "UserName": "rabbit",
"Password": "itd!@#123" "Password": "itd!@#123",
"DispatchConsumersAsync": true
} }
} }
}, },

20
src/InterfaceForward.Application.Contracts/Dtos/Interface/SaveParameterMapsInput.cs
View File

@ -2,19 +2,15 @@
public class SaveParameterMapsInput public class SaveParameterMapsInput
{ {
public SaveParameterMapsInput()
{
InParaMapList = new();
}
/// <summary> /// <summary>
/// 入参映射列表 /// 入参映射列表
/// </summary> /// </summary>
public List<MapItem> InParaMapList { get; set; } public List<MapItem> InParaMapList { get; set; } = new();
/// <summary> /// <summary>
/// 出参映射明细 /// 出参映射明细
/// </summary> /// </summary>
public List<InterfaceMapDetail> MapDetails { get; set; } public List<InterfaceMapDetail> MapDetails { get; set; } = new();
} }
public class MapItem public class MapItem
@ -32,12 +28,12 @@ public class MapItem
/// <summary> /// <summary>
/// 前置脚本 /// 前置脚本
/// </summary> /// </summary>
public string PrefixScript { get; set; } public string? PrefixScript { get; set; }
/// <summary> /// <summary>
/// 后置脚本 /// 后置脚本
/// </summary> /// </summary>
public string PostfixScript { get; set; } public string? PostfixScript { get; set; }
/// <summary> /// <summary>
/// 自由映射（支持不对等映射） /// 自由映射（支持不对等映射）
@ -47,7 +43,7 @@ public class MapItem
/// <summary> /// <summary>
/// 入参映射明细 /// 入参映射明细
/// </summary> /// </summary>
public List<InterfaceMapDetail> MapDetails { get; set; } public List<InterfaceMapDetail> MapDetails { get; set; } = new();
} }
public class InterfaceMapDetail public class InterfaceMapDetail
@ -60,17 +56,17 @@ public class InterfaceMapDetail
/// <summary> /// <summary>
/// 【固定参数专用】固定参数值 /// 【固定参数专用】固定参数值
/// </summary> /// </summary>
public string FixedValue { get; set; } public string? FixedValue { get; set; }
/// <summary> /// <summary>
/// 【固定参数专用】服务商参数别名 xxx.xxx /// 【固定参数专用】服务商参数别名 xxx.xxx
/// </summary> /// </summary>
public string Alias { get; set; } public string? Alias { get; set; }
///<summary> ///<summary>
/// 【固定参数专用】服务商参数描述 /// 【固定参数专用】服务商参数描述
///</summary> ///</summary>
public string Description { get; set; } public string? Description { get; set; }
/// <summary> /// <summary>
/// 是否必填 /// 是否必填

6
src/InterfaceForward.Application/InterfaceForward.Application.csproj
View File

@ -17,9 +17,9 @@
<PackageReference Include="DiffPlex" Version="1.7.2" /> <PackageReference Include="DiffPlex" Version="1.7.2" />
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" /> <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
<PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.2.2.1"/> <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.2.2.1"/>
<PackageReference Include="Fake.AspNetCore" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.AspNetCore" Version="8.0.0-preview10" />
<PackageReference Include="Fake.EventBus.RabbitMQ" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.EventBus.RabbitMQ" Version="8.0.0-preview10" />
<PackageReference Include="Fake.ObjectMapping.AutoMapper" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.ObjectMapping.AutoMapper" Version="8.0.0-preview10" />
<PackageReference Include="FreeRedis" Version="1.3.6" /> <PackageReference Include="FreeRedis" Version="1.3.6" />
</ItemGroup> </ItemGroup>

2
src/InterfaceForward.Application/Services/InterfaceMap/InterfaceMapPublishService.cs
View File

@ -57,7 +57,7 @@ public class InterfaceMapPublishService(
/// <returns></returns> /// <returns></returns>
[HttpGet("InterfaceMap/GetPublishCompare")] [HttpGet("InterfaceMap/GetPublishCompare")]
public async Task<InterfaceMapPublishedDifferenceVO> GetPublishCompareAsync([Required] string interfaceCode, public async Task<InterfaceMapPublishedDifferenceVO> GetPublishCompareAsync([Required] string interfaceCode,
[Required] int serviceProviderId, string version) [Required] int serviceProviderId, string? version)
{ {
var systemInterface = await interfaceForwardQuery.GetInterfaceByCodesAsync(interfaceCode); var systemInterface = await interfaceForwardQuery.GetInterfaceByCodesAsync(interfaceCode);
if (systemInterface == null) throw new BusinessException(message: "系统接口不存在"); if (systemInterface == null) throw new BusinessException(message: "系统接口不存在");

2
src/InterfaceForward.Application/Services/ServiceProvider/ServiceProviderService.cs
View File

@ -51,7 +51,7 @@ public class ServiceProviderService : ApplicationService
/// <returns></returns> /// <returns></returns>
[HttpGet("ServiceProvider/GetServiceProviderInterfaceCascadedList")] [HttpGet("ServiceProvider/GetServiceProviderInterfaceCascadedList")]
public async Task<List<ServiceProviderInterfaceCascadedObjectValue>> public async Task<List<ServiceProviderInterfaceCascadedObjectValue>>
GetServiceProviderInterfaceCascadedListAsync([Required] int interfaceId, string serviceProviderName) GetServiceProviderInterfaceCascadedListAsync([Required] int interfaceId, string? serviceProviderName)
{ {
return await _serviceProviderRepository.GetServiceProviderInterfaceCascadedListAsync(interfaceId, return await _serviceProviderRepository.GetServiceProviderInterfaceCascadedListAsync(interfaceId,
serviceProviderName); serviceProviderName);

2
src/InterfaceForward.Domain.Shared/InterfaceForward.Domain.Shared.csproj
View File

@ -11,6 +11,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Fake.DomainDrivenDesign" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.DomainDrivenDesign" Version="8.0.0-preview10" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/InterfaceForward.Domain.Shared/InterfaceForwardDomainSharedModule.cs
View File

@ -1,4 +1,5 @@
using Fake.Modularity; using Fake.DomainDrivenDesign;
using Fake.Modularity;
using InterfaceForward.Domain.Shared.Helpers; using InterfaceForward.Domain.Shared.Helpers;
using InterfaceForward.Domain.Shared.Options; using InterfaceForward.Domain.Shared.Options;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -6,6 +7,7 @@ using Microsoft.Extensions.DependencyInjection;
namespace InterfaceForward.Domain.Shared namespace InterfaceForward.Domain.Shared
{ {
[DependsOn(typeof(FakeDomainDrivenDesignModule))]
public class InterfaceForwardDomainSharedModule : FakeModule public class InterfaceForwardDomainSharedModule : FakeModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)

2
src/InterfaceForward.Repositories/Interface/ValueObjects/GetMapListInputVO.cs
View File

@ -8,5 +8,5 @@ public class GetMapListInputVO : PagedQueryInput
[Required] [Required]
public int InterfaceId { get; set; } public int InterfaceId { get; set; }
public string NameOrCode { get; set; } public string? NameOrCode { get; set; }
} }

2
src/InterfaceForward.Repositories/Interface/ValueObjects/SystemInterfacePaginatedInputObjectValue.cs
View File

@ -15,6 +15,6 @@ namespace InterfaceForward.Repositories.Interface.ValueObjects
///<summary> ///<summary>
/// 接口名 /// 接口名
///</summary> ///</summary>
public string NameOrCode { get; set; } public string? NameOrCode { get; set; }
} }
} }

2
src/InterfaceForward.Repositories/InterfaceForward.Repositories.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fake.SqlSugarCore" Version="8.0.0-preview.9" /> <PackageReference Include="Fake.SqlSugarCore" Version="8.0.0-preview10" />
<PackageReference Include="NEST" Version="7.17.5" /> <PackageReference Include="NEST" Version="7.17.5" />
</ItemGroup> </ItemGroup>

7
src/InterfaceForward.Repositories/InterfaceForwardDbContext.cs
View File

@ -24,4 +24,11 @@ public class InterfaceForwardDbContext:SugarDbContext<InterfaceForwardDbContext>
base.ConfigureEntityService(property, column); base.ConfigureEntityService(property, column);
} }
protected override void ConfigureGlobalFilters()
{
//需自定义扩展
SqlSugarClient.QueryFilter.AddTableFilter<ISoftDelete>(u =>
DataFilter.IsEnabled<ISoftDelete>() == false || !u.IsDeleted);
}
} }

2
src/InterfaceForward.Repositories/ServiceProvider/Services/IServiceProviderRepository.cs
View File

@ -22,7 +22,7 @@ namespace InterfaceForward.Repositories.ServiceProvider.Services
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<List<ServiceProviderInterfaceCascadedObjectValue>> GetServiceProviderInterfaceCascadedListAsync( Task<List<ServiceProviderInterfaceCascadedObjectValue>> GetServiceProviderInterfaceCascadedListAsync(
int interfaceId, string serviceProviderName); int interfaceId, string? serviceProviderName);
/// <summary> /// <summary>
/// 更新服务商 /// 更新服务商

2
src/InterfaceForward.Repositories/ServiceProvider/Services/ServiceProviderRepository.cs
View File

@ -46,7 +46,7 @@ public class ServiceProviderRepository : BasicRepository<ServiceProviderEntity>,
/// <inheritdoc /> /// <inheritdoc />
public async Task<List<ServiceProviderInterfaceCascadedObjectValue>> public async Task<List<ServiceProviderInterfaceCascadedObjectValue>>
GetServiceProviderInterfaceCascadedListAsync(int interfaceId, string serviceProviderName) GetServiceProviderInterfaceCascadedListAsync(int interfaceId, string? serviceProviderName)
{ {
var mappedIds = await Context.Queryable<InterfaceMapEntity>() var mappedIds = await Context.Queryable<InterfaceMapEntity>()
.LeftJoin<InterfaceEntity>((x, y) => x.DownStreamId == y.Id) .LeftJoin<InterfaceEntity>((x, y) => x.DownStreamId == y.Id)