From dd4da9a651330fabe210618581299ac3536bda2f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 26 十月 2024 21:41:24 +0800
Subject: [PATCH] 修复下载问题
---
Application/HStation.Application.Core/HStation.Application.Core.csproj | 2 +-
WinFrmUI/HStation.WinFrmUI.Common.Core/HStation.WinFrmUI.Common.Core.csproj.user | 8 +-------
WinFrmUI/HStation.WinFrmUI.Hydro.Core/HStation.WinFrmUI.Hydro.Core.csproj.user | 4 ++--
BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs | 16 ++++++++++++++--
Entry/HStation.Entry.TransferFile.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs | 5 +++++
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/Application/HStation.Application.Core/HStation.Application.Core.csproj b/Application/HStation.Application.Core/HStation.Application.Core.csproj
index c78ad78..6ac7beb 100644
--- a/Application/HStation.Application.Core/HStation.Application.Core.csproj
+++ b/Application/HStation.Application.Core/HStation.Application.Core.csproj
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Yw.Application.Core" Version="3.1.2" />
+ <PackageReference Include="Yw.Application.Core" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
diff --git a/BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs b/BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs
index c715011..afb114f 100644
--- a/BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs
+++ b/BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs
@@ -1,9 +1,11 @@
-锘縰sing System;
+锘縰sing Flurl.Http;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yw.BLL;
+using Yw.CAL.HttpClient;
namespace HStation.BLL
{
@@ -16,8 +18,18 @@
/// </summary>
public async Task<string> Download(string StorageHouse, string StorageCode)
{
- return await new HttpFileHelper().Download(_downloadUrl, StorageHouse, StorageCode, ConfigHelper.CALType);
+ return await new Yw.BLL.HttpFileHelper().Download(_downloadUrl, StorageHouse, StorageCode, ConfigHelper.CALType);
}
+
+
+
+
+
+
+
+
+
+
}
}
diff --git a/Entry/HStation.Entry.TransferFile.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/Entry/HStation.Entry.TransferFile.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index f04f3b9..1da2d6a 100644
--- a/Entry/HStation.Entry.TransferFile.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Entry/HStation.Entry.TransferFile.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\git\HStation\XHS\Entry\HStation.Entry.TransferFile.Core\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2024-10-22T04:04:52.7877610Z;True|2024-09-03T11:22:43.3813050+08:00;True|2024-09-03T11:06:18.0799295+08:00;True|2024-09-03T10:52:25.3198740+08:00;True|2024-09-02T09:16:17.5197059+08:00;False|2024-09-02T09:08:02.4504522+08:00;True|2024-06-20T12:16:07.3854116+08:00;True|2024-06-18T09:13:21.8960491+08:00;True|2024-06-12T18:55:43.2697624+08:00;True|2024-06-12T18:54:42.2191664+08:00;True|2024-06-12T18:37:39.2735086+08:00;True|2024-06-12T18:32:59.2340941+08:00;True|2024-06-12T18:18:57.9018714+08:00;True|2024-06-12T18:13:13.4471521+08:00;True|2024-06-12T18:11:38.4803257+08:00;True|2024-06-12T18:10:00.3753638+08:00;True|2024-06-12T18:03:08.9521607+08:00;True|2024-06-12T17:59:46.2755740+08:00;True|2024-06-12T17:58:01.8017051+08:00;True|2024-06-12T17:56:20.6946001+08:00;True|2024-06-12T17:32:53.8291604+08:00;True|2024-06-12T17:32:38.6492118+08:00;False|2024-06-12T17:32:17.0260105+08:00;True|2024-06-12T17:08:59.9367775+08:00;True|2024-06-12T16:32:42.3320305+08:00;True|2024-06-07T13:34:17.3014803+08:00;True|2024-06-07T13:20:33.5124438+08:00;True|2024-06-07T10:24:47.0351087+08:00;True|2024-06-05T17:04:55.4017239+08:00;True|2024-06-05T16:05:35.1432805+08:00;True|2024-06-05T15:18:06.1797165+08:00;True|2024-06-05T13:53:59.9366676+08:00;True|2024-06-05T13:43:45.7009774+08:00;True|2024-06-05T13:38:18.1415782+08:00;True|2024-06-05T12:14:05.4745826+08:00;True|2024-06-05T12:10:02.8443283+08:00;True|2024-06-02T18:41:28.5233205+08:00;True|2024-06-02T18:21:27.5679625+08:00;True|2024-06-02T17:34:02.6234679+08:00;True|2024-06-02T16:58:23.9422671+08:00;True|2024-06-02T16:16:43.6949096+08:00;True|2024-06-02T14:44:06.8963915+08:00;True|2024-06-02T11:10:51.5587482+08:00;True|2024-06-01T11:30:39.5033584+08:00;True|2024-05-30T16:29:38.0730664+08:00;True|2024-05-30T15:16:14.5429969+08:00;True|2024-05-29T17:31:27.5349115+08:00;True|2024-05-29T16:49:44.3085849+08:00;True|2024-05-29T10:46:15.3071701+08:00;True|2024-05-28T16:21:22.2987178+08:00;True|2024-05-28T11:55:02.0680294+08:00;True|2024-05-24T09:27:50.0479340+08:00;True|2024-05-23T14:16:32.3824342+08:00;True|2024-05-23T10:51:43.4383910+08:00;True|2024-05-22T11:19:10.1709647+08:00;True|2024-05-22T11:12:47.8835237+08:00;True|2024-05-22T10:43:34.7720709+08:00;True|2024-05-21T17:25:46.9831973+08:00;True|2024-05-21T12:11:55.2774332+08:00;True|2024-05-13T10:32:18.9951394+08:00;True|2024-05-09T09:53:09.1673089+08:00;True|2024-05-08T17:18:58.3017566+08:00;True|2024-05-08T11:15:08.3734126+08:00;True|2024-05-07T10:59:04.2016283+08:00;True|2024-05-07T10:58:56.6254107+08:00;True|2024-05-07T10:56:03.7274034+08:00;True|2024-05-07T10:55:53.5496684+08:00;True|2024-05-07T10:55:41.1246352+08:00;True|2024-05-07T09:57:18.3908307+08:00;True|2024-05-06T18:17:15.0427456+08:00;True|2024-05-06T17:38:00.0855585+08:00;True|2024-05-06T14:04:15.4665470+08:00;True|2024-05-06T09:38:06.9447096+08:00;False|2024-05-06T09:37:21.4257032+08:00;True|2024-04-30T10:27:11.6268274+08:00;True|2024-04-29T17:32:47.8657162+08:00;True|2024-04-29T17:26:03.4222331+08:00;True|2024-04-29T15:01:02.7501034+08:00;True|2024-04-29T14:40:23.2902896+08:00;True|2024-04-29T14:15:48.2534191+08:00;True|2024-04-29T13:50:31.8486861+08:00;True|2024-04-29T13:50:13.0369014+08:00;True|2024-04-29T11:57:41.6418088+08:00;True|2024-04-28T16:09:30.7968764+08:00;True|2024-04-28T09:35:40.6700676+08:00;True|2024-04-28T09:35:15.2841524+08:00;True|2024-04-26T15:21:07.2254684+08:00;True|2024-04-26T14:32:01.8070422+08:00;True|2024-04-25T10:44:33.7676650+08:00;True|2024-04-17T13:45:22.6768684+08:00;True|2024-04-16T17:47:19.0227884+08:00;True|2024-04-16T09:57:22.1921072+08:00;True|2024-04-15T11:05:36.4066643+08:00;True|2024-04-11T17:34:38.8235829+08:00;True|2024-04-11T16:35:57.9302909+08:00;True|2024-04-10T18:02:19.9441944+08:00;True|2024-04-10T17:21:38.1350878+08:00;True|2024-04-10T16:35:04.6259912+08:00;True|2024-04-10T15:56:11.9687705+08:00;True|2024-04-10T15:53:05.4535113+08:00;</History>
+ <History>True|2024-10-26T13:24:04.1480436Z;True|2024-10-26T10:49:30.2906922+08:00;True|2024-10-22T12:04:52.7877610+08:00;True|2024-09-03T11:22:43.3813050+08:00;True|2024-09-03T11:06:18.0799295+08:00;True|2024-09-03T10:52:25.3198740+08:00;True|2024-09-02T09:16:17.5197059+08:00;False|2024-09-02T09:08:02.4504522+08:00;True|2024-06-20T12:16:07.3854116+08:00;True|2024-06-18T09:13:21.8960491+08:00;True|2024-06-12T18:55:43.2697624+08:00;True|2024-06-12T18:54:42.2191664+08:00;True|2024-06-12T18:37:39.2735086+08:00;True|2024-06-12T18:32:59.2340941+08:00;True|2024-06-12T18:18:57.9018714+08:00;True|2024-06-12T18:13:13.4471521+08:00;True|2024-06-12T18:11:38.4803257+08:00;True|2024-06-12T18:10:00.3753638+08:00;True|2024-06-12T18:03:08.9521607+08:00;True|2024-06-12T17:59:46.2755740+08:00;True|2024-06-12T17:58:01.8017051+08:00;True|2024-06-12T17:56:20.6946001+08:00;True|2024-06-12T17:32:53.8291604+08:00;True|2024-06-12T17:32:38.6492118+08:00;False|2024-06-12T17:32:17.0260105+08:00;True|2024-06-12T17:08:59.9367775+08:00;True|2024-06-12T16:32:42.3320305+08:00;True|2024-06-07T13:34:17.3014803+08:00;True|2024-06-07T13:20:33.5124438+08:00;True|2024-06-07T10:24:47.0351087+08:00;True|2024-06-05T17:04:55.4017239+08:00;True|2024-06-05T16:05:35.1432805+08:00;True|2024-06-05T15:18:06.1797165+08:00;True|2024-06-05T13:53:59.9366676+08:00;True|2024-06-05T13:43:45.7009774+08:00;True|2024-06-05T13:38:18.1415782+08:00;True|2024-06-05T12:14:05.4745826+08:00;True|2024-06-05T12:10:02.8443283+08:00;True|2024-06-02T18:41:28.5233205+08:00;True|2024-06-02T18:21:27.5679625+08:00;True|2024-06-02T17:34:02.6234679+08:00;True|2024-06-02T16:58:23.9422671+08:00;True|2024-06-02T16:16:43.6949096+08:00;True|2024-06-02T14:44:06.8963915+08:00;True|2024-06-02T11:10:51.5587482+08:00;True|2024-06-01T11:30:39.5033584+08:00;True|2024-05-30T16:29:38.0730664+08:00;True|2024-05-30T15:16:14.5429969+08:00;True|2024-05-29T17:31:27.5349115+08:00;True|2024-05-29T16:49:44.3085849+08:00;True|2024-05-29T10:46:15.3071701+08:00;True|2024-05-28T16:21:22.2987178+08:00;True|2024-05-28T11:55:02.0680294+08:00;True|2024-05-24T09:27:50.0479340+08:00;True|2024-05-23T14:16:32.3824342+08:00;True|2024-05-23T10:51:43.4383910+08:00;True|2024-05-22T11:19:10.1709647+08:00;True|2024-05-22T11:12:47.8835237+08:00;True|2024-05-22T10:43:34.7720709+08:00;True|2024-05-21T17:25:46.9831973+08:00;True|2024-05-21T12:11:55.2774332+08:00;True|2024-05-13T10:32:18.9951394+08:00;True|2024-05-09T09:53:09.1673089+08:00;True|2024-05-08T17:18:58.3017566+08:00;True|2024-05-08T11:15:08.3734126+08:00;True|2024-05-07T10:59:04.2016283+08:00;True|2024-05-07T10:58:56.6254107+08:00;True|2024-05-07T10:56:03.7274034+08:00;True|2024-05-07T10:55:53.5496684+08:00;True|2024-05-07T10:55:41.1246352+08:00;True|2024-05-07T09:57:18.3908307+08:00;True|2024-05-06T18:17:15.0427456+08:00;True|2024-05-06T17:38:00.0855585+08:00;True|2024-05-06T14:04:15.4665470+08:00;True|2024-05-06T09:38:06.9447096+08:00;False|2024-05-06T09:37:21.4257032+08:00;True|2024-04-30T10:27:11.6268274+08:00;True|2024-04-29T17:32:47.8657162+08:00;True|2024-04-29T17:26:03.4222331+08:00;True|2024-04-29T15:01:02.7501034+08:00;True|2024-04-29T14:40:23.2902896+08:00;True|2024-04-29T14:15:48.2534191+08:00;True|2024-04-29T13:50:31.8486861+08:00;True|2024-04-29T13:50:13.0369014+08:00;True|2024-04-29T11:57:41.6418088+08:00;True|2024-04-28T16:09:30.7968764+08:00;True|2024-04-28T09:35:40.6700676+08:00;True|2024-04-28T09:35:15.2841524+08:00;True|2024-04-26T15:21:07.2254684+08:00;True|2024-04-26T14:32:01.8070422+08:00;True|2024-04-25T10:44:33.7676650+08:00;True|2024-04-17T13:45:22.6768684+08:00;True|2024-04-16T17:47:19.0227884+08:00;True|2024-04-16T09:57:22.1921072+08:00;True|2024-04-15T11:05:36.4066643+08:00;True|2024-04-11T17:34:38.8235829+08:00;True|2024-04-11T16:35:57.9302909+08:00;True|2024-04-10T18:02:19.9441944+08:00;True|2024-04-10T17:21:38.1350878+08:00;True|2024-04-10T16:35:04.6259912+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Common.Core/HStation.WinFrmUI.Common.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Common.Core/HStation.WinFrmUI.Common.Core.csproj.user
index 81dca9d..317a8c7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Common.Core/HStation.WinFrmUI.Common.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Common.Core/HStation.WinFrmUI.Common.Core.csproj.user
@@ -1,8 +1,2 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Compile Update="UserControl1.cs">
- <SubType>UserControl</SubType>
- </Compile>
- </ItemGroup>
-</Project>
\ No newline at end of file
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Hydro.Core/HStation.WinFrmUI.Hydro.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Hydro.Core/HStation.WinFrmUI.Hydro.Core.csproj.user
index 662cba5..1ef09dd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Hydro.Core/HStation.WinFrmUI.Hydro.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Hydro.Core/HStation.WinFrmUI.Hydro.Core.csproj.user
@@ -1,10 +1,10 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Compile Update="01-model\HydroModelMgrPage.cs">
+ <Compile Update="00-core\HydroQ3dViewPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-core\HydroQ3dViewPage.cs">
+ <Compile Update="01-model\HydroModelMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
index bb1f3b4..e9951ab 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraBars.Customization;
+using Yw.CAL.HttpClient;
namespace HStation.WinFrmUI
{
@@ -166,11 +167,15 @@
dlg.ReloadDataEvent += async (rhs) =>
{
var fileName = await BLLFactory<HStation.BLL.TransferRevitFile>.Instance.Download(rhs.StorageHouse, rhs.StorageCode);
+
+
this.btnEditSelectModelFile.EditValue = fileName;
};
dlg.ShowDialog();
}
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3