From 0fdda8fabc97890aa182fabce806ad5c38b76f3e Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Mon, 12 Jul 2021 17:20:50 +0800
Subject: [PATCH] =?UTF-8?q?update=E4=BD=BF=E7=94=A8=E6=9C=80=E6=96=B0?=
=?UTF-8?q?=E7=89=88Furion=E6=94=B9=E5=8A=A8=20=E5=88=A0=E9=99=A4FakeDelet?=
=?UTF-8?q?e=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=20SkipScan=E6=94=B9?=
=?UTF-8?q?=E5=90=8D=E4=B8=BASuppressSniffer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Ewide.Application.csproj | 1 -
Api/Ewide.Application/Startup.cs | 1 -
.../ClickWord/ClickWordCaptchaInput.cs | 2 +-
.../ClickWord/ClickWordCaptchaResult.cs | 6 +--
.../Captcha/General/GeneralCaptchaInput.cs | 2 +-
Api/Ewide.Core/Entity/DEntityBase.cs | 2 +-
Api/Ewide.Core/Ewide.Core.csproj | 13 ++++---
.../Extension/RestfulResultProvider.cs | 4 +-
Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs | 4 +-
.../Service/Auth/Dto/LoginOutput.cs | 4 +-
.../DbContexts/DefaultDbContext.cs | 6 +--
Api/Ewide.sln | 39 +++++++++++++++++++
12 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/Api/Ewide.Application/Ewide.Application.csproj b/Api/Ewide.Application/Ewide.Application.csproj
index 5dadc0f..8a134d8 100644
--- a/Api/Ewide.Application/Ewide.Application.csproj
+++ b/Api/Ewide.Application/Ewide.Application.csproj
@@ -23,7 +23,6 @@
-
diff --git a/Api/Ewide.Application/Startup.cs b/Api/Ewide.Application/Startup.cs
index 5442a5a..ade1ce8 100644
--- a/Api/Ewide.Application/Startup.cs
+++ b/Api/Ewide.Application/Startup.cs
@@ -1,6 +1,5 @@
using Furion;
using Microsoft.Extensions.DependencyInjection;
-using SqlSugar;
using System.Linq;
namespace Ewide.Application
diff --git a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs
index e906355..e9b9237 100644
--- a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs
+++ b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs
@@ -6,7 +6,7 @@ namespace Ewide.Core
///
/// 点击验证码输入参数
///
- [SkipScan]
+ [SuppressSniffer]
public class ClickWordCaptchaInput
{
///
diff --git a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs
index dba7cc1..8d41369 100644
--- a/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs
+++ b/Api/Ewide.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs
@@ -6,7 +6,7 @@ namespace Ewide.Core
///
/// 验证码输出参数
///
- [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
{
}
diff --git a/Api/Ewide.Core/Captcha/General/GeneralCaptchaInput.cs b/Api/Ewide.Core/Captcha/General/GeneralCaptchaInput.cs
index e9cf8b0..c4f4422 100644
--- a/Api/Ewide.Core/Captcha/General/GeneralCaptchaInput.cs
+++ b/Api/Ewide.Core/Captcha/General/GeneralCaptchaInput.cs
@@ -6,7 +6,7 @@ namespace Ewide.Core
///
/// 常规验证码输入
///
- [SkipScan]
+ [SuppressSniffer]
public class GeneralCaptchaInput
{
///
diff --git a/Api/Ewide.Core/Entity/DEntityBase.cs b/Api/Ewide.Core/Entity/DEntityBase.cs
index 3dbabbc..c310f4f 100644
--- a/Api/Ewide.Core/Entity/DEntityBase.cs
+++ b/Api/Ewide.Core/Entity/DEntityBase.cs
@@ -64,7 +64,7 @@ namespace Ewide.Core
///
/// 软删除
///
- [JsonIgnore, FakeDelete(true)]
+ [JsonIgnore]
[Comment("软删除标记")]
[Column("IsDeleted", TypeName = "bit")]
public virtual bool IsDeleted { get; set; } = false;
diff --git a/Api/Ewide.Core/Ewide.Core.csproj b/Api/Ewide.Core/Ewide.Core.csproj
index e4dc7cc..6ab3b8e 100644
--- a/Api/Ewide.Core/Ewide.Core.csproj
+++ b/Api/Ewide.Core/Ewide.Core.csproj
@@ -29,11 +29,6 @@
-
-
-
-
-
@@ -59,4 +54,12 @@
+
+
+
+
+
+
+
+
diff --git a/Api/Ewide.Core/Extension/RestfulResultProvider.cs b/Api/Ewide.Core/Extension/RestfulResultProvider.cs
index 7181e07..d35143b 100644
--- a/Api/Ewide.Core/Extension/RestfulResultProvider.cs
+++ b/Api/Ewide.Core/Extension/RestfulResultProvider.cs
@@ -15,7 +15,7 @@ namespace Ewide.Core
///
/// 规范化RESTful风格返回值
///
- [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返回格式
///
///
- [SkipScan]
+ [SuppressSniffer]
public class RestfulResult
{
///
diff --git a/Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs b/Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs
index 2bd2803..bf27e24 100644
--- a/Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs
+++ b/Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs
@@ -7,7 +7,7 @@ namespace Ewide.Core.Service
///
/// 登录输入参数
///
- [SkipScan]
+ [SuppressSniffer]
public class LoginInput
{
///
@@ -25,7 +25,7 @@ namespace Ewide.Core.Service
public virtual string Password { get; set; }
}
- [SkipScan]
+ [SuppressSniffer]
public class LoginPassInput : LoginInput
{
///
diff --git a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs b/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
index 3fb0bb8..eb423aa 100644
--- a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
+++ b/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
///
/// 用户登录输出参数
///
- [SkipScan]
+ [SuppressSniffer]
public class LoginUserOutput
{
///
diff --git a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
index 8dac982..0677877 100644
--- a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
+++ b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
@@ -71,10 +71,10 @@ namespace Ewide.EntityFramework.Core
///
public void OnCreating(ModelBuilder modelBuilder, EntityTypeBuilder entityBuilder, DbContext dbContext, Type dbContextLocator)
{
- var expression = base.FakeDeleteQueryFilterExpression(entityBuilder, dbContext);
- if (expression == null) return;
+ //var expression = base.FakeDeleteQueryFilterExpression(entityBuilder, dbContext);
+ //if (expression == null) return;
- entityBuilder.HasQueryFilter(expression);
+ //entityBuilder.HasQueryFilter(expression);
}
///
diff --git a/Api/Ewide.sln b/Api/Ewide.sln
index bb1280d..54cc592 100644
--- a/Api/Ewide.sln
+++ b/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