From 9573f058c9dc57f11427b6b3fc568b339048de3d Mon Sep 17 00:00:00 2001 From: SHM Date: Fri, 25 Apr 2025 15:42:53 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=84=B1=ED=98=84=EB=AA=A8]=20VPKI=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/ISO15118_02Service.cs | 4 +- .../Services/ISO15118_20Service.cs | 2 +- .../Module/VPKIApiCertificate.razor | 6 +-- .../Components/Module/VPKIApiTbscsr.razor | 8 +-- .../Components/Pages/VPKIApi.razor | 51 +++++++++++++++++-- .../Components/Pages/VPKIManager.razor | 34 ++++++------- 6 files changed, 73 insertions(+), 32 deletions(-) diff --git a/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_02Service.cs b/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_02Service.cs index f16f7cf..7b2a14f 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_02Service.cs +++ b/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_02Service.cs @@ -218,7 +218,7 @@ namespace VPKI.Web.Api.Services //db처리 using (var transaction = await context.CreateTransactionAsync()) { - if (await context.TCertificates.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) != null) + if (await context.TCertificates.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) == null) { var certificate = new TCertificate { @@ -245,7 +245,7 @@ namespace VPKI.Web.Api.Services var ocsp = await Ocsp(tbscsr.CCuid); using (var transaction = await context.CreateTransactionAsync()) { - if (await context.TOcsps.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) != null) + if (await context.TOcsps.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) == null) { var certificate = new TOcsp { diff --git a/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_20Service.cs b/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_20Service.cs index e3e8333..fb780b1 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_20Service.cs +++ b/Projects/VPKI/VPKI/VPKI.Web.Api/Services/ISO15118_20Service.cs @@ -228,7 +228,7 @@ namespace VPKI.Web.Api.Services using (var transaction = await context.CreateTransactionAsync()) { - if (await context.TCertificates.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) != null) + if (await context.TCertificates.AsNoTracking().FirstOrDefaultAsync(x => x.CCuid == tbscsr.CCuid) == null) { var certificate = new TCertificate { diff --git a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiCertificate.razor b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiCertificate.razor index cf3e266..633f4b9 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiCertificate.razor +++ b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiCertificate.razor @@ -112,7 +112,7 @@ CreateCsrHash(ecdsa); } - private void OnClickSignedHash() + public void OnClickSignedHash() { SignedHash(); } @@ -160,7 +160,7 @@ } } - private void OnClickGenerateCertificate() + public void OnClickGenerateCertificate() { CertificateContainer.RequestCertificate.csrsignature = CertificateContainer.CsrHashed.EncodedSignedCsr; if (TbscsrContainer.VpkiType == VpkiType.prov_cert || TbscsrContainer.VpkiType == VpkiType.vehicle_cert) @@ -171,7 +171,7 @@ CertificateContainer.StrRequest = $"{CertificateContainer.RequestCertificate.ToJson()}"; } - private async Task OnClickSendCertificate() + public async Task OnClickSendCertificate() { DialogService.OpenIndicator(); diff --git a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiTbscsr.razor b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiTbscsr.razor index 5f7ac8a..0eacbca 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiTbscsr.razor +++ b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Module/VPKIApiTbscsr.razor @@ -111,7 +111,7 @@ } //mac address - private void OnClickRandomMacaddresss() + public void OnClickRandomMacaddresss() { var randomMac = CreateRandomMacAddress(); TbscsrContainer.RequestTbscsr.cnInfo.macaddr = randomMac; @@ -126,7 +126,7 @@ } //generate key - private void OnClickGenerateKey() + public void OnClickGenerateKey() { GenerateKey(); } @@ -169,13 +169,13 @@ } //request tbscsr - private void OnClickGenerateTbscsr() + public void OnClickGenerateTbscsr() { TbscsrContainer.RequestTbscsr.publickey = TbscsrContainer.PublicKey; TbscsrContainer.StrRequest = $"{TbscsrContainer.RequestTbscsr.ToJson()}"; } - private async Task OnClickSendTbscsr() + public async Task OnClickSendTbscsr() { DialogService.OpenIndicator(); diff --git a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIApi.razor b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIApi.razor index fc44eeb..297c8b6 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIApi.razor +++ b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIApi.razor @@ -14,6 +14,9 @@
+ + +
@@ -28,12 +31,12 @@
- +
- +
@@ -50,16 +53,54 @@ -@code { - private string ServerAddress = "127.0.0.1:8080"; +@code { + private string ServerAddress = "127.0.0.1:8080"; + private bool isAutoRun = false; Dictionary DicTbscsrContainer = new Dictionary(); Dictionary DicCertificateContainer = new Dictionary(); Dictionary DicVerifyResultContainer = new Dictionary(); + VPKIApiTbscsr? refVPKIApiTbscsr; + VPKIApiCertificate? refVPKIApiCertificate; + protected override void OnInitialized() { + int cnt = 0; SetDefaultValue(); + Task.Run(async() => { + await Task.Delay(3000); + while (true) + { + //tbscsr + await Task.Delay(3000); + + if (isAutoRun == false) + continue; + + await InvokeAsync(() => refVPKIApiTbscsr.OnClickRandomMacaddresss()); + await Task.Delay(100); + await InvokeAsync(() => refVPKIApiTbscsr.OnClickGenerateKey()); + await Task.Delay(100); + await InvokeAsync(() => refVPKIApiTbscsr.OnClickGenerateTbscsr()); + await Task.Delay(100); + await InvokeAsync(async () => await refVPKIApiTbscsr.OnClickSendTbscsr()); + await Task.Delay(100); + + //certificate + await InvokeAsync(() => refVPKIApiCertificate.OnClickSignedHash()); + await Task.Delay(100); + await InvokeAsync(() => refVPKIApiCertificate.OnClickGenerateCertificate()); + await Task.Delay(100); + await InvokeAsync(async () => await refVPKIApiCertificate.OnClickSendCertificate()); + + cnt += 1; + if (cnt >= 10000) + { + break; + } + } + }); } private void SetDefaultValue() diff --git a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIManager.razor b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIManager.razor index a04ba79..af488ca 100644 --- a/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIManager.razor +++ b/Projects/VPKI/VPKI/VPKI.Web.Client/Components/Pages/VPKIManager.razor @@ -199,25 +199,25 @@ //Default filter requestUrl += $"startDate={SearchStartDate}&"; requestUrl += $"endDate={SearchEndDate}&"; - requestUrl += $"startCcuid={startCcuid}&"; + // requestUrl += $"startCcuid={startCcuid}&"; //optional filter - if (string.IsNullOrEmpty(FilterIft) == false) - { - requestUrl += $"ift={FilterIft}&"; - } - if (string.IsNullOrEmpty(FilterWMI) == false) - { - requestUrl += $"wmi={FilterWMI}&"; - } - if (string.IsNullOrEmpty(FilterDC) == false) - { - requestUrl += $"dc={FilterDC}&"; - } - if (string.IsNullOrEmpty(FilterCertType) == false) - { - requestUrl += $"certType={FilterCertType}&"; - } + // if (string.IsNullOrEmpty(FilterIft) == false) + // { + // requestUrl += $"ift={FilterIft}&"; + // } + // if (string.IsNullOrEmpty(FilterWMI) == false) + // { + // requestUrl += $"wmi={FilterWMI}&"; + // } + // if (string.IsNullOrEmpty(FilterDC) == false) + // { + // requestUrl += $"dc={FilterDC}&"; + // } + // if (string.IsNullOrEmpty(FilterCertType) == false) + // { + // requestUrl += $"certType={FilterCertType}&"; + // } history?.Clear(); var result = await ApiService.GetJsonAsync>(requestUrl);