From f3932cfaef34a25b3c686767280d8429baa384ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Tue, 12 Nov 2024 12:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Layouts/BasicLayout.razor      |  3 +++
 .../Components/Layouts/BasicLayout.razor.cs   | 25 ++++++++++++++-----
 VideoAnalysis/Components/Pages/Login.razor    |  2 +-
 VideoAnalysis/Controllers/ApiController.cs    |  2 +-
 VideoAnalysisCore/Model/Dto/VideoTaskDto.cs   | 11 +++-----
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/VideoAnalysis/Components/Layouts/BasicLayout.razor b/VideoAnalysis/Components/Layouts/BasicLayout.razor
index 2c28310..6480dbf 100644
--- a/VideoAnalysis/Components/Layouts/BasicLayout.razor
+++ b/VideoAnalysis/Components/Layouts/BasicLayout.razor
@@ -17,6 +17,9 @@
             <SpaceItem>
                 <Icon Class="action" Type="reload" Theme="outline" OnClick="Reload" />
             </SpaceItem>
+            <SpaceItem>
+                <Icon Type="api" Theme="outline" OnClick="ToSwagger" />
+            </SpaceItem>
         </Space>
     </HeaderContentRender>
     <RightContentRender>
diff --git a/VideoAnalysis/Components/Layouts/BasicLayout.razor.cs b/VideoAnalysis/Components/Layouts/BasicLayout.razor.cs
index ada5451..629624a 100644
--- a/VideoAnalysis/Components/Layouts/BasicLayout.razor.cs
+++ b/VideoAnalysis/Components/Layouts/BasicLayout.razor.cs
@@ -3,6 +3,7 @@ using AntDesign.ProLayout;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
 using Microsoft.Identity.Client.Extensions.Msal;
+using Microsoft.JSInterop;
 using System.Globalization;
 using System.Net.Http.Json;
 
@@ -15,6 +16,7 @@ namespace VideoAnalysisRazor.Layouts
 
         [Inject] IHttpContextAccessor HttpContextAccessor { get; set; } = default!;
         [Inject] private ReuseTabsService TabService { get; set; }
+        [Inject] private IJSRuntime JSRuntime { get; set; }
         [Inject] private ProtectedSessionStorage session { get; set; } = default!;
 
         bool collapsed;
@@ -34,6 +36,13 @@ namespace VideoAnalysisRazor.Layouts
         protected override async Task OnInitializedAsync()
         {
             _menuData = [
+                new MenuDataItem
+                {
+                    Path = "/",
+                    Name = "任务队列",
+                    Key = "VideoTaskPage",
+                    Icon = "unordered-list",
+                },
                 new MenuDataItem
                 {
                     Path = "/Project",
@@ -43,15 +52,15 @@ namespace VideoAnalysisRazor.Layouts
                 },
                 new MenuDataItem
                 {
-                    Path = "/",
-                    Name = "任务队列",
-                    Key = "VideoTaskPage",
-                    Icon = "unordered-list",
+                    Path = "/Login",
+                    Name = "登录页",
+                    Key = "Login",
+                    HideInMenu = true,
                 }
             ];
         }
 
-        public async Task<bool> CheckLogin() 
+        public async Task<bool> CheckLogin()
         {
             return (await session.GetAsync<bool>("Login")).Value;
         }
@@ -59,10 +68,14 @@ namespace VideoAnalysisRazor.Layouts
         {
             TabService.ReloadPage();
         }
+        async Task ToSwagger()
+        {
+            await JSRuntime.InvokeVoidAsync("open", "/swagger/index.html", "_blank");
+        }
 
         public void Dispose()
         {
-            
+
         }
 
     }
diff --git a/VideoAnalysis/Components/Pages/Login.razor b/VideoAnalysis/Components/Pages/Login.razor
index 30df1ff..5292de6 100644
--- a/VideoAnalysis/Components/Pages/Login.razor
+++ b/VideoAnalysis/Components/Pages/Login.razor
@@ -5,7 +5,7 @@
 @using SqlSugar
 @using VideoAnalysisCore.Model
 @using VideoAnalysisCore.Model.Dto
-
+@attribute [ReuseTabsPage(Ignore = true)]
 
 <section style="width:100%;height:100%">
     <!-- 背景颜色 -->
diff --git a/VideoAnalysis/Controllers/ApiController.cs b/VideoAnalysis/Controllers/ApiController.cs
index d140006..6db61d3 100644
--- a/VideoAnalysis/Controllers/ApiController.cs
+++ b/VideoAnalysis/Controllers/ApiController.cs
@@ -41,7 +41,7 @@ namespace Learn.VideoAnalysis.Controllers
         /// <param name="tagId">�Զ���id</param>
         /// <returns></returns>
         [HttpGet(Name = "TaskInfo")]
-        public async Task<IActionResult> TaskInfo(long taskId,string tagId)
+        public async Task<IActionResult> TaskInfo(long taskId,string? tagId)
         {
             var  task = await videoTaskDB.AsQueryable()
                 .WhereIF(taskId!=0, s => s.Id == taskId)
diff --git a/VideoAnalysisCore/Model/Dto/VideoTaskDto.cs b/VideoAnalysisCore/Model/Dto/VideoTaskDto.cs
index 5c1ba0b..4a912fa 100644
--- a/VideoAnalysisCore/Model/Dto/VideoTaskDto.cs
+++ b/VideoAnalysisCore/Model/Dto/VideoTaskDto.cs
@@ -50,21 +50,16 @@ namespace VideoAnalysisCore.Model.Dto
         [DisplayName("媒体路径")]
         public string MediaUrl { get; set; } = string.Empty;
         /// <summary>
-        /// 自定义值 任务完成后附带通知
+        /// 自定义ID
         /// </summary>
-        [DisplayName("自定义值")]
-        public string? Tag { get; set; }
+        [DisplayName("自定义ID")]
+        public string? TagId { get; set; }
         /// <summary>
         /// 消耗token
         /// </summary>
         [DisplayName("消耗Token")]
         public int TotalTokens { get; set; }
         /// <summary>
-        ///回调Api地址
-        /// </summary>
-        [DisplayName("回调地址")]
-        public string? CallBackUrl { get; set; }
-        /// <summary>
         /// 创建时间
         /// </summary>
         [DisplayName("创建时间")]