Browse Source

😁细节小调整

zuohuaijun 3 years ago
parent
commit
125634e083

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/APIJSON.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "APIJSON": {
         "Roles": [

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Urls": "http://*:5005", // 配置默认端口
     // "https_port": 44325,

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Cache.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Cache": {
         "CacheType": "Memory", // Memory、Redis

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/CodeGen.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     // 代码生成配置项-程序集名称集合
     "CodeGen": {

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Database.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "DbConnection": {
         // 具体配置见SqlSugar官网(第一个为默认库不需要设置ConfigId)

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Email.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Email": {
         "Host": "smtp.163.com", // 主机

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/JWT.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "JWTSettings": {
         "ValidateIssuerSigningKey": true, // 是否验证密钥,bool 类型,默认true

+ 2 - 0
Admin.NET/Admin.NET.Application/Configuration/Limit.json

@@ -1,4 +1,6 @@
 {
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
+
     // IP限流配置
     "IpRateLimiting": {
         // 例如:设置每分钟5次访问限流

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Logging.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Logging": {
         "LogLevel": {

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/OAuth.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "OAuth": {
         "Weixin": {

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/OSS.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Upload": {
         "Path": "upload/{yyyy}/{MM}/{dd}", // 文件上传目录

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Swagger.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "SpecificationDocumentSettings": {
         "DocumentTitle": "Admin.NET 框架",

+ 1 - 1
Admin.NET/Admin.NET.Application/Configuration/Wechat.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Wechat": {
         // 公众号

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

@@ -20,20 +20,20 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.6.12" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.6.12" />
-    <PackageReference Include="Furion.Pure" Version="4.8.6.12" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7" />
+    <PackageReference Include="Furion.Pure" Version="4.8.7" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.1" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.14" />
     <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="NewLife.Redis" Version="5.1.2023.207-beta0755" />
+    <PackageReference Include="NewLife.Redis" Version="5.1.2023.214-beta0217" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.15.2" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.51" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.3.52" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.25" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 2 - 4
Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs

@@ -99,17 +99,15 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             });
         }
 
-        // 异常时发送邮件,发送邮件有异常捕获一下,不然导致程序退出!!!
+        // 若有异常时则发送邮件
         if (logMsg.Exception != null)
         {
             try
             {
                 await App.GetRequiredService<SysMessageService>().SendEmail(JSON.Serialize(loggingMonitor.exception));
             }
-            catch (Exception)
-            { }
+            catch { }
         }
-            
     }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs

@@ -21,7 +21,7 @@ public static class SqlSugarFilter
         if (orgFilter == null)
         {
             // 获取用户所属机构
-            var orgIds = App.GetService<SysOrgService>().GetUserOrgIdList().Result;
+            var orgIds = App.GetService<SysOrgService>().GetUserOrgIdList().GetAwaiter().GetResult();
             if (orgIds == null || orgIds.Count == 0) return;
 
             // 获取业务实体数据表

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/appsettings.Development.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "ConfigurationScanDirectories": [ "Configuration", "" ]
 }