提交

Domain/Domain.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyNetQ" Version="3.5.2" />
     <PackageReference Include="sqlSugarCore" Version="4.9.9.10" />
   </ItemGroup>
 

Service/Service.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <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="Microsoft.Extensions.Http" Version="2.2.0" />
   </ItemGroup>
@@ -14,7 +13,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
     <ProjectReference Include="..\IService\IService.csproj" />
-    <ProjectReference Include="..\MessageQueue\MessageQueue.csproj" />
     <ProjectReference Include="..\Message\Message.csproj" />
   </ItemGroup>
 

TakeStock.Subscriber/Program.cs

@@ -17,7 +17,8 @@ namespace TakeStock.Subscriber
             try
             {
                 Init();
-                var connStr = "host=owms-rabbitmq:5672;username=bailun;password=1234abcd;prefetchcount=2;publisherConfirms=true;timeout=10";
+                //111.230.164.154
+                var connStr = "host=owms-rabbitmq:5672;username=bailun;password=1234abcd;prefetchcount=2;publisherConfirms=true;timeout=10"; 
                 var bus = RabbitHutch.CreateBus(connStr);
                 bus.SubscribeAsync<CreateTakeStockMessage>("Create", async message => await Exec(message)
                 .ContinueWith(task =>
@@ -56,7 +57,8 @@ namespace TakeStock.Subscriber
             services.AddHttpClient("TakeStock", c =>
             {
                 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();

TakeStock.Web/Startup.cs

 using Hangfire;
 using Hangfire.MySql;
 using IService.TakeStock;
-using MessageQueue;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -35,7 +34,7 @@ namespace TakeStock.Web
 
             RegisterHttpClient(services);
 
-            services.AddScoped<RabbitMQClient>();
+            //services.AddScoped<RabbitMQClient>();
             services.AddScoped<ITakeStockService, TakeStockService>();
 
             // Add Hangfire services.
@@ -70,7 +69,7 @@ namespace TakeStock.Web
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             //new DbContext().Migration();
-            
+
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();

TakeStock.sln

@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakeStock.Subscriber", "Tak
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Message", "Message\Message.csproj", "{44038020-A9C7-4A6D-BE1C-8A58E0E539B5}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{64D69277-72E8-4F9C-8AE6-654AFA7B9471}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -87,10 +85,6 @@ Global
 		{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.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
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE