fix fullurl 不抛出异常了

Helpers/SimApiStorage.cs

@@ -3,15 +3,16 @@ using System;
 using System.IO;
 using Microsoft.AspNetCore.Http;
 using Minio;
+using Minio.DataModel.Args;
 using SimApi.Configurations;
 
 namespace SimApi.Helpers;
 
 public class SimApiStorage
 {
-    private MinioClient Mc { get; }
+    private IMinioClient Mc { get; }
 
-    public MinioClient Client => Mc;
+    public IMinioClient Client => Mc;
 
     private string ServeUrl { get; }
 
@@ -113,8 +114,9 @@ public class SimApiStorage
     /// <exception cref="Exception"></exception>
     public string FullUrl(string path)
     {
+        if (string.IsNullOrEmpty(path)) return path;
         if(path.StartsWith("http://") || path.StartsWith("https://")) return path;
-        if (!(path.StartsWith('/') || path.StartsWith("~/"))) throw new Exception("path must start with / or ~/");
+        if (!(path.StartsWith('/') || path.StartsWith("~/"))) return path;
         var httpRequest = HttpContextAccessor.HttpContext?.Request;
         var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
         if (string.IsNullOrEmpty(path))
@@ -125,6 +127,27 @@ public class SimApiStorage
         return path.StartsWith('~') ? string.Concat(url, path.AsSpan(1, path.Length - 1)) : $"{ServeUrl}{path}";
     }
 
+    /// <summary>
+    /// 获取一个Path得访问URL
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    public string? GetUrl(string? path)
+    {
+        if (string.IsNullOrEmpty(path)) return path;
+        if (path.StartsWith("~/"))
+        {
+            var httpRequest = HttpContextAccessor.HttpContext?.Request;
+            var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
+            return string.Concat(url, path.AsSpan(1, path.Length - 1));
+        }
+        if (path.StartsWith('/'))
+        {
+            return $"{ServeUrl}{path}";
+        }
+        return path;
+    }
+
     /// <summary>
     /// 从URL中获取相对路径 (如果url不是当前服务器的url,则原样返回)
     /// </summary>
@@ -132,7 +155,7 @@ public class SimApiStorage
     /// <returns></returns>
     public string? GetPath(string? url)
     {
-        return url?.Replace(Endpoint, string.Empty);
+        return url?.Replace($"{Endpoint}/{Bucket}", string.Empty);
     }
 
     private void CheckPath(string path)

SimApi.csproj

@@ -25,10 +25,10 @@
         <Folder Include="Exceptions\"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Minio" Version="4.0.7"/>
+        <PackageReference Include="Minio" Version="6.0.3" />
-        <PackageReference Include="RabbitMQ.Client" Version="6.6.0"/>
+        <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
     </ItemGroup>
     <ProjectExtensions>
         <MonoDevelop>

Synapse/RpcClient.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Text.Unicode;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Serialization;
 using RabbitMQ.Client.Events;
 using SimApi.Communications;
 using SimApi.Helpers;