Преглед изворни кода

😎1、优化任务调度看板 2、外链统一加token参数

zuohuaijun пре 1 година
родитељ
комит
8964522957

+ 4 - 4
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.37" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.37" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2.37" />
+    <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="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
@@ -39,7 +39,7 @@
     <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.2.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.3.1" />
     <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" />

+ 8 - 1
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -229,7 +229,14 @@ public class Startup : AppStartup
         app.UseClientRateLimiting();
 
         // 任务调度看板
-        app.UseScheduleUI();
+        app.UseScheduleUI(options =>
+        {
+            options.RequestPath = "/schedule";  // 必须以 / 开头且不以 / 结尾
+            options.DisableOnProduction = true; // 生产环境关闭
+            options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
+            options.DisplayHead = false; // 是否显示页头
+            options.DefaultExpandAllJobs = false; // 是否默认展开所有作业
+        });
 
         // 配置Swagger-Knife4UI(路由前缀一致代表独立,不同则代表共存)
         app.UseKnife4UI(options =>

+ 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.40" />
+    <PackageReference Include="Rezero.Api" Version="1.0.41" />
   </ItemGroup>  
 
   <ItemGroup>

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

@@ -3,7 +3,7 @@
 		<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}?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>