rename CapTransaction to Transaction

samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using DotNetCore.CAP;
 using Microsoft.AspNetCore.Mvc;
+using MySql.Data.MySqlClient;
 
 namespace Sample.RabbitMQ.MySql.Controllers
 {
@@ -28,7 +29,17 @@ namespace Sample.RabbitMQ.MySql.Controllers
         [Route("~/publish2")]
         public IActionResult PublishMessage2()
         {
-            _capBus.Publish("sample.kafka.sqlserver4", DateTime.Now);
+            using (var connection = new MySqlConnection("Server=192.168.10.110;Database=testcap;UserId=root;Password=123123;"))
+            {
+                using (var transaction = connection.BeginAndJoinToTransaction(_capBus))
+                {
+                    //your business code
+
+                    _capBus.Publish("sample.rabbitmq.mysql", DateTime.Now);
+
+                    transaction.Commit();
+                }
+            } 
 
             return Ok();
         }
@@ -37,7 +48,7 @@ namespace Sample.RabbitMQ.MySql.Controllers
         public async Task<IActionResult> PublishMessageWithTransaction()
         {
             using (var trans = await _dbContext.Database.BeginTransactionAsync())
-            using (var capTrans = _capBus.CapTransaction.Begin(trans))
+            using (var capTrans = _capBus.Transaction.Begin(trans))
             {
                 for (int i = 0; i < 10; i++)
                 {
@@ -49,6 +60,8 @@ namespace Sample.RabbitMQ.MySql.Controllers
             return Ok();
         }
 
+
+
         [NonAction]
         [CapSubscribe("#.rabbitmq.mysql")]
         public void ReceiveMessage(DateTime time)

src/DotNetCore.CAP/Abstractions/CapPublisherBase.cs

@@ -14,7 +14,7 @@ namespace DotNetCore.CAP.Abstractions
 {
     public abstract class CapPublisherBase : ICapPublisher
     {
-        private readonly CapTransactionBase _capTransaction;
+        private readonly CapTransactionBase _transaction;
         private readonly IMessagePacker _msgPacker;
         private readonly IContentSerializer _serializer;
 
@@ -27,14 +27,14 @@ namespace DotNetCore.CAP.Abstractions
         protected CapPublisherBase(IServiceProvider service)
         {
             ServiceProvider = service;
-            _capTransaction = service.GetRequiredService<CapTransactionBase>();
+            _transaction = service.GetRequiredService<CapTransactionBase>();
             _msgPacker = service.GetRequiredService<IMessagePacker>();
             _serializer = service.GetRequiredService<IContentSerializer>();
         }
 
         protected IServiceProvider ServiceProvider { get; }
 
-        public ICapTransaction CapTransaction => _capTransaction;
+        public ICapTransaction Transaction => _transaction;
 
         public void Publish<T>(string name, T contentObj, string callbackName = null)
         {
@@ -65,10 +65,10 @@ namespace DotNetCore.CAP.Abstractions
 
         protected async Task PublishAsyncInternal(CapPublishedMessage message)
         {
-            if (CapTransaction.DbTransaction == null)
+            if (Transaction.DbTransaction == null)
             {
                 NotUseTransaction = true;
-                CapTransaction.DbTransaction = GetDbTransaction();
+                Transaction.DbTransaction = GetDbTransaction();
             }
 
             Guid operationId = default(Guid);
@@ -77,15 +77,15 @@ namespace DotNetCore.CAP.Abstractions
             {
                 operationId = s_diagnosticListener.WritePublishMessageStoreBefore(message);
 
-                await ExecuteAsync(message, CapTransaction);
+                await ExecuteAsync(message, Transaction);
 
-                _capTransaction.AddToSent(message);
+                _transaction.AddToSent(message);
 
                 s_diagnosticListener.WritePublishMessageStoreAfter(operationId, message);
 
-                if (NotUseTransaction || CapTransaction.AutoCommit)
+                if (NotUseTransaction || Transaction.AutoCommit)
                 {
-                    _capTransaction.Commit();
+                    _transaction.Commit();
                 }
             }
             catch (Exception e)
@@ -96,9 +96,9 @@ namespace DotNetCore.CAP.Abstractions
             }
             finally
             {
-                if (NotUseTransaction || CapTransaction.AutoCommit)
+                if (NotUseTransaction || Transaction.AutoCommit)
                 {
-                    _capTransaction.Dispose();
+                    _transaction.Dispose();
                 }
             }
         }

src/DotNetCore.CAP/ICapPublisher.cs

@@ -11,7 +11,7 @@ namespace DotNetCore.CAP
     /// </summary>
     public interface ICapPublisher
     {
-        ICapTransaction CapTransaction { get; }
+        ICapTransaction Transaction { get; }
 
         /// <summary>
         /// Asynchronous publish an object message.

test/DotNetCore.CAP.Test/CAP.BuilderTest.cs

@@ -119,7 +119,7 @@ namespace DotNetCore.CAP.Test
 
         private class MyProducerService : ICapPublisher
         {
-            public ICapTransaction CapTransaction { get; }
+            public ICapTransaction Transaction { get; }
 
             public Task PublishAsync<T>(string name, T contentObj, string callbackName = null,
                 CancellationToken cancellationToken = default(CancellationToken))