lms.sample与CAP框架整合

liuhll · liuhll · commit 395e278f9904 · 2021-07-07T14:32:39.000+08:00
diff --git a/samples/docker-compose/infrastr/docker-compose.rabbitmq.yml b/samples/docker-compose/infrastr/docker-compose.rabbitmq.yml
@@ -0,0 +1,21 @@
+version: "3.7"
+
+services:
+  lms.rabbitmq:
+    image: rabbitmq:management
+    restart: always
+    environment:
+      RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
+      RABBITMQ_DEFAULT_USER: "rabbitmq"
+      RABBITMQ_DEFAULT_PASS: "rabbitmq"
+      RABBITMQ_DEFAULT_VHOST: "/"
+    ports:
+      - "15672:15672"
+      - "5672:5672"
+    networks:
+      - lms_service_net
+
+networks:
+  lms_service_net:
+    external:
+      name: lms_service_net
diff --git a/samples/docker-compose/infrastr/docker-compose.redis.yml b/samples/docker-compose/infrastr/docker-compose.redis.yml
@@ -9,6 +9,6 @@ services:
     networks:
       - lms_service_net
 networks:
-  lms_test_service_net:
+  lms_service_net:
     external:
       name: lms_service_net
diff --git a/samples/microservices/account/Lms.Account.Application/Accounts/AccountAppService.cs b/samples/microservices/account/Lms.Account.Application/Accounts/AccountAppService.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Threading.Tasks;
+using DotNetCore.CAP;
 using Lms.Account.Application.Contracts.Accounts;
 using Lms.Account.Application.Contracts.Accounts.Dtos;
 using Lms.Account.Domain.Accounts;
@@ -8,20 +10,23 @@
 
 namespace Lms.Account.Application.Accounts
 {
-    public class AccountAppService : IAccountAppService
+    public class AccountAppService : IAccountAppService, ICapSubscribe
     {
         private readonly IAccountDomainService _accountDomainService;
-
-        public AccountAppService(IAccountDomainService accountDomainService)
+        private readonly ICapPublisher _capBus;
+        public AccountAppService(IAccountDomainService accountDomainService, ICapPublisher capBus)
         {
             _accountDomainService = accountDomainService;
+            _capBus = capBus;
         }
 
         public async Task<GetAccountOutput> Create(CreateAccountInput input)
         {
+           
             var account = input.MapTo<Domain.Accounts.Account>();
             account = await _accountDomainService.Create(account);
-            return account.MapTo<GetAccountOutput>();
+            await _capBus.PublishAsync("account.create.time", DateTime.Now);
+             return account.MapTo<GetAccountOutput>();
         }
 
         public async Task<GetAccountOutput> GetAccountByName(string name)
@@ -67,5 +72,6 @@ public Task DeductBalanceCancel(DeductBalanceInput input)
         {
             return _accountDomainService.DeductBalance(input, TccMethodType.Cancel);
         }
+        
     }
 }
diff --git a/samples/microservices/account/Lms.Account.Application/Lms.Account.Application.csproj b/samples/microservices/account/Lms.Account.Application/Lms.Account.Application.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Silky.Lms.AutoMapper" Version="$(LmsVersion)"/>
+      <PackageReference Include="Silky.Lms.AutoMapper" Version="$(LmsVersion)" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/microservices/account/Lms.Account.Domain/Lms.Account.Domain.csproj b/samples/microservices/account/Lms.Account.Domain/Lms.Account.Domain.csproj
@@ -10,6 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="DotNetCore.CAP" Version="5.1.0" />
       <PackageReference Include="Silky.Lms.AutoMapper" Version="$(LmsVersion)" />
       <PackageReference Include="Silky.Lms.Caching" Version="$(LmsVersion)" />
       <PackageReference Include="TanvirArjel.EFCore.GenericRepository" Version="5.3.0" />
