GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-26 10:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改默认api文档为Knife4j

Browse Source
This commit is contained in:
2248356998 qq.com
2023-06-07 20:34:31 +08:00
parent 4febbc261e
commit e178263b3b
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Plugins/ThingsGateway.Foundation.Tests/ThingsGateway.Foundation.Tests.csproj
+1 -1
View File
@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
src/ThingsGateway.Core/Sqlsugar/Db/DbContext.cs
+7 -2
View File
@@ -68,14 +68,19 @@ namespace ThingsGateway.Core
db.Aop.OnLogExecuting = (sql, pars) =>
{
//如果不是开发环境就打印sql
if (App.HostEnvironment.IsDevelopment())
if (App.HostEnvironment.IsDevelopment()&& !sql.Contains("tg_log_runtime"))
{
if (sql.StartsWith("SELECT"))
{
Console.ForegroundColor = ConsoleColor.Green;
WriteSqlLog($"查询{config.ConfigId}库操作");
}
if (sql.StartsWith("UPDATE") || sql.StartsWith("INSERT"))
if (sql.StartsWith("UPDATE"))
{
Console.ForegroundColor = ConsoleColor.Yellow;
WriteSqlLog($"修改{config.ConfigId}库操作");
}
if (sql.StartsWith("INSERT"))
{
Console.ForegroundColor = ConsoleColor.Blue;
WriteSqlLog($"修改{config.ConfigId}库操作");
src/ThingsGateway.Core/ThingsGateway.Core.csproj
+6 -5
View File
@@ -6,13 +6,13 @@
<Version>1.5.1</Version>
<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.23" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.23" />
<PackageReference Include="Furion.Pure" Version="4.8.8.23" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.24" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.24" />
<PackageReference Include="Furion.Pure" Version="4.8.8.24" />
<PackageReference Include="MiniExcel" Version="1.31.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.82" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.83" />
<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
<PackageReference Include="NewLife.Core" Version="10.3.2023.601" />
<PackageReference Include="UAParser" Version="3.1.47" />
@@ -21,6 +21,7 @@
<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.39" />
<PackageReference Include="Hardware.Info" Version="11.1.0" />
<PackageReference Include="CS-Script" Version="4.6.5" />
<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.13" />
<!--CS-Script与Furion冲突，直接安装覆盖版本-->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
</ItemGroup>
src/ThingsGateway.Web.Core/Configuration/Swagger.json
+1 -1
View File
@@ -6,7 +6,7 @@
"DocExpansionState": "None",
"GroupOpenApiInfos": [
{
"Group": "ThingsGateway", //分组唯一标识，string 类型，必填
"Group": "ThingsGatewayOpenApi", //分组唯一标识，string 类型，必填
"Order": 99, //分组排序，int 类型，数字越大排前面，默认 0
"Title": "ThingsGateway物联网关接口", //配置分组标题，string 类型
"Description": "物联网关Swagger",
src/ThingsGateway.Web.Core/Startup.cs
+16 -1
View File
@@ -10,6 +10,10 @@
//------------------------------------------------------------------------------
#endregion
using Furion.SpecificationDocument;
using IGeekFan.AspNetCore.Knife4jUI;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.WebEncoders;
@@ -46,7 +50,18 @@ namespace ThingsGateway.Web.Core
// 限流服务，自行开启
//app.UseIpRateLimiting();
app.UseInject("api");
// 配置Swagger-Knife4UI（路由前缀一致代表独立，不同则代表共存）
app.UseKnife4UI(options =>
{
options.RoutePrefix = "api";
foreach (var groupInfo in SpecificationDocumentBuilder.GetOpenApiGroups())
{
options.SwaggerEndpoint("/" + groupInfo.RouteTemplate, groupInfo.Title);
}
});
app.UseInject("swagger");
app.UseRouting();
src/ThingsGateway.Web.Foundation/Plugin/DriverBase.cs
+2 -2
View File
@@ -89,11 +89,11 @@ public abstract class DriverBase : DisposableObject
/// </summary>
public void NewMessage(LogType arg1, object arg2, string arg3, Exception arg4)
{
if (arg3.StartsWith("报文-") && arg1 == LogType.Trace)
if (arg1 == LogType.Trace && arg3.StartsWith("报文-"))
{
Messages.Add(new(YitIdHelper.NextId(), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff zz") + "-" + arg3));
if (Messages.Count > 500)
if (Messages.Count > 2500)
{
Messages.Clear();
}