From 69c6cd5bb287793f8080591f99423acbf69439ba Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 10 五月 2024 10:29:45 +0800
Subject: [PATCH] 引用升级
---
Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_PostgreSql.cs | 0
Yw.Service.DMA.Core/05-service/00-core/CacheHelper.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/00-core/Paras_DMA.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase.cs | 0
Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj | 6 +++---
Yw.Service.DMA.Core/paras_dma_settings.json | 4 ++--
Yw.Service.DMA.Core/03-settings/00-core/DMAParasHelper.cs | 0
Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 3 ++-
Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 3 ++-
Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_Factory.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_HttpClient.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_LocalClient.cs | 0
Yw.Service.DMA.Core/05-service/00-core/DALCreateHelper.cs | 0
Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 3 ++-
Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj | 7 ++++---
Yw.Service.DMA.Core/03-settings/01-paras/00-core/DMAParas.cs | 0
Yw.Service.DMA.Core/05-service/00-core/Extensions.cs | 0
Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj | 6 +++---
Yw.Service.DMA.Core/03-settings/00-core/DMAFileHelper.cs | 0
Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_SQLite.cs | 0
21 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 49eb4b3..6834c63 100644
--- a/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Application.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-03-30T09:09:28.4169533Z;True|2024-03-30T17:08:43.0412281+08:00;True|2024-03-30T17:07:25.2289052+08:00;True|2024-03-26T15:12:13.3294744+08:00;True|2024-03-08T16:18:57.0565373+08:00;True|2024-01-27T11:12:36.5624841+08:00;True|2024-01-21T15:11:49.7807954+08:00;True|2023-12-14T16:15:09.1175216+08:00;True|2023-12-14T16:03:02.7254674+08:00;True|2023-12-14T11:25:21.0608059+08:00;True|2023-12-14T09:22:56.3156463+08:00;True|2023-12-05T17:05:07.9898436+08:00;True|2023-12-05T17:04:51.8319435+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-05-10T02:29:18.3677390Z;True|2024-03-30T17:09:28.4169533+08:00;True|2024-03-30T17:08:43.0412281+08:00;True|2024-03-30T17:07:25.2289052+08:00;True|2024-03-26T15:12:13.3294744+08:00;True|2024-03-08T16:18:57.0565373+08:00;True|2024-01-27T11:12:36.5624841+08:00;True|2024-01-21T15:11:49.7807954+08:00;True|2023-12-14T16:15:09.1175216+08:00;True|2023-12-14T16:03:02.7254674+08:00;True|2023-12-14T11:25:21.0608059+08:00;True|2023-12-14T09:22:56.3156463+08:00;True|2023-12-05T17:05:07.9898436+08:00;True|2023-12-05T17:04:51.8319435+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.DMA.Core/Yw.Application.DMA.Core.csproj b/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj
index db181eb..c28680a 100644
--- a/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj
+++ b/Yw.Application.DMA.Core/Yw.Application.DMA.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw.Application</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.0.2</Version>
+ <Version>3.0.3</Version>
</PropertyGroup>
<ItemGroup>
@@ -32,8 +32,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
- <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Application.Core" Version="3.0.6" />
+ <PackageReference Include="Yw.Dto.DMA.Core" Version="3.0.2" />
</ItemGroup>
</Project>
diff --git a/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9ed2816..f786859 100644
--- a/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Dto.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-03-30T09:05:48.8170927Z;True|2024-03-26T15:05:50.1066628+08:00;</History>
+ <History>True|2024-05-10T02:28:26.2058407Z;True|2024-05-10T10:28:01.5997409+08:00;True|2024-03-30T17:05:48.8170927+08:00;True|2024-03-26T15:05:50.1066628+08:00;</History>
+ <LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj b/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
index c693807..7afde46 100644
--- a/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
+++ b/Yw.Dto.DMA.Core/Yw.Dto.DMA.Core.csproj
@@ -4,12 +4,13 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
- <Version>3.0.1</Version>
+ <Version>3.0.2</Version>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Dto.Core" Version="3.0.5" />
- <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.Dto.Core" Version="3.0.6" />
+ <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.2" />
</ItemGroup>
</Project>
diff --git a/Yw.Service.DMA.Core/03-settings/helper/DMAFileHelper.cs b/Yw.Service.DMA.Core/03-settings/00-core/DMAFileHelper.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/helper/DMAFileHelper.cs
rename to Yw.Service.DMA.Core/03-settings/00-core/DMAFileHelper.cs
diff --git a/Yw.Service.DMA.Core/03-settings/helper/DMAParasHelper.cs b/Yw.Service.DMA.Core/03-settings/00-core/DMAParasHelper.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/helper/DMAParasHelper.cs
rename to Yw.Service.DMA.Core/03-settings/00-core/DMAParasHelper.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/DMAParas.cs b/Yw.Service.DMA.Core/03-settings/01-paras/00-core/DMAParas.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/DMAParas.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/00-core/DMAParas.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA.cs b/Yw.Service.DMA.Core/03-settings/01-paras/00-core/Paras_DMA.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/00-core/Paras_DMA.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase.cs b/Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_Factory.cs b/Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_Factory.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_Factory.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_Factory.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_PostgreSql.cs b/Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_PostgreSql.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_PostgreSql.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_PostgreSql.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_SQLite.cs b/Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_SQLite.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_DataBase_SQLite.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/01-database/Paras_DMA_DataBase_SQLite.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL.cs b/Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_HttpClient.cs b/Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_HttpClient.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_HttpClient.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_HttpClient.cs
diff --git a/Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_LocalClient.cs b/Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_LocalClient.cs
similarity index 100%
rename from Yw.Service.DMA.Core/03-settings/paras/Paras_DMA_CAL_LocalClient.cs
rename to Yw.Service.DMA.Core/03-settings/01-paras/02-cal/Paras_DMA_CAL_LocalClient.cs
diff --git a/Yw.Service.DMA.Core/05-service/00-helper/CacheHelper.cs b/Yw.Service.DMA.Core/05-service/00-core/CacheHelper.cs
similarity index 100%
rename from Yw.Service.DMA.Core/05-service/00-helper/CacheHelper.cs
rename to Yw.Service.DMA.Core/05-service/00-core/CacheHelper.cs
diff --git a/Yw.Service.DMA.Core/05-service/00-helper/DALCreateHelper.cs b/Yw.Service.DMA.Core/05-service/00-core/DALCreateHelper.cs
similarity index 100%
rename from Yw.Service.DMA.Core/05-service/00-helper/DALCreateHelper.cs
rename to Yw.Service.DMA.Core/05-service/00-core/DALCreateHelper.cs
diff --git a/Yw.Service.DMA.Core/05-service/00-helper/Extensions.cs b/Yw.Service.DMA.Core/05-service/00-core/Extensions.cs
similarity index 100%
rename from Yw.Service.DMA.Core/05-service/00-helper/Extensions.cs
rename to Yw.Service.DMA.Core/05-service/00-core/Extensions.cs
diff --git a/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9f90195..cb0c908 100644
--- a/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Yw.Service.DMA.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-03-30T08:12:07.8965954Z;True|2024-03-26T14:58:52.6917193+08:00;True|2024-03-08T16:18:18.3780160+08:00;True|2024-01-21T15:08:21.6456363+08:00;True|2023-12-14T16:14:15.6493020+08:00;True|2023-12-14T16:02:00.2140184+08:00;True|2023-12-14T16:01:54.5715660+08:00;True|2023-12-14T11:24:08.6483638+08:00;True|2023-12-14T09:18:59.7684854+08:00;True|2023-12-05T17:01:08.6045358+08:00;True|2023-12-05T17:00:59.6449800+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-05-10T02:26:34.1160186Z;True|2024-03-30T16:12:07.8965954+08:00;True|2024-03-26T14:58:52.6917193+08:00;True|2024-03-08T16:18:18.3780160+08:00;True|2024-01-21T15:08:21.6456363+08:00;True|2023-12-14T16:14:15.6493020+08:00;True|2023-12-14T16:02:00.2140184+08:00;True|2023-12-14T16:01:54.5715660+08:00;True|2023-12-14T11:24:08.6483638+08:00;True|2023-12-14T09:18:59.7684854+08:00;True|2023-12-05T17:01:08.6045358+08:00;True|2023-12-05T17:00:59.6449800+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.DMA.Core/Yw.Service.DMA.Core.csproj b/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj
index 870e727..73886ff 100644
--- a/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj
+++ b/Yw.Service.DMA.Core/Yw.Service.DMA.Core.csproj
@@ -7,7 +7,7 @@
<RootNamespace>Yw</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.0.1</Version>
+ <Version>3.0.2</Version>
<Description>寮曠敤鍗囩骇</Description>
</PropertyGroup>
@@ -27,8 +27,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.0" />
- <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.0" />
+ <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.2" />
<PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
<PackageReference Include="Yw.Service.Core" Version="3.0.2" />
</ItemGroup>
diff --git a/Yw.Service.DMA.Core/paras_dma_settings.json b/Yw.Service.DMA.Core/paras_dma_settings.json
index 572df16..1809479 100644
--- a/Yw.Service.DMA.Core/paras_dma_settings.json
+++ b/Yw.Service.DMA.Core/paras_dma_settings.json
@@ -4,7 +4,7 @@
"DMA": {
"DataBase": {
- "DbType": "PostgreSql", //PostgreSql、SQLite
+ "DbType": "PostgreSql", //PostgreSql/SQLite
"Factory": {
"EnableCache": true,
"CacheTime": 10
@@ -17,7 +17,7 @@
}
},
"CAL": {
- "CALType": "HttpClient", //HttpClient、LocalClient
+ "CALType": "HttpClient", //HttpClient/LocalClient
"HttpClient": {
"HttpUrl": "http://101.133.133.173:97"
},
--
Gitblit v1.9.3