懒得勤快 3 tahun lalu
induk
melakukan
3b4d1e39ea

+ 1 - 1
Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj

@@ -18,7 +18,7 @@
         <LangVersion>latest</LangVersion>
         <LangVersion>latest</LangVersion>
         <RepositoryType>Github</RepositoryType>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>1.0.5.4</Version>
+        <Version>1.0.5.5</Version>
         <FileVersion>1.0</FileVersion>
         <FileVersion>1.0</FileVersion>
         <Company>masuit.com</Company>
         <Company>masuit.com</Company>
         <AssemblyVersion>1.0</AssemblyVersion>
         <AssemblyVersion>1.0</AssemblyVersion>

+ 5 - 5
Masuit.Tools.AspNetCore/ModelBinder/BodyOrDefaultModelBinder.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Text;
+using System.Threading.Tasks;
 
 
 namespace Masuit.Tools.AspNetCore.ModelBinder;
 namespace Masuit.Tools.AspNetCore.ModelBinder;
 
 
@@ -44,7 +44,7 @@ public class BodyOrDefaultModelBinder : IModelBinder
                 }
                 }
                 catch
                 catch
                 {
                 {
-                    value = text;
+                    value = text.Trim('"');
                 }
                 }
             }
             }
             else if (request.HasFormContentType)
             else if (request.HasFormContentType)

+ 0 - 2
Masuit.Tools.Excel/ExcelExtension.cs

@@ -278,7 +278,6 @@ namespace Masuit.Tools.Excel
                     using var image = Image.Load(stream);
                     using var image = Image.Load(stream);
                     var ms = new MemoryStream();
                     var ms = new MemoryStream();
                     image.SaveAsWebp(ms);
                     image.SaveAsWebp(ms);
-                    stream.Dispose();
                     return (ePictureType.WebP, ms);
                     return (ePictureType.WebP, ms);
                 }
                 }
                 catch
                 catch
@@ -286,7 +285,6 @@ namespace Masuit.Tools.Excel
                     using var bmp = new Bitmap(stream);
                     using var bmp = new Bitmap(stream);
                     var ms = new MemoryStream();
                     var ms = new MemoryStream();
                     bmp.Save(ms, ImageFormat.Jpeg);
                     bmp.Save(ms, ImageFormat.Jpeg);
-                    stream.Dispose();
                     return (ePictureType.Jpg, ms);
                     return (ePictureType.Jpg, ms);
                 }
                 }
             }
             }

+ 1 - 1
Masuit.Tools.Excel/Masuit.Tools.Excel.csproj

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6</TargetFrameworks>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>1.1.2.1</Version>
+        <Version>1.1.2.2</Version>
         <Authors>懒得勤快</Authors>
         <Authors>懒得勤快</Authors>
         <Description>Masuit.Tools.Excel导出库,支持一些简单数据的导出,支持图片列</Description>
         <Description>Masuit.Tools.Excel导出库,支持一些简单数据的导出,支持图片列</Description>
         <Copyright>懒得勤快</Copyright>
         <Copyright>懒得勤快</Copyright>