From 3818cb7636949bfbbf3b9c9d64f11470c009f3a9 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Fri, 5 Apr 2024 21:03:40 +0330 Subject: [PATCH] .... --- Back/Controllers/BaseController.cs | 8 ++++- Back/Services/ServBase.cs | 16 ++++++++- TaxPayerFull/Layout/Blog.razor | 4 +-- TaxPayerFull/Layout/LQuestion.razor | 2 +- TaxPayerFull/Layout/Lheaderbottom.razor | 16 +++++---- TaxPayerFull/Layout/TaxTools.razor | 46 ++++++++++++++++--------- 6 files changed, 64 insertions(+), 28 deletions(-) diff --git a/Back/Controllers/BaseController.cs b/Back/Controllers/BaseController.cs index af47021..0670116 100644 --- a/Back/Controllers/BaseController.cs +++ b/Back/Controllers/BaseController.cs @@ -47,7 +47,13 @@ namespace Back.Controllers } [HttpPost("ReadPublicKeyFromCER")] public async Task> ReadPublicKeyFromCER(string modelfromBase64) - => Ok(await _sBase.ReadPublicKeyFromCER(modelfromBase64)); + { + var result = await _sBase.ReadPublicKeyFromCER(modelfromBase64); + if (result.type== "error") + return BadRequest(); + + return Ok(result); + } } } diff --git a/Back/Services/ServBase.cs b/Back/Services/ServBase.cs index 18bdc75..0d7666e 100644 --- a/Back/Services/ServBase.cs +++ b/Back/Services/ServBase.cs @@ -3,6 +3,7 @@ using Back.Data.Contracts; using Back.Data.Models; using Microsoft.EntityFrameworkCore; using Shared.DTOs; +using System; using System.Diagnostics; using System.Text; @@ -147,8 +148,12 @@ namespace Back.Services return taxTools; } - public async Task ReadPublicKeyFromCER(string modelfromBase64) + public async Task ReadPublicKeyFromCER(string modelfromBase64) { + try + { + + string name = $"{DateTime.Now.Year}{DateTime.Now.Month}{DateTime.Now.DayOfWeek}{DateTime.Now.Hour}{DateTime.Now.Minute}{DateTime.Now.Second}"; string filePath = $"C:\\cer\\{name}.cer"; Stream stream = System.IO.File.Open(filePath, FileMode.Create); @@ -194,6 +199,15 @@ namespace Back.Services PublicKeyBase64 = Convert.ToBase64String(buffer), type = "txt" }; + } + catch (Exception) + { + return new PublicKeyDTO + { + PublicKeyBase64 = "error", + type = "error" + }; + } } } } diff --git a/TaxPayerFull/Layout/Blog.razor b/TaxPayerFull/Layout/Blog.razor index e181d00..589d71c 100644 --- a/TaxPayerFull/Layout/Blog.razor +++ b/TaxPayerFull/Layout/Blog.razor @@ -1,12 +1,12 @@ @using Shared.DTOs @inject HttpClient _hc -
+
-
+
diff --git a/TaxPayerFull/Layout/LQuestion.razor b/TaxPayerFull/Layout/LQuestion.razor index 43e19b3..fbb69a5 100644 --- a/TaxPayerFull/Layout/LQuestion.razor +++ b/TaxPayerFull/Layout/LQuestion.razor @@ -2,7 +2,7 @@ @inject HttpClient _hc @inject NavigationManager Navigation -
+
diff --git a/TaxPayerFull/Layout/Lheaderbottom.razor b/TaxPayerFull/Layout/Lheaderbottom.razor index 4c42c22..578d0b2 100644 --- a/TaxPayerFull/Layout/Lheaderbottom.razor +++ b/TaxPayerFull/Layout/Lheaderbottom.razor @@ -1,12 +1,12 @@ 
-
+
-
+ -
+
diff --git a/TaxPayerFull/Layout/TaxTools.razor b/TaxPayerFull/Layout/TaxTools.razor index 59ced78..99e3732 100644 --- a/TaxPayerFull/Layout/TaxTools.razor +++ b/TaxPayerFull/Layout/TaxTools.razor @@ -2,13 +2,13 @@ @using System.Text @inject HttpClient _hc @inject IJSRuntime JS -
+
-
+
ابزار/سامانه مودیان
@@ -76,12 +76,17 @@ - +
+ +
+
- +
@@ -94,8 +99,9 @@
@code { + private long maxFileSize = 1024 * 15; - + public string ErrorReadpublickey { get; set; } private EditContext? editContext; [SupplyParameterFromForm] @@ -131,6 +137,7 @@ var request = await _hc.PostAsJsonAsync("Base/CreateCsrAndPrivateKey", modelTaxTools); if (request.IsSuccessStatusCode) { + messageStore?.Clear(); var res = await request.Content.ReadFromJsonAsync(); await DownloadFileFromStream(res.Base64csr, $"{modelTaxTools.cn}.{res.typecsr}"); await DownloadFileFromStream(res.Base64key, $"{modelTaxTools.cn}.{res.typekey}"); @@ -144,6 +151,7 @@ } private async Task ReadPublicKeyFromCER(InputFileChangeEventArgs e) { + ErrorReadpublickey = ""; if (e.GetMultipleFiles()[0].Size <= maxFileSize) { string Base64Str = ""; @@ -156,21 +164,25 @@ } - // if (!string.IsNullOrEmpty(Base64Str)) - // { - // var request = await _hc.PostAsJsonAsync("Base/ReadPublicKeyFromCER", Base64Str); - // if (request.IsSuccessStatusCode) - // { - // var res = await request.Content.ReadFromJsonAsync(); - // await DownloadFileFromStream(res.PublicKeyBase64, $"{modelTaxTools.cn}.{res.type}"); - // } - // } + if (!string.IsNullOrEmpty(Base64Str)) + { + var request = await _hc.PostAsJsonAsync("Base/ReadPublicKeyFromCER", Base64Str); + if (request.IsSuccessStatusCode) + { + var res = await request.Content.ReadFromJsonAsync(); + await DownloadFileFromStream(res.PublicKeyBase64, $"{modelTaxTools.cn}.{res.type}"); + } + else + { + ErrorReadpublickey = "خطایی در اجرای عملیات رخ داده"; + } + } } else { - + ErrorReadpublickey = "حجم فایل بیشتر از حد مجاز می باشد"; } - + }