diff --git a/samples/microservices/account/Lms.AccountHost/CapConfigure.cs b/samples/microservices/account/Lms.AccountHost/CapConfigure.cs
@@ -0,0 +1,26 @@
+﻿using Lms.Account.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Silky.Lms.Core;
+
+namespace Lms.AccountHost
+{
+    public class CapConfigure : IConfigureService
+    {
+        public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddCap(x =>
+            {
+                x.UseEntityFramework<UserDbContext>();
+                x.UseRabbitMQ(z =>
+                {
+                    z.HostName = "127.0.0.1";
+                    z.UserName = "rabbitmq";
+                    z.Password = "rabbitmq";
+                });
+            });
+        }
+
+        public int Order { get; } = 1;
+    }
+}
diff --git a/samples/microservices/account/Lms.AccountHost/Lms.AccountHost.csproj b/samples/microservices/account/Lms.AccountHost/Lms.AccountHost.csproj
@@ -6,6 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.0" />
+        <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.0" />
       <PackageReference Include="Silky.Lms.NormHost" Version="$(LmsVersion)" />
     </ItemGroup>
 
diff --git a/samples/microservices/order/Lms.Order.Application/Subscribe/ISubscriberService.cs b/samples/microservices/order/Lms.Order.Application/Subscribe/ISubscriberService.cs
@@ -0,0 +1,9 @@
+﻿using System;
+
+namespace Lms.Order.Application.Subscribe
+{
+    public interface ISubscriberService
+    {
+        void CheckReceivedMessage(DateTime datetime);
+    }
+}
diff --git a/samples/microservices/order/Lms.Order.Application/Subscribe/SubscriberService.cs b/samples/microservices/order/Lms.Order.Application/Subscribe/SubscriberService.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using DotNetCore.CAP;
+using Microsoft.Extensions.Logging;
+
+namespace Lms.Order.Application.Subscribe
+{
+    public class SubscriberService : ICapSubscribe, ISubscriberService
+    {
+        private readonly ILogger<SubscriberService> _logger;
+
+        public SubscriberService(ILogger<SubscriberService> logger)
+        {
+            _logger = logger;
+        }
+
+        [CapSubscribe("account.create.time")]
+        public void CheckReceivedMessage(DateTime datetime)
+        {
+            _logger.LogInformation("Create Account Time:" + datetime.ToLocalTime());
+        }
+    }
+}
diff --git a/samples/microservices/order/Lms.Order.Domain/Lms.Order.Domain.csproj b/samples/microservices/order/Lms.Order.Domain/Lms.Order.Domain.csproj
@@ -11,6 +11,7 @@
       <ProjectReference Include="..\Lms.Order.Domain.Shared\Lms.Order.Domain.Shared.csproj" />
     </ItemGroup>
     <ItemGroup>
+        <PackageReference Include="DotNetCore.CAP" Version="5.1.0" />
         <PackageReference Include="Silky.Lms.AutoMapper" Version="$(LmsVersion)" />
         <PackageReference Include="Silky.Lms.Caching" Version="$(LmsVersion)" />
         <PackageReference Include="TanvirArjel.EFCore.GenericRepository" Version="5.3.0" />
diff --git a/samples/microservices/order/Lms.OrderHost/CapConfigure.cs b/samples/microservices/order/Lms.OrderHost/CapConfigure.cs
@@ -0,0 +1,28 @@
+﻿using Lms.Order.Application.Subscribe;
+using Lms.Order.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Silky.Lms.Core;
+
+namespace Lms.OrderHost
+{
+    public class CapConfigure : IConfigureService
+    {
+        public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddTransient<ISubscriberService,SubscriberService>();
+            services.AddCap(x =>
+            {
+                x.UseEntityFramework<OrderDbContext>();
+                x.UseRabbitMQ(z =>
+                {
+                    z.HostName = "127.0.0.1";
+                    z.UserName = "rabbitmq";
+                    z.Password = "rabbitmq";
+                });
+            });
+        }
+
+        public int Order { get; } = 1;
+    }
+}
diff --git a/samples/microservices/order/Lms.OrderHost/Lms.OrderHost.csproj b/samples/microservices/order/Lms.OrderHost/Lms.OrderHost.csproj
@@ -6,6 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.0" />
+        <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.0" />
       <PackageReference Include="Silky.Lms.NormHost" Version="$(LmsVersion)" />
     </ItemGroup>
     <ItemGroup>
diff --git a/samples/microservices/stock/Lms.Stock.Domain/Lms.Stock.Domain.csproj b/samples/microservices/stock/Lms.Stock.Domain/Lms.Stock.Domain.csproj
@@ -9,9 +9,9 @@
       <ProjectReference Include="..\Lms.Stock.Domain.Shared\Lms.Stock.Domain.Shared.csproj" />
     </ItemGroup>
     <ItemGroup>
