Commit 41ab4bd7 by pengjinyang

提交

parent c52c0aa5
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyNetQ" Version="3.5.2" />
<PackageReference Include="sqlSugarCore" Version="4.9.9.10" /> <PackageReference Include="sqlSugarCore" Version="4.9.9.10" />
</ItemGroup> </ItemGroup>
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyNetQ" Version="3.5.2" /> <PackageReference Include="EasyNetQ" Version="3.5.2" />
<PackageReference Include="EasyNetQ.DI.Microsoft" Version="3.5.1" />
<PackageReference Include="Hangfire.Core" Version="1.7.3" /> <PackageReference Include="Hangfire.Core" Version="1.7.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
</ItemGroup> </ItemGroup>
...@@ -14,7 +13,6 @@ ...@@ -14,7 +13,6 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" /> <ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\IService\IService.csproj" /> <ProjectReference Include="..\IService\IService.csproj" />
<ProjectReference Include="..\MessageQueue\MessageQueue.csproj" />
<ProjectReference Include="..\Message\Message.csproj" /> <ProjectReference Include="..\Message\Message.csproj" />
</ItemGroup> </ItemGroup>
......
...@@ -17,6 +17,7 @@ namespace TakeStock.Subscriber ...@@ -17,6 +17,7 @@ namespace TakeStock.Subscriber
try try
{ {
Init(); Init();
//111.230.164.154
var connStr = "host=owms-rabbitmq:5672;username=bailun;password=1234abcd;prefetchcount=2;publisherConfirms=true;timeout=10"; var connStr = "host=owms-rabbitmq:5672;username=bailun;password=1234abcd;prefetchcount=2;publisherConfirms=true;timeout=10";
var bus = RabbitHutch.CreateBus(connStr); var bus = RabbitHutch.CreateBus(connStr);
bus.SubscribeAsync<CreateTakeStockMessage>("Create", async message => await Exec(message) bus.SubscribeAsync<CreateTakeStockMessage>("Create", async message => await Exec(message)
...@@ -56,7 +57,8 @@ namespace TakeStock.Subscriber ...@@ -56,7 +57,8 @@ namespace TakeStock.Subscriber
services.AddHttpClient("TakeStock", c => services.AddHttpClient("TakeStock", c =>
{ {
c.Timeout = TimeSpan.FromSeconds(30); c.Timeout = TimeSpan.FromSeconds(30);
c.BaseAddress = new Uri("http://193.112.230.53:5002/api/"); //193.112.230.53
c.BaseAddress = new Uri("http://wms-takestock-api:5002/api/");
}); });
serviceProvider = services.BuildServiceProvider(); serviceProvider = services.BuildServiceProvider();
......
using Hangfire; using Hangfire;
using Hangfire.MySql; using Hangfire.MySql;
using IService.TakeStock; using IService.TakeStock;
using MessageQueue;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
...@@ -35,7 +34,7 @@ namespace TakeStock.Web ...@@ -35,7 +34,7 @@ namespace TakeStock.Web
RegisterHttpClient(services); RegisterHttpClient(services);
services.AddScoped<RabbitMQClient>(); //services.AddScoped<RabbitMQClient>();
services.AddScoped<ITakeStockService, TakeStockService>(); services.AddScoped<ITakeStockService, TakeStockService>();
// Add Hangfire services. // Add Hangfire services.
......
...@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakeStock.Subscriber", "Tak ...@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakeStock.Subscriber", "Tak
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Message", "Message\Message.csproj", "{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Message", "Message\Message.csproj", "{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}"
EndProject EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{64D69277-72E8-4F9C-8AE6-654AFA7B9471}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -87,10 +85,6 @@ Global ...@@ -87,10 +85,6 @@ Global
{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Release|Any CPU.Build.0 = Release|Any CPU {44038020-A9C7-4A6D-BE1C-8A58E0E539B5}.Release|Any CPU.Build.0 = Release|Any CPU
{64D69277-72E8-4F9C-8AE6-654AFA7B9471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64D69277-72E8-4F9C-8AE6-654AFA7B9471}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64D69277-72E8-4F9C-8AE6-654AFA7B9471}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64D69277-72E8-4F9C-8AE6-654AFA7B9471}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment