From e96ae946f9b977bd23b4d7d446c6cedb2ae0dbab Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 23 八月 2024 10:18:32 +0800
Subject: [PATCH] 底层引用升级
---
Service/HStation.Service.Organize.Core/05-service/00-core/01-dal/DALCreateHelper.cs | 2 +-
BLL/HStation.BLL.Core/HStation.BLL.Core.csproj | 2 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs | 2 +-
Service/HStation.Service.Xhs.Core/05-service/00-core/01-dal/DALCreateHelper.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Map.Core/Yw.WinFrmUI.Map.Core.csproj | 2 +-
Service/HStation.Service.Assets.Core/05-service/00-core/01-dal/DALCreateHelper.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj | 2 +-
Service/HStation.Service.PhartRelation.Core/05-service/00-core/DALCreateHelper.cs | 2 +-
WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj | 2 +-
Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj | 2 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 4 ++--
Dto/HStation.Dto.PhartRelation.Core/HStation.Dto.PhartRelation.Core.csproj | 2 +-
Hydro/Yw.Hydro.Core/ParseHelper.cs | 4 +---
BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj | 2 +-
Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj | 2 +-
WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj | 2 +-
Service/HStation.Service.Organize.Core/HStation.Service.Organize.Core.csproj | 2 +-
Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj | 2 +-
WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj | 2 +-
Dto/HStation.Dto.Organize.Core/HStation.Dto.Organize.Core.csproj | 2 +-
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj | 2 +-
Service/HStation.Service.PhartRelation.Core/HStation.Service.PhartRelation.Core.csproj | 2 +-
22 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/BLL/HStation.BLL.Core/HStation.BLL.Core.csproj b/BLL/HStation.BLL.Core/HStation.BLL.Core.csproj
index 1b08946..db52a79 100644
--- a/BLL/HStation.BLL.Core/HStation.BLL.Core.csproj
+++ b/BLL/HStation.BLL.Core/HStation.BLL.Core.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.CAL.HttpClient.Core" Version="3.0.9" />
+ <PackageReference Include="Yw.CAL.HttpClient.Core" Version="3.1.0" />
<PackageReference Include="Yw.CALFactory.Core" Version="3.0.2" />
<PackageReference Include="Yw.Mapster.Core" Version="3.0.0" />
</ItemGroup>
diff --git a/BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj b/BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj
index 47c637c..0c642de 100644
--- a/BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj
+++ b/BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj
@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.5" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
diff --git a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
index 2562b0e..c8349d1 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
+++ b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
@@ -61,7 +61,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.0.7" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
diff --git a/Dto/HStation.Dto.Organize.Core/HStation.Dto.Organize.Core.csproj b/Dto/HStation.Dto.Organize.Core/HStation.Dto.Organize.Core.csproj
index 3f853ca..72f017a 100644
--- a/Dto/HStation.Dto.Organize.Core/HStation.Dto.Organize.Core.csproj
+++ b/Dto/HStation.Dto.Organize.Core/HStation.Dto.Organize.Core.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Dto.Auth.Core" Version="3.2.0" />
+ <PackageReference Include="Yw.Dto.Auth.Core" Version="3.2.2" />
</ItemGroup>
<ItemGroup>
diff --git a/Dto/HStation.Dto.PhartRelation.Core/HStation.Dto.PhartRelation.Core.csproj b/Dto/HStation.Dto.PhartRelation.Core/HStation.Dto.PhartRelation.Core.csproj
index 145d0ce..8c94f09 100644
--- a/Dto/HStation.Dto.PhartRelation.Core/HStation.Dto.PhartRelation.Core.csproj
+++ b/Dto/HStation.Dto.PhartRelation.Core/HStation.Dto.PhartRelation.Core.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Dto.Phart.Core" Version="3.2.5" />
+ <PackageReference Include="Yw.Dto.Phart.Core" Version="3.2.7" />
</ItemGroup>
<ItemGroup>
diff --git a/Hydro/Yw.Hydro.Core/ParseHelper.cs b/Hydro/Yw.Hydro.Core/ParseHelper.cs
index 6030acd..c4b65c6 100644
--- a/Hydro/Yw.Hydro.Core/ParseHelper.cs
+++ b/Hydro/Yw.Hydro.Core/ParseHelper.cs
@@ -1,6 +1,4 @@
-锘縰sing System.Transactions;
-
-namespace Yw.Hydro
+锘縩amespace Yw.Hydro
{
/// <summary>
/// 瑙ｆ瀽杈呭姪绫�
diff --git a/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj b/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
index 6dbfda3..857c2aa 100644
--- a/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
+++ b/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Hydro.Core" Version="3.2.9" />
+ <PackageReference Include="Yw.Service.Hydro.Core" Version="3.3.1" />
</ItemGroup>
<ItemGroup>
diff --git a/Service/HStation.Service.Assets.Core/05-service/00-core/01-dal/DALCreateHelper.cs b/Service/HStation.Service.Assets.Core/05-service/00-core/01-dal/DALCreateHelper.cs
index 67cc871..4231df7 100644
--- a/Service/HStation.Service.Assets.Core/05-service/00-core/01-dal/DALCreateHelper.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/00-core/01-dal/DALCreateHelper.cs
@@ -15,7 +15,7 @@
var dbType = Settings.Assets.XhsParasHelper.Xhs.DataBase.DbType;
var enableCache = Settings.Assets.XhsParasHelper.Xhs.DataBase.Factory.EnableCache;
var cacheTime = Settings.Assets.XhsParasHelper.Xhs.DataBase.Factory.CacheTime;
- return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
+ return Yw.DALFactory.CreateDAL3<T>(dbType, enableCache, cacheTime);
}
}
}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
index 93ce600..2849a90 100644
--- a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
+++ b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
@@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.3" />
+ <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.8" />
</ItemGroup>
</Project>
diff --git a/Service/HStation.Service.Organize.Core/05-service/00-core/01-dal/DALCreateHelper.cs b/Service/HStation.Service.Organize.Core/05-service/00-core/01-dal/DALCreateHelper.cs
index 3b8805f..27b108b 100644
--- a/Service/HStation.Service.Organize.Core/05-service/00-core/01-dal/DALCreateHelper.cs
+++ b/Service/HStation.Service.Organize.Core/05-service/00-core/01-dal/DALCreateHelper.cs
@@ -16,7 +16,7 @@
var dbType = Settings.XhsParasHelper.Xhs.DataBase.DbType;
var enableCache = Settings.XhsParasHelper.Xhs.DataBase.Factory.EnableCache;
var cacheTime = Settings.XhsParasHelper.Xhs.DataBase.Factory.CacheTime;
- return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
+ return Yw.DALFactory.CreateDAL3<T>(dbType, enableCache, cacheTime);
}
}
diff --git a/Service/HStation.Service.Organize.Core/HStation.Service.Organize.Core.csproj b/Service/HStation.Service.Organize.Core/HStation.Service.Organize.Core.csproj
index 76dd630..0b389df 100644
--- a/Service/HStation.Service.Organize.Core/HStation.Service.Organize.Core.csproj
+++ b/Service/HStation.Service.Organize.Core/HStation.Service.Organize.Core.csproj
@@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.3" />
+ <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.8" />
</ItemGroup>
<ItemGroup>
diff --git a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DALCreateHelper.cs b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DALCreateHelper.cs
index 943a972..bfb13b2 100644
--- a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DALCreateHelper.cs
+++ b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DALCreateHelper.cs
@@ -16,7 +16,7 @@
var dbType = Settings.PhartRelationParasHelper.Xhs.DataBase.DbType;
var enableCache = Settings.PhartRelationParasHelper.Xhs.DataBase.Factory.EnableCache;
var cacheTime = Settings.PhartRelationParasHelper.Xhs.DataBase.Factory.CacheTime;
- return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
+ return Yw.DALFactory.CreateDAL3<T>(dbType, enableCache, cacheTime);
}
}
diff --git a/Service/HStation.Service.PhartRelation.Core/HStation.Service.PhartRelation.Core.csproj b/Service/HStation.Service.PhartRelation.Core/HStation.Service.PhartRelation.Core.csproj
index 3cd1705..a8cbdec 100644
--- a/Service/HStation.Service.PhartRelation.Core/HStation.Service.PhartRelation.Core.csproj
+++ b/Service/HStation.Service.PhartRelation.Core/HStation.Service.PhartRelation.Core.csproj
@@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="Yw.Geometry.Core" Version="3.2.5" />
<PackageReference Include="Yw.Pump.Core" Version="3.1.1" />
- <PackageReference Include="Yw.Service.Phart.Core" Version="3.2.2" />
+ <PackageReference Include="Yw.Service.Phart.Core" Version="3.2.5" />
</ItemGroup>
<ItemGroup>
diff --git a/Service/HStation.Service.Xhs.Core/05-service/00-core/01-dal/DALCreateHelper.cs b/Service/HStation.Service.Xhs.Core/05-service/00-core/01-dal/DALCreateHelper.cs
index 3b8805f..27b108b 100644
--- a/Service/HStation.Service.Xhs.Core/05-service/00-core/01-dal/DALCreateHelper.cs
+++ b/Service/HStation.Service.Xhs.Core/05-service/00-core/01-dal/DALCreateHelper.cs
@@ -16,7 +16,7 @@
var dbType = Settings.XhsParasHelper.Xhs.DataBase.DbType;
var enableCache = Settings.XhsParasHelper.Xhs.DataBase.Factory.EnableCache;
var cacheTime = Settings.XhsParasHelper.Xhs.DataBase.Factory.CacheTime;
- return Yw.DALFactory.CreateDAL<T>(dbType, enableCache, cacheTime);
+ return Yw.DALFactory.CreateDAL3<T>(dbType, enableCache, cacheTime);
}
}
diff --git a/Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj b/Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj
index 41fdad5..65240f1 100644
--- a/Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj
+++ b/Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj
@@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.6" />
+ <PackageReference Include="Yw.Service.Basic.Core" Version="3.2.8" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj b/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
index d056e40..f68f49f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.5" />
+ <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.6" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj b/WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj
index a6924d4..e490c2a 100644
--- a/WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj
+++ b/WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj
@@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.0.7" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
index f9401a7..4850f61 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
@@ -88,7 +88,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.0.3" />
+ <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.0.6" />
<PackageReference Include="Yw.WebBrower.Core" Version="3.0.2" />
<PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.1" />
</ItemGroup>
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
index 4ca1233..4b9fa08 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
@@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.Untity.Core" Version="3.0.0" />
+ <PackageReference Include="Yw.Untity.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
index c69b33b..faf2f9c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
@@ -11,7 +11,7 @@
/// <param name="rhs">褰撳墠缁勪欢</param>
/// <param name="allParterList">鎵�鏈夌粍浠跺垪琛�</param>
/// <returns></returns>
- public static HydroParterPropertyViewModel CreateViewModel(this Yw.Model.IHydroParterInfo rhs, List<Yw.Model.IHydroParterInfo> allParterList)
+ public static HydroParterPropertyViewModel CreateViewModel(this Yw.Model.HydroParterInfo rhs, List<Yw.Model.HydroParterInfo> allParterList)
{
HydroParterPropertyViewModel vm = null;
switch (rhs.Catalog)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
index fe22dc6..55a8e9f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
@@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.5" />
- <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.1.7" />
+ <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.6" />
+ <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.1.9" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/Yw.WinFrmUI.Map.Core/Yw.WinFrmUI.Map.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Map.Core/Yw.WinFrmUI.Map.Core.csproj
index 90568a5..93504c0 100644
--- a/WinFrmUI/Yw.WinFrmUI.Map.Core/Yw.WinFrmUI.Map.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Map.Core/Yw.WinFrmUI.Map.Core.csproj
@@ -146,7 +146,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.BLL.Map.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.BLL.Map.Core" Version="3.0.3" />
<PackageReference Include="Yw.WebBrower.Core" Version="3.0.2" />
<PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.1" />
</ItemGroup>
--
Gitblit v1.9.3