浏览代码

😎1、调整外链默认自带token 2、清理文件上传相关代码 3、升级nuget包

zuohuaijun 2 年之前
父节点
当前提交
9968af1dbe

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,9 +20,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.13.12" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.40" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.40" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2.40" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.42" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.42" />
+    <PackageReference Include="Furion.Pure" Version="4.9.2.42" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
@@ -32,14 +32,14 @@
     <PackageReference Include="MailKit" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.29" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.29" />
-    <PackageReference Include="NewLife.Redis" Version="5.6.2024.420-beta0005" />
+    <PackageReference Include="NewLife.Redis" Version="5.6.2024.508" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="QRCoder" Version="1.5.1" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.1.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.3.1" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.3.2" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.154" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.14" />
     <PackageReference Include="UAParser" Version="3.1.47" />

+ 1 - 1
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -254,7 +254,7 @@ public static partial class ObjectExtension
     }
 
     /// <summary>
-    /// 将string 时间日期格式转换成字符串 如 {yyyy} => 2024
+    /// 将 string 时间日期格式转换成字符串 如 {yyyy} => 2024
     /// </summary>
     /// <param name="str"></param>
     /// <returns></returns>

+ 1 - 3
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -264,9 +264,6 @@ public class SysFileService : IDynamicApiController, ITransient
             if (sysFile != null) return sysFile;
         }
 
-        var path = savePath.ParseToDateTimeForRep();
-       
-
         // 验证文件类型
         if (!_uploadOptions.ContentType.Contains(file.ContentType))
             throw Oops.Oh(ErrorCodeEnum.D8001);
@@ -294,6 +291,7 @@ public class SysFileService : IDynamicApiController, ITransient
         if (!VerifyFileExtensionName.IsSameType(file.OpenReadStream(), suffix))
             throw Oops.Oh(ErrorCodeEnum.D8001);
 
+        var path = savePath.ParseToDateTimeForRep();
         var newFile = new SysFile
         {
             Id = YitIdHelper.NextId(),

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rezero.Api" Version="1.0.41" />
+    <PackageReference Include="Rezero.Api" Version="1.0.42" />
   </ItemGroup>  
 
   <ItemGroup>

+ 11 - 1
Web/src/layout/routerView/iframes.vue

@@ -3,7 +3,17 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="w100" v-for="v in setIframeList" :key="v.path" v-loading="v.meta.loading" element-loading-background="white">
 				<transition-group :name="name">
-					<iframe :src="`${v.meta.isLink}?token=${getToken()}`" :key="v.path" frameborder="0" height="100%" width="100%" style="position: absolute" :data-url="v.path" v-show="getRoutePath === v.path" ref="iframeRef" />
+					<iframe
+						:src="`${v.meta.isLink}${v.meta.isLink.indexOf('?') > 0 ? '&' : '?'}token=${getToken()}`"
+						:key="v.path"
+						frameborder="0"
+						height="100%"
+						width="100%"
+						style="position: absolute"
+						:data-url="v.path"
+						v-show="getRoutePath === v.path"
+						ref="iframeRef"
+					/>
 				</transition-group>
 			</div>
 		</div>