From b3083f37241c3cd011e8477be152be1c3da1d6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com> Date: Fri, 18 Feb 2022 17:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E8=B0=83=E6=95=B4Nswag=20.Net?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=F0=9F=9A=91=20=E8=B0=83=E6=95=B4=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=97=A5=E5=BF=97=E6=A0=BC=E5=BC=8F=20=F0=9F=9A=91=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbpProHttpApiHostModule.cs | 5 ----- .../Extensions/SerilogToEsExtensions.cs | 2 -- .../Lion.AbpPro.HttpApi.Host/appsettings.json | 11 ++++++----- vben271/nswag/refresh.bat | 4 +--- .../views/admin/dictionary/AbpDictionary.ts | 4 ++-- .../views/admin/dictionary/AbpDictionary.vue | 2 +- vben271/src/views/admin/users/AbpUser.vue | 19 +++++++------------ 7 files changed, 17 insertions(+), 30 deletions(-) diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs index 9961a7e4..8fe27d9e 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -1,6 +1,5 @@ using Lion.AbpPro.ConfigurationOptions; using Lion.AbpPro.EntityFrameworkCore; -using Lion.AbpPro.Extensions; using Lion.AbpPro.MultiTenancy; using Hangfire; using Hangfire.MySql; @@ -13,7 +12,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using Savorboard.CAP.InMemoryMessageQueue; -using Serilog; using StackExchange.Redis; using Swashbuckle.AspNetCore.SwaggerUI; using System; @@ -32,18 +30,15 @@ using Lion.AbpPro.Shared.Hosting.Microservices.Swaggers; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Authentication.JwtBearer; -using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Serilog; -using Volo.Abp.Autofac; using Volo.Abp.BackgroundJobs; using Volo.Abp.BackgroundJobs.Hangfire; using Volo.Abp.Caching; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.Modularity; -using Volo.Abp.Swashbuckle; using Microsoft.AspNetCore.Mvc; using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Excel; diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/SerilogToEsExtensions.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/SerilogToEsExtensions.cs index 3f9f264c..841e3f95 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/SerilogToEsExtensions.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/SerilogToEsExtensions.cs @@ -2,13 +2,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Serilog; using Serilog.Exceptions; -using Serilog.Exceptions.Core; using Serilog.Sinks.Elasticsearch; using System; using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; namespace Lion.AbpPro.Extensions { diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json index 5d403ef2..7eea61cb 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json @@ -20,9 +20,10 @@ "Name": "Console" }, { - "Name": "RollingFile", + "Name": "File", "Args": { - "pathFormat": "logs/logs-{Date}.txt" + "path": "logs/logs-.txt", + "rollingInterval": "Day" } } ] @@ -38,10 +39,10 @@ "Configuration": "localhost,password=mypassword,defaultdatabase=1" }, "Jwt": { - "Audience": "LionAbpPro", + "Audience": "http://localhost:5010", "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", - "Issuer": "LionAbpPro", - "ExpirationTime": 24 + "Issuer": "YHWmsOperationApiGateway", + "ExpirationTime": 30 }, "Cap": { "Enabled": "false", diff --git a/vben271/nswag/refresh.bat b/vben271/nswag/refresh.bat index 454ca182..d7c1253d 100644 --- a/vben271/nswag/refresh.bat +++ b/vben271/nswag/refresh.bat @@ -1,3 +1 @@ -"..\node_modules\.bin\nswag" run /runtime:Net50 - -# "../node_modules/.bin/nswag" run /runtime:Net50 \ No newline at end of file +"..\node_modules\.bin\nswag" run /runtime:Net60 diff --git a/vben271/src/views/admin/dictionary/AbpDictionary.ts b/vben271/src/views/admin/dictionary/AbpDictionary.ts index 095e2d03..29fcb969 100644 --- a/vben271/src/views/admin/dictionary/AbpDictionary.ts +++ b/vben271/src/views/admin/dictionary/AbpDictionary.ts @@ -404,10 +404,10 @@ export async function deleleDetailAsync({ dataDictionaryId, dataDictionayDetailI reload(); } -export async function deleteDictinaryTypeAsync({ Id, reloadType }) { +export async function deleteDictinaryTypeAsync({ id, reloadType }) { const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy(); const request = new IdInput(); - request.Id = Id; + request.id = id; await _dataDictionaryServiceProxy.deleteDictinaryType(request); reloadType(); } diff --git a/vben271/src/views/admin/dictionary/AbpDictionary.vue b/vben271/src/views/admin/dictionary/AbpDictionary.vue index 608e99ca..8b4227d9 100644 --- a/vben271/src/views/admin/dictionary/AbpDictionary.vue +++ b/vben271/src/views/admin/dictionary/AbpDictionary.vue @@ -175,7 +175,7 @@ content: msg, onOk: async () => { await deleteDictinaryTypeAsync({ - Id: record.id, + id: record.id, reloadType, }); }, diff --git a/vben271/src/views/admin/users/AbpUser.vue b/vben271/src/views/admin/users/AbpUser.vue index bc7f8d05..80d959f9 100644 --- a/vben271/src/views/admin/users/AbpUser.vue +++ b/vben271/src/views/admin/users/AbpUser.vue @@ -59,11 +59,6 @@ @reload="reload" :bodyStyle="{ 'padding-top': '0' }" /> - @@ -77,7 +72,7 @@ getTableListAsync, deleteUserAsync, lockUserAsync, - exportAsync + exportAsync, } from './AbpUser'; import { useModal } from '/@/components/Modal'; import CreateAbpUser from './CreateAbpUser.vue'; @@ -103,7 +98,7 @@ const [registerEditAbpUserModal, { openModal: openEditAbpUserModal }] = useModal(); // table配置 - const [registerTable, { reload,getForm }] = useTable({ + const [registerTable, { reload, getForm }] = useTable({ columns: tableColumns, formConfig: { labelWidth: 70, @@ -159,11 +154,11 @@ message.success(t('common.operationSuccess')); reload(); }; - const handleExport=()=>{ + const handleExport = () => { const { getFieldsValue } = getForm(); - let request = getFieldsValue() - exportAsync({request}) - } + let request = getFieldsValue(); + exportAsync({ request }); + }; return { registerTable, handleEdit, @@ -175,7 +170,7 @@ t, reload, handleLock, - handleExport + handleExport, }; }, });