From 9af4546a11ca683d8c7f2d920c05cc97a963f3d4 Mon Sep 17 00:00:00 2001
From: SikongJueluo <selfconfusion@gmail.com>
Date: Thu, 14 Aug 2025 14:22:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B0=83=E6=95=B4reso?=
 =?UTF-8?q?urce=20manager=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=87=E7=BC=96=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/Controllers/JtagController.cs     | 10 ++--------
 server/src/Controllers/ResourceController.cs | 19 ++++---------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/server/src/Controllers/JtagController.cs b/server/src/Controllers/JtagController.cs
index 177992f..a992eb0 100644
--- a/server/src/Controllers/JtagController.cs
+++ b/server/src/Controllers/JtagController.cs
@@ -166,20 +166,14 @@ public class JtagController : ControllerBase
             var user = userResult.Value.Value;
             var resourceRet = _resourceManager.GetResourceById(bitstreamId);
 
-            if (!resourceRet.IsSuccessful)
-            {
-                logger.Error($"User {username} failed to get bitstream from database: {resourceRet.Error}");
-                return TypedResults.InternalServerError($"数据库查询失败: {resourceRet.Error?.Message}");
-            }
-
-            if (!resourceRet.Value.HasValue)
+            if (!resourceRet.HasValue)
             {
                 logger.Warn($"User {username} attempted to download non-existent bitstream ID: {bitstreamId}");
                 return TypedResults.BadRequest("比特流不存在");
             }
 
             // 处理比特流数据
-            var resource = resourceRet.Value.Value;
+            var resource = resourceRet.Value;
             var bitstreamRet = _resourceManager.ReadBytesFromPath(resource.Path);
             if (!bitstreamRet.IsSuccessful)
             {
diff --git a/server/src/Controllers/ResourceController.cs b/server/src/Controllers/ResourceController.cs
index 0a501e9..7cca444 100644
--- a/server/src/Controllers/ResourceController.cs
+++ b/server/src/Controllers/ResourceController.cs
@@ -227,19 +227,13 @@ public class ResourceController : ControllerBase
         {
             var result = _resourceManager.GetResourceById(resourceId);
 
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"获取资源时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {result.Error.Message}");
-            }
-
-            if (!result.Value.HasValue)
+            if (!result.HasValue)
             {
                 logger.Warn($"资源不存在: {resourceId}");
                 return NotFound($"资源 {resourceId} 不存在");
             }
 
-            var resource = result.Value.Value;
+            var resource = result.Value;
             logger.Info($"成功获取资源: {resourceId} ({resource.ResourceName})");
 
             var dataRet = _resourceManager.ReadBytesFromPath(resource.Path);
@@ -288,19 +282,14 @@ public class ResourceController : ControllerBase
 
             // 先获取资源信息以验证权限
             var resourceResult = _resourceManager.GetResourceById(resourceId);
-            if (!resourceResult.IsSuccessful)
-            {
-                logger.Error($"获取资源时出错: {resourceResult.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {resourceResult.Error.Message}");
-            }
 
-            if (!resourceResult.Value.HasValue)
+            if (!resourceResult.HasValue)
             {
                 logger.Warn($"资源不存在: {resourceId}");
                 return NotFound($"资源 {resourceId} 不存在");
             }
 
-            var resource = resourceResult.Value.Value;
+            var resource = resourceResult.Value;
 
             // 权限检查：管理员可以删除所有资源，普通用户只能删除自己的用户资源
             if (!User.IsInRole("Admin"))