update使用最新版Furion改动

删除FakeDelete相关内容
SkipScan改名为SuppressSniffer

Api/Ewide.Application/Ewide.Application.csproj

@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="1.17.4" />
   </ItemGroup>
 
 </Project>

Api/Ewide.Application/Startup.cs

@@ -1,6 +1,5 @@
 using Furion;
 using Microsoft.Extensions.DependencyInjection;
-using SqlSugar;
 using System.Linq;
 
 namespace Ewide.Application

Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs

@@ -6,7 +6,7 @@ namespace Ewide.Core
     /// <summary>
     /// 点击验证码输入参数
     /// </summary>
-    [SkipScan]
+    [SuppressSniffer]
     public class ClickWordCaptchaInput
     {
         /// <summary>

Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs

@@ -6,7 +6,7 @@ namespace Ewide.Core
     /// <summary>
     /// 验证码输出参数
     /// </summary>
-    [SkipScan]
+    [SuppressSniffer]
     public class ClickWordCaptchaResult
     {
         public string repCode { get; set; } = "0000";
@@ -16,7 +16,7 @@ namespace Ewide.Core
         public bool success { get; set; } = true;
     }
 
-    [SkipScan]
+    [SuppressSniffer]
     public class RepData
     {
         public string captchaId { get; set; }
@@ -37,7 +37,7 @@ namespace Ewide.Core
         public string captchaVerification { get; set; }
     }
 
-    [SkipScan]
+    [SuppressSniffer]
     public class WordList
     {
     }

Api/Ewide.Core/Captcha/General/GeneralCaptchaInput.cs

@@ -6,7 +6,7 @@ namespace Ewide.Core
     /// <summary>
     /// 常规验证码输入
     /// </summary>
-    [SkipScan]
+    [SuppressSniffer]
     public class GeneralCaptchaInput
     {
         /// <summary>

Api/Ewide.Core/Entity/DEntityBase.cs

@@ -64,7 +64,7 @@ namespace Ewide.Core
         /// <summary>
         /// 软删除
         /// </summary>
-        [JsonIgnore, FakeDelete(true)]
+        [JsonIgnore]
         [Comment("软删除标记")]
         [Column("IsDeleted", TypeName = "bit")]
         public virtual bool IsDeleted { get; set; } = false;

Api/Ewide.Core/Ewide.Core.csproj

@@ -29,11 +29,6 @@
   <ItemGroup>
     <PackageReference Include="aliyun-net-sdk-core" Version="1.5.10" />
     <PackageReference Include="CSRedisCore" Version="3.6.6" />
-    <PackageReference Include="Furion" Version="2.7.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.7.1" />
-    <PackageReference Include="Furion.Extras.DatabaseAccessor.Dapper" Version="2.7.1" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.7.1" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.7.1" />
     <PackageReference Include="Kendo.DynamicLinqCore" Version="3.1.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
     <PackageReference Include="Quartz" Version="3.3.2" />
@@ -59,4 +54,12 @@
     <Folder Include="DataBaseXML\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Furion\framework\Furion.Extras.Authentication.JwtBearer\Furion.Extras.Authentication.JwtBearer.csproj" />
+    <ProjectReference Include="..\Furion\framework\Furion.Extras.DatabaseAccessor.Dapper\Furion.Extras.DatabaseAccessor.Dapper.csproj" />
+    <ProjectReference Include="..\Furion\framework\Furion.Extras.Logging.Serilog\Furion.Extras.Logging.Serilog.csproj" />
+    <ProjectReference Include="..\Furion\framework\Furion.Extras.ObjectMapper.Mapster\Furion.Extras.ObjectMapper.Mapster.csproj" />
+    <ProjectReference Include="..\Furion\framework\Furion\Furion.csproj" />
+  </ItemGroup>
+
 </Project>

Api/Ewide.Core/Extension/RestfulResultProvider.cs

@@ -15,7 +15,7 @@ namespace Ewide.Core
     /// <summary>
     /// 规范化RESTful风格返回值
     /// </summary>
-    [SkipScan, UnifyModel(typeof(RestfulResult<>))]
+    [SuppressSniffer, UnifyModel(typeof(RestfulResult<>))]
     public class RestfulResultProvider : IUnifyResultProvider
     {
         private IActionResult DisplayJson(object data)
@@ -159,7 +159,7 @@ namespace Ewide.Core
     /// RESTful风格---XIAONUO返回格式
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    [SkipScan]
+    [SuppressSniffer]
     public class RestfulResult<T>
     {
         /// <summary>

Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs

@@ -7,7 +7,7 @@ namespace Ewide.Core.Service
     /// <summary>
     /// 登录输入参数
     /// </summary>
-    [SkipScan]
+    [SuppressSniffer]
     public class LoginInput
     {
         /// <summary>
@@ -25,7 +25,7 @@ namespace Ewide.Core.Service
         public virtual string Password { get; set; }
     }
 
-    [SkipScan]
+    [SuppressSniffer]
     public class LoginPassInput : LoginInput
     {
         /// <summary>

Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ewide.Core.Service
 {
-    [SkipScan]
+    [SuppressSniffer]
     public class LoginOutput
     {
         public bool Passed { get; set; }
@@ -16,7 +16,7 @@ namespace Ewide.Core.Service
     /// <summary>
     /// 用户登录输出参数
     /// </summary>
-    [SkipScan]
+    [SuppressSniffer]
     public class LoginUserOutput
     {
         /// <summary>

Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs

@@ -71,10 +71,10 @@ namespace Ewide.EntityFramework.Core
         /// <param name="dbContextLocator"></param>
         public void OnCreating(ModelBuilder modelBuilder, EntityTypeBuilder entityBuilder, DbContext dbContext, Type dbContextLocator)
         {
-            var expression = base.FakeDeleteQueryFilterExpression(entityBuilder, dbContext);
+            //var expression = base.FakeDeleteQueryFilterExpression(entityBuilder, dbContext);
-            if (expression == null) return;
+            //if (expression == null) return;
 
-            entityBuilder.HasQueryFilter(expression);
+            //entityBuilder.HasQueryFilter(expression);
         }
 
         /// <summary>

Api/Ewide.sln

@@ -17,6 +17,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ewide.Web.Entry", "Ewide.We
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ewide.Test", "Ewide.Test\Ewide.Test.csproj", "{DECE4796-6B13-4607-9C27-C1FE093D4DC8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Furion", "Furion", "{6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion", "Furion\framework\Furion\Furion.csproj", "{5890EF6C-26A0-4574-AF65-72328ABD0BF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.DatabaseAccessor.Dapper", "Furion\framework\Furion.Extras.DatabaseAccessor.Dapper\Furion.Extras.DatabaseAccessor.Dapper.csproj", "{DA30BF70-B175-4E27-B63F-38C417EACB14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.Authentication.JwtBearer", "Furion\framework\Furion.Extras.Authentication.JwtBearer\Furion.Extras.Authentication.JwtBearer.csproj", "{A58BF039-040D-4542-A3BE-6355F4F2BCEE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.Logging.Serilog", "Furion\framework\Furion.Extras.Logging.Serilog\Furion.Extras.Logging.Serilog.csproj", "{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.ObjectMapper.Mapster", "Furion\framework\Furion.Extras.ObjectMapper.Mapster\Furion.Extras.ObjectMapper.Mapster.csproj", "{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,10 +63,37 @@ Global
 		{DECE4796-6B13-4607-9C27-C1FE093D4DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DECE4796-6B13-4607-9C27-C1FE093D4DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DECE4796-6B13-4607-9C27-C1FE093D4DC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5890EF6C-26A0-4574-AF65-72328ABD0BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5890EF6C-26A0-4574-AF65-72328ABD0BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5890EF6C-26A0-4574-AF65-72328ABD0BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5890EF6C-26A0-4574-AF65-72328ABD0BF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA30BF70-B175-4E27-B63F-38C417EACB14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA30BF70-B175-4E27-B63F-38C417EACB14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA30BF70-B175-4E27-B63F-38C417EACB14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA30BF70-B175-4E27-B63F-38C417EACB14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A58BF039-040D-4542-A3BE-6355F4F2BCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A58BF039-040D-4542-A3BE-6355F4F2BCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A58BF039-040D-4542-A3BE-6355F4F2BCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A58BF039-040D-4542-A3BE-6355F4F2BCEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5890EF6C-26A0-4574-AF65-72328ABD0BF6} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
+		{DA30BF70-B175-4E27-B63F-38C417EACB14} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
+		{A58BF039-040D-4542-A3BE-6355F4F2BCEE} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
+		{DC31407D-4C4B-4DAC-A2CF-E488AB3734C9} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
+		{E12B30F8-E10C-496D-BDA2-2A9ABCF89752} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B2073C2C-0FD3-452B-8047-8134D68E12CE}
 	EndGlobalSection