From de1b6c80150432e6a2e2cf1ad5763c2f5fe6fad0 Mon Sep 17 00:00:00 2001 From: jianweie code Date: Mon, 18 Dec 2023 21:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A7=BB=E9=99=A4=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=8E=86=E5=8F=B2=E9=81=97=E7=95=99=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA.net=20core=202.2=EF=BC=8C.net5=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=B7=B2=E7=BB=8F=E5=BC=83=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=8B=AC=E7=AB=8B=E7=89=88=E6=9C=AClinux=20x64?= =?UTF-8?q?=E6=88=96=E5=85=B6=E4=BB=96=E6=A8=A1=E5=BC=8F=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E5=8F=8A=E6=94=AF=E6=92=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Filter/CoreCms.Net.Filter.csproj | 1 - .../CoreCms.Net.IServices.csproj | 2 +- .../CoreCms.Net.Services.csproj | 1 - .../CoreCms.Net.Swagger.csproj | 1 - .../CoreCms.Net.WeChat.Service.csproj | 1 - .../Advert/CoreCmsAdvertPositionController.cs | 1 + .../Advert/CoreCmsAdvertisementController.cs | 1 + .../Agent/CoreCmsAgentController.cs | 1 + .../Agent/CoreCmsAgentGoodsController.cs | 1 + .../Agent/CoreCmsAgentGradeController.cs | 1 + .../Agent/CoreCmsAgentOrderController.cs | 1 + .../Agent/CoreCmsAgentSettingController.cs | 1 + .../Api/CoreCmsPrinterController.cs | 1 + .../Article/CoreCmsArticleController.cs | 1 + .../Article/CoreCmsArticleTypeController.cs | 1 + .../CoreCmsDistributionController.cs | 1 + .../CoreCmsDistributionGradeController.cs | 1 + .../CoreCmsDistributionOrderController.cs | 1 + .../CoreCmsDistributionResultController.cs | 1 + .../CoreCmsDistributionSettingController.cs | 1 + .../CoreCmsBillPaymentsController.cs | 1 + .../Financial/CoreCmsBillRefundController.cs | 1 + .../Financial/CoreCmsInvoiceController.cs | 1 + .../Financial/CoreCmsPaymentsController.cs | 1 + .../Forms/CoreCmsFormController.cs | 1 + .../Forms/CoreCmsFormSubmitController.cs | 1 + .../Good/CoreCmsBrandController.cs | 1 + .../Good/CoreCmsGoodsCategoryController.cs | 1 + .../Good/CoreCmsGoodsCommentController.cs | 1 + .../Good/CoreCmsGoodsController.cs | 1 + .../Good/CoreCmsGoodsParamsController.cs | 1 + .../Good/CoreCmsGoodsTypeSpecController.cs | 1 + .../Good/CoreCmsProductsController.cs | 1 + .../Message/CoreCmsMessageCenterController.cs | 1 + .../Message/CoreCmsSmsController.cs | 1 + .../Message/CoreCmsSmsSettingController.cs | 1 + .../Order/CoreCmsBillAftersalesController.cs | 1 + .../Order/CoreCmsBillDeliveryController.cs | 1 + .../Order/CoreCmsBillLadingController.cs | 1 + .../Order/CoreCmsBillReshipController.cs | 1 + .../Order/CoreCmsOrderController.cs | 1 + .../Pay/CoreCmsAlipayConfigController.cs | 1 + .../Pay/CoreCmsWeChatPayConfigController.cs | 1 + .../PinTuan/CoreCmsPintuanRecordController.cs | 1 + .../PinTuan/CoreCmsPintuanRuleController.cs | 1 + .../Promotion/CoreCmsPromotionController.cs | 1 + .../Reports/CoreCmsReportsController.cs | 1 + .../ServiceGoods/CoreCmsServicesController.cs | 1 + .../CoreCmsUserServicesOrderController.cs | 1 + .../Controllers/Shop/CoreCmsAreaController.cs | 1 + .../Shop/CoreCmsCheckInController.cs | 1 + .../Shop/CoreCmsLogisticsController.cs | 1 + .../Shop/CoreCmsNoticeController.cs | 1 + ...CoreCmsOrderDistributionModelController.cs | 1 + .../Shop/CoreCmsPagesController.cs | 1 + .../Shop/CoreCmsPagesItemsController.cs | 1 + .../CoreCmsServiceDescriptionController.cs | 1 + .../Shop/CoreCmsSettingController.cs | 1 + .../Controllers/Shop/CoreCmsShipController.cs | 1 + .../Shop/CoreCmsStoreController.cs | 1 + .../Shop/CoreCmsTopUpTypeController.cs | 1 + .../Solitaire/CoreCmsSolitaireController.cs | 1 + .../CoreCmsSolitaireItemsController.cs | 1 + .../Stock/CoreCmsStockController.cs | 1 + .../Stock/CoreCmsStockLogController.cs | 1 + .../System/CoreCmsAppUpdateLogController.cs | 1 + .../System/SysDictionaryController.cs | 1 + .../System/SysDictionaryDataController.cs | 1 + .../System/SysLoginRecordController.cs | 1 + .../Controllers/System/SysMenuController.cs | 1 + .../System/SysNLogRecordsController.cs | 1 + .../System/SysOperRecordController.cs | 1 + .../System/SysOrganizationController.cs | 1 + .../Controllers/System/SysRoleController.cs | 1 + .../System/SysRoleMenuController.cs | 1 + .../System/SysTaskLogController.cs | 1 + .../Controllers/System/SysUserController.cs | 1 + .../System/SysUserOperationLogController.cs | 1 + .../System/SysUserRoleController.cs | 1 + .../User/CoreCmsUserBalanceController.cs | 1 + .../Controllers/User/CoreCmsUserController.cs | 1 + .../User/CoreCmsUserGradeController.cs | 1 + .../User/CoreCmsUserTocashController.cs | 1 + .../WeChat/CoreCmsUserWeChatInfoController.cs | 1 + .../CoreCmsUserWeChatMsgTemplateController.cs | 1 + .../WeChat/WeChatMenuController.cs | 1 + .../WeChat/WeChatMessageResponseController.cs | 1 + .../WeChat/WeChatUserAccessTokenController.cs | 1 + .../WeChatShippingDeliveryController.cs | 1 + .../WeChatShippingOrderController.cs | 1 + .../CoreCms.Net.Web.Admin.csproj | 2 -- .../CoreCms.Net.Web.Admin.xml | 23 ++++++++---- .../Infrastructure}/ApiExplorerIgnores.cs | 5 +-- .../GlobalExceptionsFilterForAdmin.cs | 10 +----- .../Infrastructure}/RequiredErrorForAdmin.cs | 3 +- CoreCms.Net.Web.Admin/Program.cs | 1 + .../CoreCms.Net.Web.WebApi.xml | 16 +++++++++ .../Infrastructure/ApiExplorerIgnores.cs | 35 +++++++++++++++++++ .../GlobalExceptionsFilterForClent.cs | 10 +----- .../Infrastructure}/RequiredErrorForClient.cs | 3 +- CoreCms.Net.Web.WebApi/Program.cs | 1 + 101 files changed, 160 insertions(+), 40 deletions(-) rename {CoreCms.Net.Filter => CoreCms.Net.Web.Admin/Infrastructure}/ApiExplorerIgnores.cs (93%) rename {CoreCms.Net.Filter => CoreCms.Net.Web.Admin/Infrastructure}/GlobalExceptionsFilterForAdmin.cs (86%) rename {CoreCms.Net.Filter => CoreCms.Net.Web.Admin/Infrastructure}/RequiredErrorForAdmin.cs (97%) create mode 100644 CoreCms.Net.Web.WebApi/Infrastructure/ApiExplorerIgnores.cs rename {CoreCms.Net.Filter => CoreCms.Net.Web.WebApi/Infrastructure}/GlobalExceptionsFilterForClent.cs (87%) rename {CoreCms.Net.Filter => CoreCms.Net.Web.WebApi/Infrastructure}/RequiredErrorForClient.cs (97%) diff --git a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj index 92052a40..9fa11baf 100644 --- a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj +++ b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj @@ -6,7 +6,6 @@ - diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj index 401baab5..b181c037 100644 --- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj +++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj index 8109ee2b..cc44150b 100644 --- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj +++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj @@ -9,7 +9,6 @@ - diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj index 3f81974d..b0509fdd 100644 --- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj +++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj @@ -5,7 +5,6 @@ - diff --git a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj index ee6d8088..1beb29ec 100644 --- a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj +++ b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj @@ -6,7 +6,6 @@ - diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs index aeaab90a..f88e812a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs index 9dfffe2e..318bfd86 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs index ae44bb2c..7362ce6c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs @@ -30,6 +30,7 @@ using Microsoft.AspNetCore.Mvc; using NPOI.HSSF.UserModel; using SqlSugar; using CoreCms.Net.Services; +using CoreCms.Net.Web.Admin.Infrastructure; namespace CoreCms.Net.Web.Admin.Controllers { diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs index b28ea4be..eebda4ea 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Services; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs index c1e5d4d7..c2ba25aa 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs index be15a5b7..1b762f0c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs index ffff7028..15684fcc 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Api/CoreCmsPrinterController.cs b/CoreCms.Net.Web.Admin/Controllers/Api/CoreCmsPrinterController.cs index 6df74082..d7a1d1d2 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Api/CoreCmsPrinterController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Api/CoreCmsPrinterController.cs @@ -30,6 +30,7 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using Newtonsoft.Json; using CoreCms.Net.Model.ViewModels.YiLianYun; +using CoreCms.Net.Web.Admin.Infrastructure; using Flurl.Http; namespace CoreCms.Net.Web.Admin.Controllers diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs index 9c694428..327677e2 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs @@ -25,6 +25,7 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Web.Admin.Infrastructure; namespace CoreCms.Net.Web.Admin.Controllers { diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs index 971e9b8f..b314a0bb 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Services; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs index f97d948c..80f733d0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Services; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs index f234a5ba..29e1ff68 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs index f92a9872..15faa987 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs index 45521217..e5db0f02 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs index 225994b5..fd4263be 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs index ee109bbf..4247efef 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs @@ -36,6 +36,7 @@ using Newtonsoft.Json; using NPOI.HSSF.UserModel; using SqlSugar; using CoreCms.Net.Services; +using CoreCms.Net.Web.Admin.Infrastructure; using Essensoft.Paylink.Alipay; using Essensoft.Paylink.Alipay.Domain; using Essensoft.Paylink.Alipay.Request; diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs index 0d804fe9..29e17693 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs index d2a0a5a0..450d9fa0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs index d62cc71e..73b18b16 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormController.cs b/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormController.cs index 5c340c03..e76bfd77 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormSubmitController.cs b/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormSubmitController.cs index b0f07b05..036178b1 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormSubmitController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Forms/CoreCmsFormSubmitController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs index 0ee870e4..a5558e29 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs index aeeeef43..c8757553 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.Entities; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs index 3b725e48..b5b935d4 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs index a6fad01c..69d88ef1 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs @@ -26,6 +26,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs index 3f653fce..bf2c4661 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs index 9b5520a5..bea9df93 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs index 85307100..63501da5 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs index d9a556fe..58869912 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs index 26a339e7..26948971 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs index a3ca508c..4f9597f9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs index 51863775..21c5df3f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs index c7573d2b..96ef325e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs index 7c3d2fbf..ade56147 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs index 72bd4f81..3ae062cb 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs index 8225b29a..847cce3b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs @@ -27,6 +27,7 @@ using CoreCms.Net.Model.ViewModels.Excel; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using CoreCms.Net.WeChat.Service.HttpClients; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; diff --git a/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsAlipayConfigController.cs b/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsAlipayConfigController.cs index 4fdea65c..15e5a39e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsAlipayConfigController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsAlipayConfigController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsWeChatPayConfigController.cs b/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsWeChatPayConfigController.cs index 8fb06068..a088b18e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsWeChatPayConfigController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsWeChatPayConfigController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs index 4fc19c3f..ac673695 100644 --- a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs @@ -21,6 +21,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs index 81b9a456..792000cc 100644 --- a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs index 09ac7426..5189edbe 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs index dcb62930..f7e5421b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs @@ -25,6 +25,7 @@ using System.Threading.Tasks; using CoreCms.Net.Model.ViewModels.Echarts; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using SqlSugar; namespace CoreCms.Net.Web.Admin.Controllers.Content diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs index f72b9172..09368cbd 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index 2f185197..00e18c6a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs index 6bfa238f..08ced3c7 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsCheckInController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsCheckInController.cs index 3be6c0d0..af5aed85 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsCheckInController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsCheckInController.cs @@ -11,6 +11,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.Basics; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs index d623c426..f9b97dbb 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs index 7fd22402..3fc1e4f6 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsOrderDistributionModelController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsOrderDistributionModelController.cs index e3c34bda..26f3077e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsOrderDistributionModelController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsOrderDistributionModelController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs index 7fc11aca..9d3ee6d9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs index 165d28b8..3b63faf2 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs index 2e292b74..015ea3be 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs index baa70a1e..b2db71d5 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs index 8eb1a875..b790acab 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs index 9e492e97..4bfd522e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsTopUpTypeController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsTopUpTypeController.cs index 340455fa..531fee90 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsTopUpTypeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsTopUpTypeController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs index 2bd23871..f048db53 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs index c38fef07..53616a60 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs index 757c70ca..e5ca9e8c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs index 0ea15ad4..9cd15fb0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/CoreCmsAppUpdateLogController.cs b/CoreCms.Net.Web.Admin/Controllers/System/CoreCmsAppUpdateLogController.cs index 1cad5e0b..07387ad0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/CoreCmsAppUpdateLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/CoreCmsAppUpdateLogController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs index d319b4c0..92ed8d66 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs index 3e07fe15..a9658183 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs index 3d59197a..13f29c1a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs index b22cb292..f304bcac 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs index 74e15a3f..89521b27 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs index 2d8e980e..abf4b62e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs index 0fd0a713..a4eb2a4a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs index 9924f157..16d0819a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.DTO; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs index 10682d31..13b99c97 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs index e53147a5..86b4b72d 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs index 94305c44..bfc34292 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysUserOperationLogController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysUserOperationLogController.cs index 3ab6bc91..bc986c86 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysUserOperationLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysUserOperationLogController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs index c4ac6131..ca571bda 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs index e5185f8b..5669f41a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs @@ -28,6 +28,7 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Web.Admin.Infrastructure; namespace CoreCms.Net.Web.Admin.Controllers { diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs index 5f64c056..35395c10 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs @@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs index 6be950ff..a255b29b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs @@ -22,6 +22,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs index 63e4cf24..275b8514 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs index 43b63a85..91ba0324 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs index 5a5c01b6..dd8e8258 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMenuController.cs index 1d87dc0b..66113931 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMenuController.cs @@ -14,6 +14,7 @@ using CoreCms.Net.Model.ViewModels.UI; using Microsoft.AspNetCore.Authorization; using CoreCms.Net.Caching.AccressToken; using CoreCms.Net.Model.WeChatEntites; +using CoreCms.Net.Web.Admin.Infrastructure; using SKIT.FlurlHttpClient.Wechat.Api.Models; using CoreCms.Net.WeChat.Service.HttpClients; using CoreCms.Net.WeChat.Service.Enums; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs index 15044200..77240906 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatUserAccessTokenController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatUserAccessTokenController.cs index 3f7242ac..82751048 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatUserAccessTokenController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatUserAccessTokenController.cs @@ -25,6 +25,7 @@ using CoreCms.Net.Loging; using CoreCms.Net.IServices; using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingDeliveryController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingDeliveryController.cs index be8db853..fa21228b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingDeliveryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingDeliveryController.cs @@ -31,6 +31,7 @@ using Microsoft.AspNetCore.Mvc; using NPOI.HSSF.UserModel; using SqlSugar; using CoreCms.Net.Services; +using CoreCms.Net.Web.Admin.Infrastructure; namespace CoreCms.Net.Web.Admin.Controllers { diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingOrderController.cs index 55933247..174032dd 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChatShipping/WeChatShippingOrderController.cs @@ -28,6 +28,7 @@ using CoreCms.Net.Model.FromBody; using CoreCms.Net.Services; using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressBusinessDeliveryGetAllResponse.Types; using CoreCms.Net.Loging; +using CoreCms.Net.Web.Admin.Infrastructure; namespace CoreCms.Net.Web.Admin.Controllers.WeChatShipping { diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 2868c7de..17dbef2a 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -56,8 +56,6 @@ - - diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml index d212968a..c08b08d1 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml @@ -2440,13 +2440,6 @@ - - - 单选删除 - - - - 选择导出 @@ -5832,6 +5825,22 @@ + + + 自带的Controller与swagger3.0冲突，在此排除扫描 + + + + + + 接口全局异常错误日志 + + + + + 请求验证错误处理 + + 微信自动回复消息表 diff --git a/CoreCms.Net.Filter/ApiExplorerIgnores.cs b/CoreCms.Net.Web.Admin/Infrastructure/ApiExplorerIgnores.cs similarity index 93% rename from CoreCms.Net.Filter/ApiExplorerIgnores.cs rename to CoreCms.Net.Web.Admin/Infrastructure/ApiExplorerIgnores.cs index 566458c5..7daeda3c 100644 --- a/CoreCms.Net.Filter/ApiExplorerIgnores.cs +++ b/CoreCms.Net.Web.Admin/Infrastructure/ApiExplorerIgnores.cs @@ -9,12 +9,9 @@ ***********************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.AspNetCore.Mvc.ApplicationModels; -namespace CoreCms.Net.Filter +namespace CoreCms.Net.Web.Admin.Infrastructure { public class ApiExplorerIgnores : IActionModelConvention { diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs b/CoreCms.Net.Web.Admin/Infrastructure/GlobalExceptionsFilterForAdmin.cs similarity index 86% rename from CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs rename to CoreCms.Net.Web.Admin/Infrastructure/GlobalExceptionsFilterForAdmin.cs index 34446f88..24f2189e 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs +++ b/CoreCms.Net.Web.Admin/Infrastructure/GlobalExceptionsFilterForAdmin.cs @@ -10,21 +10,13 @@ ***********************************************************************/ -using System; -using System.Collections.Generic; using System.Net; -using System.Text; - using CoreCms.Net.Loging; using CoreCms.Net.Model.ViewModels.UI; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace CoreCms.Net.Filter +namespace CoreCms.Net.Web.Admin.Infrastructure { /// /// 接口全局异常错误日志 diff --git a/CoreCms.Net.Filter/RequiredErrorForAdmin.cs b/CoreCms.Net.Web.Admin/Infrastructure/RequiredErrorForAdmin.cs similarity index 97% rename from CoreCms.Net.Filter/RequiredErrorForAdmin.cs rename to CoreCms.Net.Web.Admin/Infrastructure/RequiredErrorForAdmin.cs index bb76cfb3..e7dc8832 100644 --- a/CoreCms.Net.Filter/RequiredErrorForAdmin.cs +++ b/CoreCms.Net.Web.Admin/Infrastructure/RequiredErrorForAdmin.cs @@ -17,9 +17,8 @@ using CoreCms.Net.Model.ViewModels.UI; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -namespace CoreCms.Net.Filter +namespace CoreCms.Net.Web.Admin.Infrastructure { /// /// 请求验证错误处理 diff --git a/CoreCms.Net.Web.Admin/Program.cs b/CoreCms.Net.Web.Admin/Program.cs index f3ea1e82..df7d2a46 100644 --- a/CoreCms.Net.Web.Admin/Program.cs +++ b/CoreCms.Net.Web.Admin/Program.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Middlewares; using CoreCms.Net.Model.ViewModels.Options; using CoreCms.Net.Swagger; using CoreCms.Net.Utility; +using CoreCms.Net.Web.Admin.Infrastructure; using Microsoft.Extensions.DependencyInjection.Extensions; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml index c2da3646..8eae1e85 100644 --- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml +++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml @@ -1555,6 +1555,22 @@ + + + 自带的Controller与swagger3.0冲突，在此排除扫描 + + + + + + 接口全局异常错误日志 + + + + + 请求验证错误处理 + + 微信公众号消息推送对接 diff --git a/CoreCms.Net.Web.WebApi/Infrastructure/ApiExplorerIgnores.cs b/CoreCms.Net.Web.WebApi/Infrastructure/ApiExplorerIgnores.cs new file mode 100644 index 00000000..b2d76ff9 --- /dev/null +++ b/CoreCms.Net.Web.WebApi/Infrastructure/ApiExplorerIgnores.cs @@ -0,0 +1,35 @@ +/*********************************************************************** + * Project: CoreCms.Net * + * Web: https://CoreCms.Net * + * ProjectName: 核心内容管理系统 * + * Author: 大灰灰 * + * Email: JianWeie@163.com * + * CreateTime: 2020-03-15 20:42:29 + * Description: 暂无 + ***********************************************************************/ + + +using Microsoft.AspNetCore.Mvc.ApplicationModels; + +namespace CoreCms.Net.Web.WebApi.Infrastructure +{ + public class ApiExplorerIgnores : IActionModelConvention + { + /// + /// 自带的Controller与swagger3.0冲突，在此排除扫描 + /// + /// + public void Apply(ActionModel action) + { + //冲突的Ocelot.Raft.RaftController + if (action.Controller.ControllerName == ("WxOfficialOAuth") || action.Controller.ControllerName == ("WxOpenOAuth")) + action.ApiExplorer.IsVisible = false; + //Ocelot.Cache.OutputCacheController + if (action.Controller.ControllerName == ("AliPay")) + action.ApiExplorer.IsVisible = false; + + if (action.Controller.ControllerName == ("WeChatPay")) + action.ApiExplorer.IsVisible = false; + } + } +} diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs b/CoreCms.Net.Web.WebApi/Infrastructure/GlobalExceptionsFilterForClent.cs similarity index 87% rename from CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs rename to CoreCms.Net.Web.WebApi/Infrastructure/GlobalExceptionsFilterForClent.cs index 2616c633..952f67ff 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs +++ b/CoreCms.Net.Web.WebApi/Infrastructure/GlobalExceptionsFilterForClent.cs @@ -10,21 +10,13 @@ ***********************************************************************/ -using System; -using System.Collections.Generic; using System.Net; -using System.Text; - using CoreCms.Net.Loging; using CoreCms.Net.Model.ViewModels.UI; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace CoreCms.Net.Filter +namespace CoreCms.Net.Web.WebApi.Infrastructure { /// /// 接口全局异常错误日志 diff --git a/CoreCms.Net.Filter/RequiredErrorForClient.cs b/CoreCms.Net.Web.WebApi/Infrastructure/RequiredErrorForClient.cs similarity index 97% rename from CoreCms.Net.Filter/RequiredErrorForClient.cs rename to CoreCms.Net.Web.WebApi/Infrastructure/RequiredErrorForClient.cs index f1402d45..fb094c8f 100644 --- a/CoreCms.Net.Filter/RequiredErrorForClient.cs +++ b/CoreCms.Net.Web.WebApi/Infrastructure/RequiredErrorForClient.cs @@ -17,9 +17,8 @@ using CoreCms.Net.Model.ViewModels.UI; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -namespace CoreCms.Net.Filter +namespace CoreCms.Net.Web.WebApi.Infrastructure { /// /// 请求验证错误处理 diff --git a/CoreCms.Net.Web.WebApi/Program.cs b/CoreCms.Net.Web.WebApi/Program.cs index 5c8faf53..95d0192d 100644 --- a/CoreCms.Net.Web.WebApi/Program.cs +++ b/CoreCms.Net.Web.WebApi/Program.cs @@ -34,6 +34,7 @@ using Yitter.IdGenerator; using LogLevel = NLog.LogLevel; using Microsoft.AspNetCore.RateLimiting; using CoreCms.Net.Model.ViewModels.Options; +using CoreCms.Net.Web.WebApi.Infrastructure; using Microsoft.Extensions.Configuration;