+        <PackageReference Include="DotNetCore.CAP" Version="5.1.0" />
         <PackageReference Include="Silky.Lms.AutoMapper" Version="$(LmsVersion)" />
         <PackageReference Include="Silky.Lms.Caching" Version="$(LmsVersion)" />
         <PackageReference Include="TanvirArjel.EFCore.GenericRepository" Version="5.3.0" />
     </ItemGroup>
-
 </Project>
diff --git a/samples/microservices/stock/Lms.StockHost/CapConfigure.cs b/samples/microservices/stock/Lms.StockHost/CapConfigure.cs
@@ -0,0 +1,26 @@
+﻿using Lms.Stock.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Silky.Lms.Core;
+
+namespace Lms.StockHost
+{
+    public class CapConfigure : IConfigureService
+    {
+        public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddCap(x =>
+            {
+                x.UseEntityFramework<StockDbContext>();
+                x.UseRabbitMQ(z =>
+                {
+                    z.HostName = "127.0.0.1";
+                    z.UserName = "rabbitmq";
+                    z.Password = "rabbitmq";
+                });
+            });
+        }
+
+        public int Order { get; } = 10;
+    }
+}
diff --git a/samples/microservices/stock/Lms.StockHost/Lms.StockHost.csproj b/samples/microservices/stock/Lms.StockHost/Lms.StockHost.csproj
@@ -7,6 +7,8 @@
 
     <ItemGroup>
       <PackageReference Include="Silky.Lms.NormHost" Version="$(LmsVersion)" />
+        <PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.0" />
+        <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.0" />
     </ItemGroup>
     <ItemGroup>
         <None Update="appsettings.ContainerDev.yml">
diff --git a/samples/sample.common.props b/samples/sample.common.props
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
-	<LmsVersion>1.0.1</LmsVersion>
+	<LmsVersion>1.0.2</LmsVersion>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Threading.Tasks;`
	`3`	`+using DotNetCore.CAP;`
`2`	`4`	`using Lms.Account.Application.Contracts.Accounts;`
`3`	`5`	`using Lms.Account.Application.Contracts.Accounts.Dtos;`
`4`	`6`	`using Lms.Account.Domain.Accounts;`
`@@ -8,20 +10,23 @@`
`8`	`10`
`9`	`11`	`namespace Lms.Account.Application.Accounts`
`10`	`12`	`{`
`11`		`- public class AccountAppService : IAccountAppService`
	`13`	`+ public class AccountAppService : IAccountAppService, ICapSubscribe`
`12`	`14`	`{`
`13`	`15`	`private readonly IAccountDomainService _accountDomainService;`
`14`		`-`
`15`		`- public AccountAppService(IAccountDomainService accountDomainService)`
	`16`	`+ private readonly ICapPublisher _capBus;`
	`17`	`+ public AccountAppService(IAccountDomainService accountDomainService, ICapPublisher capBus)`
`16`	`18`	`{`
`17`	`19`	`_accountDomainService = accountDomainService;`
	`20`	`+ _capBus = capBus;`
`18`	`21`	`}`
`19`	`22`
`20`	`23`	`public async Task<GetAccountOutput> Create(CreateAccountInput input)`
`21`	`24`	`{`
	`25`	`+`
`22`	`26`	`var account = input.MapTo<Domain.Accounts.Account>();`
`23`	`27`	`account = await _accountDomainService.Create(account);`
`24`		`- return account.MapTo<GetAccountOutput>();`
	`28`	`+ await _capBus.PublishAsync("account.create.time", DateTime.Now);`
	`29`	`+ return account.MapTo<GetAccountOutput>();`
`25`	`30`	`}`
`26`	`31`
`27`	`32`	`public async Task<GetAccountOutput> GetAccountByName(string name)`
`@@ -67,5 +72,6 @@ public Task DeductBalanceCancel(DeductBalanceInput input)`
`67`	`72`	`{`
`68`	`73`	`return _accountDomainService.DeductBalance(input, TccMethodType.Cancel);`
`69`	`74`	`}`
	`75`	`+`
`70`	`76`	`}`
`71`	`77`	`}`