Bpa.Software.Development
/
BPA.SaaS.Material.Api
7
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity

Compare commits

merge into: Bpa.Software.Development:master
Bpa.Software.Development:dev_1.0.1
Bpa.Software.Development:master
...
pull from: Bpa.Software.Development:dev_1.0.1
Bpa.Software.Development:dev_1.0.1
Bpa.Software.Development:master

5 Commits
master ... dev_1.0.1

Author SHA1 Message Date
  stevelee 79efc17019 解决包冲突 2 years ago
  stevelee 9492d4b720 升级引用包 2 years ago
  stevelee a3ea1a5a44 更新分页查询 2 years ago
  stevelee ffa0afac97 格式化 2 years ago
  stevelee 7b1247c60b 新建分支 2 years ago
10 changed files with 29 additions and 26 deletions
Unified View
Diff Options
Show Stats
  1. +2
    -2
      src/BPA.SaaS.Material.Api.Bootstrap/BPA.SaaS.Material.Api.Bootstrap.csproj
  2. +1
    -1
      src/BPA.SaaS.Material.Api.DTO/BPA.SaaS.Material.Api.DTO.csproj
  3. +4
    -2
      src/BPA.SaaS.Material.Api.DTO/UnitDtoQuery.cs
  4. +2
    -2
      src/BPA.SaaS.Material.Api.Entity/BPA.SaaS.Material.Api.Entity.csproj
  5. +1
    -1
      src/BPA.SaaS.Material.Api.Model/BPA.SaaS.Material.Api.Model.csproj
  6. +2
    -3
      src/BPA.SaaS.Material.Api.Repository/BPA.SaaS.Material.Api.Repository.csproj
  7. +1
    -1
      src/BPA.SaaS.Material.Api.SDK/BPA.SaaS.Material.Api.SDK.csproj
  8. +2
    -2
      src/BPA.SaaS.Material.Api.Service/BPA.SaaS.Material.Api.Service.csproj
  9. +13
    -11
      src/BPA.SaaS.Material.Api.WebApi/BPA.SaaS.Material.Api.WebApi.csproj
  10. +1
    -1
      src/BPA.SaaS.Material.Api.WebApi/Program.cs

+ 2
- 2
src/BPA.SaaS.Material.Api.Bootstrap/BPA.SaaS.Material.Api.Bootstrap.csproj View File

@@ -11,9 +11,9 @@
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.3" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
<PackageReference Include="BPA.Component.CAP.RabbitMQ" Version="1.0.2" /> <PackageReference Include="BPA.Component.CAP.RabbitMQ" Version="1.0.2" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="BPA.Component.Extensions" Version="1.0.4" /> <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
<PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.17" />
<PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.21" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" /> <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />


+ 1
- 1
src/BPA.SaaS.Material.Api.DTO/BPA.SaaS.Material.Api.DTO.csproj View File

@@ -8,7 +8,7 @@
<PackageReleaseNotes /> <PackageReleaseNotes />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="Nuget.Tools.V2" Version="1.1.7" /> <PackageReference Include="Nuget.Tools.V2" Version="1.1.7" />
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 4
- 2
src/BPA.SaaS.Material.Api.DTO/UnitDtoQuery.cs View File

@@ -1,6 +1,8 @@
namespace BPA.SaaS.Material.Api.DTO
using BPA.Component.DTOCommon;

namespace BPA.SaaS.Material.Api.DTO
{ {
public class UnitDtoQuery
public class UnitDtoQuery : PageInputBase
{ {
/// <summary> /// <summary>
/// TypeID /// TypeID


+ 2
- 2
src/BPA.SaaS.Material.Api.Entity/BPA.SaaS.Material.Api.Entity.csproj View File

@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.Common.Entity" Version="1.0.3" />
<PackageReference Include="BPA.Common.Enums" Version="1.0.6" />
<PackageReference Include="BPA.Common.Entity" Version="1.0.5" />
<PackageReference Include="BPA.Common.Enums" Version="1.0.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 1
- 1
src/BPA.SaaS.Material.Api.Model/BPA.SaaS.Material.Api.Model.csproj View File

@@ -13,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.Component.ApolloClient" Version="1.0.9" /> <PackageReference Include="BPA.Component.ApolloClient" Version="1.0.9" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="BPA.Component.LogClient" Version="1.0.3" /> <PackageReference Include="BPA.Component.LogClient" Version="1.0.3" />
<PackageReference Include="BPA.Component.MongoClient" Version="1.0.3" /> <PackageReference Include="BPA.Component.MongoClient" Version="1.0.3" />
<PackageReference Include="BPA.Component.RabbitMQClient" Version="1.0.7" /> <PackageReference Include="BPA.Component.RabbitMQClient" Version="1.0.7" />


+ 2
- 3
src/BPA.SaaS.Material.Api.Repository/BPA.SaaS.Material.Api.Repository.csproj View File

@@ -6,11 +6,10 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.Common.Eums" Version="1.0.7" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="BPA.Component.Extensions" Version="1.0.4" /> <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
<PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" /> <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
<PackageReference Include="BPA.Common.Entity" Version="1.0.3" />
<PackageReference Include="BPA.Common.Entity" Version="1.0.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" /> <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />


+ 1
- 1
src/BPA.SaaS.Material.Api.SDK/BPA.SaaS.Material.Api.SDK.csproj View File

@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.SaaS.Material.Api.DTO" Version="1.0.1" /> <PackageReference Include="BPA.SaaS.Material.Api.DTO" Version="1.0.1" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" /> <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
<PackageReference Include="Nuget.Tools.V2" Version="1.1.7" /> <PackageReference Include="Nuget.Tools.V2" Version="1.1.7" />
</ItemGroup> </ItemGroup>

+ 2
- 2
src/BPA.SaaS.Material.Api.Service/BPA.SaaS.Material.Api.Service.csproj View File

@@ -6,10 +6,10 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
<PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
<PackageReference Include="BPA.Component.Extensions" Version="1.0.4" /> <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
<PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" /> <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
<PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.17" />
<PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.21" />
<ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" /> <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />
<ProjectReference Include="..\BPA.SaaS.Material.Api.Model\BPA.SaaS.Material.Api.Model.csproj" /> <ProjectReference Include="..\BPA.SaaS.Material.Api.Model\BPA.SaaS.Material.Api.Model.csproj" />


+ 13
- 11
src/BPA.SaaS.Material.Api.WebApi/BPA.SaaS.Material.Api.WebApi.csproj View File

@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<ProjectReference Include="..\BPA.SaaS.Material.Api.IService\BPA.SaaS.Material.Api.IService.csproj" />
<ProjectReference Include="..\BPA.SaaS.Material.Api.Bootstrap\BPA.SaaS.Material.Api.Bootstrap.csproj" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.0.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BPA.SaaS.Material.Api.IService\BPA.SaaS.Material.Api.IService.csproj"/>
<ProjectReference Include="..\BPA.SaaS.Material.Api.Bootstrap\BPA.SaaS.Material.Api.Bootstrap.csproj"/>
</ItemGroup>
</Project> </Project>

+ 1
- 1
src/BPA.SaaS.Material.Api.WebApi/Program.cs View File

@@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Autofac.Extensions.DependencyInjection; using Autofac.Extensions.DependencyInjection;
using BPA.Component.WebApiExtensions.Extensions; using BPA.Component.WebApiExtensions.Extensions;
using BPA.SaaS.Material.Api.Bootstrap;
using BPA.SaaS.Material.Api.Bootstrap;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;


var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);


Write Preview
Loading…
Cancel
Save