From 6db288304fd93521c0e20455f4b0bd98ecc3db90 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 22 八月 2024 12:46:04 +0800
Subject: [PATCH] 引用升级
---
Yw.Application.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Service.Run.Core/Yw.Service.Run.Core.csproj | 10 +-
Yw.Service.Run.Core/07-service/00-core/01-create/LCacheCreateHelper.cs | 27 ++++++
Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj | 4
Yw.Service.Run.Core/07-service/01-configure/RunAnalyConfigure.cs | 22 ++--
Yw.Service.Run.Core/07-service/00-core/01-create/ExchangeCreateHelper.cs | 26 +++++
Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs | 52 ++++++------
Yw.Application.Run.Core/Yw.Application.Run.Core.csproj | 4
Yw.Dto.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Yw.Service.Run.Core/07-service/00-core/01-create/QueueCreateHelper.cs | 26 +++++
Yw.Service.Run.Core/07-service/00-core/01-create/DALCreateHelper.cs | 28 ++++++-
Yw.Service.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
12 files changed, 143 insertions(+), 62 deletions(-)
diff --git a/Yw.Application.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Application.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6efa9da..1ab9816 100644
--- a/Yw.Application.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Application.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-08-20T03:24:43.7902997Z;True|2024-07-17T12:32:09.9783768+08:00;True|2024-07-17T12:30:25.7307989+08:00;True|2024-06-19T19:43:45.0619480+08:00;True|2024-05-31T15:22:21.0299608+08:00;True|2024-05-13T09:49:32.7865121+08:00;True|2024-05-08T14:57:38.9700807+08:00;True|2024-04-30T13:48:09.3970916+08:00;True|2024-04-26T11:52:38.6381832+08:00;True|2024-04-01T11:40:26.8126073+08:00;True|2024-03-26T09:54:08.7672773+08:00;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
+ <History>True|2024-08-22T04:45:41.3683785Z;True|2024-08-20T11:24:43.7902997+08:00;True|2024-07-17T12:32:09.9783768+08:00;True|2024-07-17T12:30:25.7307989+08:00;True|2024-06-19T19:43:45.0619480+08:00;True|2024-05-31T15:22:21.0299608+08:00;True|2024-05-13T09:49:32.7865121+08:00;True|2024-05-08T14:57:38.9700807+08:00;True|2024-04-30T13:48:09.3970916+08:00;True|2024-04-26T11:52:38.6381832+08:00;True|2024-04-01T11:40:26.8126073+08:00;True|2024-03-26T09:54:08.7672773+08:00;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Application.Run.Core/Yw.Application.Run.Core.csproj b/Yw.Application.Run.Core/Yw.Application.Run.Core.csproj
index 247b927..ef1870e 100644
--- a/Yw.Application.Run.Core/Yw.Application.Run.Core.csproj
+++ b/Yw.Application.Run.Core/Yw.Application.Run.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw.Application</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.1.5</Version>
+ <Version>3.1.6</Version>
</PropertyGroup>
<ItemGroup>
@@ -27,7 +27,7 @@
<ItemGroup>
<PackageReference Include="Yw.Application.Core" Version="3.1.1" />
- <PackageReference Include="Yw.Dto.Run.Core" Version="3.1.3" />
+ <PackageReference Include="Yw.Dto.Run.Core" Version="3.1.5" />
</ItemGroup>
</Project>
diff --git a/Yw.Dto.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Dto.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 4ced389..f33119b 100644
--- a/Yw.Dto.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Dto.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-08-20T03:24:00.2784570Z;True|2024-07-17T12:25:21.0318008+08:00;True|2024-06-19T19:42:59.0063910+08:00;True|2024-05-31T15:21:48.4686744+08:00;True|2024-05-13T09:48:52.9024655+08:00;True|2024-05-08T14:56:51.2185908+08:00;True|2024-05-08T14:25:43.7997185+08:00;True|2024-04-30T13:46:18.9575803+08:00;True|2024-04-30T11:29:49.6927256+08:00;True|2024-04-26T11:51:11.4880401+08:00;True|2024-04-26T11:50:49.7392651+08:00;True|2024-04-26T11:50:39.7372723+08:00;True|2024-04-01T11:39:12.7290526+08:00;True|2024-03-26T09:51:34.4055575+08:00;</History>
+ <History>True|2024-08-22T04:44:46.8450983Z;True|2024-08-20T11:24:00.2784570+08:00;True|2024-07-17T12:25:21.0318008+08:00;True|2024-06-19T19:42:59.0063910+08:00;True|2024-05-31T15:21:48.4686744+08:00;True|2024-05-13T09:48:52.9024655+08:00;True|2024-05-08T14:56:51.2185908+08:00;True|2024-05-08T14:25:43.7997185+08:00;True|2024-04-30T13:46:18.9575803+08:00;True|2024-04-30T11:29:49.6927256+08:00;True|2024-04-26T11:51:11.4880401+08:00;True|2024-04-26T11:50:49.7392651+08:00;True|2024-04-26T11:50:39.7372723+08:00;True|2024-04-01T11:39:12.7290526+08:00;True|2024-03-26T09:51:34.4055575+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj b/Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj
index 37f0d9b..1fb5c63 100644
--- a/Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj
+++ b/Yw.Dto.Run.Core/Yw.Dto.Run.Core.csproj
@@ -4,13 +4,13 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
- <Version>3.1.3</Version>
+ <Version>3.1.5</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Yw.Dto.Core" Version="3.1.1" />
- <PackageReference Include="Yw.Service.Run.Core" Version="3.1.1" />
+ <PackageReference Include="Yw.Service.Run.Core" Version="3.1.2" />
</ItemGroup>
</Project>
diff --git a/Yw.Service.Run.Core/07-service/00-core/01-create/DALCreateHelper.cs b/Yw.Service.Run.Core/07-service/00-core/01-create/DALCreateHelper.cs
index af4829b..2ee97b1 100644
--- a/Yw.Service.Run.Core/07-service/00-core/01-create/DALCreateHelper.cs
+++ b/Yw.Service.Run.Core/07-service/00-core/01-create/DALCreateHelper.cs
@@ -5,19 +5,39 @@
/// </summary>
internal class DALCreateHelper
{
+
+
/// <summary>
- /// 鍒涘缓DAL
+ /// 鍒涘缓DAL(鏃犵紦瀛�)
/// </summary>
- /// <typeparam name="T"></typeparam>
- /// <returns></returns>
public static T CreateDAL<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.DataBase.DbType;
+ return Yw.DALFactory.CreateDAL<T>(dbType);
+ }
+
+ /// <summary>
+ /// 鍒涘缓DAL(鍐呴儴缂撳瓨)
+ /// </summary>
+ public static T CreateDAL2<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.DataBase.DbType;
+ var enableCache = Settings.RunParasHelper.Run.DataBase.Factory.EnableCache;
+ return Yw.DALFactory.CreateDAL2<T>(dbType, enableCache);
+ }
+
+ /// <summary>
+ /// 鍒涘缓DAL(MemoryCache缂撳瓨)
+ /// </summary>
+ public static T CreateDAL3<T>()
{
var dbType = Settings.RunParasHelper.Run.DataBase.DbType;
var enableCache = Settings.RunParasHelper.Run.DataBase.Factory.EnableCache;
var cacheTime = Settings.RunParasHelper.Run.DataBase.Factory.CacheTime;
- return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
+ return Yw.DALFactory.CreateDAL3<T>(dbType, enableCache, cacheTime);
}
+
}
}
diff --git a/Yw.Service.Run.Core/07-service/00-core/01-create/ExchangeCreateHelper.cs b/Yw.Service.Run.Core/07-service/00-core/01-create/ExchangeCreateHelper.cs
index ff4daaf..a4830d5 100644
--- a/Yw.Service.Run.Core/07-service/00-core/01-create/ExchangeCreateHelper.cs
+++ b/Yw.Service.Run.Core/07-service/00-core/01-create/ExchangeCreateHelper.cs
@@ -5,15 +5,35 @@
/// </summary>
internal class ExchangeCreateHelper
{
+
/// <summary>
- /// 鍒涘缓Exchange
+ /// 鍒涘缓Exchange(鏃犵紦瀛�)
/// </summary>
public static T CreateExchange<T>()
{
- var exchangeType = Settings.RunParasHelper.Run.Exchange.ExchangeType;
+ var dbType = Settings.RunParasHelper.Run.Exchange.ExchangeType;
+ return Yw.ExchangeFactory.CreateExchange<T>(dbType);
+ }
+
+ /// <summary>
+ /// 鍒涘缓Exchange(鍐呴儴缂撳瓨)
+ /// </summary>
+ public static T CreateExchange2<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.Exchange.ExchangeType;
+ var enableCache = Settings.RunParasHelper.Run.Exchange.Factory.EnableCache;
+ return Yw.ExchangeFactory.CreateExchange2<T>(dbType, enableCache);
+ }
+
+ /// <summary>
+ /// 鍒涘缓Exchange(MemoryCache缂撳瓨)
+ /// </summary>
+ public static T CreateExchange3<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.Exchange.ExchangeType;
var enableCache = Settings.RunParasHelper.Run.Exchange.Factory.EnableCache;
var cacheTime = Settings.RunParasHelper.Run.Exchange.Factory.CacheTime;
- return Yw.ExchangeFactory.CreateExchange<T>(exchangeType, enableCache, cacheTime);
+ return Yw.ExchangeFactory.CreateExchange3<T>(dbType, enableCache, cacheTime);
}
}
diff --git a/Yw.Service.Run.Core/07-service/00-core/01-create/LCacheCreateHelper.cs b/Yw.Service.Run.Core/07-service/00-core/01-create/LCacheCreateHelper.cs
index 16954ac..6b18b8e 100644
--- a/Yw.Service.Run.Core/07-service/00-core/01-create/LCacheCreateHelper.cs
+++ b/Yw.Service.Run.Core/07-service/00-core/01-create/LCacheCreateHelper.cs
@@ -5,15 +5,36 @@
/// </summary>
internal class LCacheCreateHelper
{
+
+
/// <summary>
- /// 鍒涘缓LCache
+ /// 鍒涘缓LCache(鏃犵紦瀛�)
/// </summary>
public static T CreateLCache<T>()
{
- var cacheType = Settings.RunParasHelper.Run.LCache.LCacheType;
+ var dbType = Settings.RunParasHelper.Run.LCache.LCacheType;
+ return Yw.LCacheFactory.CreateLCache<T>(dbType);
+ }
+
+ /// <summary>
+ /// 鍒涘缓LCache(鍐呴儴缂撳瓨)
+ /// </summary>
+ public static T CreateLCache2<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.LCache.LCacheType;
+ var enableCache = Settings.RunParasHelper.Run.LCache.Factory.EnableCache;
+ return Yw.LCacheFactory.CreateLCache2<T>(dbType, enableCache);
+ }
+
+ /// <summary>
+ /// 鍒涘缓LCache(MemoryCache缂撳瓨)
+ /// </summary>
+ public static T CreateLCache3<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.LCache.LCacheType;
var enableCache = Settings.RunParasHelper.Run.LCache.Factory.EnableCache;
var cacheTime = Settings.RunParasHelper.Run.LCache.Factory.CacheTime;
- return Yw.LCacheFactory.CreateLCache<T>(cacheType, enableCache, cacheTime);
+ return Yw.LCacheFactory.CreateLCache3<T>(dbType, enableCache, cacheTime);
}
diff --git a/Yw.Service.Run.Core/07-service/00-core/01-create/QueueCreateHelper.cs b/Yw.Service.Run.Core/07-service/00-core/01-create/QueueCreateHelper.cs
index 7c245f9..740e033 100644
--- a/Yw.Service.Run.Core/07-service/00-core/01-create/QueueCreateHelper.cs
+++ b/Yw.Service.Run.Core/07-service/00-core/01-create/QueueCreateHelper.cs
@@ -6,15 +6,35 @@
internal class QueueCreateHelper
{
/// <summary>
- /// 鍒涘缓Queue
+ /// 鍒涘缓Queue(鏃犵紦瀛�)
/// </summary>
public static T CreateQueue<T>()
{
- var queueType = Settings.RunParasHelper.Run.Queue.QueueType;
+ var dbType = Settings.RunParasHelper.Run.Queue.QueueType;
+ return Yw.QueueFactory.CreateQueue<T>(dbType);
+ }
+
+ /// <summary>
+ /// 鍒涘缓Queue(鍐呴儴缂撳瓨)
+ /// </summary>
+ public static T CreateQueue2<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.Queue.QueueType;
+ var enableCache = Settings.RunParasHelper.Run.Queue.Factory.EnableCache;
+ return Yw.QueueFactory.CreateQueue2<T>(dbType, enableCache);
+ }
+
+ /// <summary>
+ /// 鍒涘缓Queue(MemoryCache缂撳瓨)
+ /// </summary>
+ public static T CreateQueue3<T>()
+ {
+ var dbType = Settings.RunParasHelper.Run.Queue.QueueType;
var enableCache = Settings.RunParasHelper.Run.Queue.Factory.EnableCache;
var cacheTime = Settings.RunParasHelper.Run.Queue.Factory.CacheTime;
- return Yw.QueueFactory.CreateQueue<T>(queueType, enableCache, cacheTime);
+ return Yw.QueueFactory.CreateQueue3<T>(dbType, enableCache, cacheTime);
}
+
}
}
diff --git a/Yw.Service.Run.Core/07-service/01-configure/RunAnalyConfigure.cs b/Yw.Service.Run.Core/07-service/01-configure/RunAnalyConfigure.cs
index 738bfa1..e9c929c 100644
--- a/Yw.Service.Run.Core/07-service/01-configure/RunAnalyConfigure.cs
+++ b/Yw.Service.Run.Core/07-service/01-configure/RunAnalyConfigure.cs
@@ -12,7 +12,7 @@
{
var all = RunAnalyConfigureCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
@@ -27,7 +27,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -48,7 +48,7 @@
{
if (Ids == null || Ids.Count < 1)
return;
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -146,7 +146,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -165,7 +165,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -186,7 +186,7 @@
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity = pure.ToEntity();
var id = dal.InsertOrUpdate(entity);
if (id > 0)
@@ -213,7 +213,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity = Model2Entity(model);
var bol = dal.Update(entity);
if (bol)
@@ -236,7 +236,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var entity_list = Model2Entities(list);
var bol = dal.Updates(entity_list);
if (bol)
@@ -269,7 +269,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var bol = dal.DeleteByID(ID);
if (bol)
{
@@ -284,7 +284,7 @@
public bool DeleteByObjectTypeAndObjectID(string ObjectType, long ObjectID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var bol = dal.DeleteByObjectTypeAndObjectID(ObjectType, ObjectID);
if (bol)
{
@@ -308,7 +308,7 @@
return false;
}
var entityList = list.ToEntityList();
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunAnalyConfigure>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunAnalyConfigure>();
var bol = dal.Set(entityList);
if (bol)
{
diff --git a/Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs b/Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs
index e8c6fd3..e9514ec 100644
--- a/Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs
+++ b/Yw.Service.Run.Core/07-service/02-record/RunRealRecord.cs
@@ -12,7 +12,7 @@
/// </summary>
public Model.RunRealRecord GetLastRecord(string ObjectType, long ObjectID)
{
- var lcacheHelper = LCacheCreateHelper.CreateLCache<Yw.LCache.IRunRealLastRecordCacheHelper>();
+ var lcacheHelper = LCacheCreateHelper.CreateLCache3<Yw.LCache.IRunRealLastRecordCacheHelper>();
return lcacheHelper.GetLastRecord(ObjectType, ObjectID);
}
@@ -25,7 +25,7 @@
{
return default;
}
- var lcacheHelper = LCacheCreateHelper.CreateLCache<Yw.LCache.IRunRealLastRecordCacheHelper>();
+ var lcacheHelper = LCacheCreateHelper.CreateLCache3<Yw.LCache.IRunRealLastRecordCacheHelper>();
return lcacheHelper.GetLastRecord(ObjectType, ObjectIds);
}
@@ -38,7 +38,7 @@
{
return default;
}
- var lcacheHelper = LCacheCreateHelper.CreateLCache<Yw.LCache.IRunRealLastRecordCacheHelper>();
+ var lcacheHelper = LCacheCreateHelper.CreateLCache3<Yw.LCache.IRunRealLastRecordCacheHelper>();
return lcacheHelper.GetLastRecord(list);
}
@@ -64,7 +64,7 @@
{
Number = 1;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLastList(StartTime, EndTime, Number, Run);
return Entity2Models(entityList);
}
@@ -78,7 +78,7 @@
{
Number = 1;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLastListByDay(Day, Number, Run);
return Entity2Models(entityList);
}
@@ -96,7 +96,7 @@
{
Number = 1;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLastListByDayRange(StartDay, EndDay, Number, Run);
return Entity2Models(entityList);
}
@@ -114,7 +114,7 @@
{
Number = 1;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLastListByTimeRange(StartTime, EndTime, Number, Run);
return Entity2Models(entityList);
}
@@ -131,7 +131,7 @@
return default;
}
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.Get(StartTime, EndTime, Run);
return Entity2Models(entityList);
}
@@ -141,7 +141,7 @@
/// </summary>
public List<Model.RunRealRecord> GetByDay(DateTime Day, bool? Run = null)
{
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByDay(Day, Run);
return Entity2Models(entityList);
}
@@ -156,7 +156,7 @@
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByDayRange(StartDay, EndDay, Run);
return Entity2Models(entityList);
}
@@ -170,7 +170,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByTimeRange(StartTime, EndTime, Run);
return Entity2Models(entityList);
}
@@ -187,7 +187,7 @@
return default;
}
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetPageList(StartTime, EndTime, Run, PageIndex, PageSize, ref Total);
return Entity2Models(entityList);
}
@@ -205,7 +205,7 @@
{
Number = 1;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLastListByObjectTypeAndObjectID(ObjectType, ObjectID, Number, Run);
return Entity2Models(entityList);
}
@@ -222,7 +222,7 @@
return default;
}
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByObjectTypeAndObjectID(ObjectType, ObjectID, StartTime, EndTime, Run);
return Entity2Models(entityList);
}
@@ -239,7 +239,7 @@
return default;
}
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLimitByObjectTypeAndObjectID(ObjectType, ObjectID, StartTime, EndTime, Limit, Run);
return Entity2Models(entityList);
}
@@ -249,7 +249,7 @@
/// </summary>
public List<Model.RunRealRecord> GetByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, bool? Run = null)
{
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByObjectTypeAndObjectIDOfDay(ObjectType, ObjectID, Day, Run);
return Entity2Models(entityList);
}
@@ -259,7 +259,7 @@
/// </summary>
public List<Model.RunRealRecord> GetLimitByObjectTypeAndObjectIDOfDay(string ObjectType, long ObjectID, DateTime Day, int Limit, bool? Run = null)
{
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLimitByObjectTypeAndObjectIDOfDay(ObjectType, ObjectID, Day, Limit, Run);
return Entity2Models(entityList);
}
@@ -273,7 +273,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByObjectTypeAndObjectIDOfDayRange(ObjectType, ObjectID, StartDay, EndDay, Run);
return Entity2Models(entityList);
}
@@ -287,7 +287,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLimitByObjectTypeAndObjectIDOfDayRange(ObjectType, ObjectID, StartDay, EndDay, Limit, Run);
return Entity2Models(entityList);
}
@@ -301,7 +301,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetByObjectTypeAndObjectIDOfTimeRange(ObjectType, ObjectID, StartTime, EndTime, Run);
return Entity2Models(entityList);
}
@@ -315,7 +315,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetLimitByObjectTypeAndObjectIDOfTimeRange(ObjectType, ObjectID, StartTime, EndTime, Limit, Run);
return Entity2Models(entityList);
}
@@ -332,7 +332,7 @@
return default;
}
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entityList = dal.GetPageListByObjectTypeAndObjectID(ObjectType, ObjectID, StartTime, EndTime, Run, PageIndex, PageSize, ref Total);
return Entity2Models(entityList);
}
@@ -354,7 +354,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entity = Model2Entity(model);
return dal.InsertOrUpdate(entity);
}
@@ -368,7 +368,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<Yw.DAL.IRunRealRecord>();
+ var dal = DALCreateHelper.CreateDAL3<Yw.DAL.IRunRealRecord>();
var entity_list = Model2Entities(list);
return dal.InsertOrUpdate(entity_list);
}
@@ -385,7 +385,7 @@
var bol = Insert(record);
if (bol)
{
- var lcacheHelper = LCacheCreateHelper.CreateLCache<Yw.LCache.IRunRealLastRecordCacheHelper>();
+ var lcacheHelper = LCacheCreateHelper.CreateLCache3<Yw.LCache.IRunRealLastRecordCacheHelper>();
bol = lcacheHelper.SetLastRecord(record);
if (bol)
{
@@ -409,7 +409,7 @@
var bol = Inserts(list);
if (bol)
{
- var lcacheHelper = LCacheCreateHelper.CreateLCache<Yw.LCache.IRunRealLastRecordCacheHelper>();
+ var lcacheHelper = LCacheCreateHelper.CreateLCache3<Yw.LCache.IRunRealLastRecordCacheHelper>();
bol = lcacheHelper.SetLastRecord(list);
if (bol)
{
diff --git a/Yw.Service.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Service.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 5f4222e..3e2fc11 100644
--- a/Yw.Service.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Service.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-08-20T03:23:13.9367290Z;True|2024-07-17T12:22:58.4192354+08:00;True|2024-06-19T19:42:06.2329654+08:00;True|2024-05-31T15:21:11.9622287+08:00;True|2024-05-08T14:21:37.5917430+08:00;True|2024-04-30T13:45:44.5067765+08:00;True|2024-04-30T11:25:45.6839060+08:00;True|2024-04-30T11:25:41.5354173+08:00;True|2024-04-26T11:47:42.9605330+08:00;True|2024-04-01T11:38:17.4702370+08:00;True|2024-03-26T09:45:14.8395625+08:00;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
+ <History>True|2024-08-22T04:43:49.1072006Z;True|2024-08-20T11:23:13.9367290+08:00;True|2024-07-17T12:22:58.4192354+08:00;True|2024-06-19T19:42:06.2329654+08:00;True|2024-05-31T15:21:11.9622287+08:00;True|2024-05-08T14:21:37.5917430+08:00;True|2024-04-30T13:45:44.5067765+08:00;True|2024-04-30T11:25:45.6839060+08:00;True|2024-04-30T11:25:41.5354173+08:00;True|2024-04-26T11:47:42.9605330+08:00;True|2024-04-01T11:38:17.4702370+08:00;True|2024-03-26T09:45:14.8395625+08:00;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Service.Run.Core/Yw.Service.Run.Core.csproj b/Yw.Service.Run.Core/Yw.Service.Run.Core.csproj
index 049156a..6a19f82 100644
--- a/Yw.Service.Run.Core/Yw.Service.Run.Core.csproj
+++ b/Yw.Service.Run.Core/Yw.Service.Run.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.1.1</Version>
+ <Version>3.1.2</Version>
<Description>寮曠敤鍗囩骇</Description>
</PropertyGroup>
@@ -29,12 +29,12 @@
<ItemGroup>
<PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.8" />
<PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.8" />
- <PackageReference Include="Yw.DALFactory.Core" Version="3.0.2" />
- <PackageReference Include="Yw.ExchangeFactory.Core" Version="3.0.2" />
- <PackageReference Include="Yw.LCacheFactory.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.DALFactory.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.ExchangeFactory.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.LCacheFactory.Core" Version="3.0.5" />
<PackageReference Include="Yw.Medis.Core" Version="3.0.0" />
<PackageReference Include="Yw.MemoryQueue.Core" Version="3.0.0" />
- <PackageReference Include="Yw.QueueFactory.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.QueueFactory.Core" Version="3.0.5" />
<PackageReference Include="Yw.RabbitMq.Core" Version="3.0.0" />
<PackageReference Include="Yw.Redis.Core" Version="3.0.0" />
<PackageReference Include="Yw.Service.Core" Version="3.0.7" />
--
Gitblit v1.9.3