From 41385bbf1ff353c4bfd2a93724d29eb89afe8a73 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Fri, 20 Jan 2023 00:58:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E6=B6=88=E9=99=A4=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/BaiduOcr.cs                      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.BaiduOcr/Services/BaiduOcr.cs b/src/Extensions/Components/BootstrapBlazor.BaiduOcr/Services/BaiduOcr.cs
index 6643ac950f9..5929dd9b078 100644
--- a/src/Extensions/Components/BootstrapBlazor.BaiduOcr/Services/BaiduOcr.cs
+++ b/src/Extensions/Components/BootstrapBlazor.BaiduOcr/Services/BaiduOcr.cs
@@ -5,6 +5,7 @@
 using Baidu.Aip.Ocr;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 
 namespace BootstrapBlazor.Components;
 
@@ -71,11 +72,11 @@ public Task<BaiduOcrResult<InvoiceEntity>> CheckVatInvoiceAsync(byte[] image, Ca
     protected async Task<string> GetAccessToken()
     {
         var client = HttpClientFactory.CreateClient();
-        var para = new Dictionary<string, string>()
+        var para = new List<KeyValuePair<string?, string?>>()
         {
-            { "grant_type", "client_credentials" },
-            { "client_id", Options.CurrentValue.ApiKey },
-            { "client_secret", Options.CurrentValue.Secret }
+            new("grant_type", "client_credentials"),
+            new("client_id", Options.CurrentValue.ApiKey),
+            new("client_secret", Options.CurrentValue.Secret)
         };
 
         var resp = await client.PostAsync("https://aip.baidubce.com/oauth/2.0/token", new FormUrlEncodedContent(para));
@@ -102,21 +103,21 @@ public Task<BaiduOcrResult<InvoiceVerifyResult>> VerifyInvoiceAsync(string invoi
         var client = HttpClientFactory.CreateClient();
 
         // 拼装参数
-        var para = new Dictionary<string, string>()
+        var para = new List<KeyValuePair<string?, string?>>()
         {
-            { "invoice_code", invoiceCode },
-            { "invoice_num", invoiceNum },
-            { "invoice_date", invoiceDate },
-            { "invoice_type", invoiceType },
+            new("invoice_code", invoiceCode),
+            new("invoice_num", invoiceNum),
+            new("invoice_date", invoiceDate),
+            new("invoice_type", invoiceType),
         };
 
         if (!string.IsNullOrEmpty(checkCode))
         {
-            para["check_code"] = checkCode;
+            para.Add(new("check_code", checkCode));
         }
         if (!string.IsNullOrEmpty(totalAmount))
         {
-            para["total_amount"] = totalAmount;
+            para.Add(new("total_amount", totalAmount));
         }
 
         // 提交数据

From c81212006a20da4ad909646df97cd725df50aaf2 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Fri, 20 Jan 2023 01:48:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E5=A2=9E=E5=80=BC?=
 =?UTF-8?q?=E7=A8=8E=E9=AA=8C=E7=9C=9F=E6=8E=A5=E5=8F=A3=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaiduOcr/BaiduOcrVerifyVatInvoice.razor   | 87 +++++++++++++++++++
 .../Samples/BaiduOcr.razor                    |  2 +
 2 files changed, 89 insertions(+)
 create mode 100644 src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor

diff --git a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor
new file mode 100644
index 00000000000..514072660ef
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor
@@ -0,0 +1,87 @@
+@inject IBaiduOcr OcrService
+@inject ToastService ToastService
+@implements IDisposable
+
+<ValidateForm Model="Model" OnValidSubmit="@Verify">
+    <EditorForm TModel="InvoiceForm" RowType="RowType.Inline" AutoGenerateAllItem="false">
+        <FieldItems>
+            <EditorItem @bind-Field="@context.InvoiceCode" Text="发票代码" />
+            <EditorItem @bind-Field="@context.InvoiceNum" Text="发票号码" />
+            <EditorItem @bind-Field="@context.InvoiceDate" Text="开票日期" />
+            <EditorItem @bind-Field="@context.CheckCode" Text="校验码" />
+            <EditorItem @bind-Field="@context.TotalAmount" Text="金额" />
+        </FieldItems>
+        <Buttons>
+            <Button ButtonType="ButtonType.Submit" Icon="fa-solid fa-check" Text="Verify" />
+        </Buttons>
+    </EditorForm>
+</ValidateForm>
+
+<div class="mt-3">@InvoiceVerifyResult?.VerifyMessage</div>
+
+@code {
+    /// <summary>
+    /// 取消请求令牌
+    /// </summary>
+    private CancellationTokenSource? TokenSource { get; set; }
+
+    private InvoiceVerifyResult? InvoiceVerifyResult { get; set; }
+
+    private InvoiceForm Model { get; set; } = new() { InvoiceType = "elec_special_vat_invoice", TotalAmount = "0" };
+
+    private async Task Verify(EditContext context)
+    {
+        var result = await OcrService.VerifyInvoiceAsync(Model.InvoiceCode, Model.InvoiceNum, Model.InvoiceDate, Model.InvoiceType, Model.CheckCode, Model.TotalAmount);
+        InvoiceVerifyResult = result.Entity;
+        StateHasChanged();
+    }
+
+    /// <summary>
+    /// 关闭网页时调用
+    /// </summary>
+    /// <param name="disposing"></param>
+    /// <returns></returns>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing && TokenSource != null)
+        {
+            TokenSource.Cancel();
+            TokenSource.Dispose();
+        }
+    }
+
+    /// <summary>
+    /// 关闭网页时调用
+    /// </summary>
+    /// <returns></returns>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    private class InvoiceForm
+    {
+        [Required(ErrorMessage = "发票代码不能为空")]
+        [NotNull]
+        public string? InvoiceCode { get; set; }
+
+        [Required(ErrorMessage = "发票号码不能为空")]
+        [NotNull]
+        public string? InvoiceNum { get; set; }
+
+        [Required(ErrorMessage = "开票日期不能为空")]
+        [NotNull]
+        public string? InvoiceDate { get; set; }
+
+        [NotNull]
+        public string? InvoiceType { get; set; }
+
+        [Required(ErrorMessage = "校验码不能为空")]
+        [NotNull]
+        public string? CheckCode { get; set; }
+
+        [NotNull]
+        public string? TotalAmount { get; set; }
+    }
+}
diff --git a/src/BootstrapBlazor.Shared/Samples/BaiduOcr.razor b/src/BootstrapBlazor.Shared/Samples/BaiduOcr.razor
index f85f8e57e1d..0a8e7187976 100644
--- a/src/BootstrapBlazor.Shared/Samples/BaiduOcr.razor
+++ b/src/BootstrapBlazor.Shared/Samples/BaiduOcr.razor
@@ -15,3 +15,5 @@
 <div>@((MarkupString)Localizer["BaiduOcrStep2"].Value)</div>
 
 <DemoBlock Title="@Localizer["BasicUsageTitle"]" Introduction="@Localizer["BasicUsageIntro"]" Name="Normal" Demo="typeof(Demos.BaiduOcr.BaiduOcrNormal)" />
+
+<DemoBlock Title="@Localizer["BasicUsageTitle"]" Introduction="@Localizer["BasicUsageIntro"]" Name="Normal" Demo="typeof(Demos.BaiduOcr.BaiduOcrVerifyVatInvoice)" />