diff --git a/Caspian.WorkflowFramework.Package/Caspian.WorkflowFramework.Package.csproj b/Caspian.WorkflowFramework.Package/Caspian.WorkflowFramework.Package.csproj
index e159b45..4fc1a11 100644
--- a/Caspian.WorkflowFramework.Package/Caspian.WorkflowFramework.Package.csproj
+++ b/Caspian.WorkflowFramework.Package/Caspian.WorkflowFramework.Package.csproj
@@ -5,7 +5,7 @@
enable
enable
Caspian.WorkflowFramework
- 1.0.1-preview2
+ 1.0.1-preview.3
Digital banking team
Caspian
Caspian.WorkflowFramework
@@ -86,7 +86,7 @@
-
+
diff --git a/Caspian.WorkflowFramework.Package/Config/DependencyInjection.cs b/Caspian.WorkflowFramework.Package/Config/DependencyInjection.cs
index a8e1874..bbea838 100644
--- a/Caspian.WorkflowFramework.Package/Config/DependencyInjection.cs
+++ b/Caspian.WorkflowFramework.Package/Config/DependencyInjection.cs
@@ -9,12 +9,12 @@ using Elsa.EntityFrameworkCore.Modules.Management;
using Elsa.EntityFrameworkCore.Modules.Runtime;
using Elsa.EntityFrameworkCore.Modules.Identity;
using Elsa.Email;
-using MongoLogger;
-using MongoLogger.Models;
+using San.MongoLogger;
+using San.MongoLogger.Models;
namespace Caspian.WorkflowFramework;
-public static class DependencyInjectionq
+public static class DependencyInjection
{
public static void AddWorkflowFramework(this IHostApplicationBuilder builder, string connectionString)
{
diff --git a/Caspian.WorkflowFramework.Package/Services/WorkflowService.cs b/Caspian.WorkflowFramework.Package/Services/WorkflowService.cs
index ae284cc..ffafbea 100644
--- a/Caspian.WorkflowFramework.Package/Services/WorkflowService.cs
+++ b/Caspian.WorkflowFramework.Package/Services/WorkflowService.cs
@@ -9,7 +9,7 @@ using Elsa.Workflows.Runtime.Messages;
using Elsa.Workflows.Models;
using Elsa.Common.Models;
using Caspian.WorkflowFramework.Utility;
-using MongoLogger;
+using San.MongoLogger;
using System.Diagnostics;
namespace Caspian.WorkflowFramework.Services
@@ -44,9 +44,10 @@ namespace Caspian.WorkflowFramework.Services
///
public async Task> CreateAndExecuteAsync(CreateAndExecuteWorkflowModel input)
{
+ var sw = Stopwatch.StartNew();
try
{
- _logger.Log("Start of CreateAndExecuteAsync", JsonConvert.SerializeObject(input));
+ _logger.Log("Start of CreateAndExecuteAsync", input);
WorkflowResponse response;
@@ -68,7 +69,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -100,7 +103,9 @@ namespace Caspian.WorkflowFramework.Services
Data = workflowModel
};
- _logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -113,7 +118,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("Exception occurs in CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, JsonConvert.SerializeObject(response), ex);
+ sw.Stop();
+
+ _logger.Log("Exception occurs in CreateAndExecuteAsync", WFInstanceId: response.Data?.InstanceId, response, sw.ElapsedMilliseconds, ex);
return response;
}
@@ -124,9 +131,10 @@ namespace Caspian.WorkflowFramework.Services
///
public async Task> PublishEventAsync(PublishEventModel input)
{
+ var sw = Stopwatch.StartNew();
try
{
- _logger.Log("Start of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(input));
+ _logger.Log("Start of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, input);
WorkflowResponse response;
@@ -142,7 +150,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -165,7 +175,9 @@ namespace Caspian.WorkflowFramework.Services
Data = workflowModel
};
- _logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -178,7 +190,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("Exception occurs in PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response), ex);
+ sw.Stop();
+
+ _logger.Log("Exception occurs in PublishEventAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds, ex);
return response;
}
@@ -189,9 +203,10 @@ namespace Caspian.WorkflowFramework.Services
///
public async Task> InquiryStateAsync(InquiryStateModel input)
{
+ var sw = Stopwatch.StartNew();
try
{
- _logger.Log("Start of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(input));
+ _logger.Log("Start of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, input);
WorkflowResponse response;
@@ -207,7 +222,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -228,7 +245,9 @@ namespace Caspian.WorkflowFramework.Services
Data = workflowModel
};
- _logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response));
+ sw.Stop();
+
+ _logger.Log("End of InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds);
return response;
}
@@ -241,7 +260,9 @@ namespace Caspian.WorkflowFramework.Services
Data = null
};
- _logger.Log("Exception occurs in InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, JsonConvert.SerializeObject(response), ex);
+ sw.Stop();
+
+ _logger.Log("Exception occurs in InquiryStateAsync", WFInstanceId: input.WorkflowInstanceId, response, sw.ElapsedMilliseconds, ex);
return response;
}
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..3157717
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SampleWorkflowWeb/Controllers/HomeController.cs b/SampleWorkflowWeb/Controllers/HomeController.cs
index 6e082b3..064ff5c 100644
--- a/SampleWorkflowWeb/Controllers/HomeController.cs
+++ b/SampleWorkflowWeb/Controllers/HomeController.cs
@@ -3,7 +3,7 @@ using SampleWorkflowWeb.Models;
using Newtonsoft.Json;
using SampleWorkflowWeb.Services;
using SampleWorkflowWeb.Dao;
-using MongoLogger;
+using San.MongoLogger;
using Caspian.WorkflowFramework.Contracts;
using Elsa.Common.Models;
using PublishEventModel = Caspian.WorkflowFramework.Models.PublishEventModel;
diff --git a/SampleWorkflowWeb/Controllers/TransferController.cs b/SampleWorkflowWeb/Controllers/TransferController.cs
index a29125b..9fdf6c9 100644
--- a/SampleWorkflowWeb/Controllers/TransferController.cs
+++ b/SampleWorkflowWeb/Controllers/TransferController.cs
@@ -5,7 +5,7 @@ using Caspian.WorkflowFramework.Contracts;
using PackageNS = Caspian.WorkflowFramework.Models;
using Elsa.Common.Models;
using Microsoft.AspNetCore.Mvc;
-using MongoLogger;
+using San.MongoLogger;
using Newtonsoft.Json;
using Microsoft.AspNetCore.Http;
@@ -43,7 +43,7 @@ namespace SampleWorkflowWeb.Controllers
{
var response = await _workflowService.CreateAndExecuteAsync(new PackageNS.CreateAndExecuteWorkflowModel()
{
- Name = "TransferWorkflow",
+ Name = "TransfersWorkflow",
UserId = userId,
Version = VersionOptions.Published
});
diff --git a/SampleWorkflowWeb/Program.cs b/SampleWorkflowWeb/Program.cs
index b81459e..85b30ac 100644
--- a/SampleWorkflowWeb/Program.cs
+++ b/SampleWorkflowWeb/Program.cs
@@ -1,7 +1,7 @@
using SampleWorkflowWeb.Services;
using Caspian.WorkflowFramework;
-using MongoLogger;
-using MongoLogger.Models;
+using San.MongoLogger;
+using San.MongoLogger.Models;
var builder = WebApplication.CreateBuilder(args);
diff --git a/SampleWorkflowWeb/appsettings.json b/SampleWorkflowWeb/appsettings.json
index d828523..a3e8a6b 100644
--- a/SampleWorkflowWeb/appsettings.json
+++ b/SampleWorkflowWeb/appsettings.json
@@ -13,11 +13,27 @@
"LogsCollectionName": "TestWorkflowCollection",
"ConnectionString": "mongodb://localhost",
"DatabaseName": "TestWorkflowDb",
- "SqlConnectionString": "",
- "SqlScriptString": "",
- "ActiveLogFile": true,
- "FileLogPath": "c:\\",
+ "BatchSize": 0,
"RollingInterval": "Daily", //none, Minutely, Daily, Weekly, Monthly, Yearly, Hourly
- "BatchSize": 1
+ "MaskList": [
+ "code",
+ "depositNumber",
+ "username",
+ "customerNo",
+ "password",
+ "sessionId",
+ "mainAccount",
+ "accountNumber",
+ "owners",
+ "balance",
+ "accountNo",
+ "depositUniqueId",
+ "externalRefList",
+ "externalref",
+ "sameSignatureDepositNumber",
+ "mobileNumber",
+ "destinationNumber",
+ "cardNumber"
+ ]
}
}