🚑 调整Nswag .Net版本

🚑 调整输出日志格式
🚑 前端数据字典类型删除

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;

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
 {

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",

vben271/nswag/refresh.bat

@@ -1,3 +1 @@
-"..\node_modules\.bin\nswag" run  /runtime:Net50
-
-# "../node_modules/.bin/nswag" run  /runtime:Net50  
+"..\node_modules\.bin\nswag" run  /runtime:Net60

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();
 }

vben271/src/views/admin/dictionary/AbpDictionary.vue

@@ -175,7 +175,7 @@
           content: msg,
           onOk: async () => {
             await deleteDictinaryTypeAsync({
-              Id: record.id,
+              id: record.id,
               reloadType,
             });
           },

vben271/src/views/admin/users/AbpUser.vue

@@ -59,11 +59,6 @@
       @reload="reload"
       :bodyStyle="{ 'padding-top': '0' }"
     />
-    <Warehouse
-      @register="registerWarehosueModal"
-      @reload="reload"
-      :bodyStyle="{ 'padding-top': '0' }"
-    />
   </div>
 </template>
 
@@ -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,
       };
     },
   });