ServiceBus

ChengLab · ChengLab · commit 0514a98685f7 · 2019-07-24T17:09:20.000+08:00
diff --git a/AA.Dapper/AA.Dapper.csproj b/AA.Dapper/AA.Dapper.csproj
@@ -11,9 +11,9 @@
     <RepositoryType>git</RepositoryType>
     <PackageTags>AA;Dapper；dommel；</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
-    <Version>1.0.1</Version>
+    <AssemblyVersion>1.0.2.0</AssemblyVersion>
+    <FileVersion>1.0.2.0</FileVersion>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AA.Dapper/Util/DataBase.cs b/AA.Dapper/Util/DataBase.cs
@@ -41,7 +41,7 @@ public Task<IEnumerable<T>> QueryAsync<T>(string sql, object param = null)
             return Connection.QueryAsync<T>(sql, param, transaction);
         }
 
-        public virtual IPage<T> GetPage<T>(PageRequest pageRequest) where T:class
+        public virtual IPage<T> GetPage<T>(PageRequest pageRequest) where T : class
         {
             int recordCount = Connection.ExecuteScalar<int>(PageUtil.CreateCountingSql(pageRequest.SqlText), pageRequest.SqlParam);
             var list = Connection.Query<T>(PageUtil.CreatePagingSql(recordCount, pageRequest.PageSize, pageRequest.PageIndex, pageRequest.SqlText, pageRequest.OrderFiled), pageRequest.SqlParam);
diff --git a/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/Consumer.cs b/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/Consumer.cs
@@ -0,0 +1,61 @@
+﻿using AA.ServiceBus;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MassTransit;
+using System.Threading.Tasks;
+using AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus.meesageContracts;
+using Xunit;
+using AA.Log4Net;
+using AA.FrameWork.Logging;
+
+namespace AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus
+{
+    public class Consumer
+    {
+        [Fact]
+        public void TestConsumer()
+        {
+            Log4NetLogger.Use("Log4Net/log4net.config");
+            string rabbitMqUri = "rabbitmq://localhost:5672";
+            string rabbitMqUserName = "";
+            string rabbitMqPassword = "";
+            string queueName = "order.queue";
+
+            var busControl = ServiceBusManager.Instance.UseRabbitMq(rabbitMqUri, rabbitMqUserName, rabbitMqPassword)
+             .RegisterConsumer<SubmitOrderCommandConsumer>(queueName)
+             .RegisterConsumer<OrderSubmittedEventConsumer>(null)
+             .Build();
+            busControl.Start();
+
+        }
+    }
+
+    public class OrderSubmittedEventConsumer : IConsumer<OrderSubmitted>
+    {
+        public async Task Consume(ConsumeContext<OrderSubmitted> context)
+        {
+            var @event = context.Message;
+
+            var result = $"OrderSubmittedEvent {@event.Id.ToString()}";
+            ILog log = Logger.Get(typeof(OrderSubmittedEventConsumer));
+            log.Debug(result);
+            //do somethings...
+        }
+    }
+
+
+    public class SubmitOrderCommandConsumer : IConsumer<SubmitOrder>
+    {
+        public async Task Consume(ConsumeContext<SubmitOrder> context)
+        {
+            var command = context.Message;
+
+            var result = $"CreateFooCommand {command.Id.ToString()}";
+            ILog log = Logger.Get(typeof(SubmitOrderCommandConsumer));
+            log.Debug(result);
+            //do somethings...
+        }
+    }
+
+}
diff --git a/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/Producer.cs b/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/Producer.cs
@@ -0,0 +1,52 @@
+﻿using AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus.meesageContracts;
+using AA.ServiceBus;
+using MassTransit;
+using MassTransit.Util;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus
+{
+    public class Producer
+    {
+        [Fact]
+        public void TestProducer()
+        {
+            string rabbitMqUri = "rabbitmq://localhost:5672";
+            string rabbitMqUserName = "";
+            string rabbitMqPassword = "";
+         
+
+            PulishEvent(rabbitMqUri, rabbitMqUserName, rabbitMqPassword);
+            SendCommand(rabbitMqUri, rabbitMqUserName, rabbitMqPassword);
+        }
+
+
+        private void PulishEvent(string rabbitMqUri, string rabbitMqUserName, string rabbitMqPassword)
+        {
+            IBusControl busControl = ServiceBusManager.Instance.UseRabbitMq(rabbitMqUri, rabbitMqUserName, rabbitMqPassword)
+                         .BuildEventProducer();
+
+            TaskUtil.Await(busControl.Publish<OrderSubmitted>(new
+            {
+                Id = 1
+            }));
+        }   
+
+        private void SendCommand(string rabbitMqUri, string rabbitMqUserName, string rabbitMqPassword)
+        {
+            string queueName = "order.queue";
+
+            ISendEndpoint busControl = ServiceBusManager.Instance.UseRabbitMq(rabbitMqUri, rabbitMqUserName, rabbitMqPassword)
+                         .BuildCommandProducer(queueName);
+
+            TaskUtil.Await(busControl.Send<SubmitOrder>(new
+            {
+                Id = 10
+            }));
+        }
+    }
+
+}
diff --git a/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/meesageContracts/OrderSubmitted.cs b/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/meesageContracts/OrderSubmitted.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus.meesageContracts
+{
+    public interface OrderSubmitted
+    {
+        long Id { get; set; }
+        decimal OrderPrice { get; set; }
+    }
+}
diff --git a/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/meesageContracts/SubmitOrder.cs b/AA.FrameWork.Tests.Unit/RabbitMQ/ServiceBus/meesageContracts/SubmitOrder.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AA.FrameWork.Tests.Unit.RabbitMQ.ServiceBus.meesageContracts
+{
+    public interface SubmitOrder
+    {
+        long Id { get; set; }
+        Decimal OrderPrice { get; set; }
+    }
+}
diff --git a/AA.FrameWork.Tests.Unit/dapper/AADapperRepositoryTest.cs b/AA.FrameWork.Tests.Unit/dapper/AADapperRepositoryTest.cs
@@ -24,6 +24,7 @@ public AADapperRepositoryTest()
         [Fact]
         public void TextInsert()
         {
+          
             var user = new UserInfo()
             {
                 UserName = "chengTian",
diff --git a/AA.RabbitMQ/AA.RabbitMQ.csproj b/AA.RabbitMQ/AA.RabbitMQ.csproj
@@ -1,7 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/AA.RabbitMQ/EventMessage.cs b/AA.RabbitMQ/EventMessage.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AA.RabbitMQ
+{
+    public class EventMessage
+    {
+        public string JsonBody { get; set; }
+    }
+}
diff --git a/AA.RabbitMQ/MqConfigDom.cs b/AA.RabbitMQ/MqConfigDom.cs
@@ -0,0 +1,31 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RabbitMQ.Client.Framing;
+
+namespace AA.RabbitMQ
+{
+     public class MqConfigDom
+    {
+        public MqConfigDom()
+        {
+
+            //MqHost = "localhost";
+            //MqUserName = "yy";
+            //MqPassword = "hello!";
+            //MqHost = ConfigurationManager.AppSettings["RabbitMQ_HostName"];
+            //MqUserName = ConfigurationManager.AppSettings["RabbitMQ_UserName"];
+            //MqPassword = ConfigurationManager.AppSettings["RabbitMQ_Password"];
+            MqPort = 5672;
+        }
+
+        public string MqHost { get; set; }
+        public string MqUserName { get; set; }
+        public string MqPassword { get; set; }
+        public int MqPort { get; set; }
+
+    }
+}
diff --git a/AA.RabbitMQ/MqConfigDomFactory.cs b/AA.RabbitMQ/MqConfigDomFactory.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AA.RabbitMQ
+{
+    public class MqConfigDomFactory
+    {
+        public static MqConfigDom CreateConfigDomInstance()
+        {
+            return new MqConfigDom();
+        }
+    }
+}
diff --git a/AA.RabbitMQ/RabbitMqClientContext.cs b/AA.RabbitMQ/RabbitMqClientContext.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RabbitMQ.Client;
+
+namespace AA.RabbitMQ
+{
+    public class RabbitMqClientContext
+    {
+        public IConnection SendConnection { get; set; }
+        public IModel SendChannel { get; set; }
+
+        public IConnection ListenConnection { get; set; }
+        public IModel ListenChannel { get; set; }
+
+        public string QueueName { get; set; }
+    }
+}
diff --git a/AA.RabbitMQ/RabbitMqClientFactory.cs b/AA.RabbitMQ/RabbitMqClientFactory.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RabbitMQ.Client;
+
+namespace AA.RabbitMQ
+{
+    public class RabbitMqClientFactory
+    {
+        public static IConnection CreateConnection()
+        {
+            var mqConfigDom = MqConfigDomFactory.CreateConfigDomInstance();//获取MQ配置
+             
+            const ushort heartbeat = 60;
+            var factory = new ConnectionFactory()
+            {
+                HostName = mqConfigDom.MqHost,
+                Port = mqConfigDom.MqPort,
+                UserName = mqConfigDom.MqUserName,
+                Password = mqConfigDom.MqPassword,
+                RequestedHeartbeat = heartbeat, //心跳超时时间
+                AutomaticRecoveryEnabled = true,//自动重连
+                //VirtualHost = "/"
+            };
+            return factory.CreateConnection(); 
+        }
+
+        public static IModel CreateModel(IConnection connection)
+        {
+            return connection.CreateModel();
+        }
+    }
+}
diff --git a/AA.RabbitMQ/RabbitMqHelper.cs b/AA.RabbitMQ/RabbitMqHelper.cs
diff --git a/AA.ServiceBus/AA.ServiceBus.csproj b/AA.ServiceBus/AA.ServiceBus.csproj
diff --git a/AA.ServiceBus/Configuration/ServiceBusConfiguration.cs b/AA.ServiceBus/Configuration/ServiceBusConfiguration.cs
diff --git a/AA.ServiceBus/ServiceBusManager.cs b/AA.ServiceBus/ServiceBusManager.cs

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Task<IEnumerable<T>> QueryAsync<T>(string sql, object param = null)`
`41`	`41`	`return Connection.QueryAsync<T>(sql, param, transaction);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public virtual IPage<T> GetPage<T>(PageRequest pageRequest) where T:class`
	`44`	`+ public virtual IPage<T> GetPage<T>(PageRequest pageRequest) where T : class`
`45`	`45`	`{`
`46`	`46`	`int recordCount = Connection.ExecuteScalar<int>(PageUtil.CreateCountingSql(pageRequest.SqlText), pageRequest.SqlParam);`
`47`	`47`	`var list = Connection.Query<T>(PageUtil.CreatePagingSql(recordCount, pageRequest.PageSize, pageRequest.PageIndex, pageRequest.SqlText, pageRequest.OrderFiled), pageRequest.SqlParam);`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public AADapperRepositoryTest()`
`24`	`24`	`[Fact]`
`25`	`25`	`public void TextInsert()`
`26`	`26`	`{`
	`27`	`+`
`27`	`28`	`var user = new UserInfo()`
`28`	`29`	`{`
`29`	`30`	`UserName = "chengTian",`