Просмотр исходного кода

😉1、优化GoView服务接口 2、升级Furion v4.8.8.26

zuohuaijun 3 лет назад
Родитель
Сommit
5845785660

+ 0 - 6
Admin.NET/Admin.NET.Application/Configuration/Swagger.json

@@ -27,12 +27,6 @@
                     "Email": "515096995@qq.com",
                     "Url": "https://gitee.com/zuohuaijun/Admin.NET"
                 }
-            },
-            {
-                "Group": "Go-View",
-                "Title": "Go-View",
-                "Description": "GoView 是一个高效的拖拽式低代码数据可视化开发平台,将图表或页面元素封装为基础组件,无需编写代码即可制作数据大屏,减少心智负担。<br/><a href='https://www.mtruning.club/'>https://www.mtruning.club</a>",
-                "Version": "1.2.6"
             }
         ],
         "EnableAllGroups": true,

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

@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.25" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.25" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.25" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.26" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.26" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.26" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />

+ 0 - 5
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -1,6 +1,5 @@
 using Admin.NET.Core;
 using Admin.NET.Core.Service;
-using Admin.NET.Plugin.GoView.Util;
 using AspNetCoreRateLimit;
 using Furion;
 using Furion.SpecificationDocument;
@@ -12,7 +11,6 @@ using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using NewLife.Caching;
 using Newtonsoft.Json;
 using OnceMi.AspNetCore.OSS;
 using System;
@@ -78,9 +76,6 @@ public class Startup : AppStartup
             //.AddXmlDataContractSerializerFormatters()
             .AddInjectWithUnifyResult<AdminResultProvider>();
 
-        // 注册 GoView 规范化处理提供器
-        services.AddUnifyProvider<GoViewResultProvider>("GoView");
-
         //// 第三方授权登录
         //services.AddAuthentication()
         //    .AddWeixin(options =>

+ 6 - 0
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Admin.NET.Plugin.GoView.csproj

@@ -19,4 +19,10 @@
     <ProjectReference Include="..\..\Admin.NET.Core\Admin.NET.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Application.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

+ 14 - 0
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Application.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
+
+    "[openapi:GoView]": {
+        "Group": "GoView",
+        "Title": "GoView",
+        "Description": "GoView 是一个高效的拖拽式低代码数据可视化开发平台,将图表或页面元素封装为基础组件,无需编写代码即可制作数据大屏,减少心智负担。<br/><a href='https://www.mtruning.club/'>https://www.mtruning.club</a>",
+        "Version": "v1.2.6",
+        "License": {
+            "Name": "MIT",
+            "Url": "https://gitee.com/dromara/go-view/blob/master/LICENSE"
+        }
+    }
+}

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Const/GoViewConst.cs

@@ -9,5 +9,5 @@ public class GoViewConst
     /// <summary>
     /// API分组名称
     /// </summary>
-    public const string GroupName = "Go-View";
+    public const string GroupName = "GoView";
 }

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Service/Project/ProjectService.cs

@@ -4,7 +4,7 @@
 /// 项目管理服务
 /// </summary>
 [UnifyProvider("GoView")]
-[ApiDescriptionSettings(GoViewConst.GroupName, Order = 100)]
+[ApiDescriptionSettings(GoViewConst.GroupName, Module = "goview", Name = "project", Order = 100)]
 public class ProjectService : IDynamicApiController
 {
     private readonly SqlSugarRepository<GoViewProject> _goViewProjectRep;

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Service/System/SystemService.cs

@@ -7,7 +7,7 @@ namespace Admin.NET.Plugin.GoView.Service;
 /// 系统登录服务
 /// </summary>
 [UnifyProvider("GoView")]
-[ApiDescriptionSettings(GoViewConst.GroupName, Order = 500)]
+[ApiDescriptionSettings(GoViewConst.GroupName, Module = "goview", Name = "sys", Order = 500)]
 public class SystemService : IDynamicApiController
 {
     private readonly SysAuthService _sysAuthService;

+ 20 - 0
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Startup.cs

@@ -0,0 +1,20 @@
+using Admin.NET.Plugin.GoView.Util;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Admin.NET.Plugin.GoView;
+
+[AppStartup(100)]
+public class Startup : AppStartup
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        // 注册 GoView 规范化处理提供器
+        services.AddUnifyProvider<GoViewResultProvider>("GoView");
+    }
+
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+    }
+}